cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cohei...@apache.org
Subject svn commit: r1477985 - in /cxf/branches/wss4j2.0-port/services/sts/systests/basic/src/test: java/org/apache/cxf/systest/sts/common/ resources/org/apache/cxf/systest/sts/symmetric/
Date Wed, 01 May 2013 13:21:24 GMT
Author: coheigea
Date: Wed May  1 13:21:24 2013
New Revision: 1477985

URL: http://svn.apache.org/r1477985
Log:
[CXF-4977] Update the test config so it gets the SAML token from the STS and sends that as
part of the request to get the SecureConversationToken.   The service is failing to process
that token (or something).

Modified:
    cxf/branches/wss4j2.0-port/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/common/TokenTestUtils.java
    cxf/branches/wss4j2.0-port/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/DoubleIt.wsdl
    cxf/branches/wss4j2.0-port/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/cxf-client.xml

Modified: cxf/branches/wss4j2.0-port/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/common/TokenTestUtils.java
URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/common/TokenTestUtils.java?rev=1477985&r1=1477984&r2=1477985&view=diff
==============================================================================
--- cxf/branches/wss4j2.0-port/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/common/TokenTestUtils.java
(original)
+++ cxf/branches/wss4j2.0-port/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/common/TokenTestUtils.java
Wed May  1 13:21:24 2013
@@ -83,6 +83,15 @@ public final class TokenTestUtils {
                 stsClient.setWsdlLocation(location.replace("8443", port));
             }
         }
+        stsClient = (STSClient)p.getRequestContext().get(SecurityConstants.STS_CLIENT + ".sct");
+        if (stsClient != null) {
+            String location = stsClient.getWsdlLocation();
+            if (location.contains("8080")) {
+                stsClient.setWsdlLocation(location.replace("8080", port));
+            } else if (location.contains("8443")) {
+                stsClient.setWsdlLocation(location.replace("8443", port));
+            }
+        }
     }
 
 }

Modified: cxf/branches/wss4j2.0-port/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/DoubleIt.wsdl
URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/DoubleIt.wsdl?rev=1477985&r1=1477984&r2=1477985&view=diff
==============================================================================
--- cxf/branches/wss4j2.0-port/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/DoubleIt.wsdl
(original)
+++ cxf/branches/wss4j2.0-port/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/DoubleIt.wsdl
Wed May  1 13:21:24 2013
@@ -275,8 +275,7 @@
                                                     <sp:RequireInternalReference />
                                                   </wsp:Policy>
                                                   <sp:Issuer>
-                                                    <wsaw:Address>http://localhost:8080/SecurityTokenService/UT
-                                                    </wsaw:Address>
+                                                    <wsaw:Address>http://localhost:8080/SecurityTokenService/UT</wsaw:Address>
                                                   </sp:Issuer>
                                                 </sp:IssuedToken>
                                               </wsp:Policy>

Modified: cxf/branches/wss4j2.0-port/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/cxf-client.xml
URL: http://svn.apache.org/viewvc/cxf/branches/wss4j2.0-port/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/cxf-client.xml?rev=1477985&r1=1477984&r2=1477985&view=diff
==============================================================================
--- cxf/branches/wss4j2.0-port/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/cxf-client.xml
(original)
+++ cxf/branches/wss4j2.0-port/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/symmetric/cxf-client.xml
Wed May  1 13:21:24 2013
@@ -99,7 +99,7 @@ http://cxf.apache.org/configuration/secu
    <jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItSymmetricSAML2SecureConversationPort"

                   createdFromAPI="true">
        <jaxws:properties>
-           <entry key="ws-security.sts.client" value-ref="stsClient"/>
+           <entry key="ws-security.sts.client.sct" value-ref="stsClient"/>
        </jaxws:properties>
    </jaxws:client>
    



Mime
View raw message