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

[noreply at shibboleth.net]

Author: putmanb
Date: Fri Oct 21 20:26:02 2016
New Revision: 8525

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8525&view=rev
Log:
IDP-1072: Config schema and parser support for Set<MetadataIndex> on batch HTTP metadata resolvers

Added:
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/https-indexes.xml   (with props)
Modified:
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/AbstractReloadingMetadataProviderParser.java
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPMetadataProviderParserTest.java
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/beans.xml
    trunk/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd

Modified: trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/AbstractReloadingMetadataProviderParser.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/AbstractReloadingMetadataProviderParser.java?rev=8525&r1=8524&r2=8525&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/AbstractReloadingMetadataProviderParser.java	(original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/AbstractReloadingMetadataProviderParser.java	Fri Oct 21 20:26:02 2016
@@ -48,6 +48,11 @@
         final String timerRef = getTaskTimerRef(element);
         if (timerRef != null) {
             builder.addConstructorArgReference(timerRef);
+        }
+
+        if (element.hasAttributeNS(null, "indexesRef")) {
+            builder.addPropertyReference("indexes",
+                    StringSupport.trimOrNull(element.getAttributeNS(null, "indexesRef")));
         }
 
         if (element.hasAttributeNS(null, "refreshDelayFactor")) {

Modified: trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPMetadataProviderParserTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPMetadataProviderParserTest.java?rev=8525&r1=8524&r2=8525&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPMetadataProviderParserTest.java	(original)
+++ trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/HTTPMetadataProviderParserTest.java	Fri Oct 21 20:26:02 2016
@@ -180,4 +180,16 @@
         Assert.assertNotNull(resolver.resolveSingle(criteriaFor(IDP_ID)));
     }
     
+    @Test public void indexes() throws Exception {
+
+        HTTPMetadataResolver resolver = getBean(HTTPMetadataResolver.class, "https-indexes.xml", "beans.xml");
+        
+        Assert.assertEquals(resolver.getId(), "HTTPSEntityWithIndexes");
+        
+        Assert.assertNotNull(resolver.resolveSingle(criteriaFor(IDP_ID)));
+        
+        Assert.assertNotNull(resolver.getIndexes());
+        Assert.assertEquals(resolver.getIndexes().size(), 3);
+    }
+    
 }

Modified: trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/beans.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/beans.xml?rev=8525&r1=8524&r2=8525&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/beans.xml	(original)
+++ trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/beans.xml	Fri Oct 21 20:26:02 2016
@@ -73,4 +73,10 @@
     
     <bean id="metadata.HttpClientSecurityParameters" class="org.opensaml.security.httpclient.HttpClientSecurityParameters" />
             
+    <util:set id="metadata.Indexes">
+        <bean class="org.opensaml.saml.metadata.resolver.index.impl.RoleMetadataIndex" />
+        <bean class="org.opensaml.saml.metadata.resolver.index.impl.EndpointMetadataIndex" />
+        <bean class="org.opensaml.saml.metadata.resolver.index.impl.SAMLArtifactMetadataIndex" />
+    </util:set>
+            
 </beans>

Modified: trunk/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd?rev=8525&r1=8524&r2=8525&view=diff
==============================================================================
--- trunk/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd	(original)

[... 17 lines stripped ...]