[java-opensaml COMMIT] in /trunk/opensaml-saml-api/src/main: java/org/opensaml/saml/common/xml/SAMLSchemaBuilder.java...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Feb 10 20:50:59 2014
New Revision: 3607

URL: http://svn.shibboleth.net/view/java-opensaml?rev=3607&view=rev
Log:
- Add mappings and excise some classpath syntax from SAML 2.0 schemas.
- Fix order of schema additions to resolve ECP/protocol import.

Modified:
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/xml/SAMLSchemaBuilder.java
    trunk/opensaml-saml-api/src/main/resources/schema/ietf-kitten-sasl-saml-ec.xsd
    trunk/opensaml-saml-api/src/main/resources/schema/saml-metadata-rpi-v1.0.xsd
    trunk/opensaml-saml-api/src/main/resources/schema/saml-schema-assertion-2.0.xsd
    trunk/opensaml-saml-api/src/main/resources/schema/saml-schema-ecp-2.0.xsd
    trunk/opensaml-saml-api/src/main/resources/schema/saml-schema-metadata-2.0.xsd
    trunk/opensaml-saml-api/src/main/resources/schema/saml-schema-protocol-2.0.xsd
    trunk/opensaml-saml-api/src/main/resources/schema/sstc-metadata-attr.xsd
    trunk/opensaml-saml-api/src/main/resources/schema/sstc-saml-channel-binding-ext-v1.0.xsd
    trunk/opensaml-saml-api/src/main/resources/schema/sstc-saml-delegation.xsd
    trunk/opensaml-saml-api/src/main/resources/schema/sstc-saml-idp-discovery.xsd
    trunk/opensaml-saml-api/src/main/resources/schema/sstc-saml-metadata-ext-query.xsd
    trunk/opensaml-saml-api/src/main/resources/schema/sstc-saml-metadata-ui-v1.0.xsd
    trunk/opensaml-saml-api/src/main/resources/schema/sstc-saml-protocol-ext-thirdparty.xsd

Modified: trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/xml/SAMLSchemaBuilder.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/xml/SAMLSchemaBuilder.java?rev=3607&r1=3606&r2=3607&view=diff
==============================================================================
--- trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/xml/SAMLSchemaBuilder.java (original)
+++ trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/xml/SAMLSchemaBuilder.java Mon Feb 10 20:50:59 2014
@@ -72,6 +72,8 @@
     /** Classpath relative location of SAML 2_0 schemas. */
     @Nonnull @NonnullElements @NotEmpty private static String[] saml20Schemas = { 
         "/schema/saml-schema-assertion-2.0.xsd",
+        "/schema/saml-schema-protocol-2.0.xsd",
+        "/schema/saml-schema-metadata-2.0.xsd",
         "/schema/saml-schema-authn-context-2.0.xsd",
         "/schema/saml-schema-authn-context-auth-telephony-2.0.xsd",
         "/schema/saml-schema-authn-context-ip-2.0.xsd",
@@ -100,8 +102,6 @@
         "/schema/saml-schema-authn-context-xmldsig-2.0.xsd",
         "/schema/saml-schema-dce-2.0.xsd",
         "/schema/saml-schema-ecp-2.0.xsd",
-        "/schema/saml-schema-metadata-2.0.xsd",
-        "/schema/saml-schema-protocol-2.0.xsd",
         "/schema/saml-schema-x500-2.0.xsd",
         "/schema/saml-schema-xacml-2.0.xsd",
         };

Modified: trunk/opensaml-saml-api/src/main/resources/schema/ietf-kitten-sasl-saml-ec.xsd
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-api/src/main/resources/schema/ietf-kitten-sasl-saml-ec.xsd?rev=3607&r1=3606&r2=3607&view=diff
==============================================================================
--- trunk/opensaml-saml-api/src/main/resources/schema/ietf-kitten-sasl-saml-ec.xsd (original)
+++ trunk/opensaml-saml-api/src/main/resources/schema/ietf-kitten-sasl-saml-ec.xsd Mon Feb 10 20:50:59 2014
@@ -11,9 +11,8 @@
    version="1.0">
 
     <import namespace="http://www.w3.org/2000/09/xmldsig#"
-        schemaLocation="classpath:/schema/xmldsig-core-schema.xsd"/>
-    <import namespace="http://schemas.xmlsoap.org/soap/envelope/"
-        schemaLocation="classpath:/schema/soap-envelope.xsd"/>
+        schemaLocation="http://www.w3.org/TR/2002/REC-xmldsig-core-20020212/xmldsig-core-schema.xsd"/>
+    <import namespace="http://schemas.xmlsoap.org/soap/envelope/"/>
 
   <element name="SessionKey" type="samlec:SessionKeyType"/>
   <complexType name="SessionKeyType">

Modified: trunk/opensaml-saml-api/src/main/resources/schema/saml-metadata-rpi-v1.0.xsd
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-api/src/main/resources/schema/saml-metadata-rpi-v1.0.xsd?rev=3607&r1=3606&r2=3607&view=diff
==============================================================================
--- trunk/opensaml-saml-api/src/main/resources/schema/saml-metadata-rpi-v1.0.xsd (original)
+++ trunk/opensaml-saml-api/src/main/resources/schema/saml-metadata-rpi-v1.0.xsd Mon Feb 10 20:50:59 2014
@@ -32,8 +32,8 @@
         </documentation>
     </annotation>
     
-    <import namespace="urn:oasis:names:tc:SAML:2.0:metadata" schemaLocation="classpath:/schema/saml-schema-metadata-2.0.xsd"/>
-    <import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="classpath:/schema/xml.xsd"/>
+    <import namespace="urn:oasis:names:tc:SAML:2.0:metadata" schemaLocation="http://docs.oasis-open.org/security/saml/v2.0/saml-schema-metadata-2.0.xsd"/>
+    <import namespace="http://www.w3.org/XML/1998/namespace" schemaLocation="http://www.w3.org/2001/xml.xsd"/>

[... 187 lines stripped ...]