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 2B162F6AF for ; Fri, 22 Mar 2013 14:00:10 +0000 (UTC) Received: (qmail 18953 invoked by uid 500); 22 Mar 2013 14:00:10 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 18865 invoked by uid 500); 22 Mar 2013 14:00:10 -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 18857 invoked by uid 99); 22 Mar 2013 14:00:10 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 22 Mar 2013 14:00:10 +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; Fri, 22 Mar 2013 14:00:06 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 5A3E523889C5; Fri, 22 Mar 2013 13:59:45 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1459780 - in /cxf/branches/2.5.x-fixes/systests/ws-security/src/test: java/org/apache/cxf/systest/ws/x509/ resources/org/apache/cxf/systest/ws/x509/ resources/org/apache/cxf/systest/ws/x509/client/ resources/org/apache/cxf/systest/ws/x509/... Date: Fri, 22 Mar 2013 13:59:45 -0000 To: commits@cxf.apache.org From: coheigea@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130322135945.5A3E523889C5@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: coheigea Date: Fri Mar 22 13:59:44 2013 New Revision: 1459780 URL: http://svn.apache.org/r1459780 Log: Merged revisions 1459773 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes ........ r1459773 | coheigea | 2013-03-22 13:50:55 +0000 (Fri, 22 Mar 2013) | 18 lines Merged revisions 1459767 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes ........ r1459767 | coheigea | 2013-03-22 13:41:15 +0000 (Fri, 22 Mar 2013) | 10 lines Merged revisions 1459762 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1459762 | coheigea | 2013-03-22 13:35:19 +0000 (Fri, 22 Mar 2013) | 2 lines Fixing failing test ........ ........ ........ Modified: cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/client/client.xml cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server/server.xml Modified: cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java?rev=1459780&r1=1459779&r2=1459780&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java (original) +++ cxf/branches/2.5.x-fixes/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java Fri Mar 22 13:59:44 2013 @@ -621,7 +621,7 @@ public class X509TokenTest extends Abstr } @org.junit.Test - public void testEndorsing() throws Exception { + public void testNegativeEndorsing() throws Exception { SpringBusFactory bf = new SpringBusFactory(); URL busFile = X509TokenTest.class.getResource("client/client.xml"); @@ -634,13 +634,13 @@ public class X509TokenTest extends Abstr Service service = Service.create(wsdl, SERVICE_QNAME); // Successful invocation - QName portQName = new QName(NAMESPACE, "DoubleItTransportEndorsingPort"); + QName portQName = new QName(NAMESPACE, "DoubleItTransportNegativeEndorsingPort"); DoubleItPortType port = service.getPort(portQName, DoubleItPortType.class); updateAddressPort(port, PORT2); port.doubleIt(25); // This should fail, as the client is not endorsing the token - portQName = new QName(NAMESPACE, "DoubleItTransportEndorsingPort2"); + portQName = new QName(NAMESPACE, "DoubleItTransportNegativeEndorsingPort2"); port = service.getPort(portQName, DoubleItPortType.class); updateAddressPort(port, PORT2); Modified: cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl?rev=1459780&r1=1459779&r2=1459780&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl (original) +++ cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/DoubleItX509.wsdl Fri Mar 22 13:59:44 2013 @@ -403,13 +403,13 @@ binding="tns:DoubleItNoSecurityBinding"> - - + - - + Modified: cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/client/client.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/client/client.xml?rev=1459780&r1=1459779&r2=1459780&view=diff ============================================================================== --- cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/client/client.xml (original) +++ cxf/branches/2.5.x-fixes/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/client/client.xml Fri Mar 22 13:59:44 2013 @@ -319,7 +319,7 @@ - -