[java-identity-provider COMMIT] in /trunk/idp-saml-api/src: main/java/net/shibboleth/idp/saml/attribute/encoding/Abst...

[noreply at shibboleth.net]

Author: tzeller
Date: Thu Nov  8 11:47:24 2012
New Revision: 4231

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=4231&view=rev
Log:
Saml1 protocol should be 1.1 rather than 1.0.

Modified:
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSaml1AttributeEncoder.java
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSaml1NameIdentifierEncoder.java
    trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSaml1AttributeEncoderTest.java
    trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSaml1NameIdentifierEncoderTest.java

Modified: trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSaml1AttributeEncoder.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSaml1AttributeEncoder.java?rev=4231&r1=4230&r2=4231&view=diff
==============================================================================
--- trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSaml1AttributeEncoder.java (original)
+++ trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSaml1AttributeEncoder.java Thu Nov  8 11:47:24 2012
@@ -54,7 +54,7 @@
 
     /** {@inheritDoc} */
     @Nonnull @NotEmpty public final String getProtocol() {
-        return SAMLConstants.SAML10P_NS;
+        return SAMLConstants.SAML11P_NS;
     }
 
     /** {@inheritDoc} */

Modified: trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSaml1NameIdentifierEncoder.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSaml1NameIdentifierEncoder.java?rev=4231&r1=4230&r2=4231&view=diff
==============================================================================
--- trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSaml1NameIdentifierEncoder.java (original)
+++ trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSaml1NameIdentifierEncoder.java Thu Nov  8 11:47:24 2012
@@ -27,6 +27,6 @@
 
     /** {@inheritDoc} */
     @Nonnull public final String getProtocol() {
-        return SAMLConstants.SAML10P_NS;
+        return SAMLConstants.SAML11P_NS;
     }
 }

Modified: trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSaml1AttributeEncoderTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSaml1AttributeEncoderTest.java?rev=4231&r1=4230&r2=4231&view=diff
==============================================================================
--- trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSaml1AttributeEncoderTest.java (original)
+++ trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSaml1AttributeEncoderTest.java Thu Nov  8 11:47:24 2012
@@ -68,7 +68,7 @@
         encoder.setNamespace(MY_NAMESPACE);
         encoder.initialize();
         // Use literal here to catch things being edited by mistake
-        Assert.assertEquals(encoder.getProtocol(), "urn:oasis:names:tc:SAML:1.0:protocol");
+        Assert.assertEquals(encoder.getProtocol(), "urn:oasis:names:tc:SAML:1.1:protocol");
 
                 
         Attribute attr = new Attribute(ATTRIBUTE_ID);

Modified: trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSaml1NameIdentifierEncoderTest.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSaml1NameIdentifierEncoderTest.java?rev=4231&r1=4230&r2=4231&view=diff
==============================================================================
--- trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSaml1NameIdentifierEncoderTest.java (original)
+++ trunk/idp-saml-api/src/test/java/net/shibboleth/idp/saml/attribute/encoding/AbstractSaml1NameIdentifierEncoderTest.java Thu Nov  8 11:47:24 2012
@@ -37,6 +37,6 @@
             }
         };
         // Again, use constants
-        Assert.assertEquals(encoder.getProtocol(), "urn:oasis:names:tc:SAML:1.0:protocol");
+        Assert.assertEquals(encoder.getProtocol(), "urn:oasis:names:tc:SAML:1.1:protocol");
     }
 }