[java-identity-provider COMMIT] in /trunk: idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ReloadMetad...

[noreply at shibboleth.net]

Author: rdw
Date: Tue Jul 22 11:44:53 2014
New Revision: 6329

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6329&view=rev
Log:
IDP-72 Add actions to reload Services and to reload the metadata within a metadataResolverService.

Added:
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ReloadMetadata.java   (with props)
    trunk/idp-profile-impl/src/main/java/net/shibboleth/idp/profile/impl/ReloadService.java   (with props)
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/ReloadTest.java   (with props)
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/reload/
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/reload/beans.xml   (with props)
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/reload/entity.xml   (with props)
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/reload/metadata.xml   (with props)
Modified:
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/AbstractMetadataParserTest.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/RelyingPartyMetadataProvider.java

Modified: trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/AbstractMetadataParserTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/AbstractMetadataParserTest.java?rev=6329&r1=6328&r2=6329&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/AbstractMetadataParserTest.java (original)
+++ trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/AbstractMetadataParserTest.java Tue Jul 22 11:44:53 2014
@@ -31,7 +31,6 @@
 
 import org.opensaml.core.OpenSAMLInitBaseTestCase;
 import org.opensaml.core.criterion.EntityIdCriterion;
-import org.opensaml.saml.metadata.resolver.MetadataResolver;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.context.support.ConversionServiceFactoryBean;
 import org.springframework.context.support.GenericApplicationContext;
@@ -112,7 +111,7 @@
 
     }
 
-    protected <T extends MetadataResolver> T getBean(Class<T> claz, String... files) throws IOException {
+    protected <T> T getBean(Class<T> claz, String... files) throws IOException {
         final Resource[] resources = new Resource[files.length];
 
         for (int i = 0; i < files.length; i++) {

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/RelyingPartyMetadataProvider.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/RelyingPartyMetadataProvider.java?rev=6329&r1=6328&r2=6329&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/RelyingPartyMetadataProvider.java (original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/metadata/impl/RelyingPartyMetadataProvider.java Tue Jul 22 11:44:53 2014
@@ -26,6 +26,7 @@
 import net.shibboleth.utilities.java.support.resolver.ResolverException;
 
 import org.opensaml.saml.metadata.resolver.MetadataResolver;
+import org.opensaml.saml.metadata.resolver.RefreshableMetadataResolver;
 import org.opensaml.saml.metadata.resolver.filter.MetadataFilter;
 import org.opensaml.saml.saml2.metadata.EntityDescriptor;
 
@@ -35,7 +36,7 @@
  * 
  */
 public class RelyingPartyMetadataProvider extends AbstractServiceableComponent<MetadataResolver> implements
-        MetadataResolver {
+        MetadataResolver, RefreshableMetadataResolver {
 
     /** The embedded resolver. */
     private final MetadataResolver resolver;
@@ -48,10 +49,11 @@
     public RelyingPartyMetadataProvider(MetadataResolver child) {
         resolver = child;
     }
-    
-    /** Return what we are build around. Used for testing.
+
+    /**
+     * Return what we are build around. Used for testing.
      * 
-     * @return the parameter we got as a constructor 
+     * @return the parameter we got as a constructor
      */
     public MetadataResolver getEmbeddedResolver() {
         return resolver;
@@ -84,10 +86,9 @@
     @Override public MetadataFilter getMetadataFilter() {
         return resolver.getMetadataFilter();
     }
-    
+
     /** {@inheritDoc} */
-    @Override
-    protected void doInitialize() throws ComponentInitializationException {
+    @Override protected void doInitialize() throws ComponentInitializationException {
         setId(resolver.getId());
         super.doInitialize();
     }
@@ -101,4 +102,12 @@

[... 13 lines stripped ...]