[java-identity-provider COMMIT] in /trunk: idp-attribute-cli/src/main/resources/conf/internal.xml idp-attribute-resol...

[noreply at shibboleth.net]

Author: rdw
Date: Mon Jul 21 09:20:12 2014
New Revision: 6317

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6317&view=rev
Log:
JSPT-46 Move Spring knowledge out of the base class and interface for services and up to the ReloadableSpringService.

Modified:
    trunk/idp-attribute-cli/src/main/resources/conf/internal.xml
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeMapperTest.java
    trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverTest.java
    trunk/idp-conf/src/main/resources/system/conf/global-system.xml
    trunk/idp-core/src/main/java/net/shibboleth/idp/service/AbstractReloadableService.java
    trunk/idp-core/src/main/java/net/shibboleth/idp/service/ReloadableService.java
    trunk/idp-core/src/main/java/net/shibboleth/idp/service/ReloadableSpringService.java

Modified: trunk/idp-attribute-cli/src/main/resources/conf/internal.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-cli/src/main/resources/conf/internal.xml?rev=6317&r1=6316&r2=6317&view=diff
==============================================================================
--- trunk/idp-attribute-cli/src/main/resources/conf/internal.xml (original)
+++ trunk/idp-attribute-cli/src/main/resources/conf/internal.xml Mon Jul 21 09:20:12 2014
@@ -5,7 +5,7 @@
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
                            http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util.xsd">
 
-    <bean id="shibboleth.LogbackLogging" class="net.shibboleth.idp.log.LogbackLoggingService" init-method="start" destroy-method="stop">
+    <bean id="shibboleth.LogbackLogging" class="net.shibboleth.idp.log.LogbackLoggingService" init-method="initialize" destroy-method="destroy">
         <property name="id" value="shibboleth.LogbackLogging"/>
         <property name="loggingConfiguration" value="conf/logging.xml"/>
         <property name="reloadCheckDelay" value="0"/>

Modified: trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeMapperTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeMapperTest.java?rev=6317&r1=6316&r2=6317&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeMapperTest.java (original)
+++ trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeMapperTest.java Mon Jul 21 09:20:12 2014
@@ -58,7 +58,7 @@
 
         final ReloadableService<AttributeResolver> attributeResolverService = context.getBean(ReloadableService.class);
 
-        attributeResolverService.start();
+        attributeResolverService.initialize();
 
         ServiceableComponent<AttributeResolver> serviceableComponent = null;
         RequestedAttributesMapper attributesMapper = null;

Modified: trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverTest.java?rev=6317&r1=6316&r2=6317&view=diff
==============================================================================
--- trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverTest.java (original)
+++ trunk/idp-attribute-resolver-spring/src/test/java/net/shibboleth/idp/attribute/resolver/spring/AttributeResolverTest.java Mon Jul 21 09:20:12 2014
@@ -119,7 +119,7 @@
 
         final ReloadableService<AttributeResolver> attributeResolverService = context.getBean(ReloadableService.class);
 
-        attributeResolverService.start();
+        attributeResolverService.initialize();
 
         ServiceableComponent<AttributeResolver> serviceableComponent = null;
         final AttributeResolutionContext resolutionContext =
@@ -260,7 +260,7 @@
 
         final ReloadableService<AttributeResolver> attributeResolverService = context.getBean(ReloadableService.class);
 
-        attributeResolverService.start();
+        attributeResolverService.initialize();
 
         ServiceableComponent<AttributeResolver> serviceableComponent = null;
 

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=6317&r1=6316&r2=6317&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/global-system.xml (original)

[... 151 lines stripped ...]