[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: Mon Oct 24 21:00:04 2016
New Revision: 8537

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=8537&view=rev
Log:
IDP-972: Support a filesystem-based version of DynamicHTTPMetadataProvider

Schema, parser and tests.

Added:
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/LocalDynamicMetadataProviderParser.java   (with props)
    trunk/idp-profile-spring/src/test/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/LocalDynamicMetadataProviderParserTest.java   (with props)
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/localDynamicWithManagerAndGenerator.xml   (with props)
    trunk/idp-profile-spring/src/test/resources/net/shibboleth/idp/profile/spring/relyingparty/metadata/localDynamicWithSourceDirectory.xml   (with props)
Modified:
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/MetadataNamespaceHandler.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/MetadataNamespaceHandler.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/MetadataNamespaceHandler.java?rev=8537&r1=8536&r2=8537&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/MetadataNamespaceHandler.java	(original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/impl/MetadataNamespaceHandler.java	Mon Oct 24 21:00:04 2016
@@ -61,6 +61,8 @@
                 new ResourceBackedMetadataProviderParser());
         registerBeanDefinitionParser(DynamicHTTPMetadataProviderParser.ELEMENT_NAME,
                 new DynamicHTTPMetadataProviderParser());
+        registerBeanDefinitionParser(LocalDynamicMetadataProviderParser.ELEMENT_NAME,
+                new LocalDynamicMetadataProviderParser());
 
         // Resources
         registerBeanDefinitionParser(ClasspathResourceParser.ELEMENT_NAME, new ClasspathResourceParser());

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=8537&r1=8536&r2=8537&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	Mon Oct 24 21:00:04 2016
@@ -78,5 +78,9 @@
         <bean class="org.opensaml.saml.metadata.resolver.index.impl.EndpointMetadataIndex" />
         <bean class="org.opensaml.saml.metadata.resolver.index.impl.SAMLArtifactMetadataIndex" />
     </util:set>
+    
+    <bean id="metadata.LocalDynamicSourceManager" class="org.opensaml.core.xml.persist.MapLoadSaveManager" />
+    
+    <bean id="metadata.LocalDynamicSourceKeyGenerator" class="org.opensaml.saml.metadata.resolver.impl.IdentityEntityIDGenerator" />
             
 </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=8537&r1=8536&r2=8537&view=diff
==============================================================================
--- trunk/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd	(original)
+++ trunk/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd	Mon Oct 24 21:00:04 2016
@@ -630,6 +630,46 @@
                     </annotation>
                 </attribute>
                 <!-- Need to deal with socket factory -->
+            </extension>
+        </complexContent>
+    </complexType>
+    
+    <complexType name="LocalDynamicMetadataProvider">
+        <annotation>
+            <documentation>A metadata provider that dynamically fetches metadata from 
+            a local source provided by an instance of XMLObjectLoadSaveManager.</documentation>
+        </annotation>
+        <complexContent>
+            <extension base="shibmd:DynamicMetadataProviderType"> 
+                <attribute name="sourceManagerRef" type="string">
+                    <annotation>
+                        <documentation>
+                            Bean reference to the XMLObjectLoadSaveManager which serves as the local source of metadata.
+                       </documentation>
+                    </annotation>

[... 27 lines stripped ...]