[java-opensaml2 COMMIT] in /branches/REL_2: doc/RELEASE-NOTES.txt src/main/java/org/opensaml/saml1/binding/encoding/B...

[noreply at shibboleth.net]

Author: putmanb
Date: Fri Jan 25 19:48:34 2013
New Revision: 1615

URL: http://svn.shibboleth.net/view/java-opensaml2?rev=1615&view=rev
Log:
JOST-201: SAML1 and 2 base message encoders have incorrect selection logic in getEndpointURL() 

Modified:
    branches/REL_2/doc/RELEASE-NOTES.txt
    branches/REL_2/src/main/java/org/opensaml/saml1/binding/encoding/BaseSAML1MessageEncoder.java
    branches/REL_2/src/main/java/org/opensaml/saml2/binding/encoding/BaseSAML2MessageEncoder.java
    branches/REL_2/src/test/java/org/opensaml/saml1/binding/encoding/HTTPPostEncoderTest.java
    branches/REL_2/src/test/java/org/opensaml/saml2/binding/encoding/HTTPPostEncoderTest.java
    branches/REL_2/src/test/java/org/opensaml/saml2/binding/encoding/HTTPPostSimpleSignEncoderTest.java
    branches/REL_2/src/test/java/org/opensaml/saml2/binding/encoding/HTTPRedirectDeflateEncoderTest.java

Modified: branches/REL_2/doc/RELEASE-NOTES.txt
URL: http://svn.shibboleth.net/view/java-opensaml2/branches/REL_2/doc/RELEASE-NOTES.txt?rev=1615&r1=1614&r2=1615&view=diff
==============================================================================
--- branches/REL_2/doc/RELEASE-NOTES.txt (original)
+++ branches/REL_2/doc/RELEASE-NOTES.txt Fri Jan 25 19:48:34 2013
@@ -15,6 +15,7 @@
 [JOST-198] - Configuration files for XMLObject providers often missing Type registrations
 [JOST-199] - SAML SOAP encoders should use the supplied outbound SOAP Envelope from the message context, if it exists 
 [JOST-200] - Reduce memory usage of unit tests
+[JOST-201] - SAML1 and 2 base message encoders have incorrect selection logic in getEndpointURL() 
 
 Changes in Release 2.5.3
 =============================================

Modified: branches/REL_2/src/main/java/org/opensaml/saml1/binding/encoding/BaseSAML1MessageEncoder.java
URL: http://svn.shibboleth.net/view/java-opensaml2/branches/REL_2/src/main/java/org/opensaml/saml1/binding/encoding/BaseSAML1MessageEncoder.java?rev=1615&r1=1614&r2=1615&view=diff
==============================================================================
--- branches/REL_2/src/main/java/org/opensaml/saml1/binding/encoding/BaseSAML1MessageEncoder.java (original)
+++ branches/REL_2/src/main/java/org/opensaml/saml1/binding/encoding/BaseSAML1MessageEncoder.java Fri Jan 25 19:48:34 2013
@@ -26,7 +26,7 @@
 import org.opensaml.common.SignableSAMLObject;
 import org.opensaml.common.binding.SAMLMessageContext;
 import org.opensaml.common.binding.encoding.SAMLMessageEncoder;
-import org.opensaml.saml2.core.Response;
+import org.opensaml.saml1.core.Response;
 import org.opensaml.saml2.metadata.Endpoint;
 import org.opensaml.util.URLBuilder;
 import org.opensaml.ws.message.encoder.BaseMessageEncoder;
@@ -105,7 +105,7 @@
         }
 
         URLBuilder urlBuilder;
-        if (messageContext.getOutboundMessage() instanceof Response
+        if (messageContext.getOutboundSAMLMessage() instanceof Response
                 && !DatatypeHelper.isEmpty(endpoint.getResponseLocation())) {
             urlBuilder = new URLBuilder(endpoint.getResponseLocation());
         } else {

Modified: branches/REL_2/src/main/java/org/opensaml/saml2/binding/encoding/BaseSAML2MessageEncoder.java
URL: http://svn.shibboleth.net/view/java-opensaml2/branches/REL_2/src/main/java/org/opensaml/saml2/binding/encoding/BaseSAML2MessageEncoder.java?rev=1615&r1=1614&r2=1615&view=diff
==============================================================================
--- branches/REL_2/src/main/java/org/opensaml/saml2/binding/encoding/BaseSAML2MessageEncoder.java (original)
+++ branches/REL_2/src/main/java/org/opensaml/saml2/binding/encoding/BaseSAML2MessageEncoder.java Fri Jan 25 19:48:34 2013
@@ -105,7 +105,7 @@
         }
         
         URLBuilder urlBuilder;
-        if (messageContext.getOutboundMessage() instanceof StatusResponseType
+        if (messageContext.getOutboundSAMLMessage() instanceof StatusResponseType
                 && !DatatypeHelper.isEmpty(endpoint.getResponseLocation())) {
             urlBuilder = new URLBuilder(endpoint.getResponseLocation());
         } else {

Modified: branches/REL_2/src/test/java/org/opensaml/saml1/binding/encoding/HTTPPostEncoderTest.java
URL: http://svn.shibboleth.net/view/java-opensaml2/branches/REL_2/src/test/java/org/opensaml/saml1/binding/encoding/HTTPPostEncoderTest.java?rev=1615&r1=1614&r2=1615&view=diff
==============================================================================
--- branches/REL_2/src/test/java/org/opensaml/saml1/binding/encoding/HTTPPostEncoderTest.java (original)
+++ branches/REL_2/src/test/java/org/opensaml/saml1/binding/encoding/HTTPPostEncoderTest.java Fri Jan 25 19:48:34 2013
@@ -82,6 +82,6 @@
         assertEquals("Unexpected content type", "text/html", response.getContentType());
         assertEquals("Unexpected character encoding", response.getCharacterEncoding(), "UTF-8");
         assertEquals("Unexpected cache controls", "no-cache, no-store", response.getHeader("Cache-control"));
-        assertEquals(212339730, response.getContentAsString().hashCode());

[... 49 lines stripped ...]