[java-identity-provider COMMIT] in /trunk/idp-conf/src/main/resources: conf/relying-party.xml system/conf/global-syst...

[noreply at shibboleth.net]

Author: scantor
Date: Fri Oct 10 10:06:53 2014
New Revision: 6670

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6670&view=rev
Log:
Move logging service bean into services file, and add to status page.

Modified:
    trunk/idp-conf/src/main/resources/conf/relying-party.xml
    trunk/idp-conf/src/main/resources/system/conf/global-system.xml
    trunk/idp-conf/src/main/resources/system/conf/services-system.xml
    trunk/idp-conf/src/main/resources/system/flows/admin/status-beans.xml

Modified: trunk/idp-conf/src/main/resources/conf/relying-party.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/relying-party.xml?rev=6670&r1=6669&r2=6670&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/relying-party.xml (original)
+++ trunk/idp-conf/src/main/resources/conf/relying-party.xml Fri Oct 10 10:06:53 2014
@@ -15,8 +15,11 @@
     <context:property-placeholder />
 
     <!--
-    Anonymous configuration, defaults to no support for any profiles. Add <ref> elements to the list
-    to enable specific default profile settings (as below), or create new beans inline to override defaults. 
+    Unverified RP configuration, defaults to no support for any profiles. Add <ref> elements to the list
+    to enable specific default profile settings (as below), or create new beans inline to override defaults.
+    
+    "Unverified" typically means the IdP has no metadata, or equivalent way of assuring the identity and
+    legitimacy of a requesting system. To run an "open" IdP, you can enable profiles here.
     -->
     
     <bean id="shibboleth.UnverifiedRelyingParty" parent="RelyingParty">

Modified: trunk/idp-conf/src/main/resources/system/conf/global-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/global-system.xml?rev=6670&r1=6669&r2=6670&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/global-system.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/global-system.xml Fri Oct 10 10:06:53 2014
@@ -46,12 +46,6 @@
     <import resource="../../conf/global.xml" />
     
     <bean id="shibboleth.TaskTimer" class="java.util.Timer" destroy-method="cancel"/> <!--  only needed if you do reloading -->
-    
-    <bean id="shibboleth.LogbackLogging" class="net.shibboleth.idp.log.LogbackLoggingService"
-          p:loggingConfiguration="%{idp.home}/conf/logback.xml"
-          p:reloadCheckDelay="%{idp.service.logging.checkInterval:PT5M}"
-          p:reloadTaskTimer-ref="shibboleth.TaskTimer"
-          p:failFast="%{idp.service.logging.failFast:true}" />
     
     <bean id="shibboleth.OpenSAMLConfig" class="net.shibboleth.idp.spring.OpenSAMLConfigBean"
         depends-on="shibboleth.LogbackLogging,shibboleth.ParserPool" p:parserPool-ref="shibboleth.ParserPool" />

Modified: trunk/idp-conf/src/main/resources/system/conf/services-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/services-system.xml?rev=6670&r1=6669&r2=6670&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/services-system.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/services-system.xml Fri Oct 10 10:06:53 2014
@@ -19,6 +19,12 @@
     services are generally defined in the services.xml file edited by deployers.
     -->
 
+    <bean id="shibboleth.LogbackLogging" class="net.shibboleth.idp.log.LogbackLoggingService"
+          p:loggingConfiguration="%{idp.home}/conf/logback.xml"
+          p:reloadCheckDelay="%{idp.service.logging.checkInterval:PT5M}"
+          p:reloadTaskTimer-ref="shibboleth.TaskTimer"
+          p:failFast="%{idp.service.logging.failFast:true}" />
+    
     <bean id="shibboleth.AttributeFilterService" class="net.shibboleth.ext.spring.service.ReloadableSpringService"
         depends-on="shibboleth.VelocityEngine"
         p:serviceConfigurations-ref="shibboleth.AttributeFilterResources"

Modified: trunk/idp-conf/src/main/resources/system/flows/admin/status-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/flows/admin/status-beans.xml?rev=6670&r1=6669&r2=6670&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/flows/admin/status-beans.xml (original)
+++ trunk/idp-conf/src/main/resources/system/flows/admin/status-beans.xml Fri Oct 10 10:06:53 2014
@@ -22,6 +22,7 @@
     <import resource="../../conf/audit-system.xml" />
     
     <util:list id="ServiceCollection">
+        <ref bean="shibboleth.LogbackLogging" />
         <ref bean="shibboleth.ReloadableAccessControlService" />
         <ref bean="shibboleth.MetadataResolverService" />
         <ref bean="shibboleth.RelyingPartyResolverService" />