[java-identity-provider COMMIT] in /trunk: idp-conf/src/main/resources/system/conf/global-system.xml idp-saml-api/src...

[noreply at shibboleth.net]

Author: putmanb
Date: Fri Feb 20 17:39:04 2015
New Revision: 7358

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7358&view=rev
Log:
Add wiring for additional schema (Shib metadata extensions) to global-system.xml schema builder instance.

Modified:
    trunk/idp-conf/src/main/resources/system/conf/global-system.xml
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/xmlobject/ExtensionsConstants.java

Modified: trunk/idp-conf/src/main/resources/system/conf/global-system.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-conf/src/main/resources/system/conf/global-system.xml?rev=7358&r1=7357&r2=7358&view=diff
==============================================================================
--- trunk/idp-conf/src/main/resources/system/conf/global-system.xml (original)
+++ trunk/idp-conf/src/main/resources/system/conf/global-system.xml Fri Feb 20 17:39:04 2015
@@ -109,7 +109,20 @@
 
     <!--  Bean used by the SchemaValidation metadata filter and anything else doing basic schema validation. -->
     <bean id="shibboleth.SchemaBuilder" lazy-init="true"
-        class="org.opensaml.saml.common.xml.SAMLSchemaBuilder" c:ver="SAML_11" />
+        class="org.opensaml.saml.common.xml.SAMLSchemaBuilder" c:ver="SAML_11" >
+        <property name="schemaBuilder">
+            <bean class="net.shibboleth.utilities.java.support.xml.SchemaBuilder">
+                <property name="resourceResolver">
+                    <bean class="net.shibboleth.utilities.java.support.xml.ClasspathResolver" />
+                </property>
+                <property name="schemaResources">
+                    <list>
+                        <util:constant static-field="net.shibboleth.idp.saml.xmlobject.ExtensionsConstants.SHIB_MDEXT10_SCHEMA_LOCATION" />
+                    </list>
+                </property>
+            </bean>
+        </property>
+    </bean>
 
     <bean id="shibboleth.HttpServletRequest" class="net.shibboleth.utilities.java.support.net.ThreadLocalHttpServletRequestProxy" />
     <bean id="shibboleth.HttpServletResponse" class="net.shibboleth.utilities.java.support.net.ThreadLocalHttpServletResponseProxy" />

Modified: trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/xmlobject/ExtensionsConstants.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/xmlobject/ExtensionsConstants.java?rev=7358&r1=7357&r2=7358&view=diff
==============================================================================
--- trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/xmlobject/ExtensionsConstants.java (original)
+++ trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/xmlobject/ExtensionsConstants.java Fri Feb 20 17:39:04 2015
@@ -21,6 +21,9 @@
 public final class ExtensionsConstants {
 
     /** URI for XML schema namespace for Shibboleth extensions to SAML metadata. */
+    public static final String SHIB_MDEXT10_SCHEMA_LOCATION = "/schema/shibboleth-metadata-1.0.xsd";
+    
+    /** URI for XML schema namespace for Shibboleth extensions to SAML metadata. */
     public static final String SHIB_MDEXT10_NS = "urn:mace:shibboleth:metadata:1.0";
 
     /** Namespace QName prefix for Shibboleth extensions to SAML metadata. */