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
