Return-Path: X-Original-To: apmail-cxf-commits-archive@www.apache.org Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id E3F87105F9 for ; Wed, 1 May 2013 13:21:46 +0000 (UTC) Received: (qmail 78100 invoked by uid 500); 1 May 2013 13:21:46 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 78047 invoked by uid 500); 1 May 2013 13:21:46 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 78034 invoked by uid 99); 1 May 2013 13:21:46 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 May 2013 13:21:46 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 01 May 2013 13:21:44 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D98932388A67; Wed, 1 May 2013 13:21:24 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit 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 -0000 To: commits@cxf.apache.org From: coheigea@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130501132124.D98932388A67@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 @@ - http://localhost:8080/SecurityTokenService/UT - + http://localhost:8080/SecurityTokenService/UT 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 - +