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 EFC83102A0 for ; Wed, 24 Jul 2013 12:43:11 +0000 (UTC) Received: (qmail 30653 invoked by uid 500); 24 Jul 2013 12:43:11 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 30544 invoked by uid 500); 24 Jul 2013 12:43: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 30528 invoked by uid 99); 24 Jul 2013 12:43:09 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 24 Jul 2013 12:43:09 +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, 24 Jul 2013 12:43:06 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 8C90A23888E7; Wed, 24 Jul 2013 12:42:45 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1506525 - in /cxf/branches/2.6.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/caching: CachingTest.java ServerCachingTest.java Date: Wed, 24 Jul 2013 12:42:45 -0000 To: commits@cxf.apache.org From: coheigea@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130724124245.8C90A23888E7@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: coheigea Date: Wed Jul 24 12:42:45 2013 New Revision: 1506525 URL: http://svn.apache.org/r1506525 Log: Merged revisions 1506521 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes ........ r1506521 | coheigea | 2013-07-24 13:38:21 +0100 (Wed, 24 Jul 2013) | 10 lines Merged revisions 1506518 via git cherry-pick from https://svn.apache.org/repos/asf/cxf/trunk ........ r1506518 | coheigea | 2013-07-24 13:25:36 +0100 (Wed, 24 Jul 2013) | 2 lines Making some tests thread-safe ........ ........ Modified: cxf/branches/2.6.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/caching/CachingTest.java cxf/branches/2.6.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/caching/ServerCachingTest.java Modified: cxf/branches/2.6.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/caching/CachingTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/caching/CachingTest.java?rev=1506525&r1=1506524&r2=1506525&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/caching/CachingTest.java (original) +++ cxf/branches/2.6.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/caching/CachingTest.java Wed Jul 24 12:42:45 2013 @@ -74,9 +74,7 @@ public class CachingTest extends Abstrac stopAllServers(); } - // @Ignore'd due to continually failing on Jenkins build @org.junit.Test - @org.junit.Ignore public void testSTSClientCaching() throws Exception { SpringBusFactory bf = new SpringBusFactory(); @@ -91,6 +89,7 @@ public class CachingTest extends Abstrac QName portQName = new QName(NAMESPACE, "DoubleItTransportSAML1Port"); DoubleItPortType port = service.getPort(portQName, DoubleItPortType.class); + ((BindingProvider)port).getRequestContext().put("thread.local.request.context", "true"); updateAddressPort(port, PORT); // Make a successful invocation @@ -135,6 +134,7 @@ public class CachingTest extends Abstrac QName portQName = new QName(NAMESPACE, "DoubleItTransportSAML1Port2"); DoubleItPortType port = service.getPort(portQName, DoubleItPortType.class); + ((BindingProvider)port).getRequestContext().put("thread.local.request.context", "true"); updateAddressPort(port, PORT); // Disable storing tokens per-proxy Modified: cxf/branches/2.6.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/caching/ServerCachingTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/caching/ServerCachingTest.java?rev=1506525&r1=1506524&r2=1506525&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/caching/ServerCachingTest.java (original) +++ cxf/branches/2.6.x-fixes/services/sts/systests/advanced/src/test/java/org/apache/cxf/systest/sts/caching/ServerCachingTest.java Wed Jul 24 12:42:45 2013 @@ -101,6 +101,7 @@ public class ServerCachingTest extends A QName portQName = new QName(NAMESPACE, "DoubleItTransportSAML1AlternativePort"); DoubleItPortType port = service.getPort(portQName, DoubleItPortType.class); + ((BindingProvider)port).getRequestContext().put("thread.local.request.context", "true"); updateAddressPort(port, PORT); // Make an initial successful invocation @@ -152,6 +153,7 @@ public class ServerCachingTest extends A QName portQName = new QName(NAMESPACE, "DoubleItTransportUTPort"); DoubleItPortType transportUTPort = service.getPort(portQName, DoubleItPortType.class); + ((BindingProvider)transportUTPort).getRequestContext().put("thread.local.request.context", "true"); updateAddressPort(transportUTPort, PORT); // Make an initial successful invocation @@ -190,6 +192,7 @@ public class ServerCachingTest extends A QName portQName = new QName(NAMESPACE, "DoubleItAsymmetricBSTPort"); DoubleItPortType bstPort = service.getPort(portQName, DoubleItPortType.class); + ((BindingProvider)bstPort).getRequestContext().put("thread.local.request.context", "true"); updateAddressPort(bstPort, PORT2); // Make an initial successful invocation