[java-identity-provider COMMIT] in /trunk: idp-cas-impl/pom.xml idp-cas-impl/src/main/java/net/shibboleth/idp/cas/ser...

[noreply at shibboleth.net]

Author: serac
Date: Wed May  6 18:59:08 2015
New Revision: 7501

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7501&view=rev
Log:
IDP-615 Implement ServiceRegistry reloading.

Added:
    trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/service/ReloadableServiceRegistry.java
Modified:
    trunk/idp-cas-impl/pom.xml
    trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/service/PatternServiceRegistry.java
    trunk/idp-cas-impl/src/test/resources/spring/test-flow-beans.xml
    trunk/idp-conf/src/main/resources/conf/cas-protocol.xml
    trunk/idp-conf/src/main/resources/conf/services.properties
    trunk/idp-conf/src/main/resources/conf/services.xml
    trunk/idp-conf/src/main/resources/system/conf/cas-protocol-system.xml
    trunk/idp-conf/src/main/resources/system/conf/services-system.xml
    trunk/idp-conf/src/main/resources/system/flows/cas/abstractValidate/abstractValidate-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/cas/common-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/cas/login/login-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/cas/proxy/proxy-beans.xml
    trunk/idp-conf/src/main/resources/system/flows/cas/proxyValidate/proxyValidate-beans.xml
    trunk/idp-conf/src/test/resources/test/test-cas-beans.xml
    trunk/idp-conf/src/test/resources/test/test-cas-error-beans.xml

Modified: trunk/idp-cas-impl/pom.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-cas-impl/pom.xml?rev=7501&r1=7500&r2=7501&view=diff
==============================================================================
--- trunk/idp-cas-impl/pom.xml	(original)
+++ trunk/idp-cas-impl/pom.xml	Wed May  6 18:59:08 2015
@@ -46,6 +46,10 @@
             <groupId>${httpclient.groupId}</groupId>
             <artifactId>httpclient</artifactId>
         </dependency>
+        <dependency>
+            <groupId>net.shibboleth.ext</groupId>
+            <artifactId>spring-extensions</artifactId>
+        </dependency>
 
         <!-- Provided Dependencies -->
 
@@ -62,11 +66,6 @@
             <groupId>${opensaml.groupId}</groupId>
             <artifactId>opensaml-storage-impl</artifactId>
             <version>${opensaml.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>net.shibboleth.ext</groupId>
-            <artifactId>spring-extensions</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>

Modified: trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/service/PatternServiceRegistry.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/service/PatternServiceRegistry.java?rev=7501&r1=7500&r2=7501&view=diff
==============================================================================
--- trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/service/PatternServiceRegistry.java	(original)
+++ trunk/idp-cas-impl/src/main/java/net/shibboleth/idp/cas/service/PatternServiceRegistry.java	Wed May  6 18:59:08 2015
@@ -17,7 +17,9 @@
 
 package net.shibboleth.idp.cas.service;
 
+import net.shibboleth.ext.spring.service.AbstractServiceableComponent;
 import net.shibboleth.utilities.java.support.annotation.constraint.NonnullElements;
+import net.shibboleth.utilities.java.support.component.IdentifiableComponent;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -33,7 +35,8 @@
  *
  * @author Marvin S. Addison
  */
-public class PatternServiceRegistry implements ServiceRegistry {
+public class PatternServiceRegistry extends AbstractServiceableComponent<ServiceRegistry>
+        implements IdentifiableComponent, ServiceRegistry {
 
     /** Class logger. */
     private final Logger log = LoggerFactory.getLogger(PatternServiceRegistry.class);
@@ -43,6 +46,11 @@
     @NonnullElements
     private List<ServiceDefinition> definitions = Collections.emptyList();
 
+    @Override
+    public void setId(@Nonnull final String componentId) {
+        super.setId(componentId);
+    }
+
     /**
      * Sets the list of service definitions that back the registry.
      * @param definitions List of service definitions, each of which defines a match pattern to evaluate a candidate
@@ -50,6 +58,12 @@
      */
     public void setDefinitions(@Nonnull @NonnullElements List<ServiceDefinition> definitions) {
         this.definitions = Constraint.isNotNull(definitions, "Service definition list cannot be null");
+    }
+
+    @Nonnull
+    @Override
+    public ServiceRegistry getComponent() {
+        return this;
     }
 
     @Override

Modified: trunk/idp-cas-impl/src/test/resources/spring/test-flow-beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-cas-impl/src/test/resources/spring/test-flow-beans.xml?rev=7501&r1=7500&r2=7501&view=diff
==============================================================================
--- trunk/idp-cas-impl/src/test/resources/spring/test-flow-beans.xml	(original)

[... 296 lines stripped ...]