[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 Nov 17 17:17:50 2014
New Revision: 6924

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6924&view=rev
Log:
Checkpoint some work on dynamic metadata resolver schema and Spring parsers.

Added:
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/AbstractDynamicHTTPMetadataProviderParser.java   (with props)
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/AbstractDynamicMetadataProviderParser.java   (with props)
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/DynamicHTTPMetadataProviderParser.java   (with props)
Modified:
    trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/MetadataNamespaceHandler.java
    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/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/MetadataNamespaceHandler.java?rev=6924&r1=6923&r2=6924&view=diff
==============================================================================
--- trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/MetadataNamespaceHandler.java (original)
+++ trunk/idp-profile-spring/src/main/java/net/shibboleth/idp/profile/spring/relyingparty/metadata/MetadataNamespaceHandler.java Mon Nov 17 17:17:50 2014
@@ -59,6 +59,8 @@
                 new FileBackedHTTPMetadataProviderParser());
         registerBeanDefinitionParser(ResourceBackedMetadataProviderParser.ELEMENT_NAME,
                 new ResourceBackedMetadataProviderParser());
+        registerBeanDefinitionParser(DynamicHTTPMetadataProviderParser.ELEMENT_NAME,
+                new DynamicHTTPMetadataProviderParser());
         
         // Resources
         registerBeanDefinitionParser(ClasspathResourceParser.ELEMENT_NAME, new ClasspathResourceParser());

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=6924&r1=6923&r2=6924&view=diff
==============================================================================
--- trunk/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd (original)
+++ trunk/idp-schema/src/main/resources/schema/shibboleth-metadata.xsd Mon Nov 17 17:17:50 2014
@@ -229,7 +229,7 @@
             </documentation>
         </annotation>
         <complexContent>
-            <extension base="shibmd:DynamicMetadataProviderType">
+            <extension base="shibmd:AbstractDynamicHTTPMetadataProviderType">
                 <choice minOccurs="0" maxOccurs="1">
                     <element name="Template">
                         <annotation>
@@ -243,6 +243,11 @@
                         <complexType>
                             <simpleContent>
                                 <extension base="string">
+                                    <attribute name="velocityEngine" type="string">
+                                        <annotation>
+                                            <documentation>Name of the Velocity Engine defined within the application.</documentation>
+                                        </annotation>
+                                    </attribute>
                                     <attribute name="encoded" type="string">
                                         <annotation>
                                             <documentation>
@@ -250,6 +255,13 @@
                                             </documentation>
                                         </annotation>
                                     </attribute>
+                                    <attribute name="transformRef" type="string">
+                                        <annotation>
+                                            <documentation>
+                                                Reference to an optional transform function for the entity ID.
+                                            </documentation>
+                                        </annotation>
+                                    </attribute>
                                 </extension>
                             </simpleContent>
                         </complexType>
@@ -266,7 +278,7 @@
                         <complexType>
                             <simpleContent>
                                 <extension base="string">
-                                    <attribute name="match" type="string">
+                                    <attribute name="match" type="string" use="required">
                                         <annotation>
                                             <documentation>

[... 43 lines stripped ...]