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

[noreply at shibboleth.net]

Author: putmanb
Date: Thu Sep 25 21:25:23 2014
New Revision: 4082

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4082&view=rev
Log:
OSJ-12: Schema for SAML1.1 and SAML1.0 are the cs-sstc,mumble versions, not the oasis-sstc-mumble versions

Added:
    trunk/opensaml-saml-api/src/main/resources/schema/oasis-sstc-saml-schema-assertion-1.0.xsd   (with props)
    trunk/opensaml-saml-api/src/main/resources/schema/oasis-sstc-saml-schema-assertion-1.1.xsd   (with props)
    trunk/opensaml-saml-api/src/main/resources/schema/oasis-sstc-saml-schema-protocol-1.0.xsd   (with props)
    trunk/opensaml-saml-api/src/main/resources/schema/oasis-sstc-saml-schema-protocol-1.1.xsd   (with props)
Modified:
    trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/xml/SAMLConstants.java
    trunk/opensaml-saml-api/src/main/resources/schema/cs-sstc-schema-assertion-01.xsd
    trunk/opensaml-saml-api/src/main/resources/schema/cs-sstc-schema-assertion-1.1.xsd
    trunk/opensaml-saml-api/src/main/resources/schema/cs-sstc-schema-protocol-01.xsd
    trunk/opensaml-saml-api/src/main/resources/schema/cs-sstc-schema-protocol-1.1.xsd
    trunk/opensaml-saml-impl/src/test/resources/data/org/opensaml/saml/saml1/binding/Response.xml
    trunk/opensaml-saml-impl/src/test/resources/data/org/opensaml/saml/saml1/core/FullResponse.xml

Modified: trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/xml/SAMLConstants.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/xml/SAMLConstants.java?rev=4082&r1=4081&r2=4082&view=diff
==============================================================================
--- trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/xml/SAMLConstants.java (original)
+++ trunk/opensaml-saml-api/src/main/java/org/opensaml/saml/common/xml/SAMLConstants.java Thu Sep 25 21:25:23 2014
@@ -78,19 +78,19 @@
     // SAML 1.X
     // ****************************
     /** SAML 1.0 Assertion schema system Id. */
-    public static final String SAML10_SCHEMA_LOCATION = SCHEMA_DIR + "cs-sstc-schema-assertion-01.xsd";
+    public static final String SAML10_SCHEMA_LOCATION = SCHEMA_DIR + "oasis-sstc-saml-schema-assertion-1.0.xsd";
 
     /** SAML 1.1 Assertion schema system Id. */
-    public static final String SAML11_SCHEMA_LOCATION = SCHEMA_DIR + "cs-sstc-schema-assertion-1.1.xsd";
+    public static final String SAML11_SCHEMA_LOCATION = SCHEMA_DIR + "oasis-sstc-saml-schema-assertion-1.1.xsd";
 
     /** SAML 1.X XML namespace. */
     public static final String SAML1_NS = "urn:oasis:names:tc:SAML:1.0:assertion";
 
     /** SAML 1.0 Protocol schema system Id. */
-    public static final String SAML10P_SCHEMA_LOCATION = SCHEMA_DIR + "cs-sstc-schema-protocol-01.xsd";
+    public static final String SAML10P_SCHEMA_LOCATION = SCHEMA_DIR + "oasis-sstc-saml-schema-protocol-1.0.xsd";
 
     /** SAML 1.1 Protocol schema system Id. */
-    public static final String SAML11P_SCHEMA_LOCATION = SCHEMA_DIR + "cs-sstc-schema-protocol-1.1.xsd";
+    public static final String SAML11P_SCHEMA_LOCATION = SCHEMA_DIR + "oasis-sstc-saml-schema-protocol-1.1.xsd";
 
     /** SAML 1.X protocol XML namespace. */
     public static final String SAML10P_NS = "urn:oasis:names:tc:SAML:1.0:protocol";

Modified: trunk/opensaml-saml-impl/src/test/resources/data/org/opensaml/saml/saml1/binding/Response.xml
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/test/resources/data/org/opensaml/saml/saml1/binding/Response.xml?rev=4082&r1=4081&r2=4082&view=diff
==============================================================================
--- trunk/opensaml-saml-impl/src/test/resources/data/org/opensaml/saml/saml1/binding/Response.xml (original)
+++ trunk/opensaml-saml-impl/src/test/resources/data/org/opensaml/saml/saml1/binding/Response.xml Thu Sep 25 21:25:23 2014
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- xsi:schemaLocation="urn:oasis:names:tc:SAML:1.0:protocol ../../../../../src/schema/cs-sstc-schema-assertion-1.1.xsd"-->
+<!-- xsi:schemaLocation="urn:oasis:names:tc:SAML:1.0:protocol ../../../../../src/schema/oasis-sstc-saml-schema-assertion-1.1.xsd"-->
 <Response xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:samlp="urn:oasis:names:tc:SAML:1.0:protocol" xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion" xmlns="urn:oasis:names:tc:SAML:1.0:protocol" InResponseTo="_aa3cde13c0963b75651196e0e9c2095f" IssueInstant="2005-12-09T09:27:55.124Z" MajorVersion="1" MinorVersion="1" ResponseID="_e75ba05f107c1f21feb6aa984f050c4d" Recipient="https://sp.example.org/sso/acs">
     <Status>
         <StatusCode Value="samlp:Success">

Modified: trunk/opensaml-saml-impl/src/test/resources/data/org/opensaml/saml/saml1/core/FullResponse.xml
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-saml-impl/src/test/resources/data/org/opensaml/saml/saml1/core/FullResponse.xml?rev=4082&r1=4081&r2=4082&view=diff
==============================================================================

[... 10 lines stripped ...]