[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/conf/services.properties idp-conf/src/main/res...

[noreply at shibboleth.net]

Author: scantor
Date: Thu Dec 18 23:08:32 2014
New Revision: 7165

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7165&view=rev
Log:
IDP-547 - Logging service should be abstracted away from logback

Added:
    trunk/idp-core/src/main/java/net/shibboleth/idp/log/LoggingService.java   (with props)
Modified:
    trunk/idp-conf/src/main/resources/conf/services.properties
    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
    trunk/idp-core/src/main/java/net/shibboleth/idp/log/LogbackLoggingService.java

Modified: trunk/idp-conf/src/main/resources/conf/services.properties
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/conf/services.properties?rev=7165&r1=7164&r2=7165&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/conf/services.properties (original)
+++ trunk/idp-conf/src/main/resources/conf/services.properties Thu Dec 18 23:08:32 2014
@@ -4,6 +4,7 @@
 # failFast=true prevents IdP startup if a configuration is bad
 # checkInterval=0 means never reload (this is the default)
 
+#idp.service.logging.resource=%{idp.home}/conf/logback.xml
 #idp.service.logging.failFast=false
 idp.service.logging.checkInterval=PT5M
 

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=7165&r1=7164&r2=7165&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 Thu Dec 18 23:08:32 2014
@@ -49,10 +49,10 @@
     <import resource="utilities.xml" />
 
     <bean id="shibboleth.OpenSAMLConfig" class="net.shibboleth.idp.spring.OpenSAMLConfigBean"
-        depends-on="shibboleth.LogbackLogging,shibboleth.ParserPool" p:parserPool-ref="shibboleth.ParserPool" />
+        depends-on="shibboleth.LoggingService,shibboleth.ParserPool" p:parserPool-ref="shibboleth.ParserPool" />
 
     <bean id="shibboleth.VelocityEngine" class="org.springframework.ui.velocity.VelocityEngineFactoryBean"
-            depends-on="shibboleth.LogbackLogging">
+            depends-on="shibboleth.LoggingService">
         <property name="overrideLogging" value="false"/>
         <property name="velocityProperties">
             <props>
@@ -78,7 +78,7 @@
     </bean>
 
     <bean id="shibboleth.ParserPool" class="net.shibboleth.utilities.java.support.xml.BasicParserPool"
-            depends-on="shibboleth.LogbackLogging"
+            depends-on="shibboleth.LoggingService"
             p:maxPoolSize="100"
             p:coalescing="true"
             p:ignoreComments="true"
@@ -170,7 +170,7 @@
         p:cookieName="shib_idp_persistent_ss"
         p:dataSealer-ref="shibboleth.DataSealer" />
 
-    <bean id="shibboleth.ReplayCache" class="org.opensaml.storage.ReplayCache" depends-on="shibboleth.LogbackLogging"
+    <bean id="shibboleth.ReplayCache" class="org.opensaml.storage.ReplayCache" depends-on="shibboleth.LoggingService"
         p:storage-ref="shibboleth.StorageService" p:strict="true" />
 
     <bean id="shibboleth.SAMLArtifactMap" depends-on="shibboleth.StorageService"

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=7165&r1=7164&r2=7165&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 Thu Dec 18 23:08:32 2014
@@ -19,8 +19,8 @@
     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"
+    <bean id="shibboleth.LoggingService" class="%{idp.service.logging.class:net.shibboleth.idp.log.LogbackLoggingService}"
+        p:loggingConfiguration="%{idp.service.logging.resource:%{idp.home}/conf/logback.xml}"
         p:reloadCheckDelay="%{idp.service.logging.checkInterval:0}"
         p:failFast="%{idp.service.logging.failFast:true}" />
     

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=7165&r1=7164&r2=7165&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 Thu Dec 18 23:08:32 2014

[... 231 lines stripped ...]