[java-identity-provider COMMIT] in /trunk: idp-saml-api/src/main/java/net/shibboleth/idp/saml/session/SAML2SPSession....

[noreply at shibboleth.net]

Author: scantor
Date: Thu Aug 28 22:13:46 2014
New Revision: 6482

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6482&view=rev
Log:
IDP-224 - checkpoint work on SAML 2 ProcessLogout action

Added:
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/saml2/profile/impl/ProcessLogout.java   (with props)
    trunk/idp-saml-impl/src/test/java/net/shibboleth/idp/saml/saml2/profile/impl/ProcessLogoutTest.java   (with props)
Modified:
    trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/session/SAML2SPSession.java
    trunk/idp-saml-impl/pom.xml
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/encoding/impl/SAML2StringNameIDEncoder.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/principalconnector/impl/PrinicpalConnectorCanonicalizer.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/AttributeSourcedSAML2NameIDGenerator.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/nameid/impl/NameIDCanonicalization.java
    trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/session/impl/SAML2SPSessionCreationStrategy.java
    trunk/idp-session-impl/src/test/java/net/shibboleth/idp/session/impl/SessionManagerBaseTestCase.java

Modified: trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/session/SAML2SPSession.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/session/SAML2SPSession.java?rev=6482&r1=6481&r2=6482&view=diff
==============================================================================
--- trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/session/SAML2SPSession.java (original)
+++ trunk/idp-saml-api/src/main/java/net/shibboleth/idp/saml/session/SAML2SPSession.java Thu Aug 28 22:13:46 2014
@@ -110,7 +110,7 @@
             final NameID n1 = ((SAML2SPSession) obj).getNameID();
             final NameID n2 = nameID;
             if (n1 != null && n2 != null && Objects.equal(n1.getValue(), n2.getValue())
-                    && SAML2ObjectSupport.areNameIdentifierFormatsEquivalent(n1.getFormat(), n2.getFormat())
+                    && SAML2ObjectSupport.areNameIDFormatsEquivalent(n1.getFormat(), n2.getFormat())
                     && Objects.equal(n1.getNameQualifier(), n2.getNameQualifier())
                     && Objects.equal(n1.getSPNameQualifier(), n2.getSPNameQualifier())) {
                 return Objects.equal(getSessionIndex(), ((SAML2SPSession) obj).getSessionIndex());

Modified: trunk/idp-saml-impl/pom.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/pom.xml?rev=6482&r1=6481&r2=6482&view=diff
==============================================================================
--- trunk/idp-saml-impl/pom.xml (original)
+++ trunk/idp-saml-impl/pom.xml Thu Aug 28 22:13:46 2014
@@ -105,6 +105,19 @@
             <scope>test</scope>
         </dependency>
         <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>idp-session-impl</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>${project.groupId}</groupId>
+            <artifactId>idp-session-impl</artifactId>
+            <version>${project.version}</version>
+            <type>test-jar</type>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
             <groupId>${opensaml.groupId}</groupId>
             <artifactId>opensaml-core</artifactId>
             <version>${opensaml.version}</version>

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/encoding/impl/SAML2StringNameIDEncoder.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/encoding/impl/SAML2StringNameIDEncoder.java?rev=6482&r1=6481&r2=6482&view=diff
==============================================================================
--- trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/encoding/impl/SAML2StringNameIDEncoder.java (original)
+++ trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/encoding/impl/SAML2StringNameIDEncoder.java Thu Aug 28 22:13:46 2014
@@ -111,7 +111,7 @@
     /** {@inheritDoc} */
     @Override
     public boolean apply(String input) {
-        return SAML2ObjectSupport.areNameIdentifierFormatsEquivalent(input, format);
+        return SAML2ObjectSupport.areNameIDFormatsEquivalent(input, format);
     }
 
     /** {@inheritDoc} */

Modified: trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/principalconnector/impl/PrinicpalConnectorCanonicalizer.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-saml-impl/src/main/java/net/shibboleth/idp/saml/attribute/principalconnector/impl/PrinicpalConnectorCanonicalizer.java?rev=6482&r1=6481&r2=6482&view=diff
==============================================================================

[... 80 lines stripped ...]