Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 85454200B49 for ; Wed, 3 Aug 2016 18:40:34 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 83DF3160A86; Wed, 3 Aug 2016 16:40:34 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 5D42D160AAA for ; Wed, 3 Aug 2016 18:40:32 +0200 (CEST) Received: (qmail 3406 invoked by uid 500); 3 Aug 2016 16:40:31 -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 3378 invoked by uid 99); 3 Aug 2016 16:40:31 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 03 Aug 2016 16:40:31 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 50C38EE68D; Wed, 3 Aug 2016 16:40:31 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: coheigea@apache.org To: commits@cxf.apache.org Date: Wed, 03 Aug 2016 16:40:35 -0000 Message-Id: <53b075c0771b4eb6b9b3245cbf99196c@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [5/6] cxf git commit: More refactoring archived-at: Wed, 03 Aug 2016 16:40:34 -0000 More refactoring Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ff0c73b1 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ff0c73b1 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ff0c73b1 Branch: refs/heads/master Commit: ff0c73b1f83fb5c6b7e5b364ac7e8be69d59a9fa Parents: 6869a8f Author: Colm O hEigeartaigh Authored: Wed Aug 3 17:38:53 2016 +0100 Committer: Colm O hEigeartaigh Committed: Wed Aug 3 17:38:53 2016 +0100 ---------------------------------------------------------------------- .../sts/asymmetric/AsymmetricBindingTest.java | 19 +-- .../cxf/systest/sts/bearer/BearerTest.java | 19 +-- .../cxf/systest/sts/deployment/STSServer.java | 8 +- .../systest/sts/deployment/StaxSTSServer.java | 8 +- .../IntermediaryTransformationCachingTest.java | 9 +- .../IntermediaryTransformationTest.java | 9 +- .../cxf/systest/sts/issuer/STSServer.java | 2 +- .../systest/sts/issueunit/IssueUnitTest.java | 9 +- .../apache/cxf/systest/sts/jaas/JAASTest.java | 9 +- .../systest/sts/stsclient/STSClientTest.java | 9 +- .../stsclient/STSTokenOutInterceptorTest.java | 13 +- .../sts/stsclient/STSTokenRetrieverTest.java | 13 +- .../sts/symmetric/SymmetricBindingTest.java | 19 +-- .../cxf/systest/sts/template/TemplateTest.java | 13 +- .../sts/transport/TransportBindingTest.java | 19 +-- .../UsernameActAsCachingTest.java | 9 +- .../sts/username_actas/UsernameActAsTest.java | 19 +-- .../UsernameOnBehalfOfCachingTest.java | 9 +- .../UsernameOnBehalfOfTest.java | 19 +-- .../sts/x509/X509AsymmetricBindingTest.java | 9 +- .../sts/x509/X509SymmetricBindingTest.java | 19 +-- .../systest/sts/deployment/cxf-encrypted-ut.xml | 59 -------- .../cxf/systest/sts/deployment/cxf-servlet.xml | 31 ---- .../cxf/systest/sts/deployment/cxf-sts.xml | 44 +++--- .../cxf/systest/sts/deployment/cxf-ut.xml | 33 +++++ .../cxf/systest/sts/deployment/cxf-x509.xml | 55 ++----- .../sts/deployment/stax-cxf-encrypted-ut.xml | 60 -------- .../systest/sts/deployment/stax-cxf-servlet.xml | 31 ---- .../cxf/systest/sts/deployment/stax-cxf-ut.xml | 34 +++++ .../systest/sts/deployment/stax-cxf-x509.xml | 48 ++----- .../sts/issuer/cxf-issuer-sts-transport.xml | 143 +++++++++++++++++++ .../systest/sts/issuer/cxf-sts-transport.xml | 143 ------------------- 32 files changed, 354 insertions(+), 589 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cxf/blob/ff0c73b1/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/asymmetric/AsymmetricBindingTest.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/asymmetric/AsymmetricBindingTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/asymmetric/AsymmetricBindingTest.java index 8e6bb3a..f3082f1 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/asymmetric/AsymmetricBindingTest.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/asymmetric/AsymmetricBindingTest.java @@ -84,18 +84,13 @@ public class AsymmetricBindingTest extends AbstractBusClientServerTestBase { // set this to false to fork launchServer(StaxServer.class, true) ); - assertTrue( - "Server failed to launch", - // run the server in the same process - // set this to false to fork - launchServer(STSServer.class, true) - ); - assertTrue( - "Server failed to launch", - // run the server in the same process - // set this to false to fork - launchServer(StaxSTSServer.class, true) - ); + STSServer stsServer = new STSServer(); + stsServer.setContext("cxf-ut.xml"); + assertTrue(launchServer(stsServer)); + + StaxSTSServer staxStsServer = new StaxSTSServer(); + staxStsServer.setContext("stax-cxf-ut.xml"); + assertTrue(launchServer(staxStsServer)); } @Parameters(name = "{0}") http://git-wip-us.apache.org/repos/asf/cxf/blob/ff0c73b1/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/bearer/BearerTest.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/bearer/BearerTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/bearer/BearerTest.java index f99d718..369e4ea 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/bearer/BearerTest.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/bearer/BearerTest.java @@ -76,18 +76,13 @@ public class BearerTest extends AbstractBusClientServerTestBase { // set this to false to fork launchServer(StaxServer.class, true) ); - assertTrue( - "Server failed to launch", - // run the server in the same process - // set this to false to fork - launchServer(STSServer.class, true) - ); - assertTrue( - "Server failed to launch", - // run the server in the same process - // set this to false to fork - launchServer(StaxSTSServer.class, true) - ); + STSServer stsServer = new STSServer(); + stsServer.setContext("cxf-transport.xml"); + assertTrue(launchServer(stsServer)); + + StaxSTSServer staxStsServer = new StaxSTSServer(); + staxStsServer.setContext("stax-cxf-transport.xml"); + assertTrue(launchServer(staxStsServer)); } @Parameters(name = "{0}") http://git-wip-us.apache.org/repos/asf/cxf/blob/ff0c73b1/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/deployment/STSServer.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/deployment/STSServer.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/deployment/STSServer.java index 64e10ba..4256ee3 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/deployment/STSServer.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/deployment/STSServer.java @@ -26,13 +26,15 @@ import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; public class STSServer extends AbstractBusTestServerBase { + + private String context; public STSServer() { } protected void run() { - URL busFile = STSServer.class.getResource("cxf-servlet.xml"); + URL busFile = STSServer.class.getResource(context); Bus busLocal = new SpringBusFactory().createBus(busFile); BusFactory.setDefaultBus(busLocal); setBus(busLocal); @@ -43,4 +45,8 @@ public class STSServer extends AbstractBusTestServerBase { e.printStackTrace(); } } + + public void setContext(String context) { + this.context = context; + } } http://git-wip-us.apache.org/repos/asf/cxf/blob/ff0c73b1/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/deployment/StaxSTSServer.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/deployment/StaxSTSServer.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/deployment/StaxSTSServer.java index e3c2089..8ea95d6 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/deployment/StaxSTSServer.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/deployment/StaxSTSServer.java @@ -27,12 +27,14 @@ import org.apache.cxf.testutil.common.AbstractBusTestServerBase; public class StaxSTSServer extends AbstractBusTestServerBase { + private String context; + public StaxSTSServer() { } protected void run() { - URL busFile = StaxSTSServer.class.getResource("stax-cxf-servlet.xml"); + URL busFile = StaxSTSServer.class.getResource(context); Bus busLocal = new SpringBusFactory().createBus(busFile); BusFactory.setDefaultBus(busLocal); setBus(busLocal); @@ -43,4 +45,8 @@ public class StaxSTSServer extends AbstractBusTestServerBase { e.printStackTrace(); } } + + public void setContext(String context) { + this.context = context; + } } http://git-wip-us.apache.org/repos/asf/cxf/blob/ff0c73b1/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationCachingTest.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationCachingTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationCachingTest.java index 8de807e..31a3958 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationCachingTest.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationCachingTest.java @@ -69,12 +69,9 @@ public class IntermediaryTransformationCachingTest extends AbstractBusClientServ // set this to false to fork launchServer(Server.class, true) ); - assertTrue( - "Server failed to launch", - // run the server in the same process - // set this to false to fork - launchServer(STSServer.class, true) - ); + STSServer stsServer = new STSServer(); + stsServer.setContext("cxf-transport.xml"); + assertTrue(launchServer(stsServer)); } @org.junit.AfterClass http://git-wip-us.apache.org/repos/asf/cxf/blob/ff0c73b1/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationTest.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationTest.java index ba3d46d..4e7bd78 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationTest.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/intermediary_transformation/IntermediaryTransformationTest.java @@ -68,12 +68,9 @@ public class IntermediaryTransformationTest extends AbstractBusClientServerTestB // set this to false to fork launchServer(Server.class, true) ); - assertTrue( - "Server failed to launch", - // run the server in the same process - // set this to false to fork - launchServer(STSServer.class, true) - ); + STSServer stsServer = new STSServer(); + stsServer.setContext("cxf-transport.xml"); + assertTrue(launchServer(stsServer)); } @org.junit.AfterClass http://git-wip-us.apache.org/repos/asf/cxf/blob/ff0c73b1/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issuer/STSServer.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issuer/STSServer.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issuer/STSServer.java index 9815fe0..9266418 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issuer/STSServer.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issuer/STSServer.java @@ -32,7 +32,7 @@ public class STSServer extends AbstractBusTestServerBase { } protected void run() { - URL busFile = STSServer.class.getResource("cxf-sts-transport.xml"); + URL busFile = STSServer.class.getResource("cxf-issuer-sts-transport.xml"); Bus busLocal = new SpringBusFactory().createBus(busFile); BusFactory.setDefaultBus(busLocal); setBus(busLocal); http://git-wip-us.apache.org/repos/asf/cxf/blob/ff0c73b1/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java index 12f7697..b8de1fb 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/issueunit/IssueUnitTest.java @@ -94,12 +94,9 @@ public class IssueUnitTest extends AbstractBusClientServerTestBase { @BeforeClass public static void startServers() throws Exception { - assertTrue( - "Server failed to launch", - // run the server in the same process - // set this to false to fork - launchServer(STSServer.class, true) - ); + STSServer stsServer = new STSServer(); + stsServer.setContext("cxf-transport.xml"); + assertTrue(launchServer(stsServer)); } @org.junit.AfterClass http://git-wip-us.apache.org/repos/asf/cxf/blob/ff0c73b1/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/jaas/JAASTest.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/jaas/JAASTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/jaas/JAASTest.java index 80283f2..944e3fc 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/jaas/JAASTest.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/jaas/JAASTest.java @@ -68,13 +68,10 @@ public class JAASTest extends AbstractBusClientServerTestBase { // set this to false to fork launchServer(Server2.class, true) ); - assertTrue( - "Server failed to launch", - // run the server in the same process - // set this to false to fork - launchServer(STSServer.class, true) - ); + STSServer stsServer = new STSServer(); + stsServer.setContext("cxf-transport.xml"); + assertTrue(launchServer(stsServer)); } @org.junit.AfterClass http://git-wip-us.apache.org/repos/asf/cxf/blob/ff0c73b1/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSClientTest.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSClientTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSClientTest.java index 37757c3..5ac75a5 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSClientTest.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSClientTest.java @@ -52,12 +52,9 @@ public class STSClientTest extends AbstractBusClientServerTestBase { // set this to false to fork launchServer(Server.class, true) ); - assertTrue( - "Server failed to launch", - // run the server in the same process - // set this to false to fork - launchServer(STSServer.class, true) - ); + STSServer stsServer = new STSServer(); + stsServer.setContext("cxf-transport.xml"); + assertTrue(launchServer(stsServer)); } @org.junit.AfterClass http://git-wip-us.apache.org/repos/asf/cxf/blob/ff0c73b1/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSTokenOutInterceptorTest.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSTokenOutInterceptorTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSTokenOutInterceptorTest.java index 978f017..5a78f3e 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSTokenOutInterceptorTest.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSTokenOutInterceptorTest.java @@ -100,12 +100,13 @@ public class STSTokenOutInterceptorTest extends AbstractBusClientServerTestBase @BeforeClass public static void startServers() throws Exception { - assertTrue( - "Server failed to launch", - // run the server in the same process - // set this to false to fork - launchServer(STSServer.class, true) - ); + STSServer stsServer = new STSServer(); + stsServer.setContext("cxf-transport.xml"); + assertTrue(launchServer(stsServer)); + + stsServer = new STSServer(); + stsServer.setContext("cxf-x509.xml"); + assertTrue(launchServer(stsServer)); } @AfterClass http://git-wip-us.apache.org/repos/asf/cxf/blob/ff0c73b1/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSTokenRetrieverTest.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSTokenRetrieverTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSTokenRetrieverTest.java index 549269d..a8ad265 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSTokenRetrieverTest.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/stsclient/STSTokenRetrieverTest.java @@ -98,12 +98,13 @@ public class STSTokenRetrieverTest extends AbstractBusClientServerTestBase { @BeforeClass public static void startServers() throws Exception { - assertTrue( - "Server failed to launch", - // run the server in the same process - // set this to false to fork - launchServer(STSServer.class, true) - ); + STSServer stsServer = new STSServer(); + stsServer.setContext("cxf-transport.xml"); + assertTrue(launchServer(stsServer)); + + stsServer = new STSServer(); + stsServer.setContext("cxf-x509.xml"); + assertTrue(launchServer(stsServer)); } @AfterClass http://git-wip-us.apache.org/repos/asf/cxf/blob/ff0c73b1/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java index f761de4..bbeb002 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/symmetric/SymmetricBindingTest.java @@ -95,18 +95,13 @@ public class SymmetricBindingTest extends AbstractBusClientServerTestBase { // set this to false to fork launchServer(StaxServer.class, true) ); - assertTrue( - "Server failed to launch", - // run the server in the same process - // set this to false to fork - launchServer(STSServer.class, true) - ); - assertTrue( - "Server failed to launch", - // run the server in the same process - // set this to false to fork - launchServer(StaxSTSServer.class, true) - ); + STSServer stsServer = new STSServer(); + stsServer.setContext("cxf-ut.xml"); + assertTrue(launchServer(stsServer)); + + StaxSTSServer staxStsServer = new StaxSTSServer(); + staxStsServer.setContext("stax-cxf-ut.xml"); + assertTrue(launchServer(staxStsServer)); } @Parameters(name = "{0}") http://git-wip-us.apache.org/repos/asf/cxf/blob/ff0c73b1/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/template/TemplateTest.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/template/TemplateTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/template/TemplateTest.java index bc84260..39a59f3 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/template/TemplateTest.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/template/TemplateTest.java @@ -33,7 +33,6 @@ import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.systest.sts.common.SecurityTestUtil; import org.apache.cxf.systest.sts.common.TestParam; import org.apache.cxf.systest.sts.deployment.STSServer; -import org.apache.cxf.systest.sts.deployment.StaxSTSServer; import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; import org.apache.cxf.ws.security.SecurityConstants; import org.apache.cxf.ws.security.trust.STSClient; @@ -50,9 +49,7 @@ import org.junit.runners.Parameterized.Parameters; public class TemplateTest extends AbstractBusClientServerTestBase { static final String STSPORT = allocatePort(STSServer.class); - static final String STAX_STSPORT = allocatePort(StaxSTSServer.class); static final String STSPORT2 = allocatePort(STSServer.class, 2); - static final String STAX_STSPORT2 = allocatePort(StaxSTSServer.class, 2); private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt"; private static final QName SERVICE_QNAME = new QName(NAMESPACE, "DoubleItService"); @@ -74,18 +71,16 @@ public class TemplateTest extends AbstractBusClientServerTestBase { // set this to false to fork launchServer(Server.class, true) ); + assertTrue( "Server failed to launch", // run the server in the same process // set this to false to fork launchServer(StaxServer.class, true) ); - assertTrue( - "Server failed to launch", - // run the server in the same process - // set this to false to fork - launchServer(STSServer.class, true) - ); + STSServer stsServer = new STSServer(); + stsServer.setContext("cxf-transport.xml"); + assertTrue(launchServer(stsServer)); } @Parameters(name = "{0}") http://git-wip-us.apache.org/repos/asf/cxf/blob/ff0c73b1/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java index 735827a..4ea89ce 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/transport/TransportBindingTest.java @@ -92,18 +92,13 @@ public class TransportBindingTest extends AbstractBusClientServerTestBase { // set this to false to fork launchServer(StaxServer.class, true) ); - assertTrue( - "Server failed to launch", - // run the server in the same process - // set this to false to fork - launchServer(STSServer.class, true) - ); - assertTrue( - "Server failed to launch", - // run the server in the same process - // set this to false to fork - launchServer(StaxSTSServer.class, true) - ); + STSServer stsServer = new STSServer(); + stsServer.setContext("cxf-transport.xml"); + assertTrue(launchServer(stsServer)); + + StaxSTSServer staxStsServer = new StaxSTSServer(); + staxStsServer.setContext("stax-cxf-transport.xml"); + assertTrue(launchServer(staxStsServer)); } @Parameters(name = "{0}") http://git-wip-us.apache.org/repos/asf/cxf/blob/ff0c73b1/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsCachingTest.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsCachingTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsCachingTest.java index c66eea4..c8d2f1c 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsCachingTest.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsCachingTest.java @@ -65,12 +65,9 @@ public class UsernameActAsCachingTest extends AbstractBusClientServerTestBase { // set this to false to fork launchServer(Server.class, true) ); - assertTrue( - "Server failed to launch", - // run the server in the same process - // set this to false to fork - launchServer(STSServer.class, true) - ); + STSServer stsServer = new STSServer(); + stsServer.setContext("cxf-x509.xml"); + assertTrue(launchServer(stsServer)); } @org.junit.AfterClass http://git-wip-us.apache.org/repos/asf/cxf/blob/ff0c73b1/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsTest.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsTest.java index 2a429ba..705b63c 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsTest.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_actas/UsernameActAsTest.java @@ -73,18 +73,13 @@ public class UsernameActAsTest extends AbstractBusClientServerTestBase { // set this to false to fork launchServer(Server2.class, true) ); - assertTrue( - "Server failed to launch", - // run the server in the same process - // set this to false to fork - launchServer(STSServer.class, true) - ); - assertTrue( - "Server failed to launch", - // run the server in the same process - // set this to false to fork - launchServer(StaxSTSServer.class, true) - ); + STSServer stsServer = new STSServer(); + stsServer.setContext("cxf-x509.xml"); + assertTrue(launchServer(stsServer)); + + StaxSTSServer staxStsServer = new StaxSTSServer(); + staxStsServer.setContext("stax-cxf-x509.xml"); + assertTrue(launchServer(staxStsServer)); } @Parameters(name = "{0}") http://git-wip-us.apache.org/repos/asf/cxf/blob/ff0c73b1/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfCachingTest.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfCachingTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfCachingTest.java index 555c5a2..1f6dda2 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfCachingTest.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfCachingTest.java @@ -64,12 +64,9 @@ public class UsernameOnBehalfOfCachingTest extends AbstractBusClientServerTestBa // set this to false to fork launchServer(Server.class, true) ); - assertTrue( - "Server failed to launch", - // run the server in the same process - // set this to false to fork - launchServer(STSServer.class, true) - ); + STSServer stsServer = new STSServer(); + stsServer.setContext("cxf-x509.xml"); + assertTrue(launchServer(stsServer)); } @org.junit.AfterClass http://git-wip-us.apache.org/repos/asf/cxf/blob/ff0c73b1/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfTest.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfTest.java index 3e5f0ef..04b11b0 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfTest.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/username_onbehalfof/UsernameOnBehalfOfTest.java @@ -72,18 +72,13 @@ public class UsernameOnBehalfOfTest extends AbstractBusClientServerTestBase { // set this to false to fork launchServer(Server2.class, true) ); - assertTrue( - "Server failed to launch", - // run the server in the same process - // set this to false to fork - launchServer(STSServer.class, true) - ); - assertTrue( - "Server failed to launch", - // run the server in the same process - // set this to false to fork - launchServer(StaxSTSServer.class, true) - ); + STSServer stsServer = new STSServer(); + stsServer.setContext("cxf-x509.xml"); + assertTrue(launchServer(stsServer)); + + StaxSTSServer staxStsServer = new StaxSTSServer(); + staxStsServer.setContext("stax-cxf-x509.xml"); + assertTrue(launchServer(staxStsServer)); } @Parameters(name = "{0}") http://git-wip-us.apache.org/repos/asf/cxf/blob/ff0c73b1/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/X509AsymmetricBindingTest.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/X509AsymmetricBindingTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/X509AsymmetricBindingTest.java index 344819f..86cf52f 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/X509AsymmetricBindingTest.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/X509AsymmetricBindingTest.java @@ -57,12 +57,9 @@ public class X509AsymmetricBindingTest extends AbstractBusClientServerTestBase { // set this to false to fork launchServer(AsymmetricServer.class, true) ); - assertTrue( - "Server failed to launch", - // run the server in the same process - // set this to false to fork - launchServer(STSServer.class, true) - ); + STSServer stsServer = new STSServer(); + stsServer.setContext("cxf-x509.xml"); + assertTrue(launchServer(stsServer)); } @org.junit.AfterClass http://git-wip-us.apache.org/repos/asf/cxf/blob/ff0c73b1/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/X509SymmetricBindingTest.java ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/X509SymmetricBindingTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/X509SymmetricBindingTest.java index 0e3878b..ea9fb89 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/X509SymmetricBindingTest.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/x509/X509SymmetricBindingTest.java @@ -78,18 +78,13 @@ public class X509SymmetricBindingTest extends AbstractBusClientServerTestBase { // set this to false to fork launchServer(StaxServer.class, true) ); - assertTrue( - "Server failed to launch", - // run the server in the same process - // set this to false to fork - launchServer(STSServer.class, true) - ); - assertTrue( - "Server failed to launch", - // run the server in the same process - // set this to false to fork - launchServer(StaxSTSServer.class, true) - ); + STSServer stsServer = new STSServer(); + stsServer.setContext("cxf-x509.xml"); + assertTrue(launchServer(stsServer)); + + StaxSTSServer staxStsServer = new StaxSTSServer(); + staxStsServer.setContext("stax-cxf-x509.xml"); + assertTrue(launchServer(staxStsServer)); } @Parameters(name = "{0}") http://git-wip-us.apache.org/repos/asf/cxf/blob/ff0c73b1/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-encrypted-ut.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-encrypted-ut.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-encrypted-ut.xml deleted file mode 100644 index 8b5cdfb..0000000 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-encrypted-ut.xml +++ /dev/null @@ -1,59 +0,0 @@ - - - - - - - - - - - - - - - - - - - http://localhost:(\d)*/doubleit/services/doubleit(a)?symmetricsaml1encrypted - - - - - - - - - - - - - - - - - - - - - - - http://git-wip-us.apache.org/repos/asf/cxf/blob/ff0c73b1/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-servlet.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-servlet.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-servlet.xml deleted file mode 100644 index 92182f3..0000000 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-servlet.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - http://git-wip-us.apache.org/repos/asf/cxf/blob/ff0c73b1/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-sts.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-sts.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-sts.xml index 7a205a7..926dc01 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-sts.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-sts.xml @@ -35,41 +35,41 @@ - - - - - + + + + + - - - + + + - + - - - + + + - - + + - + - + - - + + - - + + - + http(s)?://localhost:(\d)*/doubleit/services/doubleit.* @@ -83,7 +83,7 @@ - + http://git-wip-us.apache.org/repos/asf/cxf/blob/ff0c73b1/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-ut.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-ut.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-ut.xml index e4bf59b..659b9a2 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-ut.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-ut.xml @@ -33,4 +33,37 @@ + + + + + + + + + + + http://localhost:(\d)*/doubleit/services/doubleit(a)?symmetricsaml1encrypted + + + + + + + + + + + + + + + + + + + + + + http://git-wip-us.apache.org/repos/asf/cxf/blob/ff0c73b1/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-x509.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-x509.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-x509.xml index 3489adc..b73359c 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-x509.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/cxf-x509.xml @@ -24,55 +24,16 @@ - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - - - - - - - - - - http://localhost:(\d)*/doubleit/services/doubleitsymmetric.* - - http://localhost:(\d)*/doubleit/services/doubleitasymmetric.* - - - - - - - - - - - + + http://git-wip-us.apache.org/repos/asf/cxf/blob/ff0c73b1/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-encrypted-ut.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-encrypted-ut.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-encrypted-ut.xml deleted file mode 100644 index 8f9d848..0000000 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-encrypted-ut.xml +++ /dev/null @@ -1,60 +0,0 @@ - - - - - - - - - - - - - - - - - - - http://localhost:(\d)*/doubleit/services/doubleit(a)?symmetricsaml1encrypted - - - - - - - - - - - - - - - - - - - - - - - - http://git-wip-us.apache.org/repos/asf/cxf/blob/ff0c73b1/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-servlet.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-servlet.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-servlet.xml deleted file mode 100644 index 2644883..0000000 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-servlet.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - - - - - - - - http://git-wip-us.apache.org/repos/asf/cxf/blob/ff0c73b1/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-ut.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-ut.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-ut.xml index 92d34dc..20420ef 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-ut.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-ut.xml @@ -34,4 +34,38 @@ + + + + + + + + + + + http://localhost:(\d)*/doubleit/services/doubleit(a)?symmetricsaml1encrypted + + + + + + + + + + + + + + + + + + + + + + + http://git-wip-us.apache.org/repos/asf/cxf/blob/ff0c73b1/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-x509.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-x509.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-x509.xml index db83d75..7a5a3ab 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-x509.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/deployment/stax-cxf-x509.xml @@ -24,48 +24,16 @@ - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - - - - http://localhost:(\d)*/doubleit/services/doubleitsymmetric.* - - http://localhost:(\d)*/doubleit/services/doubleitasymmetric.* - - - - - - - - - - - + + http://git-wip-us.apache.org/repos/asf/cxf/blob/ff0c73b1/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-issuer-sts-transport.xml ---------------------------------------------------------------------- diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-issuer-sts-transport.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-issuer-sts-transport.xml new file mode 100644 index 0000000..9d69637 --- /dev/null +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/issuer/cxf-issuer-sts-transport.xml @@ -0,0 +1,143 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + https://localhost:(\d)*/doubleit/services/doubleittransport.* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +