[java-opensaml2 COMMIT] /branches/REL_2/src/main/java/org/opensaml/common/xml/SAMLSchemaBuilder.java

[noreply at shibboleth.net]

Author: scantor
Date: Thu Nov  8 10:28:56 2012
New Revision: 1598

URL: http://svn.shibboleth.net/view/java-opensaml2?rev=1598&view=rev
Log:
Load additional schemas for Sig/Enc 1.1 and SAML ext specs.

Modified:
    branches/REL_2/src/main/java/org/opensaml/common/xml/SAMLSchemaBuilder.java

Modified: branches/REL_2/src/main/java/org/opensaml/common/xml/SAMLSchemaBuilder.java
URL: http://svn.shibboleth.net/view/java-opensaml2/branches/REL_2/src/main/java/org/opensaml/common/xml/SAMLSchemaBuilder.java?rev=1598&r1=1597&r2=1598&view=diff
==============================================================================
--- branches/REL_2/src/main/java/org/opensaml/common/xml/SAMLSchemaBuilder.java (original)
+++ branches/REL_2/src/main/java/org/opensaml/common/xml/SAMLSchemaBuilder.java Thu Nov  8 10:28:56 2012
@@ -56,8 +56,14 @@
     private static SoftReference<Schema> saml11Schema;
 
     /** Classpath relative location of basic XML schemas. */
-    private static String[] baseXMLSchemas = { "/schema/xml.xsd", "/schema/XMLSchema.xsd",
-            "/schema/xmldsig-core-schema.xsd", "/schema/xenc-schema.xsd", };
+    private static String[] baseXMLSchemas = {
+        "/schema/xml.xsd",
+        "/schema/XMLSchema.xsd",
+        "/schema/xmldsig-core-schema.xsd",
+        "/schema/xenc-schema.xsd",
+        "/schema/xmldsig11-schema.xsd",
+        "/schema/xenc11-schema.xsd",
+    };
 
     /** Classpath relative location of SOAP 1_1 schemas. */
     private static String[] soapSchemas = { "/schema/soap-envelope.xsd", };
@@ -106,15 +112,21 @@
         "/schema/saml-schema-x500-2.0.xsd",
         "/schema/saml-schema-xacml-2.0.xsd",
         "/schema/sstc-saml-delegation.xsd",
+    };
+
+    /** Classpath relative location of SAML extension schemas. */
+    private static String[] baseExtSchemas = {
+        "/schema/sstc-saml1x-metadata.xsd",
         "/schema/sstc-saml-idp-discovery.xsd",
+        "/schema/sstc-saml-protocol-ext-thirdparty.xsd",
         "/schema/sstc-saml-metadata-ext-query.xsd",
-        "/schema/sstc-saml-protocol-ext-thirdparty.xsd",
         "/schema/sstc-saml1x-metadata.xsd",
+        "/schema/sstc-saml-metadata-ui-v1.0.xsd",
+        "/schema/sstc-metadata-attr.xsd",
+        "/schema/sstc-saml-delegation.xsd",
+        "/schema/saml-metadata-rpi-v1.0.xsd",
+        "/schema/saml-async-slo-v1.0.xsd",
     };
-
-    /** Classpath relative location of SAML extension schemas. */
-    private static String[] baseExtSchemas = { "/schema/sstc-saml-protocol-ext-thirdparty.xsd",
-            "/schema/sstc-saml-metadata-ext-query.xsd", "/schema/sstc-saml1x-metadata.xsd", };
 
     /** Additional schema locations relative to classpath. */
     private static List<String> extensionSchema = new ArrayList<String>();