diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/delegation/STSServer.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/delegation/DelegationSTSServer.java similarity index 94% rename from services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/delegation/STSServer.java rename to services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/delegation/DelegationSTSServer.java index f678d53bb4f..3a45b8d978b 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/delegation/STSServer.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/delegation/DelegationSTSServer.java @@ -21,7 +21,7 @@ import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class STSServer extends AbstractBusTestServerBase { +public class DelegationSTSServer extends AbstractBusTestServerBase { protected void run() { setBus(new SpringBusFactory().createBus(getClass().getResource("cxf-sts-transport.xml"))); diff --git a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/delegation/SAMLDelegationTest.java b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/delegation/SAMLDelegationTest.java index 9f792491468..7fb2ed3578a 100644 --- a/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/delegation/SAMLDelegationTest.java +++ b/services/sts/systests/basic/src/test/java/org/apache/cxf/systest/sts/delegation/SAMLDelegationTest.java @@ -63,7 +63,7 @@ */ public class SAMLDelegationTest extends AbstractBusClientServerTestBase { - private static final String STSPORT = allocatePort(STSServer.class); + private static final String STSPORT = allocatePort(DelegationSTSServer.class); private static final String SAML2_TOKEN_TYPE = "http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0"; @@ -80,7 +80,7 @@ public static void startServers() throws Exception { "Server failed to launch", // run the server in the same process // set this to false to fork - launchServer(STSServer.class, true) + launchServer(DelegationSTSServer.class, true) ); } diff --git a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/delegation/cxf-sts-transport.xml b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/delegation/cxf-sts-transport.xml index af8adcce855..d6376155774 100644 --- a/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/delegation/cxf-sts-transport.xml +++ b/services/sts/systests/basic/src/test/resources/org/apache/cxf/systest/sts/delegation/cxf-sts-transport.xml @@ -116,19 +116,19 @@ - + - + - + diff --git a/systests/cdi/cdi-owb/cdi-multiple-apps-owb/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java b/systests/cdi/cdi-owb/cdi-multiple-apps-owb/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java index bacfc640465..f6e04c5ff89 100644 --- a/systests/cdi/cdi-owb/cdi-multiple-apps-owb/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java +++ b/systests/cdi/cdi-owb/cdi-multiple-apps-owb/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java @@ -29,10 +29,10 @@ import static org.junit.Assert.assertTrue; public class JettyWarTest extends AbstractCdiMultiAppTest { - public static class EmbeddedJettyServer extends AbstractJettyServer { - public static final int PORT = allocatePortAsInt(EmbeddedJettyServer.class); + public static class EmbeddedJettyWarServer extends AbstractJettyServer { + public static final int PORT = allocatePortAsInt(EmbeddedJettyWarServer.class); - public EmbeddedJettyServer() { + public EmbeddedJettyWarServer() { super("/jaxrs_cdi", "/", PORT, new WebBeansConfigurationListener()); } } @@ -40,13 +40,13 @@ public EmbeddedJettyServer() { @BeforeClass public static void startServers() throws Exception { AbstractResourceInfo.clearAllMaps(); - assertTrue("server did not launch correctly", launchServer(EmbeddedJettyServer.class, true)); + assertTrue("server did not launch correctly", launchServer(EmbeddedJettyWarServer.class, true)); createStaticBus(); } @Override protected int getPort() { - return EmbeddedJettyServer.PORT; + return EmbeddedJettyWarServer.PORT; } } diff --git a/systests/cdi/cdi-owb/cdi-no-apps-owb/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java b/systests/cdi/cdi-owb/cdi-no-apps-owb/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java index 2c2f5b5ffe5..bbc334fc06c 100644 --- a/systests/cdi/cdi-owb/cdi-no-apps-owb/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java +++ b/systests/cdi/cdi-owb/cdi-no-apps-owb/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java @@ -28,10 +28,10 @@ import static org.junit.Assert.assertTrue; public class JettyWarTest extends AbstractCdiSingleAppTest { - public static class EmbeddedJettyServer extends AbstractJettyServer { - public static final int PORT = allocatePortAsInt(EmbeddedJettyServer.class); + public static class EmbeddedJettyWarServer extends AbstractJettyServer { + public static final int PORT = allocatePortAsInt(EmbeddedJettyWarServer.class); - public EmbeddedJettyServer() { + public EmbeddedJettyWarServer() { super("/jaxrs_cdi", "/", PORT, new WebBeansConfigurationListener()); } } @@ -39,13 +39,13 @@ public EmbeddedJettyServer() { @BeforeClass public static void startServers() throws Exception { AbstractResourceInfo.clearAllMaps(); - assertTrue("server did not launch correctly", launchServer(EmbeddedJettyServer.class, true)); + assertTrue("server did not launch correctly", launchServer(EmbeddedJettyWarServer.class, true)); createStaticBus(); } @Override protected int getPort() { - return EmbeddedJettyServer.PORT; + return EmbeddedJettyWarServer.PORT; } } diff --git a/systests/cdi/cdi-owb/cdi-producers-owb/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java b/systests/cdi/cdi-owb/cdi-producers-owb/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java index 454727fbb8d..66419b6d91a 100644 --- a/systests/cdi/cdi-owb/cdi-producers-owb/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java +++ b/systests/cdi/cdi-owb/cdi-producers-owb/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java @@ -37,10 +37,10 @@ public class JettyWarTest extends AbstractCdiSingleAppTest { @Ignore - public static class EmbeddedJettyServer extends AbstractJettyServer { - public static final int PORT = allocatePortAsInt(EmbeddedJettyServer.class); + public static class EmbeddedJettyWarServer extends AbstractJettyServer { + public static final int PORT = allocatePortAsInt(EmbeddedJettyWarServer.class); - public EmbeddedJettyServer() { + public EmbeddedJettyWarServer() { super("/jaxrs_cdi", "/", PORT, new WebBeansConfigurationListener()); } } @@ -48,7 +48,7 @@ public EmbeddedJettyServer() { @BeforeClass public static void startServers() throws Exception { AbstractResourceInfo.clearAllMaps(); - assertTrue("server did not launch correctly", launchServer(EmbeddedJettyServer.class, true)); + assertTrue("server did not launch correctly", launchServer(EmbeddedJettyWarServer.class, true)); createStaticBus(); } @@ -102,6 +102,6 @@ public void testConfiguredProviders() { @Override protected int getPort() { - return EmbeddedJettyServer.PORT; + return EmbeddedJettyWarServer.PORT; } } diff --git a/systests/cdi/cdi-weld/cdi-multiple-apps-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java b/systests/cdi/cdi-weld/cdi-multiple-apps-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java index 677129c7af5..67d677a638f 100644 --- a/systests/cdi/cdi-weld/cdi-multiple-apps-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java +++ b/systests/cdi/cdi-weld/cdi-multiple-apps-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java @@ -33,10 +33,10 @@ public class JettyWarTest extends AbstractCdiMultiAppTest { @Ignore - public static class EmbeddedJettyServer extends AbstractJettyServer { - public static final int PORT = allocatePortAsInt(EmbeddedJettyServer.class); + public static class EmbeddedJettyWarServer extends AbstractJettyServer { + public static final int PORT = allocatePortAsInt(EmbeddedJettyWarServer.class); - public EmbeddedJettyServer() { + public EmbeddedJettyWarServer() { super("/jaxrs_cdi", "/", PORT, new Listener()); } } @@ -45,13 +45,13 @@ public EmbeddedJettyServer() { public static void startServers() throws Exception { AbstractResourceInfo.clearAllMaps(); System.setProperty(Container.class.getName(), JettyContainer.class.getName()); - assertTrue("server did not launch correctly", launchServer(EmbeddedJettyServer.class, true)); + assertTrue("server did not launch correctly", launchServer(EmbeddedJettyWarServer.class, true)); createStaticBus(); } @Override protected int getPort() { - return EmbeddedJettyServer.PORT; + return EmbeddedJettyWarServer.PORT; } } diff --git a/systests/cdi/cdi-weld/cdi-no-apps-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java b/systests/cdi/cdi-weld/cdi-no-apps-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java index a11a9d15265..510e5c2ba18 100644 --- a/systests/cdi/cdi-weld/cdi-no-apps-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java +++ b/systests/cdi/cdi-weld/cdi-no-apps-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java @@ -32,10 +32,10 @@ public class JettyWarTest extends AbstractCdiSingleAppTest { @Ignore - public static class EmbeddedJettyServer extends AbstractJettyServer { - public static final int PORT = allocatePortAsInt(EmbeddedJettyServer.class); + public static class EmbeddedJettyWarServer extends AbstractJettyServer { + public static final int PORT = allocatePortAsInt(EmbeddedJettyWarServer.class); - public EmbeddedJettyServer() { + public EmbeddedJettyWarServer() { super("/jaxrs_cdi", "/", PORT, new Listener()); } } @@ -44,13 +44,13 @@ public EmbeddedJettyServer() { public static void startServers() throws Exception { AbstractResourceInfo.clearAllMaps(); System.setProperty(Container.class.getName(), JettyContainer.class.getName()); - assertTrue("server did not launch correctly", launchServer(EmbeddedJettyServer.class, true)); + assertTrue("server did not launch correctly", launchServer(EmbeddedJettyWarServer.class, true)); createStaticBus(); } @Override protected int getPort() { - return EmbeddedJettyServer.PORT; + return EmbeddedJettyWarServer.PORT; } } diff --git a/systests/cdi/cdi-weld/cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java b/systests/cdi/cdi-weld/cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java index 71573cb26a6..bb2ed74c312 100644 --- a/systests/cdi/cdi-weld/cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java +++ b/systests/cdi/cdi-weld/cdi-producers-weld/src/test/java/org/apache/cxf/systest/jaxrs/cdi/jetty/JettyWarTest.java @@ -32,10 +32,10 @@ public class JettyWarTest extends AbstractBookStoreCdiTest { @Ignore - public static class EmbeddedJettyServer extends AbstractJettyServer { - public static final int PORT = allocatePortAsInt(EmbeddedJettyServer.class); + public static class EmbeddedJettyWarServer extends AbstractJettyServer { + public static final int PORT = allocatePortAsInt(EmbeddedJettyWarServer.class); - public EmbeddedJettyServer() { + public EmbeddedJettyWarServer() { super("/jaxrs_cdi", "/", PORT, new Listener()); } } @@ -44,11 +44,11 @@ public EmbeddedJettyServer() { public static void startServers() throws Exception { AbstractResourceInfo.clearAllMaps(); System.setProperty(Container.class.getName(), JettyContainer.class.getName()); - assertTrue("server did not launch correctly", launchServer(EmbeddedJettyServer.class, true)); + assertTrue("server did not launch correctly", launchServer(EmbeddedJettyWarServer.class, true)); createStaticBus(); } protected int getPort() { - return EmbeddedJettyServer.PORT; + return EmbeddedJettyWarServer.PORT; } } diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerUserResourceAsteriskTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerUserResourceAsteriskTest.java index 11e6ef58d27..3e0a4b52483 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerUserResourceAsteriskTest.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerUserResourceAsteriskTest.java @@ -47,10 +47,10 @@ import static org.junit.Assert.assertTrue; public class JAXRSClientServerUserResourceAsteriskTest extends AbstractClientServerTestBase { - public static final String PORT = allocatePort(Server.class); + public static final String PORT = allocatePort(UserResourceAsteriskServer.class); public static final String CONTEXT = "/jetty/*/asterisk"; - public static class Server extends AbstractServerTestServerBase { + public static class UserResourceAsteriskServer extends AbstractServerTestServerBase { @Override protected org.apache.cxf.endpoint.Server createServer(Bus bus) throws Exception { JAXRSServerFactoryBean sf = new JAXRSServerFactoryBean(); @@ -93,14 +93,14 @@ protected org.apache.cxf.endpoint.Server createServer(Bus bus) throws Exception } public static void main(String[] args) throws Exception { - new Server().start(); + new UserResourceAsteriskServer().start(); } } @BeforeClass public static void startServers() throws Exception { AbstractResourceInfo.clearAllMaps(); - assertTrue("server did not launch correctly", launchServer(Server.class)); + assertTrue("server did not launch correctly", launchServer(UserResourceAsteriskServer.class)); } @Test diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerUserResourceDefaultTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerUserResourceDefaultTest.java index 6e96b0dc651..472fe67bfbd 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerUserResourceDefaultTest.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerUserResourceDefaultTest.java @@ -73,9 +73,9 @@ import static org.junit.Assert.assertTrue; public class JAXRSClientServerUserResourceDefaultTest extends AbstractBusClientServerTestBase { - public static final String PORT = allocatePort(Server.class); + public static final String PORT = allocatePort(UserResourceDefaultServer.class); - public static class Server extends AbstractServerTestServerBase { + public static class UserResourceDefaultServer extends AbstractServerTestServerBase { @Override protected org.apache.cxf.endpoint.Server createServer(Bus bus) throws Exception { @@ -122,7 +122,7 @@ protected org.apache.cxf.endpoint.Server createServer(Bus bus) throws Exception } public static void main(String[] args) throws Exception { - new Server().start(); + new UserResourceDefaultServer().start(); } } @@ -130,7 +130,7 @@ public static void main(String[] args) throws Exception { public static void startServers() throws Exception { AbstractResourceInfo.clearAllMaps(); assertTrue("server did not launch correctly", - launchServer(Server.class, true)); + launchServer(UserResourceDefaultServer.class, true)); createStaticBus(); } diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerUserResourceTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerUserResourceTest.java index 34c0b5ca0b9..a0bf08d4401 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerUserResourceTest.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerUserResourceTest.java @@ -47,9 +47,9 @@ import static org.junit.Assert.assertTrue; public class JAXRSClientServerUserResourceTest extends AbstractClientServerTestBase { - public static final String PORT = allocatePort(Server.class); + public static final String PORT = allocatePort(UserResourceServer.class); - public static class Server extends AbstractServerTestServerBase { + public static class UserResourceServer extends AbstractServerTestServerBase { @Override protected org.apache.cxf.endpoint.Server createServer(Bus bus) throws Exception { @@ -93,7 +93,7 @@ protected org.apache.cxf.endpoint.Server createServer(Bus bus) throws Exception } public static void main(String[] args) throws Exception { - new Server().start(); + new UserResourceServer().start(); } } @@ -101,7 +101,7 @@ public static void main(String[] args) throws Exception { public static void startServers() throws Exception { AbstractResourceInfo.clearAllMaps(); assertTrue("server did not launch correctly", - launchServer(Server.class, true)); + launchServer(UserResourceServer.class, true)); } @Test diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSUnicodeTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSUnicodeTest.java index c1713b0ccd7..c53f85eae8e 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSUnicodeTest.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSUnicodeTest.java @@ -31,18 +31,18 @@ import static org.junit.Assert.assertEquals; public class JAXRSUnicodeTest extends AbstractBusClientServerTestBase { - public static final int PORT = SpringServer.PORT; + public static final int PORT = SpringUnicodeServer.PORT; @BeforeClass public static void beforeClass() throws Exception { // must be 'in-process' to communicate with inner class in single JVM // and to spawn class SpringServer w/o using main() method - launchServer(SpringServer.class, true); + launchServer(SpringUnicodeServer.class, true); } @Ignore - public static class SpringServer extends AbstractSpringServer { - public static final int PORT = allocatePortAsInt(SpringServer.class); - public SpringServer() { + public static class SpringUnicodeServer extends AbstractSpringServer { + public static final int PORT = allocatePortAsInt(SpringUnicodeServer.class); + public SpringUnicodeServer() { super("/jaxrs_unicode", PORT); } } diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSUriInfoMatchTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSUriInfoMatchTest.java index 13961b556cb..97ecc0479f1 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSUriInfoMatchTest.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSUriInfoMatchTest.java @@ -38,18 +38,18 @@ import static org.junit.Assert.assertEquals; public class JAXRSUriInfoMatchTest extends AbstractClientServerTestBase { - public static final int PORT = SpringServer.PORT; + public static final int PORT = SpringUriInfoMatchServer.PORT; @BeforeClass public static void beforeClass() throws Exception { // must be 'in-process' to communicate with inner class in single JVM // and to spawn class SpringServer w/o using main() method - launchServer(SpringServer.class, true); + launchServer(SpringUriInfoMatchServer.class, true); } @Ignore - public static class SpringServer extends AbstractSpringServer { - public static final int PORT = allocatePortAsInt(SpringServer.class); - public SpringServer() { + public static class SpringUriInfoMatchServer extends AbstractSpringServer { + public static final int PORT = allocatePortAsInt(SpringUriInfoMatchServer.class); + public SpringUriInfoMatchServer() { super("/jaxrs_uriinfo_match", "/match", PORT); } } diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSUriInfoTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSUriInfoTest.java index b4313018d35..858bb04a8d5 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSUriInfoTest.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSUriInfoTest.java @@ -34,18 +34,18 @@ import static org.junit.Assert.assertEquals; public class JAXRSUriInfoTest extends AbstractClientServerTestBase { - public static final int PORT = SpringServer.PORT; + public static final int PORT = SpringUriInfoServer.PORT; @BeforeClass public static void beforeClass() throws Exception { // must be 'in-process' to communicate with inner class in single JVM // and to spawn class SpringServer w/o using main() method - launchServer(SpringServer.class, true); + launchServer(SpringUriInfoServer.class, true); } @Ignore - public static class SpringServer extends AbstractSpringServer { - public static final int PORT = allocatePortAsInt(SpringServer.class); - public SpringServer() { + public static class SpringUriInfoServer extends AbstractSpringServer { + public static final int PORT = allocatePortAsInt(SpringUriInfoServer.class); + public SpringUriInfoServer() { super("/jaxrs_uriinfo", "/app", PORT); } } diff --git a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/CrossOriginSimpleTest.java b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/CrossOriginSimpleTest.java index 6855fc96ada..7ff161e082d 100644 --- a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/CrossOriginSimpleTest.java +++ b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/cors/CrossOriginSimpleTest.java @@ -63,12 +63,12 @@ * */ public class CrossOriginSimpleTest extends AbstractBusClientServerTestBase { - public static final int PORT = SpringServer.PORT; + public static final int PORT = SpringCrossOriginSimpleServer.PORT; private WebClient configClient; @BeforeClass public static void startServers() throws Exception { - assertTrue("server did not launch correctly", launchServer(SpringServer.class, true)); + assertTrue("server did not launch correctly", launchServer(SpringCrossOriginSimpleServer.class, true)); } @Before @@ -572,10 +572,10 @@ public void testAnnotatedLocalPreflightNoGo() throws Exception { } @Ignore - public static class SpringServer extends AbstractSpringServer { - public static final int PORT = allocatePortAsInt(SpringServer.class); + public static class SpringCrossOriginSimpleServer extends AbstractSpringServer { + public static final int PORT = allocatePortAsInt(SpringCrossOriginSimpleServer.class); - public SpringServer() { + public SpringCrossOriginSimpleServer() { super("/jaxrs_cors", PORT); } } diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationTest.java index 1b6b4127973..aa33ff30aa3 100644 --- a/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationTest.java +++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/HandlerInvocationTest.java @@ -79,7 +79,7 @@ import static org.junit.Assert.fail; public class HandlerInvocationTest extends AbstractBusClientServerTestBase { - private static String port = TestUtil.getPortNumber(Server.class); + private static String port = TestUtil.getPortNumber(HandlersServer.class); private final QName serviceName = new QName("http://apache.org/handler_test", "HandlerTestService"); private final QName portName = new QName("http://apache.org/handler_test", "SoapPort"); @@ -96,7 +96,7 @@ public static void startServers() throws Exception { //System.setProperty(SAAJFactoryResolver.SOAP_FACTORY_KEY, // "com.ibm.ws.webservices.engine.xmlsoap.SOAPFactory"); createStaticBus(); - assertTrue("server did not launch correctly", launchServer(Server.class, true)); + assertTrue("server did not launch correctly", launchServer(HandlersServer.class, true)); } @Before diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/Server.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/HandlersServer.java similarity index 88% rename from systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/Server.java rename to systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/HandlersServer.java index 1f27ad97ed6..05314153550 100644 --- a/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/Server.java +++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/HandlersServer.java @@ -23,10 +23,10 @@ import org.apache.cxf.testutil.common.AbstractBusTestServerBase; import org.apache.cxf.testutil.common.TestUtil; -public class Server extends AbstractBusTestServerBase { +public class HandlersServer extends AbstractBusTestServerBase { protected void run() { - String port = TestUtil.getPortNumber(Server.class); + String port = TestUtil.getPortNumber(HandlersServer.class); Object implementor = new HandlerTestImpl(); String address = "http://localhost:" + port + "/HandlerTest/SoapPort"; @@ -37,7 +37,7 @@ protected void run() { public static void main(String[] args) { try { - Server s = new Server(); + HandlersServer s = new HandlersServer(); s.start(); } catch (Exception ex) { ex.printStackTrace(); diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/TrivialSOAPHandlerTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/TrivialSOAPHandlerTest.java index 9e1cba81b8a..323fb9548bb 100644 --- a/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/TrivialSOAPHandlerTest.java +++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/handlers/TrivialSOAPHandlerTest.java @@ -41,10 +41,10 @@ */ public class TrivialSOAPHandlerTest extends AbstractClientServerTestBase { static String address = "http://localhost:" - + TestUtil.getPortNumber(Server.class) + + TestUtil.getPortNumber(TrivialSOAPHandlerServer.class) + "/SoapContext/GreeterPort"; - public static class Server extends AbstractBusTestServerBase { + public static class TrivialSOAPHandlerServer extends AbstractBusTestServerBase { protected void run() { Object implementor = new TrivialSOAPHandlerAnnotatedGreeterImpl(); @@ -54,7 +54,7 @@ protected void run() { public static void main(String[] args) { try { - Server s = new Server(); + TrivialSOAPHandlerServer s = new TrivialSOAPHandlerServer(); s.start(); } catch (Exception ex) { ex.printStackTrace(); @@ -69,7 +69,7 @@ public static void main(String[] args) { @BeforeClass public static void startServers() throws Exception { assertTrue("server did not launch correctly", - launchServer(Server.class)); + launchServer(TrivialSOAPHandlerServer.class)); } @Test diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/AttachmentMtomChunkingTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/AttachmentMtomChunkingTest.java index c4da85e9003..2884f00bd0d 100644 --- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/AttachmentMtomChunkingTest.java +++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/AttachmentMtomChunkingTest.java @@ -44,10 +44,10 @@ import static org.junit.Assert.assertTrue; public class AttachmentMtomChunkingTest extends AbstractAttachmentChunkingTest { - private static final String PORT = allocatePort(DownloadServer.class); + private static final String PORT = allocatePort(ChunkingDownloadServer.class); private static final Logger LOG = LogUtils.getLogger(AttachmentMtomChunkingTest.class); - public static class DownloadServer extends AbstractBusTestServerBase { + public static class ChunkingDownloadServer extends AbstractBusTestServerBase { protected void run() { Object implementor = new DownloadImpl(); String address = "http://localhost:" + PORT + "/SoapContext/SoapPort"; @@ -57,7 +57,7 @@ protected void run() { public static void main(String[] args) { try { - DownloadServer s = new DownloadServer(); + ChunkingDownloadServer s = new ChunkingDownloadServer(); s.start(); } catch (Exception ex) { ex.printStackTrace(); @@ -70,7 +70,7 @@ public static void main(String[] args) { @BeforeClass public static void startServers() throws Exception { - assertTrue("server did not launch correctly", launchServer(DownloadServer.class, true)); + assertTrue("server did not launch correctly", launchServer(ChunkingDownloadServer.class, true)); } @Test diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF5061Test.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF5061Test.java index 9c8a8e023d7..e1035311b31 100644 --- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF5061Test.java +++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF5061Test.java @@ -38,7 +38,7 @@ public class CXF5061Test extends AbstractBusClientServerTestBase { = "http://localhost:" + TestUtil.getPortNumber("org.apache.cxf.systest.jaxws.CXF5061Test") + "/cxf5061"; - public static class Server extends AbstractBusTestServerBase { + public static class CXF5061Server extends AbstractBusTestServerBase { protected void run() { new SpringBusFactory().createBus("org/apache/cxf/systest/jaxws/springWebService.xml"); @@ -46,7 +46,7 @@ protected void run() { public static void main(String[] args) { try { - Server s = new Server(); + CXF5061Server s = new CXF5061Server(); s.start(); } catch (Exception ex) { ex.printStackTrace(); @@ -59,7 +59,7 @@ public static void main(String[] args) { @BeforeClass public static void startServers() throws Exception { - assertTrue("server did not launch correctly", launchServer(Server.class, true)); + assertTrue("server did not launch correctly", launchServer(CXF5061Server.class, true)); } @Test diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF6655Test.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF6655Test.java index 64c5f83f9cf..46e17fbfdbf 100644 --- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF6655Test.java +++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF6655Test.java @@ -44,11 +44,11 @@ import static org.junit.Assert.assertTrue; public class CXF6655Test extends AbstractClientServerTestBase { - static final String PORT = allocatePort(Server.class); + static final String PORT = allocatePort(CXF6655Server.class); static final int PROXY_PORT = Integer.parseInt(allocatePort(CXF6655Test.class)); static HttpProxyServer proxy; - public static class Server extends AbstractBusTestServerBase { + public static class CXF6655Server extends AbstractBusTestServerBase { protected void run() { Object implementor = new HelloImpl(); @@ -58,7 +58,7 @@ protected void run() { public static void main(String[] args) { try { - Server s = new Server(); + CXF6655Server s = new CXF6655Server(); s.start(); } catch (Exception ex) { ex.printStackTrace(); @@ -77,7 +77,7 @@ public static void stopProxy() { @BeforeClass public static void startServers() throws Exception { - assertTrue("server did not launch correctly", launchServer(Server.class, true)); + assertTrue("server did not launch correctly", launchServer(CXF6655Server.class, true)); proxy = DefaultHttpProxyServer.bootstrap().withPort(PROXY_PORT).start(); } diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF7990Test.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF7990Test.java index 834ff047a27..52929c04476 100644 --- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF7990Test.java +++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CXF7990Test.java @@ -37,9 +37,9 @@ import static org.junit.Assert.fail; public class CXF7990Test extends AbstractClientServerTestBase { - static final String PORT = allocatePort(Server.class); + static final String PORT = allocatePort(CXF7990Server.class); - public static class Server extends AbstractBusTestServerBase { + public static class CXF7990Server extends AbstractBusTestServerBase { protected void run() { Object implementor = new EchoServiceImpl(); String address = "http://localhost:" + PORT + "/echo/service"; @@ -52,7 +52,7 @@ protected void run() { public static void main(String[] args) { try { - Server s = new Server(); + CXF7990Server s = new CXF7990Server(); s.start(); } catch (Exception ex) { ex.printStackTrace(); @@ -65,7 +65,7 @@ public static void main(String[] args) { @BeforeClass public static void startServers() throws Exception { - assertTrue("server did not launch correctly", launchServer(Server.class, true)); + assertTrue("server did not launch correctly", launchServer(CXF7990Server.class, true)); } @Test diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerRPCLitDefatulAnnoTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerRPCLitDefaultAnnoTest.java similarity index 87% rename from systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerRPCLitDefatulAnnoTest.java rename to systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerRPCLitDefaultAnnoTest.java index 3868e9b9d0a..74f9e02f6f1 100644 --- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerRPCLitDefatulAnnoTest.java +++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerRPCLitDefaultAnnoTest.java @@ -32,10 +32,10 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -public class ClientServerRPCLitDefatulAnnoTest extends AbstractClientServerTestBase { - static final String PORT = allocatePort(Server.class); +public class ClientServerRPCLitDefaultAnnoTest extends AbstractClientServerTestBase { + static final String PORT = allocatePort(RPCLitDefaultAnnoServer.class); - public static class Server extends AbstractBusTestServerBase { + public static class RPCLitDefaultAnnoServer extends AbstractBusTestServerBase { protected void run() { Object implementor = new HelloImpl(); @@ -45,7 +45,7 @@ protected void run() { public static void main(String[] args) { try { - Server s = new Server(); + RPCLitDefaultAnnoServer s = new RPCLitDefaultAnnoServer(); s.start(); } catch (Exception ex) { ex.printStackTrace(); @@ -58,7 +58,7 @@ public static void main(String[] args) { @BeforeClass public static void startServers() throws Exception { - assertTrue("server did not launch correctly", launchServer(Server.class, true)); + assertTrue("server did not launch correctly", launchServer(RPCLitDefaultAnnoServer.class, true)); } @Test diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerRPCLitTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerRPCLitTest.java index 2456c6e00b3..197bcaf9c64 100644 --- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerRPCLitTest.java +++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerRPCLitTest.java @@ -75,11 +75,11 @@ import static org.junit.Assert.fail; public class ClientServerRPCLitTest extends AbstractBusClientServerTestBase { - static final String PORT = allocatePort(Server.class); + static final String PORT = allocatePort(RPCLitServer.class); private final QName portName = new QName("http://apache.org/hello_world_rpclit", "SoapPortRPCLit"); - public static class Server extends AbstractBusTestServerBase { + public static class RPCLitServer extends AbstractBusTestServerBase { protected void run() { String address; @@ -92,7 +92,7 @@ protected void run() { public static void main(String[] args) { try { - Server s = new Server(); + RPCLitServer s = new RPCLitServer(); s.start(); } catch (Exception ex) { ex.printStackTrace(); @@ -105,7 +105,7 @@ public static void main(String[] args) { @BeforeClass public static void startServers() throws Exception { - assertTrue("server did not launch correctly", launchServer(Server.class, true)); + assertTrue("server did not launch correctly", launchServer(RPCLitServer.class, true)); } @Test diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java index 5d7767b1c6d..edafa3b7b4a 100644 --- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java +++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/ClientServerTest.java @@ -99,13 +99,13 @@ import static org.junit.Assert.fail; public class ClientServerTest extends AbstractBusClientServerTestBase { - static final String PORT = allocatePort(Server.class); - static final String BARE_PORT = allocatePort(Server.class, 1); - static final String BOGUS_REAL_PORT = allocatePort(Server.class, 2); + static final String PORT = allocatePort(JAXWSServer.class); + static final String BARE_PORT = allocatePort(JAXWSServer.class, 1); + static final String BOGUS_REAL_PORT = allocatePort(JAXWSServer.class, 2); - static final String BOGUS_PORT = allocatePort(Server.class, 3); - static final String PUB_PORT = allocatePort(Server.class, 4); - static final String CLIENT_PORT = allocatePort(Server.class, 5); + static final String BOGUS_PORT = allocatePort(JAXWSServer.class, 3); + static final String PUB_PORT = allocatePort(JAXWSServer.class, 4); + static final String CLIENT_PORT = allocatePort(JAXWSServer.class, 5); @@ -130,7 +130,7 @@ public static void startServers() throws Exception { // Create bus first so it will be shared between the server and clients createStaticBus(url.toString()); assertNotNull("cannot find test resource", url); - assertTrue("server did not launch correctly", launchServer(Server.class, true)); + assertTrue("server did not launch correctly", launchServer(JAXWSServer.class, true)); } @Test diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CustomizedMicrometerProviderClientServerTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CustomizedMicrometerProviderClientServerTest.java index a909f7ae6d8..d135538d340 100644 --- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CustomizedMicrometerProviderClientServerTest.java +++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/CustomizedMicrometerProviderClientServerTest.java @@ -74,11 +74,11 @@ public class CustomizedMicrometerProviderClientServerTest extends AbstractBusCli public static final MeterRegistry METER_REGISTER = new SimpleMeterRegistry(); - private static final String PORT = allocatePort(Server.class); + private static final String PORT = allocatePort(CustomizedMicrometerProviderServer.class); private final QName portName = new QName("http://cxf.apache.org/jaxws/schemavalidation", "servicePort"); - public static class Server extends AbstractBusTestServerBase { + public static class CustomizedMicrometerProviderServer extends AbstractBusTestServerBase { protected void run() { var jaxwsTags = new JaxwsTags(); @@ -117,7 +117,7 @@ protected void run() { @BeforeClass public static void startServers() { createStaticBus(); - assertTrue("server did not launch correctly", launchServer(Server.class, true)); + assertTrue("server did not launch correctly", launchServer(CustomizedMicrometerProviderServer.class, true)); } @Test diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/Server.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JAXWSServer.java similarity index 96% rename from systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/Server.java rename to systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JAXWSServer.java index 836d7311128..702e33085f4 100644 --- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/Server.java +++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/JAXWSServer.java @@ -45,10 +45,10 @@ import org.apache.hello_world_soap_http.GreeterImpl; import org.apache.hello_world_soap_http.types.GreetMeResponse; -public class Server extends AbstractBusTestServerBase { - static final String PORT = allocatePort(Server.class); - static final String BARE_PORT = allocatePort(Server.class, 1); - static final String BOGUS_REAL_PORT = allocatePort(Server.class, 2); +public class JAXWSServer extends AbstractBusTestServerBase { + static final String PORT = allocatePort(JAXWSServer.class); + static final String BARE_PORT = allocatePort(JAXWSServer.class, 1); + static final String BOGUS_REAL_PORT = allocatePort(JAXWSServer.class, 2); List eps = new LinkedList<>(); @@ -182,7 +182,7 @@ public void run() { public static void main(String[] args) { try { - Server s = new Server(); + JAXWSServer s = new JAXWSServer(); s.start(); } catch (Exception ex) { ex.printStackTrace(); diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/LocatorClientServerTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/LocatorClientServerTest.java index 6d7679c1753..453371e1340 100644 --- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/LocatorClientServerTest.java +++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/LocatorClientServerTest.java @@ -41,12 +41,12 @@ import static org.junit.Assert.fail; public class LocatorClientServerTest extends AbstractBusClientServerTestBase { - static final String PORT = allocatePort(MyServer.class); + static final String PORT = allocatePort(LocatorServer.class); static final Logger LOG = LogUtils.getLogger(LocatorClientServerTest.class); private final QName serviceName = new QName("http://apache.org/locator", "LocatorService"); - public static class MyServer extends AbstractBusTestServerBase { + public static class LocatorServer extends AbstractBusTestServerBase { protected void run() { Object implementor = new LocatorServiceImpl(); @@ -57,7 +57,7 @@ protected void run() { public static void main(String[] args) { try { - MyServer s = new MyServer(); + LocatorServer s = new LocatorServer(); s.start(); } catch (Exception ex) { ex.printStackTrace(); @@ -70,7 +70,7 @@ public static void main(String[] args) { @BeforeClass public static void startServers() throws Exception { - assertTrue("server did not launch correctly", launchServer(MyServer.class, true)); + assertTrue("server did not launch correctly", launchServer(LocatorServer.class, true)); } @Test diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/SchemaValidationMetricsClientServerTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/SchemaValidationMetricsClientServerTest.java index 226e3547e1c..4dd89a78fb6 100644 --- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/SchemaValidationMetricsClientServerTest.java +++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/SchemaValidationMetricsClientServerTest.java @@ -66,11 +66,11 @@ public class SchemaValidationMetricsClientServerTest extends AbstractBusClientSe private static final MeterRegistry METER_REGISTER = new SimpleMeterRegistry(); - private static final String PORT = allocatePort(Server.class); + private static final String PORT = allocatePort(SchemaValidationMetricsServer.class); private final QName portName = new QName("http://cxf.apache.org/jaxws/schemavalidation", "servicePort"); - public static class Server extends AbstractBusTestServerBase { + public static class SchemaValidationMetricsServer extends AbstractBusTestServerBase { protected void run() { var jaxwsTags = new JaxwsTags(); @@ -108,7 +108,7 @@ protected void run() { @BeforeClass public static void startServers() { createStaticBus(); - assertTrue("server did not launch correctly", launchServer(Server.class, true)); + assertTrue("server did not launch correctly", launchServer(SchemaValidationMetricsServer.class, true)); } @Test diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/SchemaValidationWithoutViolationMetricsClientServerTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/SchemaValidationWithoutViolationMetricsClientServerTest.java index 3a3087561ec..ef93c881737 100644 --- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/SchemaValidationWithoutViolationMetricsClientServerTest.java +++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/SchemaValidationWithoutViolationMetricsClientServerTest.java @@ -74,11 +74,11 @@ public class SchemaValidationWithoutViolationMetricsClientServerTest extends Abs public static final MeterRegistry METER_REGISTER = new SimpleMeterRegistry(); - private static final String PORT = allocatePort(Server.class); + private static final String PORT = allocatePort(SchemaValidationWithoutViolationServer.class); private final QName portName = new QName("http://cxf.apache.org/jaxws/schemavalidation", "servicePort"); - public static class Server extends AbstractBusTestServerBase { + public static class SchemaValidationWithoutViolationServer extends AbstractBusTestServerBase { protected void run() { var jaxwsTags = new JaxwsTags(); @@ -119,7 +119,7 @@ protected void run() { @BeforeClass public static void startServers() { createStaticBus(); - assertTrue("server did not launch correctly", launchServer(Server.class, true)); + assertTrue("server did not launch correctly", launchServer(SchemaValidationWithoutViolationServer.class, true)); } @Test diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/websocket/ClientServerWebSocketTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/websocket/ClientServerWebSocketTest.java index ef2e3ab82d7..088bb707e28 100644 --- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/websocket/ClientServerWebSocketTest.java +++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/websocket/ClientServerWebSocketTest.java @@ -56,7 +56,7 @@ import static org.junit.Assert.fail; public class ClientServerWebSocketTest extends AbstractBusClientServerTestBase { - static final String PORT = allocatePort(Server.class); + static final String PORT = allocatePort(WebSocketServer.class); static final Logger LOG = LogUtils.getLogger(ClientServerWebSocketTest.class); private final QName serviceName = new QName("http://apache.org/hello_world_soap_http", @@ -68,7 +68,7 @@ public class ClientServerWebSocketTest extends AbstractBusClientServerTestBase { public static void startServers() throws Exception { // set up configuration to enable schema validation //System.setProperty("org.apache.cxf.transport.websocket.atmosphere.disabled", "true"); - assertTrue("server did not launch correctly", launchServer(Server.class, true)); + assertTrue("server did not launch correctly", launchServer(WebSocketServer.class, true)); createStaticBus(); } diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/websocket/Server.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/websocket/WebSocketServer.java similarity index 90% rename from systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/websocket/Server.java rename to systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/websocket/WebSocketServer.java index 1f2b7b38bac..76cea2ac65b 100644 --- a/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/websocket/Server.java +++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/jaxws/websocket/WebSocketServer.java @@ -29,9 +29,9 @@ import org.apache.hello_world_soap_http.BaseGreeterImpl; import org.apache.hello_world_soap_http.GreeterImpl; -public class Server extends AbstractBusTestServerBase { - static final String PORT = allocatePort(Server.class); - static final String BOGUS_REAL_PORT = allocatePort(Server.class, 2); +public class WebSocketServer extends AbstractBusTestServerBase { + static final String PORT = allocatePort(WebSocketServer.class); + static final String BOGUS_REAL_PORT = allocatePort(WebSocketServer.class, 2); List eps = new LinkedList<>(); @@ -68,7 +68,7 @@ public class Greeter12Impl extends BaseGreeterImpl { public static void main(String[] args) { try { - Server s = new Server(); + WebSocketServer s = new WebSocketServer(); s.start(); } catch (Exception ex) { ex.printStackTrace(); diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/CXF4130Test.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/CXF4130Test.java index 2955de9929f..a45a4374367 100644 --- a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/CXF4130Test.java +++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/CXF4130Test.java @@ -47,10 +47,10 @@ public class CXF4130Test extends AbstractBusClientServerTestBase { public static final String ADDRESS - = "http://localhost:" + TestUtil.getPortNumber(Server.class) + = "http://localhost:" + TestUtil.getPortNumber(CXF4130Server.class) + "/InBand33MessageServiceProvider/InBandSoapHeaderSoapHttpPort"; - public static class Server extends AbstractBusTestServerBase { + public static class CXF4130Server extends AbstractBusTestServerBase { protected void run() { Object implementor = new CXF4130Provider(); @@ -59,7 +59,7 @@ protected void run() { public static void main(String[] args) { try { - Server s = new Server(); + CXF4130Server s = new CXF4130Server(); s.start(); } catch (Exception ex) { ex.printStackTrace(); @@ -72,7 +72,7 @@ public static void main(String[] args) { @BeforeClass public static void startServers() throws Exception { - assertTrue("server did not launch correctly", launchServer(Server.class, true)); + assertTrue("server did not launch correctly", launchServer(CXF4130Server.class, true)); } @Test diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/CXF4818Test.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/CXF4818Test.java index ade9dda45f9..ea88a0acc3e 100644 --- a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/CXF4818Test.java +++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/CXF4818Test.java @@ -59,10 +59,10 @@ public class CXF4818Test extends AbstractBusClientServerTestBase { public static final String ADDRESS - = "http://localhost:" + TestUtil.getPortNumber(Server.class) + = "http://localhost:" + TestUtil.getPortNumber(CXF4818Server.class) + "/AddressProvider/AddressProvider"; - public static class Server extends AbstractBusTestServerBase { + public static class CXF4818Server extends AbstractBusTestServerBase { protected void run() { Object implementor = new CXF4818Provider(); @@ -71,7 +71,7 @@ protected void run() { public static void main(String[] args) { try { - Server s = new Server(); + CXF4818Server s = new CXF4818Server(); s.start(); } catch (Exception ex) { ex.printStackTrace(); @@ -84,7 +84,7 @@ public static void main(String[] args) { @BeforeClass public static void startServers() throws Exception { - assertTrue("server did not launch correctly", launchServer(Server.class, true)); + assertTrue("server did not launch correctly", launchServer(CXF4818Server.class, true)); } @Test diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/InterpretNullAsOnewayProviderTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/InterpretNullAsOnewayProviderTest.java index 186dc2f5dcb..2d2cb1d061f 100755 --- a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/InterpretNullAsOnewayProviderTest.java +++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/InterpretNullAsOnewayProviderTest.java @@ -43,13 +43,13 @@ * Testing the null response behavior of jaxws provider (jaxws 2.2 section 5.1.1) */ public class InterpretNullAsOnewayProviderTest extends AbstractBusClientServerTestBase { - public static final String PORT = allocatePort(Server.class); + public static final String PORT = allocatePort(NullAsOnewayServer.class); private static final String ADDRESS1 = "http://localhost:" + PORT + "/test/nullable1"; private static final String ADDRESS2 = "http://localhost:" + PORT + "/test/nullable2"; private static final String ADDRESS3 = "http://localhost:" + PORT + "/test/nullable3"; - public static class Server extends AbstractBusTestServerBase { + public static class NullAsOnewayServer extends AbstractBusTestServerBase { protected void run() { // endpoint not interpreting null as oneway @@ -72,7 +72,7 @@ protected void run() { public static void main(String[] args) throws Exception { try { - Server s = new Server(); + NullAsOnewayServer s = new NullAsOnewayServer(); s.start(); } catch (Exception ex) { ex.printStackTrace(); @@ -94,7 +94,7 @@ public Source invoke(Source request) { @BeforeClass public static void startServers() throws Exception { - assertTrue("server did not launch correctly", launchServer(Server.class, true)); + assertTrue("server did not launch correctly", launchServer(NullAsOnewayServer.class, true)); } @Test diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/NBProviderClientServerTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/NBProviderClientServerTest.java index beaff8b2df9..bfe063300ed 100644 --- a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/NBProviderClientServerTest.java +++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/NBProviderClientServerTest.java @@ -48,12 +48,12 @@ public class NBProviderClientServerTest extends AbstractBusClientServerTestBase { public static final String ADDRESS - = "http://localhost:" + TestUtil.getPortNumber(Server.class) + = "http://localhost:" + TestUtil.getPortNumber(NBProviderServer.class) + "/SoapContext/SoapProviderPort"; private static QName sayHi = new QName("http://apache.org/hello_world_soap_http/types", "sayHi"); - public static class Server extends AbstractBusTestServerBase { + public static class NBProviderServer extends AbstractBusTestServerBase { Endpoint ep; protected void run() { @@ -68,7 +68,7 @@ public void tearDown() { public static void main(String[] args) { try { - Server s = new Server(); + NBProviderServer s = new NBProviderServer(); s.start(); } catch (Exception ex) { ex.printStackTrace(); @@ -81,7 +81,7 @@ public static void main(String[] args) { @BeforeClass public static void startServers() throws Exception { - assertTrue("server did not launch correctly", launchServer(Server.class, true)); + assertTrue("server did not launch correctly", launchServer(NBProviderServer.class, true)); } @Test diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/ProviderClientServerTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/ProviderClientServerTest.java index 0ae20390278..5c963541bcf 100644 --- a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/ProviderClientServerTest.java +++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/ProviderClientServerTest.java @@ -48,10 +48,10 @@ public class ProviderClientServerTest extends AbstractBusClientServerTestBase { public static final String ADDRESS - = "http://localhost:" + TestUtil.getPortNumber(Server.class) + = "http://localhost:" + TestUtil.getPortNumber(ProviderServer.class) + "/SoapContext/SoapProviderPort"; - public static class Server extends AbstractBusTestServerBase { + public static class ProviderServer extends AbstractBusTestServerBase { protected void run() { Object implementor = new HWSoapMessageDocProvider(); @@ -67,7 +67,7 @@ protected void run() { public static void main(String[] args) { try { - Server s = new Server(); + ProviderServer s = new ProviderServer(); s.start(); } catch (Exception ex) { ex.printStackTrace(); @@ -80,7 +80,7 @@ public static void main(String[] args) { @BeforeClass public static void startServers() throws Exception { - assertTrue("server did not launch correctly", launchServer(Server.class, true)); + assertTrue("server did not launch correctly", launchServer(ProviderServer.class, true)); } @Test diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/ProviderRPCClientServerTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/ProviderRPCClientServerTest.java index e6726a8941b..36ca559409b 100644 --- a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/ProviderRPCClientServerTest.java +++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/ProviderRPCClientServerTest.java @@ -44,11 +44,11 @@ import static org.junit.Assert.assertTrue; public class ProviderRPCClientServerTest extends AbstractBusClientServerTestBase { - private static final String PORT = Server.PORT; + private static final String PORT = ProviderRPCServer.PORT; @BeforeClass public static void startServers() throws Exception { - assertTrue("server did not launch correctly", launchServer(Server.class, true)); + assertTrue("server did not launch correctly", launchServer(ProviderRPCServer.class, true)); } @Test diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/Server.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/ProviderRPCServer.java similarity index 95% rename from systests/jaxws/src/test/java/org/apache/cxf/systest/provider/Server.java rename to systests/jaxws/src/test/java/org/apache/cxf/systest/provider/ProviderRPCServer.java index b0a5eb2d0d9..1fbf34d5c33 100644 --- a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/Server.java +++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/ProviderRPCServer.java @@ -27,8 +27,8 @@ import org.apache.cxf.testutil.common.AbstractBusTestServerBase; import org.apache.cxf.testutil.common.TestUtil; -public class Server extends AbstractBusTestServerBase { - public static final String PORT = TestUtil.getPortNumber(Server.class); +public class ProviderRPCServer extends AbstractBusTestServerBase { + public static final String PORT = TestUtil.getPortNumber(ProviderRPCServer.class); protected void run() { Object implementor = new HWSourcePayloadProvider(); @@ -100,7 +100,7 @@ protected void run() { public static void main(String[] args) { try { - Server s = new Server(); + ProviderRPCServer s = new ProviderRPCServer(); s.start(); } catch (Exception ex) { ex.printStackTrace(); diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/datasource/DataSourceProviderTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/datasource/DataSourceProviderTest.java index 163afa15912..1a0e4070ecf 100644 --- a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/datasource/DataSourceProviderTest.java +++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/datasource/DataSourceProviderTest.java @@ -54,7 +54,7 @@ import static org.junit.Assert.assertTrue; public class DataSourceProviderTest extends AbstractBusClientServerTestBase { - static String serverPort = TestUtil.getPortNumber(Server.class); + static String serverPort = TestUtil.getPortNumber(DataSourceServer.class); static final Logger LOG = LogUtils.getLogger(DataSourceProviderTest.class); private static final String BOUNDARY = "----=_Part_4_701508.1145579811786"; @@ -62,7 +62,7 @@ public class DataSourceProviderTest extends AbstractBusClientServerTestBase { @BeforeClass public static void startServers() throws Exception { assertTrue("server did not launch correctly", - launchServer(Server.class, true)); + launchServer(DataSourceServer.class, true)); } @Test diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/datasource/Server.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/datasource/DataSourceServer.java similarity index 87% rename from systests/jaxws/src/test/java/org/apache/cxf/systest/provider/datasource/Server.java rename to systests/jaxws/src/test/java/org/apache/cxf/systest/provider/datasource/DataSourceServer.java index b8ef5b0d59f..c5b4283519f 100644 --- a/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/datasource/Server.java +++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/provider/datasource/DataSourceServer.java @@ -23,17 +23,17 @@ import org.apache.cxf.testutil.common.TestUtil; -public class Server extends AbstractBusTestServerBase { +public class DataSourceServer extends AbstractBusTestServerBase { protected void run() { - String port = TestUtil.getPortNumber(Server.class); + String port = TestUtil.getPortNumber(DataSourceServer.class); TestProvider servant = new TestProvider(); servant.publish("http://localhost:" + port + "/test/foo"); } public static void main(String[] args) throws Exception { try { - Server s = new Server(); + DataSourceServer s = new DataSourceServer(); s.start(); } catch (Exception ex) { ex.printStackTrace(); diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/swa/ClientServerSwaTest.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/swa/ClientServerSwaTest.java index 01ce406607e..e574acb0957 100644 --- a/systests/jaxws/src/test/java/org/apache/cxf/systest/swa/ClientServerSwaTest.java +++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/swa/ClientServerSwaTest.java @@ -65,8 +65,8 @@ @RunWith(value = Parameterized.class) public class ClientServerSwaTest extends AbstractBusClientServerTestBase { - static String serverPort = TestUtil.getPortNumber(Server.class); - static String serverPortInvalid = TestUtil.getPortNumber(Server.class, 1); + static String serverPort = TestUtil.getPortNumber(SwaServer.class); + static String serverPortInvalid = TestUtil.getPortNumber(SwaServer.class, 1); static class TestParam { private final String port; @@ -99,7 +99,7 @@ public static Collection data() { @BeforeClass public static void startServers() throws Exception { - assertTrue("server did not launch correctly", launchServer(Server.class, true)); + assertTrue("server did not launch correctly", launchServer(SwaServer.class, true)); } private String getFullStackTrace(Exception ex) { diff --git a/systests/jaxws/src/test/java/org/apache/cxf/systest/swa/Server.java b/systests/jaxws/src/test/java/org/apache/cxf/systest/swa/SwaServer.java similarity index 92% rename from systests/jaxws/src/test/java/org/apache/cxf/systest/swa/Server.java rename to systests/jaxws/src/test/java/org/apache/cxf/systest/swa/SwaServer.java index 4eef61b9562..af35e53a497 100644 --- a/systests/jaxws/src/test/java/org/apache/cxf/systest/swa/Server.java +++ b/systests/jaxws/src/test/java/org/apache/cxf/systest/swa/SwaServer.java @@ -24,10 +24,10 @@ import org.apache.cxf.testutil.common.AbstractBusTestServerBase; import org.apache.cxf.testutil.common.TestUtil; -public class Server extends AbstractBusTestServerBase { +public class SwaServer extends AbstractBusTestServerBase { protected void run() { - String port = TestUtil.getPortNumber(Server.class); + String port = TestUtil.getPortNumber(SwaServer.class); Object implementor = new SwAServiceImpl(); String address = "http://localhost:" + port + "/swa"; @@ -49,7 +49,7 @@ protected void run() { public static void main(String[] args) { try { - Server s = new Server(); + SwaServer s = new SwaServer(); s.start(); } catch (Exception ex) { ex.printStackTrace(); diff --git a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/StaxServer.java b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosServer.java similarity index 87% rename from systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/StaxServer.java rename to systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosServer.java index 7877dc488cd..0106ab9725e 100644 --- a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/StaxServer.java +++ b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosServer.java @@ -26,20 +26,20 @@ import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class StaxServer extends AbstractBusTestServerBase { +public class KerberosServer extends AbstractBusTestServerBase { - public StaxServer() { + public KerberosServer() { } protected void run() { - URL busFile = StaxServer.class.getResource("stax-server.xml"); + URL busFile = KerberosServer.class.getResource("server.xml"); Bus busLocal = new SpringBusFactory().createBus(busFile); BusFactory.setDefaultBus(busLocal); setBus(busLocal); try { - new StaxServer(); + new KerberosServer(); } catch (Exception e) { e.printStackTrace(); } diff --git a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/Server.java b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosStaxServer.java similarity index 85% rename from systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/Server.java rename to systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosStaxServer.java index 8e5c6c2d94e..f29bae10d1f 100644 --- a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/Server.java +++ b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosStaxServer.java @@ -26,20 +26,20 @@ import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class Server extends AbstractBusTestServerBase { +public class KerberosStaxServer extends AbstractBusTestServerBase { - public Server() { + public KerberosStaxServer() { } protected void run() { - URL busFile = Server.class.getResource("server.xml"); + URL busFile = KerberosStaxServer.class.getResource("stax-server.xml"); Bus busLocal = new SpringBusFactory().createBus(busFile); BusFactory.setDefaultBus(busLocal); setBus(busLocal); try { - new Server(); + new KerberosStaxServer(); } catch (Exception e) { e.printStackTrace(); } diff --git a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java index 50878effd1e..7d36b3ffd2e 100644 --- a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java +++ b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/kerberos/KerberosTokenTest.java @@ -46,12 +46,12 @@ * A set of tests for Kerberos Tokens that use an Apache Kerby instance as the KDC. */ public class KerberosTokenTest extends AbstractBusClientServerTestBase { - static final String PORT = TestUtil.getPortNumber(Server.class); - static final String STAX_PORT = TestUtil.getPortNumber(StaxServer.class); - static final String PORT2 = TestUtil.getPortNumber(Server.class, 2); - static final String STAX_PORT2 = TestUtil.getPortNumber(StaxServer.class, 2); + static final String PORT = TestUtil.getPortNumber(KerberosServer.class); + static final String STAX_PORT = TestUtil.getPortNumber(KerberosStaxServer.class); + static final String PORT2 = TestUtil.getPortNumber(KerberosServer.class, 2); + static final String STAX_PORT2 = TestUtil.getPortNumber(KerberosStaxServer.class, 2); - static final String PORT3 = TestUtil.getPortNumber(Server.class, 3); + static final String PORT3 = TestUtil.getPortNumber(KerberosServer.class, 3); static final String STSPORT = TestUtil.getPortNumber(STSServer.class); static final String STAX_STSPORT = TestUtil.getPortNumber(StaxSTSServer.class); @@ -117,14 +117,14 @@ public static void startServers() throws Exception { "Server failed to launch", // run the server in the same process // set this to false to fork - AbstractClientServerTestBase.launchServer(Server.class, true) + AbstractClientServerTestBase.launchServer(KerberosServer.class, true) ); org.junit.Assert.assertTrue( "Server failed to launch", // run the server in the same process // set this to false to fork - AbstractClientServerTestBase.launchServer(StaxServer.class, true) + AbstractClientServerTestBase.launchServer(KerberosStaxServer.class, true) ); org.junit.Assert.assertTrue( diff --git a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/StaxServer.java b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoServer.java similarity index 87% rename from systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/StaxServer.java rename to systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoServer.java index 234c4be9173..fd224def1e3 100644 --- a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/StaxServer.java +++ b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoServer.java @@ -26,20 +26,20 @@ import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class StaxServer extends AbstractBusTestServerBase { +public class SpnegoServer extends AbstractBusTestServerBase { - public StaxServer() { + public SpnegoServer() { } protected void run() { - URL busFile = StaxServer.class.getResource("stax-server.xml"); + URL busFile = SpnegoServer.class.getResource("server.xml"); Bus busLocal = new SpringBusFactory().createBus(busFile); BusFactory.setDefaultBus(busLocal); setBus(busLocal); try { - new StaxServer(); + new SpnegoServer(); } catch (Exception e) { e.printStackTrace(); } diff --git a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/Server.java b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoStaxServer.java similarity index 86% rename from systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/Server.java rename to systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoStaxServer.java index c83b66e5e09..2dbe57c139d 100644 --- a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/Server.java +++ b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoStaxServer.java @@ -26,20 +26,20 @@ import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class Server extends AbstractBusTestServerBase { +public class SpnegoStaxServer extends AbstractBusTestServerBase { - public Server() { + public SpnegoStaxServer() { } protected void run() { - URL busFile = Server.class.getResource("server.xml"); + URL busFile = SpnegoStaxServer.class.getResource("stax-server.xml"); Bus busLocal = new SpringBusFactory().createBus(busFile); BusFactory.setDefaultBus(busLocal); setBus(busLocal); try { - new Server(); + new SpnegoStaxServer(); } catch (Exception e) { e.printStackTrace(); } diff --git a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java index 0b0522fbfbd..225892f8629 100644 --- a/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java +++ b/systests/kerberos/src/test/java/org/apache/cxf/systest/kerberos/wssec/spnego/SpnegoTokenTest.java @@ -43,10 +43,10 @@ * A set of tests for Spnego Tokens that use an Apache Kerby instance as the KDC. */ public class SpnegoTokenTest extends AbstractBusClientServerTestBase { - static final String PORT = TestUtil.getPortNumber(Server.class); - static final String STAX_PORT = TestUtil.getPortNumber(StaxServer.class); - static final String PORT2 = TestUtil.getPortNumber(Server.class, 2); - static final String STAX_PORT2 = TestUtil.getPortNumber(StaxServer.class, 2); + static final String PORT = TestUtil.getPortNumber(SpnegoServer.class); + static final String STAX_PORT = TestUtil.getPortNumber(SpnegoStaxServer.class); + static final String PORT2 = TestUtil.getPortNumber(SpnegoServer.class, 2); + static final String STAX_PORT2 = TestUtil.getPortNumber(SpnegoStaxServer.class, 2); private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt"; private static final QName SERVICE_QNAME = new QName(NAMESPACE, "DoubleItService"); @@ -102,14 +102,14 @@ public static void startServers() throws Exception { "Server failed to launch", // run the server in the same process // set this to false to fork - AbstractClientServerTestBase.launchServer(Server.class, true) + AbstractClientServerTestBase.launchServer(SpnegoServer.class, true) ); org.junit.Assert.assertTrue( "Server failed to launch", // run the server in the same process // set this to false to fork - AbstractClientServerTestBase.launchServer(StaxServer.class, true) + AbstractClientServerTestBase.launchServer(SpnegoStaxServer.class, true) ); } diff --git a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/server.xml b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/server.xml index 62248ccc2dd..175a5633a0e 100644 --- a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/server.xml +++ b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/server.xml @@ -40,7 +40,7 @@ - + @@ -64,14 +64,14 @@ - + - + @@ -91,35 +91,35 @@ - + - + - + - + - + @@ -130,14 +130,14 @@ - + - + @@ -148,21 +148,21 @@ - + - + - + @@ -173,7 +173,7 @@ - + @@ -184,14 +184,14 @@ - + - + @@ -199,7 +199,7 @@ - + @@ -207,7 +207,7 @@ - + @@ -223,7 +223,7 @@ - + @@ -237,7 +237,7 @@ - + diff --git a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/stax-server.xml b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/stax-server.xml index 1783caeb061..f8daf2dd6ff 100644 --- a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/stax-server.xml +++ b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/kerberos/stax-server.xml @@ -39,7 +39,7 @@ - + @@ -56,42 +56,42 @@ - + - + - + - + - + - + @@ -102,7 +102,7 @@ - + @@ -110,7 +110,7 @@ - + @@ -121,21 +121,21 @@ - + - + - + @@ -146,7 +146,7 @@ - + @@ -157,14 +157,14 @@ - + - + diff --git a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/server.xml b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/server.xml index b6eeaa863ac..e7c29403958 100644 --- a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/server.xml +++ b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/server.xml @@ -40,7 +40,7 @@ - + @@ -59,43 +59,43 @@ - + - + - + - + - + - + - + diff --git a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/stax-server.xml b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/stax-server.xml index 0bab198a370..22ebcc422a7 100644 --- a/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/stax-server.xml +++ b/systests/kerberos/src/test/resources/org/apache/cxf/systest/kerberos/wssec/spnego/stax-server.xml @@ -40,7 +40,7 @@ - + @@ -59,42 +59,42 @@ - + - + - + - + - + - + diff --git a/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettyEmptyApplicationTest.java b/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettyEmptyApplicationTest.java index 298b824a793..2491693c8b3 100644 --- a/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettyEmptyApplicationTest.java +++ b/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettyEmptyApplicationTest.java @@ -33,10 +33,10 @@ public class JettyEmptyApplicationTest extends AbstractSciTest { @Ignore - public static class EmbeddedJettyServer extends AbstractJettyServer { - public static final int PORT = allocatePortAsInt(EmbeddedJettyServer.class); + public static class EmbeddedJettyEmptyApplicationServer extends AbstractJettyServer { + public static final int PORT = allocatePortAsInt(EmbeddedJettyEmptyApplicationServer.class); - public EmbeddedJettyServer() { + public EmbeddedJettyEmptyApplicationServer() { super("/", new Resource[] { // Limit the classpath scanning to org.apache.demo.resources package @@ -55,13 +55,13 @@ public EmbeddedJettyServer() { @BeforeClass public static void startServers() throws Exception { AbstractResourceInfo.clearAllMaps(); - assertTrue("server did not launch correctly", launchServer(EmbeddedJettyServer.class, true)); + assertTrue("server did not launch correctly", launchServer(EmbeddedJettyEmptyApplicationServer.class, true)); createStaticBus(); } @Override protected int getPort() { - return EmbeddedJettyServer.PORT; + return EmbeddedJettyEmptyApplicationServer.PORT; } @Override diff --git a/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettyEmptyPathApplicationTest.java b/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettyEmptyPathApplicationTest.java index 32cfd9db0c2..b54bf01a093 100644 --- a/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettyEmptyPathApplicationTest.java +++ b/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettyEmptyPathApplicationTest.java @@ -34,10 +34,10 @@ public class JettyEmptyPathApplicationTest extends AbstractSciTest { @Ignore - public static class EmbeddedJettyServer extends AbstractJettyServer { - public static final int PORT = allocatePortAsInt(EmbeddedJettyServer.class); + public static class EmbeddedJettyEmptyPathServer extends AbstractJettyServer { + public static final int PORT = allocatePortAsInt(EmbeddedJettyEmptyPathServer.class); - public EmbeddedJettyServer() { + public EmbeddedJettyEmptyPathServer() { super("/", new Resource[] { // Limit the classpath scanning to org.apache.demo.resources package @@ -61,13 +61,13 @@ protected void configureContext(final WebAppContext context) throws Exception { @BeforeClass public static void startServers() throws Exception { AbstractResourceInfo.clearAllMaps(); - assertTrue("server did not launch correctly", launchServer(EmbeddedJettyServer.class, true)); + assertTrue("server did not launch correctly", launchServer(EmbeddedJettyEmptyPathServer.class, true)); createStaticBus(); } @Override protected int getPort() { - return EmbeddedJettyServer.PORT; + return EmbeddedJettyEmptyPathServer.PORT; } @Override diff --git a/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettyNoApplicationTest.java b/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettyNoApplicationTest.java index f8902dd8696..f3c3cb689bd 100644 --- a/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettyNoApplicationTest.java +++ b/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettyNoApplicationTest.java @@ -34,10 +34,10 @@ public class JettyNoApplicationTest extends AbstractSciTest { @Ignore - public static class EmbeddedJettyServer extends AbstractJettyServer { - public static final int PORT = allocatePortAsInt(EmbeddedJettyServer.class); + public static class EmbeddedJettyNoApplicationServer extends AbstractJettyServer { + public static final int PORT = allocatePortAsInt(EmbeddedJettyNoApplicationServer.class); - public EmbeddedJettyServer() { + public EmbeddedJettyNoApplicationServer() { super("/", new Resource[] { // Limit the classpath scanning to org.apache.demo.resources package @@ -58,13 +58,13 @@ protected void configureContext(final WebAppContext context) throws Exception { @BeforeClass public static void startServers() throws Exception { AbstractResourceInfo.clearAllMaps(); - assertTrue("server did not launch correctly", launchServer(EmbeddedJettyServer.class, true)); + assertTrue("server did not launch correctly", launchServer(EmbeddedJettyNoApplicationServer.class, true)); createStaticBus(); } @Override protected int getPort() { - return EmbeddedJettyServer.PORT; + return EmbeddedJettyNoApplicationServer.PORT; } @Override diff --git a/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettySingleApplicationOnlyClassesTest.java b/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettySingleApplicationOnlyClassesTest.java index b2702433bec..446f929f340 100644 --- a/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettySingleApplicationOnlyClassesTest.java +++ b/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettySingleApplicationOnlyClassesTest.java @@ -32,10 +32,10 @@ public class JettySingleApplicationOnlyClassesTest extends AbstractSciTest { @Ignore - public static class EmbeddedJettyServer extends AbstractJettyServer { - public static final int PORT = allocatePortAsInt(EmbeddedJettyServer.class); + public static class EmbeddedJettySingleApplicationOnlyClassesServer extends AbstractJettyServer { + public static final int PORT = allocatePortAsInt(EmbeddedJettySingleApplicationOnlyClassesServer.class); - public EmbeddedJettyServer() { + public EmbeddedJettySingleApplicationOnlyClassesServer() { super("/", new Resource[] { // Limit the classpath scanning to org.apache.demo.resources package @@ -51,13 +51,14 @@ public EmbeddedJettyServer() { @BeforeClass public static void startServers() throws Exception { AbstractResourceInfo.clearAllMaps(); - assertTrue("server did not launch correctly", launchServer(EmbeddedJettyServer.class, true)); + assertTrue("server did not launch correctly", + launchServer(EmbeddedJettySingleApplicationOnlyClassesServer.class, true)); createStaticBus(); } @Override protected int getPort() { - return EmbeddedJettyServer.PORT; + return EmbeddedJettySingleApplicationOnlyClassesServer.PORT; } @Override diff --git a/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettySingleApplicationOnlySingletonsTest.java b/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettySingleApplicationOnlySingletonsTest.java index 0d0ee2fbef8..302ed0bacda 100644 --- a/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettySingleApplicationOnlySingletonsTest.java +++ b/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettySingleApplicationOnlySingletonsTest.java @@ -32,10 +32,10 @@ public class JettySingleApplicationOnlySingletonsTest extends AbstractSciTest { @Ignore - public static class EmbeddedJettyServer extends AbstractJettyServer { - public static final int PORT = allocatePortAsInt(EmbeddedJettyServer.class); + public static class EmbeddedJettySingleApplicationOnlySingletonsServer extends AbstractJettyServer { + public static final int PORT = allocatePortAsInt(EmbeddedJettySingleApplicationOnlySingletonsServer.class); - public EmbeddedJettyServer() { + public EmbeddedJettySingleApplicationOnlySingletonsServer() { super("/", new Resource[] { // Limit the classpath scanning to org.apache.demo.resources package @@ -51,13 +51,14 @@ public EmbeddedJettyServer() { @BeforeClass public static void startServers() throws Exception { AbstractResourceInfo.clearAllMaps(); - assertTrue("server did not launch correctly", launchServer(EmbeddedJettyServer.class, true)); + assertTrue("server did not launch correctly", + launchServer(EmbeddedJettySingleApplicationOnlySingletonsServer.class, true)); createStaticBus(); } @Override protected int getPort() { - return EmbeddedJettyServer.PORT; + return EmbeddedJettySingleApplicationOnlySingletonsServer.PORT; } @Override diff --git a/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettySingleApplicationTest.java b/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettySingleApplicationTest.java index 039abe31d39..d13f4c1d5a8 100644 --- a/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettySingleApplicationTest.java +++ b/systests/rs-http-sci/src/test/java/org/apache/cxf/jaxrs/servlet/jetty/JettySingleApplicationTest.java @@ -32,10 +32,10 @@ public class JettySingleApplicationTest extends AbstractSciTest { @Ignore - public static class EmbeddedJettyServer extends AbstractJettyServer { - public static final int PORT = allocatePortAsInt(EmbeddedJettyServer.class); + public static class EmbeddedJettySingleApplicationServer extends AbstractJettyServer { + public static final int PORT = allocatePortAsInt(EmbeddedJettySingleApplicationServer.class); - public EmbeddedJettyServer() { + public EmbeddedJettySingleApplicationServer() { super("/", new Resource[] { // Limit the classpath scanning to org.apache.demo.resources package @@ -51,13 +51,13 @@ public EmbeddedJettyServer() { @BeforeClass public static void startServers() throws Exception { AbstractResourceInfo.clearAllMaps(); - assertTrue("server did not launch correctly", launchServer(EmbeddedJettyServer.class, true)); + assertTrue("server did not launch correctly", launchServer(EmbeddedJettySingleApplicationServer.class, true)); createStaticBus(); } @Override protected int getPort() { - return EmbeddedJettyServer.PORT; + return EmbeddedJettySingleApplicationServer.PORT; } @Override diff --git a/systests/rs-sse/rs-sse-jetty/src/test/java/org/apache/cxf/systest/jaxrs/sse/jetty/JettyWarTest.java b/systests/rs-sse/rs-sse-jetty/src/test/java/org/apache/cxf/systest/jaxrs/sse/jetty/JettyWarTest.java index b84c328b750..bf241bbb20e 100644 --- a/systests/rs-sse/rs-sse-jetty/src/test/java/org/apache/cxf/systest/jaxrs/sse/jetty/JettyWarTest.java +++ b/systests/rs-sse/rs-sse-jetty/src/test/java/org/apache/cxf/systest/jaxrs/sse/jetty/JettyWarTest.java @@ -29,10 +29,10 @@ public class JettyWarTest extends AbstractSseTest { @Ignore - public static class EmbeddedJettyServer extends AbstractJettyServer { - public static final int PORT = allocatePortAsInt(EmbeddedJettyServer.class); + public static class EmbeddedJettyWarServer extends AbstractJettyServer { + public static final int PORT = allocatePortAsInt(EmbeddedJettyWarServer.class); - public EmbeddedJettyServer() { + public EmbeddedJettyWarServer() { super("/jaxrs_sse", "/", PORT); } } @@ -40,12 +40,12 @@ public EmbeddedJettyServer() { @BeforeClass public static void startServers() throws Exception { AbstractResourceInfo.clearAllMaps(); - assertTrue("server did not launch correctly", launchServer(EmbeddedJettyServer.class, true)); + assertTrue("server did not launch correctly", launchServer(EmbeddedJettyWarServer.class, true)); createStaticBus(); } @Override protected int getPort() { - return EmbeddedJettyServer.PORT; + return EmbeddedJettyWarServer.PORT; } } diff --git a/systests/rs-sse/rs-sse-tomcat/src/test/java/org/apache/cxf/systest/jaxrs/sse/tomcat/TomcatWarTest.java b/systests/rs-sse/rs-sse-tomcat/src/test/java/org/apache/cxf/systest/jaxrs/sse/tomcat/TomcatWarTest.java index 8425d0d1bf4..99a940f53df 100644 --- a/systests/rs-sse/rs-sse-tomcat/src/test/java/org/apache/cxf/systest/jaxrs/sse/tomcat/TomcatWarTest.java +++ b/systests/rs-sse/rs-sse-tomcat/src/test/java/org/apache/cxf/systest/jaxrs/sse/tomcat/TomcatWarTest.java @@ -29,10 +29,10 @@ public class TomcatWarTest extends AbstractSseTest { @Ignore - public static class EmbeddedTomcatServer extends AbstractTomcatServer { - public static final int PORT = allocatePortAsInt(EmbeddedTomcatServer.class); + public static class EmbeddedTomcatWarServer extends AbstractTomcatServer { + public static final int PORT = allocatePortAsInt(EmbeddedTomcatWarServer.class); - public EmbeddedTomcatServer() { + public EmbeddedTomcatWarServer() { super("/jaxrs_sse", "/", PORT); } } @@ -40,13 +40,13 @@ public EmbeddedTomcatServer() { @BeforeClass public static void startServers() throws Exception { AbstractResourceInfo.clearAllMaps(); - assertTrue("server did not launch correctly", launchServer(EmbeddedTomcatServer.class, true)); + assertTrue("server did not launch correctly", launchServer(EmbeddedTomcatWarServer.class, true)); createStaticBus(); } @Override protected int getPort() { - return EmbeddedTomcatServer.PORT; + return EmbeddedTomcatWarServer.PORT; } @Override diff --git a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/brave/BraveTracingTest.java b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/brave/JaxrsBraveTracingTest.java similarity index 95% rename from systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/brave/BraveTracingTest.java rename to systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/brave/JaxrsBraveTracingTest.java index f402b0a71ca..85718387fcf 100644 --- a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/brave/BraveTracingTest.java +++ b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/brave/JaxrsBraveTracingTest.java @@ -37,8 +37,8 @@ import static org.junit.Assert.assertTrue; -public class BraveTracingTest extends AbstractBraveTracingTest { - public static final String PORT = allocatePort(BraveTracingTest.class); +public class JaxrsBraveTracingTest extends AbstractBraveTracingTest { + public static final String PORT = allocatePort(JaxrsBraveTracingTest.class); public static class BraveServer extends AbstractTestServerBase { private org.apache.cxf.endpoint.Server server; diff --git a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/micrometer/MicrometerTracingTest.java b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/micrometer/JaxrsMicrometerTracingTest.java similarity index 97% rename from systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/micrometer/MicrometerTracingTest.java rename to systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/micrometer/JaxrsMicrometerTracingTest.java index 2a668deb89c..5f5a56e9be4 100644 --- a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/micrometer/MicrometerTracingTest.java +++ b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/micrometer/JaxrsMicrometerTracingTest.java @@ -51,8 +51,8 @@ import static org.apache.cxf.systest.micrometer.ObservationRegistrySupport.createObservationRegistry; import static org.junit.Assert.assertTrue; -public class MicrometerTracingTest extends AbstractBraveTracingTest { - public static final String PORT = allocatePort(MicrometerTracingTest.class); +public class JaxrsMicrometerTracingTest extends AbstractBraveTracingTest { + public static final String PORT = allocatePort(JaxrsMicrometerTracingTest.class); private static MeterRegistry meterRegistry; diff --git a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/opentelemetry/OpenTelemetryTracingTest.java b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/opentelemetry/JaxrsOpenTelemetryTracingTest.java similarity index 99% rename from systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/opentelemetry/OpenTelemetryTracingTest.java rename to systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/opentelemetry/JaxrsOpenTelemetryTracingTest.java index 6b218a49df3..f49a46e068a 100644 --- a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/opentelemetry/OpenTelemetryTracingTest.java +++ b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/opentelemetry/JaxrsOpenTelemetryTracingTest.java @@ -91,8 +91,8 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; -public class OpenTelemetryTracingTest extends AbstractClientServerTestBase { - public static final String PORT = allocatePort(OpenTelemetryTracingTest.class); +public class JaxrsOpenTelemetryTracingTest extends AbstractClientServerTestBase { + public static final String PORT = allocatePort(JaxrsOpenTelemetryTracingTest.class); @ClassRule public static OpenTelemetryRule otelRule = OpenTelemetryRule.create(); diff --git a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/opentracing/OpenTracingTracingTest.java b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/opentracing/JaxrsOpenTracingTracingTest.java similarity index 99% rename from systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/opentracing/OpenTracingTracingTest.java rename to systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/opentracing/JaxrsOpenTracingTracingTest.java index 6566e213582..da278ba6f20 100644 --- a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/opentracing/OpenTracingTracingTest.java +++ b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxrs/tracing/opentracing/JaxrsOpenTracingTracingTest.java @@ -81,8 +81,8 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -public class OpenTracingTracingTest extends AbstractClientServerTestBase { - public static final String PORT = allocatePort(OpenTracingTracingTest.class); +public class JaxrsOpenTracingTracingTest extends AbstractClientServerTestBase { + public static final String PORT = allocatePort(JaxrsOpenTracingTracingTest.class); private static final AtomicLong RANDOM = new AtomicLong(); diff --git a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/brave/BraveTracingTest.java b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/brave/JaxwsBraveTracingTest.java similarity index 94% rename from systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/brave/BraveTracingTest.java rename to systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/brave/JaxwsBraveTracingTest.java index e985f2f043f..f0fe7cfd321 100644 --- a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/brave/BraveTracingTest.java +++ b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/brave/JaxwsBraveTracingTest.java @@ -33,8 +33,8 @@ import static org.junit.Assert.assertTrue; -public class BraveTracingTest extends AbstractBraveTracingTest { - public static final String PORT = allocatePort(BraveTracingTest.class); +public class JaxwsBraveTracingTest extends AbstractBraveTracingTest { + public static final String PORT = allocatePort(JaxwsBraveTracingTest.class); public static class Server extends AbstractTestServerBase { diff --git a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/micrometer/MicrometerTracingTest.java b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/micrometer/JaxwsMicrometerTracingTest.java similarity index 96% rename from systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/micrometer/MicrometerTracingTest.java rename to systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/micrometer/JaxwsMicrometerTracingTest.java index 8996da34d7e..b38a4b56e15 100644 --- a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/micrometer/MicrometerTracingTest.java +++ b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/micrometer/JaxwsMicrometerTracingTest.java @@ -45,8 +45,8 @@ import static org.apache.cxf.systest.micrometer.ObservationRegistrySupport.createObservationRegistry; import static org.junit.Assert.assertTrue; -public class MicrometerTracingTest extends AbstractBraveTracingTest { - public static final String PORT = allocatePort(MicrometerTracingTest.class); +public class JaxwsMicrometerTracingTest extends AbstractBraveTracingTest { + public static final String PORT = allocatePort(JaxwsMicrometerTracingTest.class); private static MeterRegistry meterRegistry; diff --git a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentelemetry/OpenTelemetryTracingTest.java b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentelemetry/JaxwsOpenTelemetryTracingTest.java similarity index 99% rename from systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentelemetry/OpenTelemetryTracingTest.java rename to systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentelemetry/JaxwsOpenTelemetryTracingTest.java index 295ae79fd79..821b57e943e 100644 --- a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentelemetry/OpenTelemetryTracingTest.java +++ b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentelemetry/JaxwsOpenTelemetryTracingTest.java @@ -78,8 +78,8 @@ import static org.junit.Assert.fail; -public class OpenTelemetryTracingTest extends AbstractClientServerTestBase { - public static final String PORT = allocatePort(OpenTelemetryTracingTest.class); +public class JaxwsOpenTelemetryTracingTest extends AbstractClientServerTestBase { + public static final String PORT = allocatePort(JaxwsOpenTelemetryTracingTest.class); @ClassRule public static OpenTelemetryRule otelRule = OpenTelemetryRule.create(); diff --git a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentracing/OpenTracingTracingTest.java b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentracing/JaxwsOpenTracingTracingTest.java similarity index 98% rename from systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentracing/OpenTracingTracingTest.java rename to systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentracing/JaxwsOpenTracingTracingTest.java index bdbdceb6f06..d3f9f5e4384 100644 --- a/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentracing/OpenTracingTracingTest.java +++ b/systests/tracing/src/test/java/org/apache/cxf/systest/jaxws/tracing/opentracing/JaxwsOpenTracingTracingTest.java @@ -67,8 +67,8 @@ import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; -public class OpenTracingTracingTest extends AbstractClientServerTestBase { - public static final String PORT = allocatePort(OpenTracingTracingTest.class); +public class JaxwsOpenTracingTracingTest extends AbstractClientServerTestBase { + public static final String PORT = allocatePort(JaxwsOpenTracingTracingTest.class); private static final AtomicLong RANDOM = new AtomicLong(); diff --git a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/action/Server.java b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/action/JMSSoapActionServer.java similarity index 86% rename from systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/action/Server.java rename to systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/action/JMSSoapActionServer.java index d7ea0ac2ced..de83094e12f 100644 --- a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/action/Server.java +++ b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/action/JMSSoapActionServer.java @@ -24,11 +24,11 @@ import org.apache.cxf.testutil.common.AbstractBusTestServerBase; import org.apache.cxf.testutil.common.EmbeddedJMSBrokerLauncher; -public class Server extends AbstractBusTestServerBase { - public static final String PORT = allocatePort(Server.class); +public class JMSSoapActionServer extends AbstractBusTestServerBase { + public static final String PORT = allocatePort(JMSSoapActionServer.class); EmbeddedJMSBrokerLauncher broker; - public Server(EmbeddedJMSBrokerLauncher b) { + public JMSSoapActionServer(EmbeddedJMSBrokerLauncher b) { broker = b; } diff --git a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/action/JMSSoapActionTest.java b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/action/JMSSoapActionTest.java index 2d561112da6..3c8dfe2b5c9 100644 --- a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/action/JMSSoapActionTest.java +++ b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/action/JMSSoapActionTest.java @@ -58,7 +58,7 @@ public class JMSSoapActionTest extends AbstractBusClientServerTestBase { public static void startServers() throws Exception { broker = new EmbeddedJMSBrokerLauncher("tcp://localhost:" + PORT); launchServer(broker); - launchServer(new Server(broker)); + launchServer(new JMSSoapActionServer(broker)); createStaticBus(); } diff --git a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/Server.java b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/JMSWSSecurityServer.java similarity index 90% rename from systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/Server.java rename to systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/JMSWSSecurityServer.java index dc1e4aed01b..0cce357219d 100644 --- a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/Server.java +++ b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/JMSWSSecurityServer.java @@ -29,11 +29,11 @@ import org.apache.cxf.ws.security.wss4j.WSS4JInInterceptor; import org.apache.wss4j.common.ConfigurationConstants; -public class Server extends AbstractBusTestServerBase { - public static final String PORT = allocatePort(Server.class); +public class JMSWSSecurityServer extends AbstractBusTestServerBase { + public static final String PORT = allocatePort(JMSWSSecurityServer.class); EmbeddedJMSBrokerLauncher broker; - public Server(EmbeddedJMSBrokerLauncher b) { + public JMSWSSecurityServer(EmbeddedJMSBrokerLauncher b) { broker = b; } diff --git a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/JMSWSSecurityTest.java b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/JMSWSSecurityTest.java index f55da4d6a21..523d7489dd2 100644 --- a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/JMSWSSecurityTest.java +++ b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/security/JMSWSSecurityTest.java @@ -65,7 +65,7 @@ public class JMSWSSecurityTest extends AbstractBusClientServerTestBase { public static void startServers() throws Exception { broker = new EmbeddedJMSBrokerLauncher("tcp://localhost:" + PORT); launchServer(broker); - launchServer(new Server(broker)); + launchServer(new JMSWSSecurityServer(broker)); createStaticBus(); } diff --git a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/swa/ClientServerSwaTest.java b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/swa/ClientServerSwaTest.java index 8d5dc4bbb49..e8dd84a465b 100644 --- a/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/swa/ClientServerSwaTest.java +++ b/systests/transport-jms/src/test/java/org/apache/cxf/systest/jms/swa/ClientServerSwaTest.java @@ -50,7 +50,7 @@ public class ClientServerSwaTest extends AbstractBusClientServerTestBase { static EmbeddedJMSBrokerLauncher broker; - public static class Server extends AbstractBusTestServerBase { + public static class SwaServer extends AbstractBusTestServerBase { protected void run() { try { JaxWsServerFactoryBean factory = new JaxWsServerFactoryBean(); @@ -74,7 +74,7 @@ public static void startServers() throws Exception { broker = new EmbeddedJMSBrokerLauncher(); System.setProperty("EmbeddedBrokerURL", broker.getBrokerURL()); launchServer(broker); - launchServer(new Server()); + launchServer(new SwaServer()); createStaticBus(); } @AfterClass diff --git a/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/continuations/ClientServerWrappedContinuationTest.java b/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/continuations/ClientServerWrappedContinuationTest.java index 424a6221f3a..4108c80b042 100644 --- a/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/continuations/ClientServerWrappedContinuationTest.java +++ b/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/continuations/ClientServerWrappedContinuationTest.java @@ -46,8 +46,8 @@ import static org.junit.Assert.assertTrue; public class ClientServerWrappedContinuationTest extends AbstractClientServerTestBase { - public static final String PORT = allocatePort(Server.class); - public static final String HTTPS_PORT = allocatePort(Server.class, 1); + public static final String PORT = allocatePort(ContinuationServer.class); + public static final String HTTPS_PORT = allocatePort(ContinuationServer.class, 1); private static final String CLIENT_CONFIG_FILE = "org/apache/cxf/systest/http_undertow/continuations/cxf.xml"; @@ -56,7 +56,7 @@ public class ClientServerWrappedContinuationTest extends AbstractClientServerTes private static final String SERVER_CONFIG_FILE = "org/apache/cxf/systest/http_undertow/continuations/jaxws-server.xml"; - public static class Server extends AbstractBusTestServerBase { + public static class ContinuationServer extends AbstractBusTestServerBase { protected void run() { SpringBusFactory bf = new SpringBusFactory(); @@ -75,7 +75,7 @@ protected void run() { public static void main(String[] args) { try { - Server s = new Server(); + ContinuationServer s = new ContinuationServer(); s.start(); } catch (Exception ex) { ex.printStackTrace(); @@ -86,7 +86,7 @@ public static void main(String[] args) { @BeforeClass public static void startServers() throws Exception { - assertTrue("server did not launch correctly", launchServer(Server.class)); + assertTrue("server did not launch correctly", launchServer(ContinuationServer.class)); } @Test diff --git a/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/multipart/ClientServerSwaTest.java b/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/multipart/ClientServerSwaTest.java index ab5c7af190e..a1ea14ea26b 100644 --- a/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/multipart/ClientServerSwaTest.java +++ b/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/multipart/ClientServerSwaTest.java @@ -50,8 +50,8 @@ @RunWith(value = Parameterized.class) public class ClientServerSwaTest extends AbstractBusClientServerTestBase { - static String serverPort = TestUtil.getPortNumber(Server.class); - static String serverPortInvalid = TestUtil.getPortNumber(Server.class, 1); + static String serverPort = TestUtil.getPortNumber(MultipartServer.class); + static String serverPortInvalid = TestUtil.getPortNumber(MultipartServer.class, 1); static class TestParam { private final String port; @@ -84,7 +84,7 @@ public static Collection data() { @BeforeClass public static void startServers() throws Exception { - assertTrue("server did not launch correctly", launchServer(Server.class, true)); + assertTrue("server did not launch correctly", launchServer(MultipartServer.class, true)); } private String getFullStackTrace(Exception ex) { diff --git a/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/multipart/Server.java b/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/multipart/MultipartServer.java similarity index 91% rename from systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/multipart/Server.java rename to systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/multipart/MultipartServer.java index 4dfa45c0bdf..e797d13fdcd 100644 --- a/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/multipart/Server.java +++ b/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/multipart/MultipartServer.java @@ -25,10 +25,10 @@ import org.apache.cxf.testutil.common.AbstractBusTestServerBase; import org.apache.cxf.testutil.common.TestUtil; -public class Server extends AbstractBusTestServerBase { +public class MultipartServer extends AbstractBusTestServerBase { protected void run() { - String port = TestUtil.getPortNumber(Server.class); + String port = TestUtil.getPortNumber(MultipartServer.class); Object implementor = new SwAServiceImpl(); String address = "http://localhost:" + port + "/swa"; @@ -51,7 +51,7 @@ protected void run() { public static void main(String[] args) { try { - Server s = new Server(); + MultipartServer s = new MultipartServer(); s.start(); } catch (Exception ex) { ex.printStackTrace(); diff --git a/systests/transport-undertow/src/test/resources/org/apache/cxf/systest/http_undertow/continuations/jaxws-server.xml b/systests/transport-undertow/src/test/resources/org/apache/cxf/systest/http_undertow/continuations/jaxws-server.xml index 6297df44df7..4907ade58e9 100644 --- a/systests/transport-undertow/src/test/resources/org/apache/cxf/systest/http_undertow/continuations/jaxws-server.xml +++ b/systests/transport-undertow/src/test/resources/org/apache/cxf/systest/http_undertow/continuations/jaxws-server.xml @@ -38,7 +38,7 @@ under the License. - + diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPConduitTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPConduitTest.java index 0bf25c36f8a..6a10f6db0ce 100644 --- a/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPConduitTest.java +++ b/systests/transports/src/test/java/org/apache/cxf/systest/http/HTTPConduitTest.java @@ -89,12 +89,12 @@ public HTTPConduitTest() { public static String getPort(String s) { - return BusServer.PORTMAP.get(s); + return HttpBusServer.PORTMAP.get(s); } @BeforeClass public static void allocatePorts() { - BusServer.resetPortMap(); + HttpBusServer.resetPortMap(); addrMap.clear(); addrMap.put("Mortimer", "http://localhost:" + getPort("PORT0") + "/"); addrMap.put("Rethwel", "http://localhost:" + getPort("PORT1") + "/"); @@ -119,10 +119,10 @@ public synchronized boolean startServer(String name) { } Bus bus = BusFactory.getThreadDefaultBus(false); URL serverC = - Server.class.getResource(name + ".cxf"); + HttpServer.class.getResource(name + ".cxf"); BusFactory.setDefaultBus(null); BusFactory.setThreadDefaultBus(null); - boolean server = launchServer(Server.class, null, + boolean server = launchServer(HttpServer.class, null, new String[] { name, addrMap.get(name), diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/BusServer.java b/systests/transports/src/test/java/org/apache/cxf/systest/http/HttpBusServer.java similarity index 88% rename from systests/transports/src/test/java/org/apache/cxf/systest/http/BusServer.java rename to systests/transports/src/test/java/org/apache/cxf/systest/http/HttpBusServer.java index 33a90c15ac5..315e74f4ad3 100644 --- a/systests/transports/src/test/java/org/apache/cxf/systest/http/BusServer.java +++ b/systests/transports/src/test/java/org/apache/cxf/systest/http/HttpBusServer.java @@ -31,18 +31,18 @@ * This server just instantiates a Bus, full stop. * Everything else is designed to be spring-loaded. */ -public class BusServer extends AbstractBusTestServerBase { +public class HttpBusServer extends AbstractBusTestServerBase { public static final Map PORTMAP = new HashMap<>(); public static void resetPortMap() { PORTMAP.clear(); for (int x = 0; x < 9; x++) { - PORTMAP.put("PORT" + x, TestUtil.getNewPortNumber(BusServer.class, x)); + PORTMAP.put("PORT" + x, TestUtil.getNewPortNumber(HttpBusServer.class, x)); } } public static String getPort(int x) { if (PORTMAP.isEmpty()) { for (int y = 0; y < 9; y++) { - PORTMAP.put("PORT" + y, TestUtil.getPortNumber(BusServer.class, y)); + PORTMAP.put("PORT" + y, TestUtil.getPortNumber(HttpBusServer.class, y)); } } return PORTMAP.get("PORT" + x); @@ -63,7 +63,7 @@ protected void run() { public static void main(String[] args) { try { - BusServer s = new BusServer(); + HttpBusServer s = new HttpBusServer(); s.start(); } catch (Exception ex) { ex.printStackTrace(); diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/Server.java b/systests/transports/src/test/java/org/apache/cxf/systest/http/HttpServer.java similarity index 90% rename from systests/transports/src/test/java/org/apache/cxf/systest/http/Server.java rename to systests/transports/src/test/java/org/apache/cxf/systest/http/HttpServer.java index e4b9e007805..7ba4f1e6ada 100644 --- a/systests/transports/src/test/java/org/apache/cxf/systest/http/Server.java +++ b/systests/transports/src/test/java/org/apache/cxf/systest/http/HttpServer.java @@ -27,19 +27,19 @@ import org.apache.cxf.jaxws.EndpointImpl; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class Server extends AbstractBusTestServerBase { - public static final String PORT = allocatePort(Server.class); +public class HttpServer extends AbstractBusTestServerBase { + public static final String PORT = allocatePort(HttpServer.class); private String name; private String address; private URL configFileURL; private EndpointImpl ep; - public Server(String[] args) throws Exception { + public HttpServer(String[] args) throws Exception { this(args[0], args[1], args[2]); } - public Server(String n, String addr, String conf) throws Exception { + public HttpServer(String n, String addr, String conf) throws Exception { name = n; address = addr; configFileURL = new URL(conf); @@ -88,7 +88,7 @@ protected void run() { public static void main(String[] args) { try { - Server s = new Server(args); + HttpServer s = new HttpServer(args); s.start(); } catch (Exception ex) { ex.printStackTrace(); diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/jaxws/JAXWSAsyncClientTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/http/jaxws/JAXWSAsyncClientTest.java index bd700802776..d92b97872ad 100644 --- a/systests/transports/src/test/java/org/apache/cxf/systest/http/jaxws/JAXWSAsyncClientTest.java +++ b/systests/transports/src/test/java/org/apache/cxf/systest/http/jaxws/JAXWSAsyncClientTest.java @@ -72,10 +72,10 @@ import static org.junit.jupiter.api.Assertions.assertThrows; public class JAXWSAsyncClientTest extends AbstractBusClientServerTestBase { - static final String PORT = allocatePort(Server.class); + static final String PORT = allocatePort(JAXWSAsyncServer.class); static ScheduledExecutorService executor; - public static class Server extends AbstractBusTestServerBase { + public static class JAXWSAsyncServer extends AbstractBusTestServerBase { protected void run() { GreeterImpl implementor = new GreeterImpl(); @@ -85,7 +85,7 @@ protected void run() { public static void main(String[] args) { try { - Server s = new Server(); + JAXWSAsyncServer s = new JAXWSAsyncServer(); s.start(); } catch (Exception ex) { ex.printStackTrace(); @@ -119,7 +119,7 @@ public String greetMe(String arg) { @BeforeClass public static void startServers() throws Exception { - assertTrue("server did not launch correctly", launchServer(Server.class, true)); + assertTrue("server did not launch correctly", launchServer(JAXWSAsyncServer.class, true)); executor = Executors.newScheduledThreadPool(5); } diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http/jaxws/JAXWSClientTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/http/jaxws/JAXWSClientTest.java index fbfed4483f5..60693c2b5ce 100644 --- a/systests/transports/src/test/java/org/apache/cxf/systest/http/jaxws/JAXWSClientTest.java +++ b/systests/transports/src/test/java/org/apache/cxf/systest/http/jaxws/JAXWSClientTest.java @@ -59,9 +59,9 @@ import static org.junit.Assert.assertTrue; public class JAXWSClientTest extends AbstractBusClientServerTestBase { - static final String PORT = allocatePort(Server.class); + static final String PORT = allocatePort(JAXWSServer.class); - public static class Server extends AbstractBusTestServerBase { + public static class JAXWSServer extends AbstractBusTestServerBase { protected void run() { GreeterImpl implementor = new GreeterImpl(); @@ -71,7 +71,7 @@ protected void run() { public static void main(String[] args) { try { - Server s = new Server(); + JAXWSServer s = new JAXWSServer(); s.start(); } catch (Exception ex) { ex.printStackTrace(); @@ -93,7 +93,7 @@ public class GreeterImpl extends AbstractGreeterImpl { @BeforeClass public static void startServers() throws Exception { - assertTrue("server did not launch correctly", launchServer(Server.class, true)); + assertTrue("server did not launch correctly", launchServer(JAXWSServer.class, true)); } @AfterClass diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/ClientServerWrappedContinuationTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/ClientServerWrappedContinuationTest.java index c02601f155a..b40355ae969 100644 --- a/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/ClientServerWrappedContinuationTest.java +++ b/systests/transports/src/test/java/org/apache/cxf/systest/http_jetty/continuations/ClientServerWrappedContinuationTest.java @@ -42,8 +42,8 @@ import static org.junit.Assert.assertTrue; public class ClientServerWrappedContinuationTest extends AbstractClientServerTestBase { - public static final String PORT = allocatePort(Server.class); - public static final String HTTPS_PORT = allocatePort(Server.class, 1); + public static final String PORT = allocatePort(ContinuationServer.class); + public static final String HTTPS_PORT = allocatePort(ContinuationServer.class, 1); private static final String CLIENT_CONFIG_FILE = "org/apache/cxf/systest/http_jetty/continuations/cxf.xml"; @@ -52,7 +52,7 @@ public class ClientServerWrappedContinuationTest extends AbstractClientServerTes private static final String SERVER_CONFIG_FILE = "org/apache/cxf/systest/http_jetty/continuations/jaxws-server.xml"; - public static class Server extends AbstractBusTestServerBase { + public static class ContinuationServer extends AbstractBusTestServerBase { protected void run() { SpringBusFactory bf = new SpringBusFactory(); @@ -69,7 +69,7 @@ protected void run() { public static void main(String[] args) { try { - Server s = new Server(); + ContinuationServer s = new ContinuationServer(); s.start(); } catch (Exception ex) { ex.printStackTrace(); @@ -80,7 +80,7 @@ public static void main(String[] args) { @BeforeClass public static void startServers() throws Exception { - assertTrue("server did not launch correctly", launchServer(Server.class)); + assertTrue("server did not launch correctly", launchServer(ContinuationServer.class)); } @Test diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/https/BusServer.java b/systests/transports/src/test/java/org/apache/cxf/systest/https/HttpsBusServer.java similarity index 87% rename from systests/transports/src/test/java/org/apache/cxf/systest/https/BusServer.java rename to systests/transports/src/test/java/org/apache/cxf/systest/https/HttpsBusServer.java index 2f3327268f4..b95644405c1 100644 --- a/systests/transports/src/test/java/org/apache/cxf/systest/https/BusServer.java +++ b/systests/transports/src/test/java/org/apache/cxf/systest/https/HttpsBusServer.java @@ -31,18 +31,18 @@ * This server just instantiates a Bus, full stop. * Everything else is designed to be spring-loaded. */ -public class BusServer extends AbstractBusTestServerBase { +public class HttpsBusServer extends AbstractBusTestServerBase { public static final Map PORTMAP = new HashMap<>(); public static void resetPortMap() { PORTMAP.clear(); for (int x = 0; x < 9; x++) { - PORTMAP.put("PORT" + x, TestUtil.getNewPortNumber(BusServer.class, x)); + PORTMAP.put("PORT" + x, TestUtil.getNewPortNumber(HttpsBusServer.class, x)); } } public static String getPort(int x) { if (PORTMAP.isEmpty()) { for (int y = 0; y < 9; y++) { - PORTMAP.put("PORT" + y, TestUtil.getPortNumber(BusServer.class, y)); + PORTMAP.put("PORT" + y, TestUtil.getPortNumber(HttpsBusServer.class, y)); } } return PORTMAP.get("PORT" + x); @@ -63,7 +63,7 @@ protected void run() { public static void main(String[] args) { try { - BusServer s = new BusServer(); + HttpsBusServer s = new HttpsBusServer(); s.start(); } catch (Exception ex) { ex.printStackTrace(); diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSClientTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSClientTest.java index 187d7c7778e..7e1bc7ae9cd 100644 --- a/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSClientTest.java +++ b/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSClientTest.java @@ -32,7 +32,7 @@ import org.apache.cxf.configuration.security.KeyStoreType; import org.apache.cxf.configuration.security.TrustManagersType; import org.apache.cxf.jaxws.endpoint.dynamic.JaxWsDynamicClientFactory; -import org.apache.cxf.systest.https.BusServer; +import org.apache.cxf.systest.https.HttpsBusServer; import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; import org.apache.hello_world.Greeter; import org.apache.hello_world.services.SOAPService; @@ -70,7 +70,7 @@ private void setTheConfiguration(String config) { @BeforeClass public static void setupPorts() { - BusServer.resetPortMap(); + HttpsBusServer.resetPortMap(); } protected void startServers() throws Exception { @@ -78,7 +78,7 @@ protected void startServers() throws Exception { "Server failed to launch", // run the server in the same process // set this to false to fork a new process - launchServer(BusServer.class, true) + launchServer(HttpsBusServer.class, true) ); } @@ -144,44 +144,44 @@ public final void testSuccessfulCall(String configuration, @Test public final void testJaxwsServer() throws Exception { testSuccessfulCall("jaxws-server.xml", - "https://localhost:" + BusServer.getPort(2) + "/SoapContext/HttpsPort"); + "https://localhost:" + HttpsBusServer.getPort(2) + "/SoapContext/HttpsPort"); } @Test public final void testJaxwsServerChangeHttpsToHttp() throws Exception { testSuccessfulCall("jaxws-server.xml", - "http://localhost:" + BusServer.getPort(3) + "/SoapContext/HttpPort"); + "http://localhost:" + HttpsBusServer.getPort(3) + "/SoapContext/HttpPort"); } @Test public final void testJaxwsEndpoint() throws Exception { testSuccessfulCall("jaxws-publish.xml", - "https://localhost:" + BusServer.getPort(1) + "/SoapContext/HttpsPort"); + "https://localhost:" + HttpsBusServer.getPort(1) + "/SoapContext/HttpsPort"); } @Test public final void testJaxwsEndpointCallback() throws Exception { testSuccessfulCall("jaxws-publish-callback.xml", - "https://localhost:" + BusServer.getPort(1) + "/SoapContext/HttpsPort"); + "https://localhost:" + HttpsBusServer.getPort(1) + "/SoapContext/HttpsPort"); } @Test public final void testJaxwsTLSRefsEndpoint() throws Exception { testSuccessfulCall("jaxws-tlsrefs-publish.xml", - "https://localhost:" + BusServer.getPort(1) + "/SoapContext/HttpsPort"); + "https://localhost:" + HttpsBusServer.getPort(1) + "/SoapContext/HttpsPort"); } @Test public final void testPKCS12Endpoint() throws Exception { testSuccessfulCall("pkcs12.xml", - "https://localhost:" + BusServer.getPort(6) + "/SoapContext/HttpsPort"); + "https://localhost:" + HttpsBusServer.getPort(6) + "/SoapContext/HttpsPort"); } @Test public final void testResourceKeySpecEndpoint() throws Exception { testSuccessfulCall("resource-key-spec.xml", - "https://localhost:" + BusServer.getPort(4) + "/SoapContext/HttpsPort"); + "https://localhost:" + HttpsBusServer.getPort(4) + "/SoapContext/HttpsPort"); } @Test public final void testResourceKeySpecEndpointURL() throws Exception { testSuccessfulCall("resource-key-spec-url.xml", - "https://localhost:" + BusServer.getPort(5) + "/SoapContext/HttpsPort", - new URL("https://localhost:" + BusServer.getPort(5) + "/SoapContext/HttpsPort?wsdl"), + "https://localhost:" + HttpsBusServer.getPort(5) + "/SoapContext/HttpsPort", + new URL("https://localhost:" + HttpsBusServer.getPort(5) + "/SoapContext/HttpsPort?wsdl"), true); } diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSConduitTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSConduitTest.java index df9290cc3c9..c94e5ca0fd2 100644 --- a/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSConduitTest.java +++ b/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HTTPSConduitTest.java @@ -65,7 +65,7 @@ import org.apache.cxf.endpoint.Client; import org.apache.cxf.frontend.ClientProxy; import org.apache.cxf.message.Message; -import org.apache.cxf.systest.https.BusServer; +import org.apache.cxf.systest.https.HttpsBusServer; import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; import org.apache.cxf.transport.http.HTTPConduit; import org.apache.cxf.transport.http.MessageTrustDecider; @@ -155,12 +155,12 @@ public HTTPSConduitTest() { public static String getPort(String s) { - return BusServer.PORTMAP.get(s); + return HttpsBusServer.PORTMAP.get(s); } @BeforeClass public static void allocatePorts() { - BusServer.resetPortMap(); + HttpsBusServer.resetPortMap(); addrMap.clear(); addrMap.put("Mortimer", List.of("http://localhost:" + getPort("PORT0") + "/")); addrMap.put("Tarpin", List.of("https://localhost:" + getPort("PORT1") + "/")); @@ -189,10 +189,10 @@ public synchronized boolean startServer(String name) { } Bus bus = BusFactory.getThreadDefaultBus(false); URL serverC = - Server.class.getResource(name + ".cxf"); + HttpsServer.class.getResource(name + ".cxf"); BusFactory.setDefaultBus(null); BusFactory.setThreadDefaultBus(null); - boolean server = launchServer(Server.class, null, + boolean server = launchServer(HttpsServer.class, null, new String[] { name, addrMap.get(name).stream().collect(Collectors.joining(",")), diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/Server.java b/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HttpsServer.java similarity index 90% rename from systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/Server.java rename to systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HttpsServer.java index a1887d7a063..88a183714ea 100644 --- a/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/Server.java +++ b/systests/transports/src/test/java/org/apache/cxf/systest/https/conduit/HttpsServer.java @@ -28,19 +28,19 @@ import org.apache.cxf.systest.http.GreeterImpl; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class Server extends AbstractBusTestServerBase { - public static final String PORT = allocatePort(Server.class); +public class HttpsServer extends AbstractBusTestServerBase { + public static final String PORT = allocatePort(HttpsServer.class); private String name; private String[] addresses; private URL configFileURL; private EndpointImpl[] eps; - public Server(String[] args) throws Exception { + public HttpsServer(String[] args) throws Exception { this(args[0], args[1], args[2]); } - public Server(String n, String addr, String conf) throws Exception { + public HttpsServer(String n, String addr, String conf) throws Exception { name = n; addresses = addr.split(","); configFileURL = new URL(conf); @@ -93,7 +93,7 @@ protected void run() { public static void main(String[] args) { try { - Server s = new Server(args); + HttpsServer s = new HttpsServer(args); s.start(); } catch (Exception ex) { ex.printStackTrace(); diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/https/constraints/CertConstraintsTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/https/constraints/CertConstraintsTest.java index 01f2f8fc998..5a3004b2b7b 100644 --- a/systests/transports/src/test/java/org/apache/cxf/systest/https/constraints/CertConstraintsTest.java +++ b/systests/transports/src/test/java/org/apache/cxf/systest/https/constraints/CertConstraintsTest.java @@ -24,7 +24,7 @@ import jakarta.xml.ws.BindingProvider; import org.apache.cxf.BusFactory; import org.apache.cxf.configuration.Configurer; -import org.apache.cxf.systest.https.BusServer; +import org.apache.cxf.systest.https.HttpsBusServer; import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; import org.apache.hello_world.Greeter; import org.apache.hello_world.services.SOAPService; @@ -48,7 +48,7 @@ public class CertConstraintsTest extends AbstractBusClientServerTestBase { @BeforeClass public static void allocatePorts() { - BusServer.resetPortMap(); + HttpsBusServer.resetPortMap(); } /** @@ -71,7 +71,7 @@ protected void startServers() throws Exception { "Server failed to launch", // run the server in the same process // set this to false to fork a new process - launchServer(BusServer.class, true) + launchServer(HttpsBusServer.class, true) ); } @@ -130,35 +130,35 @@ public final void testCertConstraints() throws Exception { // // Good Subject DN // - testSuccessfulCall("https://localhost:" + BusServer.getPort(0) + "/SoapContext/HttpsPort"); + testSuccessfulCall("https://localhost:" + HttpsBusServer.getPort(0) + "/SoapContext/HttpsPort"); // // Bad Subject DN // - testFailedCall("https://localhost:" + BusServer.getPort(1) + "/SoapContext/HttpsPort"); + testFailedCall("https://localhost:" + HttpsBusServer.getPort(1) + "/SoapContext/HttpsPort"); // // Mixed Subject DN (ALL) // - testFailedCall("https://localhost:" + BusServer.getPort(2) + "/SoapContext/HttpsPort"); + testFailedCall("https://localhost:" + HttpsBusServer.getPort(2) + "/SoapContext/HttpsPort"); // // Mixed Subject DN (ANY) // - testSuccessfulCall("https://localhost:" + BusServer.getPort(3) + "/SoapContext/HttpsPort"); + testSuccessfulCall("https://localhost:" + HttpsBusServer.getPort(3) + "/SoapContext/HttpsPort"); // // Mixed Issuer DN (ALL) // - testFailedCall("https://localhost:" + BusServer.getPort(4) + "/SoapContext/HttpsPort"); + testFailedCall("https://localhost:" + HttpsBusServer.getPort(4) + "/SoapContext/HttpsPort"); // // Mixed Issuer DN (ANY) // - testSuccessfulCall("https://localhost:" + BusServer.getPort(5) + "/SoapContext/HttpsPort"); + testSuccessfulCall("https://localhost:" + HttpsBusServer.getPort(5) + "/SoapContext/HttpsPort"); // // Bad server Subject DN // - testFailedCall("https://localhost:" + BusServer.getPort(6) + "/SoapContext/HttpsPort"); + testFailedCall("https://localhost:" + HttpsBusServer.getPort(6) + "/SoapContext/HttpsPort"); // // Bad server Issuer DN // - testFailedCall("https://localhost:" + BusServer.getPort(7) + "/SoapContext/HttpsPort"); + testFailedCall("https://localhost:" + HttpsBusServer.getPort(7) + "/SoapContext/HttpsPort"); stopServers(); } diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/servlet/CXFFilterTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/servlet/CXFFilterTest.java index b4e6baf8c8a..8c94a150a75 100644 --- a/systests/transports/src/test/java/org/apache/cxf/systest/servlet/CXFFilterTest.java +++ b/systests/transports/src/test/java/org/apache/cxf/systest/servlet/CXFFilterTest.java @@ -49,10 +49,10 @@ public class CXFFilterTest extends AbstractServletTest { @Ignore - public static class EmbeddedJettyServer extends AbstractJettyServer { - public static final int PORT = allocatePortAsInt(EmbeddedJettyServer.class); + public static class CXFFilterEmbeddedJettyServer extends AbstractJettyServer { + public static final int PORT = allocatePortAsInt(CXFFilterEmbeddedJettyServer.class); - public EmbeddedJettyServer() { + public CXFFilterEmbeddedJettyServer() { super("/org/apache/cxf/systest/servlet/web-filter.xml", "/", CONTEXT, PORT); } } @@ -60,7 +60,7 @@ public EmbeddedJettyServer() { @BeforeClass public static void startServers() throws Exception { AbstractResourceInfo.clearAllMaps(); - assertTrue("server did not launch correctly", launchServer(EmbeddedJettyServer.class, true)); + assertTrue("server did not launch correctly", launchServer(CXFFilterEmbeddedJettyServer.class, true)); createStaticBus(); } @@ -116,6 +116,6 @@ public void testPostInvokeServices() throws Exception { @Override protected int getPort() { - return EmbeddedJettyServer.PORT; + return CXFFilterEmbeddedJettyServer.PORT; } } diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/servlet/CXFServletTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/servlet/CXFServletTest.java index 3c96a769482..6e9e98c8584 100644 --- a/systests/transports/src/test/java/org/apache/cxf/systest/servlet/CXFServletTest.java +++ b/systests/transports/src/test/java/org/apache/cxf/systest/servlet/CXFServletTest.java @@ -62,10 +62,10 @@ public class CXFServletTest extends AbstractServletTest { @Ignore - public static class EmbeddedJettyServer extends AbstractJettyServer { - public static final int PORT = allocatePortAsInt(EmbeddedJettyServer.class); + public static class CXFServletEmbeddedJettyServer extends AbstractJettyServer { + public static final int PORT = allocatePortAsInt(CXFServletEmbeddedJettyServer.class); - public EmbeddedJettyServer() { + public CXFServletEmbeddedJettyServer() { super("/org/apache/cxf/systest/servlet/web.xml", "/", CONTEXT, PORT); } } @@ -73,7 +73,7 @@ public EmbeddedJettyServer() { @BeforeClass public static void startServers() throws Exception { AbstractResourceInfo.clearAllMaps(); - assertTrue("server did not launch correctly", launchServer(EmbeddedJettyServer.class, true)); + assertTrue("server did not launch correctly", launchServer(CXFServletEmbeddedJettyServer.class, true)); createStaticBus(); } @@ -372,6 +372,6 @@ public static class NoWsdlGreeter extends BaseGreeterImpl { @Override protected int getPort() { - return EmbeddedJettyServer.PORT; + return CXFServletEmbeddedJettyServer.PORT; } } diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/servlet/ExternalServicesServletTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/servlet/ExternalServicesServletTest.java index 7f848b9bf81..b8939d22f01 100644 --- a/systests/transports/src/test/java/org/apache/cxf/systest/servlet/ExternalServicesServletTest.java +++ b/systests/transports/src/test/java/org/apache/cxf/systest/servlet/ExternalServicesServletTest.java @@ -50,10 +50,10 @@ public class ExternalServicesServletTest extends AbstractServletTest { private static final String FORCED_BASE_ADDRESS = "http://localhost/somewhere"; @Ignore - public static class EmbeddedJettyServer extends AbstractJettyServer { - public static final int PORT = allocatePortAsInt(EmbeddedJettyServer.class); + public static class ExternalServicesEmbeddedJettyServer extends AbstractJettyServer { + public static final int PORT = allocatePortAsInt(ExternalServicesEmbeddedJettyServer.class); - public EmbeddedJettyServer() { + public ExternalServicesEmbeddedJettyServer() { super("/org/apache/cxf/systest/servlet/web-external.xml", "/", CONTEXT, PORT); } } @@ -61,7 +61,7 @@ public EmbeddedJettyServer() { @BeforeClass public static void startServers() throws Exception { AbstractResourceInfo.clearAllMaps(); - assertTrue("server did not launch correctly", launchServer(EmbeddedJettyServer.class, true)); + assertTrue("server did not launch correctly", launchServer(ExternalServicesEmbeddedJettyServer.class, true)); createStaticBus(); } @@ -117,6 +117,6 @@ public void testPostInvokeServices() throws Exception { @Override protected int getPort() { - return EmbeddedJettyServer.PORT; + return ExternalServicesEmbeddedJettyServer.PORT; } } diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/servlet/JsFrontEndServletTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/servlet/JsFrontEndServletTest.java index 9212e13869d..d8d4ea7f83b 100644 --- a/systests/transports/src/test/java/org/apache/cxf/systest/servlet/JsFrontEndServletTest.java +++ b/systests/transports/src/test/java/org/apache/cxf/systest/servlet/JsFrontEndServletTest.java @@ -41,10 +41,10 @@ public class JsFrontEndServletTest extends AbstractServletTest { @Ignore - public static class EmbeddedJettyServer extends AbstractJettyServer { - public static final int PORT = allocatePortAsInt(EmbeddedJettyServer.class); + public static class JsFrontEndEmbeddedJettyServer extends AbstractJettyServer { + public static final int PORT = allocatePortAsInt(JsFrontEndEmbeddedJettyServer.class); - public EmbeddedJettyServer() { + public JsFrontEndEmbeddedJettyServer() { super("/org/apache/cxf/systest/servlet/web-js.xml", "/", CONTEXT, PORT); } } @@ -52,7 +52,7 @@ public EmbeddedJettyServer() { @BeforeClass public static void startServers() throws Exception { AbstractResourceInfo.clearAllMaps(); - assertTrue("server did not launch correctly", launchServer(EmbeddedJettyServer.class, true)); + assertTrue("server did not launch correctly", launchServer(JsFrontEndEmbeddedJettyServer.class, true)); createStaticBus(); } @@ -88,6 +88,6 @@ public void testPostInvokeServices() throws Exception { @Override protected int getPort() { - return EmbeddedJettyServer.PORT; + return JsFrontEndEmbeddedJettyServer.PORT; } } diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/servlet/SpringAutoPublishServletTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/servlet/SpringAutoPublishServletTest.java index 8209ab6c3b3..fa67bb26ae8 100644 --- a/systests/transports/src/test/java/org/apache/cxf/systest/servlet/SpringAutoPublishServletTest.java +++ b/systests/transports/src/test/java/org/apache/cxf/systest/servlet/SpringAutoPublishServletTest.java @@ -43,10 +43,10 @@ public class SpringAutoPublishServletTest extends AbstractServletTest { @Ignore - public static class EmbeddedJettyServer extends AbstractJettyServer { - public static final int PORT = allocatePortAsInt(EmbeddedJettyServer.class); + public static class SpringEmbeddedJettyServer extends AbstractJettyServer { + public static final int PORT = allocatePortAsInt(SpringEmbeddedJettyServer.class); - public EmbeddedJettyServer() { + public SpringEmbeddedJettyServer() { super("/org/apache/cxf/systest/servlet/web-spring-auto-launch.xml", "/", CONTEXT, PORT); } } @@ -54,7 +54,7 @@ public EmbeddedJettyServer() { @BeforeClass public static void startServers() throws Exception { AbstractResourceInfo.clearAllMaps(); - assertTrue("server did not launch correctly", launchServer(EmbeddedJettyServer.class, true)); + assertTrue("server did not launch correctly", launchServer(SpringEmbeddedJettyServer.class, true)); createStaticBus(); } @@ -129,6 +129,6 @@ public void testGetWSDL() throws Exception { @Override protected int getPort() { - return EmbeddedJettyServer.PORT; + return SpringEmbeddedJettyServer.PORT; } } diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/servlet/SpringServletContextTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/servlet/SpringServletContextTest.java index 87e0a870fc3..71d24bd6217 100644 --- a/systests/transports/src/test/java/org/apache/cxf/systest/servlet/SpringServletContextTest.java +++ b/systests/transports/src/test/java/org/apache/cxf/systest/servlet/SpringServletContextTest.java @@ -47,10 +47,10 @@ public class SpringServletContextTest extends AbstractServletTest { @Ignore - public static class EmbeddedJettyServer extends AbstractJettyServer { - public static final int PORT = allocatePortAsInt(EmbeddedJettyServer.class); + public static class SpringServletContexEmbeddedJettyServer extends AbstractJettyServer { + public static final int PORT = allocatePortAsInt(SpringServletContexEmbeddedJettyServer.class); - public EmbeddedJettyServer() { + public SpringServletContexEmbeddedJettyServer() { super("/org/apache/cxf/systest/servlet/web-spring-context.xml", "/", CONTEXT, PORT); } } @@ -91,7 +91,7 @@ public void refresh() { @BeforeClass public static void startServers() throws Exception { AbstractResourceInfo.clearAllMaps(); - assertTrue("server did not launch correctly", launchServer(EmbeddedJettyServer.class, true)); + assertTrue("server did not launch correctly", launchServer(SpringServletContexEmbeddedJettyServer.class, true)); createStaticBus(); } @@ -115,6 +115,6 @@ public void testContextRefresh() throws Exception { @Override protected int getPort() { - return EmbeddedJettyServer.PORT; + return SpringServletContexEmbeddedJettyServer.PORT; } } diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/servlet/SpringServletTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/servlet/SpringServletTest.java index c46280554d9..7ce8cf35613 100644 --- a/systests/transports/src/test/java/org/apache/cxf/systest/servlet/SpringServletTest.java +++ b/systests/transports/src/test/java/org/apache/cxf/systest/servlet/SpringServletTest.java @@ -44,10 +44,10 @@ public class SpringServletTest extends AbstractServletTest { @Ignore - public static class EmbeddedJettyServer extends AbstractJettyServer { - public static final int PORT = allocatePortAsInt(EmbeddedJettyServer.class); + public static class SpringServletEmbeddedJettyServer extends AbstractJettyServer { + public static final int PORT = allocatePortAsInt(SpringServletEmbeddedJettyServer.class); - public EmbeddedJettyServer() { + public SpringServletEmbeddedJettyServer() { super("/org/apache/cxf/systest/servlet/web-spring.xml", "/", CONTEXT, PORT); } } @@ -55,7 +55,7 @@ public EmbeddedJettyServer() { @BeforeClass public static void startServers() throws Exception { AbstractResourceInfo.clearAllMaps(); - assertTrue("server did not launch correctly", launchServer(EmbeddedJettyServer.class, true)); + assertTrue("server did not launch correctly", launchServer(SpringServletEmbeddedJettyServer.class, true)); } @AfterClass @@ -152,6 +152,6 @@ public void testIgnoreServiceList() throws Exception { @Override protected int getPort() { - return EmbeddedJettyServer.PORT; + return SpringServletEmbeddedJettyServer.PORT; } } diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/soap_udp/Server.java b/systests/transports/src/test/java/org/apache/cxf/systest/soap_udp/SoapUDPServer.java similarity index 91% rename from systests/transports/src/test/java/org/apache/cxf/systest/soap_udp/Server.java rename to systests/transports/src/test/java/org/apache/cxf/systest/soap_udp/SoapUDPServer.java index 49f9c41a0f9..87d23e0ede5 100644 --- a/systests/transports/src/test/java/org/apache/cxf/systest/soap_udp/Server.java +++ b/systests/transports/src/test/java/org/apache/cxf/systest/soap_udp/SoapUDPServer.java @@ -25,8 +25,8 @@ import org.apache.cxf.testutil.common.AbstractBusTestServerBase; import org.apache.hello_world_soap_http.BaseGreeterImpl; -public class Server extends AbstractBusTestServerBase { - public static final String PORT = allocatePort(Server.class); +public class SoapUDPServer extends AbstractBusTestServerBase { + public static final String PORT = allocatePort(SoapUDPServer.class); Endpoint ep; protected void run() { @@ -45,7 +45,7 @@ public void tearDown() { public static void main(String[] args) { try { - Server s = new Server(); + SoapUDPServer s = new SoapUDPServer(); s.start(); } catch (Exception ex) { ex.printStackTrace(); diff --git a/systests/transports/src/test/java/org/apache/cxf/systest/soap_udp/SoapUDPTest.java b/systests/transports/src/test/java/org/apache/cxf/systest/soap_udp/SoapUDPTest.java index cb9ced41dd6..fa63bcb4a6c 100644 --- a/systests/transports/src/test/java/org/apache/cxf/systest/soap_udp/SoapUDPTest.java +++ b/systests/transports/src/test/java/org/apache/cxf/systest/soap_udp/SoapUDPTest.java @@ -35,7 +35,7 @@ import static org.junit.Assert.assertTrue; public class SoapUDPTest extends AbstractBusClientServerTestBase { - private static final String PORT = Server.PORT; + private static final String PORT = SoapUDPServer.PORT; private final QName serviceName = new QName("http://apache.org/hello_world_soap_http", "SOAPService"); private final QName localPortName = new QName("http://apache.org/hello_world_soap_http", @@ -47,7 +47,7 @@ public static void startServers() throws Exception { staticBus = BusFactory.getDefaultBus(); new LoggingFeature().initialize(staticBus); BusFactory.setThreadDefaultBus(staticBus); - assertTrue("server did not launch correctly", launchServer(Server.class, true)); + assertTrue("server did not launch correctly", launchServer(SoapUDPServer.class, true)); } @Test diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/http/Abost.cxf b/systests/transports/src/test/resources/org/apache/cxf/systest/http/Abost.cxf index c06dbea5e84..38a8a1e5c74 100644 --- a/systests/transports/src/test/resources/org/apache/cxf/systest/http/Abost.cxf +++ b/systests/transports/src/test/resources/org/apache/cxf/systest/http/Abost.cxf @@ -40,7 +40,7 @@ - + diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/http/Hurlon.cxf b/systests/transports/src/test/resources/org/apache/cxf/systest/http/Hurlon.cxf index a8f5b00dc17..90438bf6d36 100644 --- a/systests/transports/src/test/resources/org/apache/cxf/systest/http/Hurlon.cxf +++ b/systests/transports/src/test/resources/org/apache/cxf/systest/http/Hurlon.cxf @@ -41,7 +41,7 @@ - + diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/http/Rethwel.cxf b/systests/transports/src/test/resources/org/apache/cxf/systest/http/Rethwel.cxf index 2c6393c0e65..0daddb27a37 100644 --- a/systests/transports/src/test/resources/org/apache/cxf/systest/http/Rethwel.cxf +++ b/systests/transports/src/test/resources/org/apache/cxf/systest/http/Rethwel.cxf @@ -42,7 +42,7 @@ - + diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/http_jetty/continuations/jaxws-server.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/http_jetty/continuations/jaxws-server.xml index 12b289f7f47..ce6fa0d1439 100644 --- a/systests/transports/src/test/resources/org/apache/cxf/systest/http_jetty/continuations/jaxws-server.xml +++ b/systests/transports/src/test/resources/org/apache/cxf/systest/http_jetty/continuations/jaxws-server.xml @@ -38,7 +38,7 @@ under the License. - + diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/Bethal.cxf b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/Bethal.cxf index 8302e28a9f5..390b394c64a 100644 --- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/Bethal.cxf +++ b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/Bethal.cxf @@ -47,7 +47,7 @@ - + - + - + \ No newline at end of file diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/Gordy.cxf b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/Gordy.cxf index 8986a203883..f1634901fef 100644 --- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/Gordy.cxf +++ b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/Gordy.cxf @@ -42,11 +42,11 @@ - + - + - + - + - + - + - + - + - + diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/jaxws-publish.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/jaxws-publish.xml index a02440bf65c..af273a50d6b 100644 --- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/jaxws-publish.xml +++ b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/jaxws-publish.xml @@ -38,12 +38,12 @@ under the License. - + - + diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/jaxws-server.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/jaxws-server.xml index d793b5576cc..a1646058d1a 100644 --- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/jaxws-server.xml +++ b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/jaxws-server.xml @@ -38,13 +38,13 @@ under the License. - + - + @@ -53,7 +53,7 @@ under the License. - + diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/jaxws-tlsrefs-publish.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/jaxws-tlsrefs-publish.xml index 379423b8ddf..e741eb4fd9a 100644 --- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/jaxws-tlsrefs-publish.xml +++ b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/jaxws-tlsrefs-publish.xml @@ -38,14 +38,14 @@ under the License. - + - + diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/pkcs12.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/pkcs12.xml index 8a6d104acc4..e1b0ae28256 100644 --- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/pkcs12.xml +++ b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/pkcs12.xml @@ -40,7 +40,7 @@ under the License. - + @@ -49,7 +49,7 @@ under the License. - + diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/resource-key-spec-url.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/resource-key-spec-url.xml index 260f0ed4f52..073e2b8635f 100644 --- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/resource-key-spec-url.xml +++ b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/resource-key-spec-url.xml @@ -39,7 +39,7 @@ under the License. - + @@ -50,7 +50,7 @@ under the License. - + diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/resource-key-spec.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/resource-key-spec.xml index f9a42c345d1..98bc99381a0 100644 --- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/resource-key-spec.xml +++ b/systests/transports/src/test/resources/org/apache/cxf/systest/https/conduit/resource-key-spec.xml @@ -38,14 +38,14 @@ under the License. - + - + diff --git a/systests/transports/src/test/resources/org/apache/cxf/systest/https/constraints/jaxws-server-constraints.xml b/systests/transports/src/test/resources/org/apache/cxf/systest/https/constraints/jaxws-server-constraints.xml index 686788a9714..bf37d066208 100644 --- a/systests/transports/src/test/resources/org/apache/cxf/systest/https/constraints/jaxws-server-constraints.xml +++ b/systests/transports/src/test/resources/org/apache/cxf/systest/https/constraints/jaxws-server-constraints.xml @@ -38,42 +38,42 @@ under the License. - + - + - + - + - + - + - + - + @@ -81,8 +81,8 @@ under the License. - - + + @@ -102,8 +102,8 @@ under the License. - - + + @@ -122,8 +122,8 @@ under the License. - - + + @@ -143,8 +143,8 @@ under the License. - - + + @@ -164,8 +164,8 @@ under the License. - - + + @@ -185,8 +185,8 @@ under the License. - - + + @@ -206,8 +206,8 @@ under the License. - - + + @@ -222,8 +222,8 @@ under the License. - - + + diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/cxf2006/Server.java b/systests/uncategorized/src/test/java/org/apache/cxf/cxf2006/Cxf2006Server.java similarity index 89% rename from systests/uncategorized/src/test/java/org/apache/cxf/cxf2006/Server.java rename to systests/uncategorized/src/test/java/org/apache/cxf/cxf2006/Cxf2006Server.java index 3ec9bab07f5..914aecc8dc2 100644 --- a/systests/uncategorized/src/test/java/org/apache/cxf/cxf2006/Server.java +++ b/systests/uncategorized/src/test/java/org/apache/cxf/cxf2006/Cxf2006Server.java @@ -28,16 +28,16 @@ import org.apache.cxf.testutil.common.AbstractBusTestServerBase; import org.apache.hello_world_soap_http.RPCLitGreeterImpl; -public class Server extends AbstractBusTestServerBase { - public static final String PORT = allocatePort(Server.class); +public class Cxf2006Server extends AbstractBusTestServerBase { + public static final String PORT = allocatePort(Cxf2006Server.class); Endpoint ep; String wsdlLocation; - public Server() { + public Cxf2006Server() { this(new String[] {"/wsdl_systest/cxf2006.wsdl"}); } - public Server(String[] args) { + public Cxf2006Server(String[] args) { wsdlLocation = args.length > 0 ? args[0] : "/wsdl_systest/cxf2006.wsdl"; } @@ -61,7 +61,7 @@ public void tearDown() { public static void main(String[] args) { try { - Server s = new Server(); + Cxf2006Server s = new Cxf2006Server(); s.start(); } catch (Exception ex) { ex.printStackTrace(); diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/cxf2006/RespectBindingFeatureClientServerTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/cxf2006/RespectBindingFeatureClientServerTest.java index 9da3113a4de..b7a9524b4b1 100644 --- a/systests/uncategorized/src/test/java/org/apache/cxf/cxf2006/RespectBindingFeatureClientServerTest.java +++ b/systests/uncategorized/src/test/java/org/apache/cxf/cxf2006/RespectBindingFeatureClientServerTest.java @@ -35,7 +35,7 @@ import static org.junit.Assert.fail; public class RespectBindingFeatureClientServerTest extends AbstractBusClientServerTestBase { - public static final String PORT = Server.PORT; + public static final String PORT = Cxf2006Server.PORT; private final QName portName = new QName("http://apache.org/hello_world_rpclit", "SoapPortRPCLit"); private SOAPServiceRPCLit service = new SOAPServiceRPCLit(); private ServerLauncher serverLauncher; @@ -51,7 +51,7 @@ public void tearDown() throws Exception { private void startServers(String wsdlLocation) throws Exception { String[] args = new String[] {wsdlLocation}; - serverLauncher = new ServerLauncher(Server.class.getName(), null, args, true); + serverLauncher = new ServerLauncher(Cxf2006Server.class.getName(), null, args, true); boolean isServerReady = serverLauncher.launchServer(); assertTrue("server did not launch correctly", isServerReady); diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/callback/CallbackClientServerTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/callback/CallbackClientServerTest.java index c047533bb2d..09dd90daa79 100644 --- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/callback/CallbackClientServerTest.java +++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/callback/CallbackClientServerTest.java @@ -37,7 +37,7 @@ import static org.junit.Assert.assertTrue; public class CallbackClientServerTest extends AbstractBusClientServerTestBase { - public static final String PORT = Server.PORT; + public static final String PORT = CallbackServer.PORT; public static final String CB_PORT = allocatePort(CallbackClientServerTest.class); private static final QName SERVICE_NAME @@ -49,7 +49,7 @@ public class CallbackClientServerTest extends AbstractBusClientServerTestBase { @BeforeClass public static void startServers() throws Exception { - assertTrue("server did not launch correctly", launchServer(Server.class, true)); + assertTrue("server did not launch correctly", launchServer(CallbackServer.class, true)); createStaticBus(); } diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/callback/Server.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/callback/CallbackServer.java similarity index 89% rename from systests/uncategorized/src/test/java/org/apache/cxf/systest/callback/Server.java rename to systests/uncategorized/src/test/java/org/apache/cxf/systest/callback/CallbackServer.java index 77e77daaf90..b1e95d9b451 100644 --- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/callback/Server.java +++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/callback/CallbackServer.java @@ -24,8 +24,8 @@ import org.apache.cxf.BusFactory; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class Server extends AbstractBusTestServerBase { - public static final String PORT = allocatePort(Server.class); +public class CallbackServer extends AbstractBusTestServerBase { + public static final String PORT = allocatePort(CallbackServer.class); Endpoint ep; @@ -42,7 +42,7 @@ public void tearDown() { public static void main(String[] args) { try { - Server s = new Server(); + CallbackServer s = new CallbackServer(); s.start(); } catch (Exception ex) { ex.printStackTrace(); diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/Server.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaServer.java similarity index 89% rename from systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/Server.java rename to systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaServer.java index d8a9e18efa5..bf21f58cd08 100644 --- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/Server.java +++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaServer.java @@ -24,8 +24,8 @@ import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class Server extends AbstractBusTestServerBase { - public static final String PERSIST_PORT = allocatePort(Server.class); +public class CorbaServer extends AbstractBusTestServerBase { + public static final String PERSIST_PORT = allocatePort(CorbaServer.class); protected void run() { System.setProperty("com.sun.CORBA.POA.ORBServerId", "1"); @@ -37,6 +37,6 @@ protected void run() { } public static void main(String[] args) throws Exception { - new Server().start(); + new CorbaServer().start(); } } diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTest.java index 7406856a752..69365dbb984 100644 --- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTest.java +++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTest.java @@ -43,7 +43,7 @@ */ public class CorbaTest extends AbstractBusClientServerTestBase { - public static final String PORT = Server.PERSIST_PORT; + public static final String PORT = CorbaServer.PERSIST_PORT; private static final QName SERVICE_NAME = new QName("http://cxf.apache.org/hello_world_corba", @@ -53,7 +53,7 @@ public class CorbaTest extends AbstractBusClientServerTestBase { public static void startServers() throws Exception { assertTrue( "Server failed to launch", - launchServer(Server.class) + launchServer(CorbaServer.class) ); } diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java index 234b6301a6e..a4731fdfa58 100644 --- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java +++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/CorbaTimeoutTest.java @@ -45,7 +45,7 @@ */ public class CorbaTimeoutTest extends AbstractBusClientServerTestBase { - public static final String PORT = Server.PERSIST_PORT; + public static final String PORT = CorbaServer.PERSIST_PORT; private static final QName SERVICE_NAME = new QName("http://cxf.apache.org/hello_world_corba", diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/cxf993/Server.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/cxf993/Cxf993Server.java similarity index 88% rename from systests/uncategorized/src/test/java/org/apache/cxf/systest/cxf993/Server.java rename to systests/uncategorized/src/test/java/org/apache/cxf/systest/cxf993/Cxf993Server.java index ee386f903fa..887ea302c56 100644 --- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/cxf993/Server.java +++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/cxf993/Cxf993Server.java @@ -22,8 +22,8 @@ import jakarta.xml.ws.Endpoint; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class Server extends AbstractBusTestServerBase { - public static final String PORT = allocatePort(Server.class); +public class Cxf993Server extends AbstractBusTestServerBase { + public static final String PORT = allocatePort(Cxf993Server.class); protected void run() { Object implementor = new Cxf993Impl(); @@ -33,7 +33,7 @@ protected void run() { public static void main(String[] args) { try { - Server s = new Server(); + Cxf993Server s = new Cxf993Server(); s.start(); } catch (Exception ex) { ex.printStackTrace(); diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/cxf993/Cxf993Test.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/cxf993/Cxf993Test.java index 602b3102ace..ae3a5593195 100644 --- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/cxf993/Cxf993Test.java +++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/cxf993/Cxf993Test.java @@ -37,12 +37,12 @@ import static org.junit.Assert.assertTrue; public class Cxf993Test extends AbstractBusClientServerTestBase { - public static final String PORT = Server.PORT; + public static final String PORT = Cxf993Server.PORT; private final QName serviceName = new QName("urn://testnotification", "NotificationService"); @BeforeClass public static void startServers() throws Exception { - assertTrue("server did not launch correctly", launchServer(Server.class)); + assertTrue("server did not launch correctly", launchServer(Cxf993Server.class)); } @Test diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/exception/GenericExceptionTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/exception/GenericExceptionTest.java index aaeb3b4c61c..82c3bb04990 100644 --- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/exception/GenericExceptionTest.java +++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/exception/GenericExceptionTest.java @@ -44,12 +44,12 @@ import static org.junit.Assert.fail; public class GenericExceptionTest extends AbstractBusClientServerTestBase { - public static final String PORT = Server.PORT; + public static final String PORT = GenericServer.PORT; private final QName serviceName = new QName("http://cxf.apache.org/test/HelloService", "HelloService"); @BeforeClass public static void startServers() throws Exception { - assertTrue("server did not launch correctly", launchServer(Server.class)); + assertTrue("server did not launch correctly", launchServer(GenericServer.class)); } diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/exception/Server.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/exception/GenericServer.java similarity index 88% rename from systests/uncategorized/src/test/java/org/apache/cxf/systest/exception/Server.java rename to systests/uncategorized/src/test/java/org/apache/cxf/systest/exception/GenericServer.java index 487ad71f5d4..e481f43cb8e 100644 --- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/exception/Server.java +++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/exception/GenericServer.java @@ -22,8 +22,8 @@ import jakarta.xml.ws.Endpoint; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class Server extends AbstractBusTestServerBase { - public static final String PORT = allocatePort(Server.class); +public class GenericServer extends AbstractBusTestServerBase { + public static final String PORT = allocatePort(GenericServer.class); protected void run() { Object implementor = new GenericsEchoImpl(); @@ -33,7 +33,7 @@ protected void run() { public static void main(String[] args) { try { - Server s = new Server(); + GenericServer s = new GenericServer(); s.start(); } catch (Exception ex) { ex.printStackTrace(); diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/fault/IntFaultClientServerTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/fault/IntFaultClientServerTest.java index fffb0d9e63f..5fc52d69d7b 100644 --- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/fault/IntFaultClientServerTest.java +++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/fault/IntFaultClientServerTest.java @@ -46,13 +46,13 @@ import static org.junit.Assert.fail; public class IntFaultClientServerTest extends AbstractBusClientServerTestBase { - public static final String PORT = Server.PORT; + public static final String PORT = IntFaultServer.PORT; private final QName serviceName = new QName("http://apache.org/intfault", "SOAPService"); @BeforeClass public static void startServers() throws Exception { createStaticBus(); - assertTrue("server did not launch correctly", launchServer(Server.class, true)); + assertTrue("server did not launch correctly", launchServer(IntFaultServer.class, true)); } @Test diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/fault/Server.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/fault/IntFaultServer.java similarity index 88% rename from systests/uncategorized/src/test/java/org/apache/cxf/systest/fault/Server.java rename to systests/uncategorized/src/test/java/org/apache/cxf/systest/fault/IntFaultServer.java index ffc5c56c37c..ae0acb6df7a 100644 --- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/fault/Server.java +++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/fault/IntFaultServer.java @@ -22,8 +22,8 @@ import jakarta.xml.ws.Endpoint; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class Server extends AbstractBusTestServerBase { - public static final String PORT = allocatePort(Server.class); +public class IntFaultServer extends AbstractBusTestServerBase { + public static final String PORT = allocatePort(IntFaultServer.class); Endpoint ep; protected void run() { @@ -38,7 +38,7 @@ public void tearDown() { public static void main(String[] args) { try { - Server s = new Server(); + IntFaultServer s = new IntFaultServer(); s.start(); } catch (Exception ex) { ex.printStackTrace(); diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/interceptor/InterceptorFaultTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/interceptor/InterceptorFaultTest.java index 113016ef335..ad700cfa40b 100644 --- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/interceptor/InterceptorFaultTest.java +++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/interceptor/InterceptorFaultTest.java @@ -72,7 +72,7 @@ * */ public class InterceptorFaultTest extends AbstractBusClientServerTestBase { - public static final String PORT = allocatePort(Server.class); + public static final String PORT = allocatePort(InterceptorFaultServer.class); private static final Logger LOG = LogUtils.getLogger(InterceptorFaultTest.class); @@ -96,7 +96,7 @@ public class InterceptorFaultTest extends AbstractBusClientServerTestBase { * QOS interceptors such as the RM, addressing and policy interceptors). * */ - public static class Server extends AbstractBusTestServerBase { + public static class InterceptorFaultServer extends AbstractBusTestServerBase { Endpoint ep; protected void run() { @@ -121,7 +121,7 @@ public void tearDown() { public static void main(String[] args) { try { - Server s = new Server(); + InterceptorFaultServer s = new InterceptorFaultServer(); s.start(); } catch (Exception ex) { ex.printStackTrace(); @@ -145,7 +145,7 @@ public static void main(String[] args) { @BeforeClass public static void startServers() throws Exception { System.setProperty("org.apache.cxf.transports.http_jetty.DontClosePort." + PORT, "true"); - assertTrue("server did not launch correctly", launchServer(Server.class, true)); + assertTrue("server did not launch correctly", launchServer(InterceptorFaultServer.class, true)); createStaticBus(); } @AfterClass diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/jca/OutBoundConnectionTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/jca/OutBoundConnectionTest.java index e7ce0baf8ef..4b12ffb373b 100644 --- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/jca/OutBoundConnectionTest.java +++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/jca/OutBoundConnectionTest.java @@ -45,15 +45,15 @@ import static org.junit.Assert.assertTrue; public class OutBoundConnectionTest extends AbstractBusClientServerTestBase { - public static final String PORT = Server.PORT; + public static final String PORT = OutBoundServer.PORT; private final QName serviceName = new QName("http://apache.org/hello_world_soap_http", "SOAPService"); private final QName portName = new QName("http://apache.org/hello_world_soap_http", "SoapPort"); - public static class Server extends AbstractBusTestServerBase { - public static final String PORT = allocatePort(Server.class); + public static class OutBoundServer extends AbstractBusTestServerBase { + public static final String PORT = allocatePort(OutBoundServer.class); Endpoint ep; protected void run() { @@ -69,7 +69,7 @@ public void tearDown() { public static void main(String[] args) { try { - Server s = new Server(); + OutBoundServer s = new OutBoundServer(); s.start(); } catch (Exception ex) { ex.printStackTrace(); @@ -82,7 +82,7 @@ public static void main(String[] args) { @BeforeClass public static void startServers() throws Exception { - assertTrue("server did not launch correctly", launchServer(Server.class, true)); + assertTrue("server did not launch correctly", launchServer(OutBoundServer.class, true)); createStaticBus(); } diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/js/JSClientServerTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/js/JSClientServerTest.java index d346577e114..fe72bd37677 100644 --- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/js/JSClientServerTest.java +++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/js/JSClientServerTest.java @@ -38,14 +38,14 @@ public class JSClientServerTest extends AbstractBusClientServerTestBase { - public static final String JS_PORT = Server.JS_PORT; - public static final String JSX_PORT = Server.JSX_PORT; + public static final String JS_PORT = JSServer.JS_PORT; + public static final String JSX_PORT = JSServer.JSX_PORT; private static final String NS = "http://apache.org/hello_world_soap_http"; @BeforeClass public static void startServers() throws Exception { - assertTrue("server did not launch correctly", launchServer(Server.class, true)); + assertTrue("server did not launch correctly", launchServer(JSServer.class, true)); createStaticBus(); } diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/js/Server.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/js/JSServer.java similarity index 89% rename from systests/uncategorized/src/test/java/org/apache/cxf/systest/js/Server.java rename to systests/uncategorized/src/test/java/org/apache/cxf/systest/js/JSServer.java index 5515735b894..c52947fe1ac 100644 --- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/js/Server.java +++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/js/JSServer.java @@ -26,9 +26,9 @@ import org.apache.cxf.js.rhino.ProviderFactory; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class Server extends AbstractBusTestServerBase { - public static final String JS_PORT = allocatePort(Server.class); - public static final String JSX_PORT = allocatePort(Server.class, 1); +public class JSServer extends AbstractBusTestServerBase { + public static final String JS_PORT = allocatePort(JSServer.class); + public static final String JSX_PORT = allocatePort(JSServer.class, 1); ProviderFactory pf = new ProviderFactory(); protected void run() { @@ -51,7 +51,7 @@ public void tearDown() { public static void main(String[] args) { try { System.err.println("Server main"); - Server s = new Server(); + JSServer s = new JSServer(); s.start(); } catch (Exception ex) { ex.printStackTrace(); diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_bindingtype/Server.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_bindingtype/MTOMBindingServer.java similarity index 87% rename from systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_bindingtype/Server.java rename to systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_bindingtype/MTOMBindingServer.java index de925dfdb70..f506e57f074 100644 --- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_bindingtype/Server.java +++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_bindingtype/MTOMBindingServer.java @@ -22,8 +22,8 @@ import jakarta.xml.ws.Endpoint; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class Server extends AbstractBusTestServerBase { - public static final String PORT = allocatePort(Server.class); +public class MTOMBindingServer extends AbstractBusTestServerBase { + public static final String PORT = allocatePort(MTOMBindingServer.class); protected void run() { Object implementor = new HelloImpl(); @@ -33,7 +33,7 @@ protected void run() { public static void main(String[] args) { try { - Server s = new Server(); + MTOMBindingServer s = new MTOMBindingServer(); s.start(); } catch (Exception ex) { ex.printStackTrace(); diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_bindingtype/MTOMBindingTypeTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_bindingtype/MTOMBindingTypeTest.java index e38ed4ee212..aba60c6c52c 100644 --- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_bindingtype/MTOMBindingTypeTest.java +++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_bindingtype/MTOMBindingTypeTest.java @@ -46,7 +46,7 @@ import static org.junit.Assert.assertTrue; public class MTOMBindingTypeTest extends AbstractBusClientServerTestBase { - public static final String PORT = Server.PORT; + public static final String PORT = MTOMBindingServer.PORT; private final QName serviceName = new QName("http://apache.org/cxf/systest/mtom_feature", "HelloService"); @@ -59,7 +59,7 @@ public void setUp() throws Exception { @BeforeClass public static void startServers() throws Exception { - assertTrue("server did not launch correctly", launchServer(Server.class, true)); + assertTrue("server did not launch correctly", launchServer(MTOMBindingServer.class, true)); } protected ByteArrayOutputStream setupInLogging() { diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_feature/MtomFeatureClientServerTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_feature/MtomFeatureClientServerTest.java index 959c0e30729..d43083c5e50 100644 --- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_feature/MtomFeatureClientServerTest.java +++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_feature/MtomFeatureClientServerTest.java @@ -46,14 +46,14 @@ import static org.junit.Assert.assertTrue; public class MtomFeatureClientServerTest extends AbstractBusClientServerTestBase { - public static final String PORT = Server.PORT; + public static final String PORT = MtomFeatureServer.PORT; private final QName serviceName = new QName("http://apache.org/cxf/systest/mtom_feature", "HelloService"); private Hello port = getPort(); @BeforeClass public static void startServers() throws Exception { - assertTrue("server did not launch correctly", launchServer(Server.class, true)); + assertTrue("server did not launch correctly", launchServer(MtomFeatureServer.class, true)); } @Before diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_feature/Server.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_feature/MtomFeatureServer.java similarity index 87% rename from systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_feature/Server.java rename to systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_feature/MtomFeatureServer.java index 893d93ea9f3..20eb3ccdbb7 100644 --- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_feature/Server.java +++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_feature/MtomFeatureServer.java @@ -22,8 +22,8 @@ import jakarta.xml.ws.Endpoint; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class Server extends AbstractBusTestServerBase { - public static final String PORT = allocatePort(Server.class); +public class MtomFeatureServer extends AbstractBusTestServerBase { + public static final String PORT = allocatePort(MtomFeatureServer.class); protected void run() { Object implementor = new HelloImpl(); @@ -33,7 +33,7 @@ protected void run() { public static void main(String[] args) { try { - Server s = new Server(); + MtomFeatureServer s = new MtomFeatureServer(); s.start(); } catch (Exception ex) { ex.printStackTrace(); diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_schema_validation/Server.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_schema_validation/MTOMProviderSchemaValidationServer.java similarity index 85% rename from systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_schema_validation/Server.java rename to systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_schema_validation/MTOMProviderSchemaValidationServer.java index 6e74d01ee7e..e4f8890f114 100644 --- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_schema_validation/Server.java +++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_schema_validation/MTOMProviderSchemaValidationServer.java @@ -24,8 +24,8 @@ import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class Server extends AbstractBusTestServerBase { - public static final String PORT = allocatePort(Server.class); +public class MTOMProviderSchemaValidationServer extends AbstractBusTestServerBase { + public static final String PORT = allocatePort(MTOMProviderSchemaValidationServer.class); protected void run() { TestProvider implementor = new TestProvider(); @@ -36,7 +36,7 @@ protected void run() { public static void main(String[] args) throws Exception { try { - Server s = new Server(); + MTOMProviderSchemaValidationServer s = new MTOMProviderSchemaValidationServer(); s.start(); } catch (Exception ex) { ex.printStackTrace(); diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_schema_validation/MTOMProviderSchemaValidationTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_schema_validation/MTOMProviderSchemaValidationTest.java index 82a0fc7882f..a8842625047 100644 --- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_schema_validation/MTOMProviderSchemaValidationTest.java +++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom_schema_validation/MTOMProviderSchemaValidationTest.java @@ -36,13 +36,13 @@ import static org.junit.Assert.assertTrue; public final class MTOMProviderSchemaValidationTest extends AbstractBusClientServerTestBase { - public static final String PORT = Server.PORT; + public static final String PORT = MTOMProviderSchemaValidationServer.PORT; private final QName serviceName = new QName("http://cxf.apache.org/", "HelloWS"); @BeforeClass public static void startservers() throws Exception { - assertTrue("server did not launch correctly", launchServer(Server.class, true)); + assertTrue("server did not launch correctly", launchServer(MTOMProviderSchemaValidationServer.class, true)); } @Test public void testSchemaValidation() throws Exception { diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/nested_callback/CallbackClientServerTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/nested_callback/CallbackClientServerTest.java index 81b6e589a0b..ed019233f02 100644 --- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/nested_callback/CallbackClientServerTest.java +++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/nested_callback/CallbackClientServerTest.java @@ -40,8 +40,8 @@ import static org.junit.Assert.assertTrue; public class CallbackClientServerTest extends AbstractBusClientServerTestBase { - public static final String PORT = Server.PORT; - public static final String CB_PORT = allocatePort(CallbackClientServerTest.class); + public static final String PORT = NestedCallbackServer.PORT; + public static final String CB_PORT = allocatePort(NestedCallbackServer.class); private static final QName SERVICE_NAME = new QName("http://apache.org/nested_callback", "SOAPService"); @@ -60,7 +60,7 @@ public class CallbackClientServerTest extends AbstractBusClientServerTestBase { @BeforeClass public static void startServers() throws Exception { - assertTrue("server did not launch correctly", launchServer(Server.class, true)); + assertTrue("server did not launch correctly", launchServer(NestedCallbackServer.class, true)); } @Test diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/nested_callback/Server.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/nested_callback/NestedCallbackServer.java similarity index 86% rename from systests/uncategorized/src/test/java/org/apache/cxf/systest/nested_callback/Server.java rename to systests/uncategorized/src/test/java/org/apache/cxf/systest/nested_callback/NestedCallbackServer.java index 0cbe3a14ef8..95a1c66f307 100644 --- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/nested_callback/Server.java +++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/nested_callback/NestedCallbackServer.java @@ -23,8 +23,8 @@ import jakarta.xml.ws.Endpoint; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class Server extends AbstractBusTestServerBase { - public static final String PORT = allocatePort(Server.class); +public class NestedCallbackServer extends AbstractBusTestServerBase { + public static final String PORT = allocatePort(NestedCallbackServer.class); protected void run() { Object implementor = new ServerImpl(); @@ -35,7 +35,7 @@ protected void run() { public static void main(String[] args) { try { - Server s = new Server(); + NestedCallbackServer s = new NestedCallbackServer(); s.start(); } catch (Exception ex) { ex.printStackTrace(); diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/outofband/header/OOBHeaderTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/outofband/header/OOBHeaderTest.java index 2c714e3bcbe..e4e70a65746 100644 --- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/outofband/header/OOBHeaderTest.java +++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/outofband/header/OOBHeaderTest.java @@ -56,7 +56,7 @@ import static org.junit.Assert.fail; public class OOBHeaderTest extends AbstractBusClientServerTestBase { - public static final String PORT = Server.PORT; + public static final String PORT = OOBServer.PORT; public static final String CONFIG_FILE = "org/apache/cxf/systest/outofband/header/cxf.xml"; public static final String TEST_HDR_NS = "http://cxf.apache.org/outofband/Header"; @@ -74,7 +74,7 @@ public static void startServers() throws Exception { System.setProperty("cxf.config.file", "org/apache/cxf/systest/outofband/header/cxf.xml"); createStaticBus(CONFIG_FILE); - assertTrue("server did not launch correctly", launchServer(Server.class, true)); + assertTrue("server did not launch correctly", launchServer(OOBServer.class, true)); } private void addOutOfBoundHeader(PutLastTradedPricePortType portType, boolean invalid, boolean mu) { diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/outofband/header/Server.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/outofband/header/OOBServer.java similarity index 96% rename from systests/uncategorized/src/test/java/org/apache/cxf/systest/outofband/header/Server.java rename to systests/uncategorized/src/test/java/org/apache/cxf/systest/outofband/header/OOBServer.java index 6bec5722d52..733ad5df5df 100644 --- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/outofband/header/Server.java +++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/outofband/header/OOBServer.java @@ -32,8 +32,8 @@ import org.apache.cxf.annotations.EndpointProperty; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class Server extends AbstractBusTestServerBase { - public static final String PORT = allocatePort(Server.class); +public class OOBServer extends AbstractBusTestServerBase { + public static final String PORT = allocatePort(OOBServer.class); Bus bus; @@ -89,7 +89,7 @@ protected void run() { public static void main(String[] args) { try { - Server s = new Server(); + OOBServer s = new OOBServer(); s.start(); } catch (Exception ex) { ex.printStackTrace(); diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/resolver/Server.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/resolver/JarResolverServer.java similarity index 87% rename from systests/uncategorized/src/test/java/org/apache/cxf/systest/resolver/Server.java rename to systests/uncategorized/src/test/java/org/apache/cxf/systest/resolver/JarResolverServer.java index 2213b64c55f..6f16caf7cac 100644 --- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/resolver/Server.java +++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/resolver/JarResolverServer.java @@ -23,8 +23,8 @@ import org.apache.cxf.testutil.common.AbstractBusTestServerBase; import org.apache.hello_world_soap_http.GreeterImpl; -public class Server extends AbstractBusTestServerBase { - public static final String PORT = allocatePort(Server.class); +public class JarResolverServer extends AbstractBusTestServerBase { + public static final String PORT = allocatePort(JarResolverServer.class); protected void run() { Object implementor = new GreeterImpl(); String address = "http://localhost:" + PORT + "/SoapContext/SoapPort"; @@ -34,7 +34,7 @@ protected void run() { public static void main(String[] args) { try { - Server s = new Server(); + JarResolverServer s = new JarResolverServer(); s.start(); } catch (Exception ex) { ex.printStackTrace(); diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/resolver/JarResolverTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/resolver/JarResolverTest.java index 0bb9266a7b1..16a9b4fb813 100644 --- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/resolver/JarResolverTest.java +++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/resolver/JarResolverTest.java @@ -36,14 +36,14 @@ import static org.junit.Assert.assertTrue; public class JarResolverTest extends AbstractBusClientServerTestBase { - public static final String PORT = Server.PORT; + public static final String PORT = JarResolverServer.PORT; private final QName serviceName = new QName("http://apache.org/hello_world_soap_http", "SOAPService"); private final QName portName = new QName("http://apache.org/hello_world_soap_http", "SoapPort"); @BeforeClass public static void startServers() throws Exception { - assertTrue("server did not launch correctly", launchServer(Server.class, true)); + assertTrue("server did not launch correctly", launchServer(JarResolverServer.class, true)); } @Test diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/Server.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/SchemaImportServer.java similarity index 89% rename from systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/Server.java rename to systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/SchemaImportServer.java index 0e3693b91ce..2f08ac3e30a 100644 --- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/Server.java +++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/SchemaImportServer.java @@ -21,10 +21,10 @@ import jakarta.xml.ws.Endpoint; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class Server extends AbstractBusTestServerBase { - public static final String PORT = allocatePort(Server.class); +public class SchemaImportServer extends AbstractBusTestServerBase { + public static final String PORT = allocatePort(SchemaImportServer.class); - public Server() { + public SchemaImportServer() { } protected void run() { @@ -44,7 +44,7 @@ protected void run() { public static void main(String[] args) { try { - Server s = new Server(); + SchemaImportServer s = new SchemaImportServer(); s.start(); } catch (Exception ex) { ex.printStackTrace(); diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/SchemaImportTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/SchemaImportTest.java index c148af79243..498fd174f7f 100644 --- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/SchemaImportTest.java +++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/schemaimport/SchemaImportTest.java @@ -31,11 +31,11 @@ import static org.junit.Assert.fail; public class SchemaImportTest extends AbstractBusClientServerTestBase { - public static final String PORT = Server.PORT; + public static final String PORT = SchemaImportServer.PORT; @BeforeClass public static void startservers() throws Exception { - assertTrue("server did not launch correctly", launchServer(Server.class, true)); + assertTrue("server did not launch correctly", launchServer(SchemaImportServer.class, true)); } @Test diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap12/Soap12ClientServerTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap12/Soap12ClientServerTest.java index 76873f38a1f..81ca7bf141c 100644 --- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap12/Soap12ClientServerTest.java +++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap12/Soap12ClientServerTest.java @@ -54,7 +54,7 @@ import static org.junit.Assert.fail; public class Soap12ClientServerTest extends AbstractBusClientServerTestBase { - public static final String PORT = Server.PORT; + public static final String PORT = Soap12Server.PORT; private final QName serviceName = new QName("http://apache.org/hello_world_soap12_http", "SOAPService"); @@ -62,7 +62,7 @@ public class Soap12ClientServerTest extends AbstractBusClientServerTestBase { @BeforeClass public static void startServers() throws Exception { - assertTrue("server did not launch correctly", launchServer(Server.class, true)); + assertTrue("server did not launch correctly", launchServer(Soap12Server.class, true)); } @Test diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap12/Server.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap12/Soap12Server.java similarity index 90% rename from systests/uncategorized/src/test/java/org/apache/cxf/systest/soap12/Server.java rename to systests/uncategorized/src/test/java/org/apache/cxf/systest/soap12/Soap12Server.java index c0870b688d6..a2a7c588a45 100644 --- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap12/Server.java +++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap12/Soap12Server.java @@ -22,8 +22,8 @@ import jakarta.xml.ws.Endpoint; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class Server extends AbstractBusTestServerBase { - public static final String PORT = allocatePort(Server.class); +public class Soap12Server extends AbstractBusTestServerBase { + public static final String PORT = allocatePort(Soap12Server.class); Endpoint ep; Endpoint ep11; @@ -45,7 +45,7 @@ public void tearDown() throws Exception { public static void main(String[] args) { try { - Server s = new Server(); + Soap12Server s = new Soap12Server(); s.start(); } catch (Exception ex) { ex.printStackTrace(); diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/SOAPFaultRequestTestCase.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/SOAPFaultRequestTestCase.java index b4ab5020874..6b7870ff869 100644 --- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/SOAPFaultRequestTestCase.java +++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/SOAPFaultRequestTestCase.java @@ -32,12 +32,12 @@ import static org.junit.Assert.assertTrue; public class SOAPFaultRequestTestCase extends AbstractClientServerTestBase { - private static final String PORT = Server.PORT; + private static final String PORT = SOAPFaultServer.PORT; private final QName portName = new QName("http://cxf.apache.org/soapfault", "SoapFaultPortType"); @BeforeClass public static void startServers() throws Exception { - assertTrue("server did not launch correctly", launchServer(Server.class)); + assertTrue("server did not launch correctly", launchServer(SOAPFaultServer.class)); } @Test diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/Server.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/SOAPFaultServer.java similarity index 87% rename from systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/Server.java rename to systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/SOAPFaultServer.java index bd0c4228463..96f1682c926 100644 --- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/Server.java +++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/SOAPFaultServer.java @@ -22,8 +22,8 @@ import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class Server extends AbstractBusTestServerBase { - public static final String PORT = allocatePort(Server.class); +public class SOAPFaultServer extends AbstractBusTestServerBase { + public static final String PORT = allocatePort(SOAPFaultServer.class); protected void run() { String address = "http://localhost:" + PORT + "/SoapFault"; @@ -34,7 +34,7 @@ protected void run() { public static void main(String[] args) { try { - Server s = new Server(); + SOAPFaultServer s = new SOAPFaultServer(); s.start(); } catch (Exception ex) { ex.printStackTrace(); diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapheader/HeaderClientServerTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapheader/HeaderClientServerTest.java index 48942ebacd0..0f874aa256f 100644 --- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapheader/HeaderClientServerTest.java +++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapheader/HeaderClientServerTest.java @@ -47,13 +47,13 @@ import static org.junit.Assert.assertTrue; public class HeaderClientServerTest extends AbstractBusClientServerTestBase { - public static final String PORT = Server.PORT; + public static final String PORT = SoapHeaderServer.PORT; private final QName serviceName = new QName("http://cxf.apache.org/pizza", "PizzaService"); @BeforeClass public static void startServers() throws Exception { - assertTrue("server did not launch correctly", launchServer(Server.class, true)); + assertTrue("server did not launch correctly", launchServer(SoapHeaderServer.class, true)); } @Test diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapheader/Server.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapheader/SoapHeaderServer.java similarity index 87% rename from systests/uncategorized/src/test/java/org/apache/cxf/systest/soapheader/Server.java rename to systests/uncategorized/src/test/java/org/apache/cxf/systest/soapheader/SoapHeaderServer.java index dad44a63cee..c3709f94bfa 100644 --- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapheader/Server.java +++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapheader/SoapHeaderServer.java @@ -22,8 +22,8 @@ import jakarta.xml.ws.Endpoint; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class Server extends AbstractBusTestServerBase { - public static final String PORT = allocatePort(Server.class); +public class SoapHeaderServer extends AbstractBusTestServerBase { + public static final String PORT = allocatePort(SoapHeaderServer.class); protected void run() { Object implementor = new PizzaImpl(); @@ -33,7 +33,7 @@ protected void run() { public static void main(String[] args) { try { - Server s = new Server(); + SoapHeaderServer s = new SoapHeaderServer(); s.start(); } catch (Exception ex) { ex.printStackTrace(); diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapheader_ext/ExtSoapHeaderClientServerTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapheader_ext/ExtSoapHeaderClientServerTest.java index 50f177c9784..4e48e12b62b 100644 --- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapheader_ext/ExtSoapHeaderClientServerTest.java +++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapheader_ext/ExtSoapHeaderClientServerTest.java @@ -45,14 +45,14 @@ import static org.junit.Assert.assertTrue; public class ExtSoapHeaderClientServerTest extends AbstractClientServerTestBase { - public static final String PORT0 = allocatePort(Server.class, 0); - public static final String PORT1 = allocatePort(Server.class, 1); + public static final String PORT0 = allocatePort(ExtSoapHeaderServer.class, 0); + public static final String PORT1 = allocatePort(ExtSoapHeaderServer.class, 1); private static SamplePortType client; private static final QName SERVIVE_NAME = new QName("http://cxf.apache.org/soap_ext_header/ws", "SampleService"); - public static class Server extends AbstractServerTestServerBase { + public static class ExtSoapHeaderServer extends AbstractServerTestServerBase { @Override protected org.apache.cxf.endpoint.Server createServer(Bus bus) throws Exception { @@ -74,13 +74,13 @@ protected org.apache.cxf.endpoint.Server createServer(Bus bus) throws Exception } public static void main(String[] args) throws Exception { - new Server().start(); + new ExtSoapHeaderServer().start(); } } @BeforeClass public static void startServers() throws Exception { - assertTrue("server did not launch correctly", launchServer(Server.class, true)); + assertTrue("server did not launch correctly", launchServer(ExtSoapHeaderServer.class, true)); initClient(); } diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/stax_transform_feature/StaxTransformFeatureTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/stax_transform_feature/StaxTransformFeatureTest.java index d84e87cd8e8..07c7ea9c436 100755 --- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/stax_transform_feature/StaxTransformFeatureTest.java +++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/stax_transform_feature/StaxTransformFeatureTest.java @@ -57,7 +57,7 @@ * */ public class StaxTransformFeatureTest extends AbstractBusClientServerTestBase { - public static final String PORT = allocatePort(Server.class); + public static final String PORT = allocatePort(StaxTransformServer.class); private static final Logger LOG = LogUtils.getLogger(StaxTransformFeatureTest.class); private static final String GREETER_PORT_ADDRESS = "http://localhost:" + PORT + "/SoapContext/GreeterPort"; @@ -69,7 +69,7 @@ public class StaxTransformFeatureTest extends AbstractBusClientServerTestBase { private Greeter greeter; - public static class Server extends AbstractBusTestServerBase { + public static class StaxTransformServer extends AbstractBusTestServerBase { Endpoint ep; protected void run() { @@ -109,7 +109,7 @@ public void tearDown() { public static void main(String[] args) { try { - Server s = new Server(); + StaxTransformServer s = new StaxTransformServer(); s.start(); } catch (Exception ex) { ex.printStackTrace(); @@ -125,7 +125,7 @@ public static void main(String[] args) { public static void startServers() throws Exception { // force the info logging for this test LOG.setLevel(Level.INFO); - assertTrue("server did not launch correctly", launchServer(Server.class, true)); + assertTrue("server did not launch correctly", launchServer(StaxTransformServer.class, true)); } @AfterClass diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/stringarray/Server.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/stringarray/StringArrayServer.java similarity index 88% rename from systests/uncategorized/src/test/java/org/apache/cxf/systest/stringarray/Server.java rename to systests/uncategorized/src/test/java/org/apache/cxf/systest/stringarray/StringArrayServer.java index 1bd8d0556ac..d265ec3abf0 100644 --- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/stringarray/Server.java +++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/stringarray/StringArrayServer.java @@ -21,8 +21,8 @@ import jakarta.xml.ws.Endpoint; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class Server extends AbstractBusTestServerBase { - public static final String PORT = allocatePort(Server.class); +public class StringArrayServer extends AbstractBusTestServerBase { + public static final String PORT = allocatePort(StringArrayServer.class); protected void run() { Object implementor = new StringArrayTestImpl(); @@ -37,7 +37,7 @@ protected void run() { public static void main(String[] args) { try { - Server s = new Server(); + StringArrayServer s = new StringArrayServer(); s.start(); } catch (Exception ex) { ex.printStackTrace(); diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/stringarray/StringArrayTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/stringarray/StringArrayTest.java index fdeaca0c317..ddede2a259f 100644 --- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/stringarray/StringArrayTest.java +++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/stringarray/StringArrayTest.java @@ -38,11 +38,11 @@ import static org.junit.Assert.assertTrue; public class StringArrayTest extends AbstractBusClientServerTestBase { - public static final String PORT = Server.PORT; + public static final String PORT = StringArrayServer.PORT; @BeforeClass public static void startServers() throws Exception { - assertTrue("server did not launch correctly", launchServer(Server.class, true)); + assertTrue("server did not launch correctly", launchServer(StringArrayServer.class, true)); } @AfterClass diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_substitution/TypeSubClientServerTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_substitution/TypeSubClientServerTest.java index 6addcbf29dc..b364c0e21da 100644 --- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_substitution/TypeSubClientServerTest.java +++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_substitution/TypeSubClientServerTest.java @@ -40,13 +40,13 @@ import static org.junit.Assert.fail; public class TypeSubClientServerTest extends AbstractBusClientServerTestBase { - public static final String PORT = Server.PORT; + public static final String PORT = TypeSubstitutionServer.PORT; private final QName serviceName = new QName("http://apache.org/type_substitution/", "CarDealerService"); @BeforeClass public static void startServers() throws Exception { - assertTrue("server did not launch correctly", launchServer(Server.class, true)); + assertTrue("server did not launch correctly", launchServer(TypeSubstitutionServer.class, true)); } @Test diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_substitution/Server.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_substitution/TypeSubstitutionServer.java similarity index 86% rename from systests/uncategorized/src/test/java/org/apache/cxf/systest/type_substitution/Server.java rename to systests/uncategorized/src/test/java/org/apache/cxf/systest/type_substitution/TypeSubstitutionServer.java index 1797f26cb8b..eff051aa527 100644 --- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_substitution/Server.java +++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_substitution/TypeSubstitutionServer.java @@ -22,8 +22,8 @@ import jakarta.xml.ws.Endpoint; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class Server extends AbstractBusTestServerBase { - public static final String PORT = allocatePort(Server.class); +public class TypeSubstitutionServer extends AbstractBusTestServerBase { + public static final String PORT = allocatePort(TypeSubstitutionServer.class); protected void run() { Object implementor = new CarDealerImpl(); @@ -34,7 +34,7 @@ protected void run() { public static void main(String[] args) { try { - Server s = new Server(); + TypeSubstitutionServer s = new TypeSubstitutionServer(); s.start(); } catch (Exception ex) { ex.printStackTrace(); diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/versioning/ClientServerVersioningTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/versioning/ClientServerVersioningTest.java index cb820fd8f64..efe0210eead 100644 --- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/versioning/ClientServerVersioningTest.java +++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/versioning/ClientServerVersioningTest.java @@ -37,12 +37,12 @@ import static org.junit.Assert.assertTrue; public class ClientServerVersioningTest extends AbstractClientServerTestBase { - private static final String PORT = Server.PORT; + private static final String PORT = VersioningServer.PORT; private final QName portName = new QName("http://apache.org/hello_world_mixedstyle", "SoapPort"); @BeforeClass public static void startServers() throws Exception { - assertTrue("server did not launch correctly", launchServer(Server.class)); + assertTrue("server did not launch correctly", launchServer(VersioningServer.class)); } @Test diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/versioning/Server.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/versioning/VersioningServer.java similarity index 92% rename from systests/uncategorized/src/test/java/org/apache/cxf/systest/versioning/Server.java rename to systests/uncategorized/src/test/java/org/apache/cxf/systest/versioning/VersioningServer.java index 207c3c1d0e3..cb8f9463f1b 100644 --- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/versioning/Server.java +++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/versioning/VersioningServer.java @@ -28,8 +28,8 @@ import org.apache.hello_world_mixedstyle.GreeterImplMixedStyle; -public class Server extends AbstractBusTestServerBase { - public static final String PORT = allocatePort(Server.class); +public class VersioningServer extends AbstractBusTestServerBase { + public static final String PORT = allocatePort(VersioningServer.class); protected void run() { setBus(BusFactory.getDefaultBus()); @@ -56,7 +56,7 @@ protected void run() { public static void main(String[] args) { try { - Server s = new Server(); + VersioningServer s = new VersioningServer(); s.start(); } catch (Exception ex) { ex.printStackTrace(); diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/CachedOutMessageTest.java b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/CachedOutMessageTest.java index 6bb596c6e38..ca26208bb76 100644 --- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/CachedOutMessageTest.java +++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/CachedOutMessageTest.java @@ -46,7 +46,7 @@ * Tests the WS-RM processing with the cached out message (using temporary files). */ public class CachedOutMessageTest extends AbstractBusClientServerTestBase { - public static final String PORT = allocatePort(Server.class); + public static final String PORT = allocatePort(CachedOutMessageServer.class); public static final String DECOUPLE_PORT = allocatePort("decoupled.port"); private static final Logger LOG = LogUtils.getLogger(RetransmissionQueueTest.class); @@ -54,7 +54,7 @@ public class CachedOutMessageTest extends AbstractBusClientServerTestBase { - public static class Server extends AbstractBusTestServerBase { + public static class CachedOutMessageServer extends AbstractBusTestServerBase { Endpoint ep; protected void run() { SpringBusFactory bf = new SpringBusFactory(); @@ -87,7 +87,7 @@ public void tearDown() { public static void startServers() throws Exception { CachedOutputStream.setDefaultThreshold(16); assertTrue("server did not launch correctly", - launchServer(Server.class, true)); + launchServer(CachedOutMessageServer.class, true)); } @AfterClass diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledBareTest.java b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledBareTest.java index 04e8975a46a..def4a8b5f7a 100644 --- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledBareTest.java +++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledBareTest.java @@ -50,12 +50,12 @@ * exchange of WS-RM protocol messages. */ public class DecoupledBareTest extends AbstractBusClientServerTestBase { - public static final String PORT = allocatePort(Server.class); + public static final String PORT = allocatePort(DecoupledBareServer.class); public static final String DECOUPLE_PORT = allocatePort(DecoupledBareTest.class); private static final Logger LOG = LogUtils.getLogger(DecoupledBareTest.class); - public static class Server extends AbstractBusTestServerBase { + public static class DecoupledBareServer extends AbstractBusTestServerBase { Endpoint ep; protected void run() { @@ -81,7 +81,7 @@ public void tearDown() { @BeforeClass public static void startServers() throws Exception { - assertTrue("server did not launch correctly", launchServer(Server.class, true)); + assertTrue("server did not launch correctly", launchServer(DecoupledBareServer.class, true)); } @Test diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledClientServerOnewayTest.java b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledClientServerOnewayTest.java index 06de107d7e4..8bc41286f27 100644 --- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledClientServerOnewayTest.java +++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledClientServerOnewayTest.java @@ -48,12 +48,12 @@ * exchange of WS-RM protocol messages. */ public class DecoupledClientServerOnewayTest extends AbstractBusClientServerTestBase { - public static final String PORT = allocatePort(Server.class); + public static final String PORT = allocatePort(DecoupledOnewayServer.class); public static final String DECOUPLE_PORT = allocatePort(DecoupledClientServerOnewayTest.class); private static final Logger LOG = LogUtils.getLogger(DecoupledClientServerOnewayTest.class); - public static class Server extends AbstractBusTestServerBase { + public static class DecoupledOnewayServer extends AbstractBusTestServerBase { Endpoint ep; protected void run() { SpringBusFactory bf = new SpringBusFactory(); @@ -91,7 +91,7 @@ public void tearDown() { @BeforeClass public static void startServers() throws Exception { assertTrue("server did not launch correctly", - launchServer(Server.class, true)); + launchServer(DecoupledOnewayServer.class, true)); } @Test diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledClientServerTest.java b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledClientServerTest.java index 61b3061077f..631a8f663e5 100644 --- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledClientServerTest.java +++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/DecoupledClientServerTest.java @@ -49,12 +49,12 @@ * exchange of WS-RM protocol messages. */ public class DecoupledClientServerTest extends AbstractBusClientServerTestBase { - public static final String PORT = allocatePort(Server.class); + public static final String PORT = allocatePort(DecoupledServer.class); public static final String DECOUPLE_PORT = allocatePort(DecoupledClientServerTest.class); private static final Logger LOG = LogUtils.getLogger(DecoupledClientServerTest.class); - public static class Server extends AbstractBusTestServerBase { + public static class DecoupledServer extends AbstractBusTestServerBase { Endpoint ep; protected void run() { SpringBusFactory bf = new SpringBusFactory(); @@ -90,7 +90,7 @@ public void tearDown() { @BeforeClass public static void startServers() throws Exception { assertTrue("server did not launch correctly", - launchServer(Server.class, true)); + launchServer(DecoupledServer.class, true)); } @Test diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RedeliveryTest.java b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RedeliveryTest.java index 97f299931d2..ba104e2ba26 100644 --- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RedeliveryTest.java +++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RedeliveryTest.java @@ -48,7 +48,7 @@ * Tests the redelivery of the message upon a delivery error. */ public class RedeliveryTest extends AbstractBusClientServerTestBase { - public static final String PORT = allocatePort(Server.class); + public static final String PORT = allocatePort(RedeliveryServer.class); private static final Logger LOG = LogUtils.getLogger(RedeliveryTest.class); private static GreeterRecorderImpl serverGreeter; @@ -56,12 +56,12 @@ public class RedeliveryTest extends AbstractBusClientServerTestBase { private Greeter greeter; - public static class Server extends AbstractBusTestServerBase { + public static class RedeliveryServer extends AbstractBusTestServerBase { String port; String pfx; Endpoint ep; - public Server(String[] args) { + public RedeliveryServer(String[] args) { port = args[0]; pfx = args[1]; } @@ -97,7 +97,7 @@ public void tearDown() { public static void main(String[] args) { try { - Server s = new Server(args); + RedeliveryServer s = new RedeliveryServer(args); s.start(); } catch (Exception ex) { ex.printStackTrace(); @@ -112,7 +112,7 @@ public static void main(String[] args) { public static void startServers() throws Exception { RMTxStore.deleteDatabaseFiles("redlv-server", true); assertTrue("server did not launch correctly", - launchServer(Server.class, null, new String[]{PORT, "redlv"}, true)); + launchServer(RedeliveryServer.class, null, new String[]{PORT, "redlv"}, true)); } @AfterClass diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RetransmissionGZIPTest.java b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RetransmissionGZIPTest.java index 3f5ef1e7a2a..517eadb783f 100755 --- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RetransmissionGZIPTest.java +++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RetransmissionGZIPTest.java @@ -53,13 +53,13 @@ * with retransmission. */ public class RetransmissionGZIPTest extends AbstractBusClientServerTestBase { - public static final String PORT = allocatePort(Server.class); + public static final String PORT = allocatePort(RetransmissionGZIPServer.class); public static final String DECOUPLE_PORT = allocatePort(RetransmissionGZIPTest.class); private static final Logger LOG = LogUtils.getLogger(RetransmissionQueueTest.class); private Bus bus; - public static class Server extends AbstractBusTestServerBase { + public static class RetransmissionGZIPServer extends AbstractBusTestServerBase { protected void run() { SpringBusFactory bf = new SpringBusFactory(); @@ -83,7 +83,7 @@ protected void run() { public static void main(String[] args) { try { - Server s = new Server(); + RetransmissionGZIPServer s = new RetransmissionGZIPServer(); s.start(); } catch (Exception ex) { ex.printStackTrace(); @@ -97,7 +97,7 @@ public static void main(String[] args) { @BeforeClass public static void startServers() throws Exception { assertTrue("server did not launch correctly", - launchServer(Server.class, true)); + launchServer(RetransmissionGZIPServer.class, true)); } @Test diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RetransmissionQueueTest.java b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RetransmissionQueueTest.java index 2f0966f49b9..a8707f30466 100644 --- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RetransmissionQueueTest.java +++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RetransmissionQueueTest.java @@ -49,13 +49,13 @@ * the message is queued and retransmission is scheduled. */ public class RetransmissionQueueTest extends AbstractBusClientServerTestBase { - public static final String PORT = allocatePort(Server.class); + public static final String PORT = allocatePort(RetransmissionQueueServer.class); public static final String DECOUPLE_PORT = allocatePort(RetransmissionQueueTest.class); private static final Logger LOG = LogUtils.getLogger(RetransmissionQueueTest.class); private Bus bus; - public static class Server extends AbstractBusTestServerBase { + public static class RetransmissionQueueServer extends AbstractBusTestServerBase { protected void run() { SpringBusFactory bf = new SpringBusFactory(); @@ -79,7 +79,7 @@ protected void run() { public static void main(String[] args) { try { - Server s = new Server(); + RetransmissionQueueServer s = new RetransmissionQueueServer(); s.start(); } catch (Exception ex) { ex.printStackTrace(); @@ -93,7 +93,7 @@ public static void main(String[] args) { @BeforeClass public static void startServers() throws Exception { assertTrue("server did not launch correctly", - launchServer(Server.class, true)); + launchServer(RetransmissionQueueServer.class, true)); } @Test diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/Server.java b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RmServer.java similarity index 93% rename from systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/Server.java rename to systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RmServer.java index e68375cca22..b93a100aff7 100644 --- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/Server.java +++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RmServer.java @@ -26,8 +26,8 @@ import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class Server extends AbstractBusTestServerBase { - public static final String PORT = allocatePort(Server.class); +public class RmServer extends AbstractBusTestServerBase { + public static final String PORT = allocatePort(RmServer.class); private static final String ADDRESS = "http://localhost:" + PORT + "/SoapContext/ControlPort"; private static final String GREETER_ADDRESS = "http://localhost:" + PORT + "/SoapContext/GreeterPort"; @@ -58,7 +58,7 @@ public void tearDown() throws Exception { public static void main(String[] args) { try { - Server s = new Server(); + RmServer s = new RmServer(); s.start(); } catch (Exception ex) { ex.printStackTrace(); diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RobustServiceAtMostOnceTest.java b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RobustServiceAtMostOnceTest.java index 8c8ff6ac83c..409541b182a 100644 --- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RobustServiceAtMostOnceTest.java +++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RobustServiceAtMostOnceTest.java @@ -44,7 +44,7 @@ * exchange of WS-RM protocol messages. */ public class RobustServiceAtMostOnceTest extends AbstractBusClientServerTestBase { - public static final String PORT = allocatePort(Server.class); + public static final String PORT = allocatePort(RobustServiceAtMostOnceServer.class); public static final String GREETMEONEWAY_ACTION = "http://cxf.apache.org/greeter_control/Greeter/greetMeOneWayRequest"; private static final Logger LOG = LogUtils.getLogger(RobustServiceAtMostOnceTest.class); @@ -53,7 +53,7 @@ public class RobustServiceAtMostOnceTest extends AbstractBusClientServerTestBase private Greeter greeter; - public static class Server extends AbstractBusTestServerBase { + public static class RobustServiceAtMostOnceServer extends AbstractBusTestServerBase { Endpoint ep; protected void run() { SpringBusFactory bf = new SpringBusFactory(); @@ -86,7 +86,7 @@ public void tearDown() { @BeforeClass public static void startServers() throws Exception { - assertTrue("server did not launch correctly", launchServer(Server.class, true)); + assertTrue("server did not launch correctly", launchServer(RobustServiceAtMostOnceServer.class, true)); } @Test diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RobustServiceWithFaultTest.java b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RobustServiceWithFaultTest.java index 7f9649f2f36..d348334015b 100644 --- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RobustServiceWithFaultTest.java +++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/RobustServiceWithFaultTest.java @@ -48,7 +48,7 @@ * exchange of WS-RM protocol messages. */ public class RobustServiceWithFaultTest extends AbstractBusClientServerTestBase { - public static final String PORT = allocatePort(Server.class); + public static final String PORT = allocatePort(RobustServiceWithFaultServer.class); public static final String GREETMEONEWAY_ACTION = "http://cxf.apache.org/greeter_control/Greeter/greetMeOneWayRequest"; private static final Logger LOG = LogUtils.getLogger(RobustServiceWithFaultTest.class); @@ -58,7 +58,7 @@ public class RobustServiceWithFaultTest extends AbstractBusClientServerTestBase private Greeter greeter; - public static class Server extends AbstractBusTestServerBase { + public static class RobustServiceWithFaultServer extends AbstractBusTestServerBase { Endpoint ep; protected void run() { SpringBusFactory bf = new SpringBusFactory(); @@ -90,7 +90,7 @@ public void tearDown() { @BeforeClass public static void startServers() throws Exception { - assertTrue("server did not launch correctly", launchServer(Server.class, true)); + assertTrue("server did not launch correctly", launchServer(RobustServiceWithFaultServer.class, true)); } @Test diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java index 6dcef6952f3..f39100aa145 100644 --- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java +++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/SequenceTest.java @@ -106,7 +106,7 @@ * exchange of WS-RM protocol messages. */ public class SequenceTest extends AbstractBusClientServerTestBase { - public static final String PORT = Server.PORT; + public static final String PORT = RmServer.PORT; private static final Logger LOG = LogUtils.getLogger(SequenceTest.class); private static final QName GREETMEONEWAY_NAME @@ -135,7 +135,7 @@ public class SequenceTest extends AbstractBusClientServerTestBase { @BeforeClass public static void startServers() throws Exception { - assertTrue("server did not launch correctly", launchServer(Server.class)); + assertTrue("server did not launch correctly", launchServer(RmServer.class)); } diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/policy/Server.java b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/policy/WSRMOptionalPolicyServer.java similarity index 86% rename from systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/policy/Server.java rename to systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/policy/WSRMOptionalPolicyServer.java index 9655bf25df1..f338abaef4d 100644 --- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/policy/Server.java +++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/policy/WSRMOptionalPolicyServer.java @@ -21,8 +21,8 @@ import jakarta.xml.ws.Endpoint; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class Server extends AbstractBusTestServerBase { - public static final String PORT = allocatePort(Server.class); +public class WSRMOptionalPolicyServer extends AbstractBusTestServerBase { + public static final String PORT = allocatePort(WSRMOptionalPolicyServer.class); private static final String ADDRESS = "http://localhost:" + PORT + "/GreetingServer"; protected void run() { @@ -32,7 +32,7 @@ protected void run() { public static void main(String[] args) { try { - Server s = new Server(); + WSRMOptionalPolicyServer s = new WSRMOptionalPolicyServer(); s.start(); } catch (Exception ex) { ex.printStackTrace(); diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/policy/WSRMOptionalPolicyTest.java b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/policy/WSRMOptionalPolicyTest.java index 357754ede09..07ed139bbd0 100644 --- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/policy/WSRMOptionalPolicyTest.java +++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/policy/WSRMOptionalPolicyTest.java @@ -34,14 +34,14 @@ import static org.junit.Assert.assertTrue; public class WSRMOptionalPolicyTest extends AbstractBusClientServerTestBase { - public static final String PORT = Server.PORT; + public static final String PORT = WSRMOptionalPolicyServer.PORT; private static final URL WSDL = GreetingService.class.getResource("greeting.wsdl"); private static final QName SERVICE = new QName("http://ws.samples.apache.org/", "GreetingService"); private static final String ENDPOINT = "http://localhost:" + PORT + "/GreetingServer"; @BeforeClass public static void startServers() throws Exception { - assertTrue("server did not launch correctly", launchServer(Server.class, true)); + assertTrue("server did not launch correctly", launchServer(WSRMOptionalPolicyServer.class, true)); } @Test diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/WSRMWithWSSecurityPolicyTest.java b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/WSRMWithWSSecurityPolicyTest.java index c69cd6aad18..245c9f29b5e 100644 --- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/WSRMWithWSSecurityPolicyTest.java +++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/WSRMWithWSSecurityPolicyTest.java @@ -50,10 +50,10 @@ * Tests the correct interaction of ws-rm calls with security.when policy validator verifies the calls. */ public class WSRMWithWSSecurityPolicyTest extends AbstractBusClientServerTestBase { - public static final String PORT = allocatePort(Server.class); + public static final String PORT = allocatePort(WSRMWithWSSecurityPolicyServer.class); private static final Logger LOG = LogUtils.getLogger(WSRMWithWSSecurityPolicyTest.class); - public static class Server extends AbstractBusTestServerBase { + public static class WSRMWithWSSecurityPolicyServer extends AbstractBusTestServerBase { protected void run() { SpringBusFactory bf = new SpringBusFactory(); Bus bus = bf.createBus("/org/apache/cxf/systest/ws/rm/sec/server-policy.xml"); @@ -64,7 +64,7 @@ protected void run() { @BeforeClass public static void startServers() throws Exception { - assertTrue("server did not launch correctly", launchServer(Server.class, true)); + assertTrue("server did not launch correctly", launchServer(WSRMWithWSSecurityPolicyServer.class, true)); } @Test diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/client-policy.xml b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/client-policy.xml index 04dca130a55..cac50ea166f 100644 --- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/client-policy.xml +++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/client-policy.xml @@ -41,7 +41,7 @@ under the License. - + @@ -57,11 +57,11 @@ under the License. - + diff --git a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/server-policy.xml b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/server-policy.xml index 58a5c58232e..34f6ca6da1d 100644 --- a/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/server-policy.xml +++ b/systests/ws-rm/src/test/java/org/apache/cxf/systest/ws/rm/sec/server-policy.xml @@ -39,7 +39,7 @@ - + @@ -53,7 +53,7 @@ - + diff --git a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/saml/Server.java b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/saml/SamlServer.java similarity index 87% rename from systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/saml/Server.java rename to systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/saml/SamlServer.java index 904f6cdcf93..5b786f96de5 100644 --- a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/saml/Server.java +++ b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/saml/SamlServer.java @@ -26,20 +26,20 @@ import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class Server extends AbstractBusTestServerBase { +public class SamlServer extends AbstractBusTestServerBase { - public Server() { + public SamlServer() { } protected void run() { - URL busFile = Server.class.getResource("server.xml"); + URL busFile = SamlServer.class.getResource("server.xml"); Bus busLocal = new SpringBusFactory().createBus(busFile); BusFactory.setDefaultBus(busLocal); setBus(busLocal); try { - new Server(); + new SamlServer(); } catch (Exception e) { e.printStackTrace(); } diff --git a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/saml/StaxServer.java b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/saml/SamlStaxServer.java similarity index 86% rename from systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/saml/StaxServer.java rename to systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/saml/SamlStaxServer.java index c24d0d46235..9dabc55d969 100644 --- a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/saml/StaxServer.java +++ b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/saml/SamlStaxServer.java @@ -26,20 +26,20 @@ import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class StaxServer extends AbstractBusTestServerBase { +public class SamlStaxServer extends AbstractBusTestServerBase { - public StaxServer() { + public SamlStaxServer() { } protected void run() { - URL busFile = StaxServer.class.getResource("stax-server.xml"); + URL busFile = SamlStaxServer.class.getResource("stax-server.xml"); Bus busLocal = new SpringBusFactory().createBus(busFile); BusFactory.setDefaultBus(busLocal); setBus(busLocal); try { - new StaxServer(); + new SamlStaxServer(); } catch (Exception e) { e.printStackTrace(); } diff --git a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/saml/SamlTokenTest.java b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/saml/SamlTokenTest.java index deeb80ee855..d658080b65a 100644 --- a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/saml/SamlTokenTest.java +++ b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/saml/SamlTokenTest.java @@ -49,10 +49,10 @@ */ @RunWith(value = org.junit.runners.Parameterized.class) public class SamlTokenTest extends AbstractBusClientServerTestBase { - static final String PORT = allocatePort(Server.class); - static final String STAX_PORT = allocatePort(StaxServer.class); - static final String PORT2 = allocatePort(Server.class, 2); - static final String STAX_PORT2 = allocatePort(StaxServer.class, 2); + static final String PORT = allocatePort(SamlServer.class); + static final String STAX_PORT = allocatePort(SamlStaxServer.class); + static final String PORT2 = allocatePort(SamlServer.class, 2); + static final String STAX_PORT2 = allocatePort(SamlStaxServer.class, 2); static final String STS_PORT = allocatePort(STSServer.class); private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt"; @@ -70,13 +70,13 @@ public static void startServers() throws Exception { "Server failed to launch", // run the server in the same process // set this to false to fork - launchServer(Server.class, true) + launchServer(SamlServer.class, true) ); assertTrue( "Server failed to launch", // run the server in the same process // set this to false to fork - launchServer(StaxServer.class, true) + launchServer(SamlStaxServer.class, true) ); assertTrue( "Server failed to launch", diff --git a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/secconv/Server.java b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/secconv/SecureConversationServer.java similarity index 84% rename from systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/secconv/Server.java rename to systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/secconv/SecureConversationServer.java index 00a6634a18c..440077d2c3e 100644 --- a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/secconv/Server.java +++ b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/secconv/SecureConversationServer.java @@ -26,20 +26,20 @@ import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class Server extends AbstractBusTestServerBase { +public class SecureConversationServer extends AbstractBusTestServerBase { - public Server() { + public SecureConversationServer() { } protected void run() { - URL busFile = Server.class.getResource("server.xml"); + URL busFile = SecureConversationServer.class.getResource("server.xml"); Bus busLocal = new SpringBusFactory().createBus(busFile); BusFactory.setDefaultBus(busLocal); setBus(busLocal); try { - new Server(); + new SecureConversationServer(); } catch (Exception e) { e.printStackTrace(); } diff --git a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/secconv/StaxServer.java b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/secconv/SecureConversationStaxServer.java similarity index 83% rename from systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/secconv/StaxServer.java rename to systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/secconv/SecureConversationStaxServer.java index cb3dd61aafb..fd38313fb7d 100644 --- a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/secconv/StaxServer.java +++ b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/secconv/SecureConversationStaxServer.java @@ -26,20 +26,20 @@ import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class StaxServer extends AbstractBusTestServerBase { +public class SecureConversationStaxServer extends AbstractBusTestServerBase { - public StaxServer() { + public SecureConversationStaxServer() { } protected void run() { - URL busFile = StaxServer.class.getResource("stax-server.xml"); + URL busFile = SecureConversationStaxServer.class.getResource("stax-server.xml"); Bus busLocal = new SpringBusFactory().createBus(busFile); BusFactory.setDefaultBus(busLocal); setBus(busLocal); try { - new StaxServer(); + new SecureConversationStaxServer(); } catch (Exception e) { e.printStackTrace(); } diff --git a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/secconv/SecureConversationTest.java b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/secconv/SecureConversationTest.java index a2a5d7d1603..03e90288b80 100644 --- a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/secconv/SecureConversationTest.java +++ b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/secconv/SecureConversationTest.java @@ -46,8 +46,8 @@ */ @RunWith(value = org.junit.runners.Parameterized.class) public class SecureConversationTest extends AbstractBusClientServerTestBase { - static final String PORT = allocatePort(Server.class); - static final String STAX_PORT = allocatePort(StaxServer.class); + static final String PORT = allocatePort(SecureConversationServer.class); + static final String STAX_PORT = allocatePort(SecureConversationStaxServer.class); private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt"; private static final QName SERVICE_QNAME = new QName(NAMESPACE, "DoubleItService"); @@ -64,13 +64,13 @@ public static void startServers() throws Exception { "Server failed to launch", // run the server in the same process // set this to false to fork - launchServer(Server.class, true) + launchServer(SecureConversationServer.class, true) ); assertTrue( "Server failed to launch", // run the server in the same process // set this to false to fork - launchServer(StaxServer.class, true) + launchServer(SecureConversationStaxServer.class, true) ); } diff --git a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/ut/Server.java b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/ut/UsernameTokenServer.java similarity index 85% rename from systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/ut/Server.java rename to systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/ut/UsernameTokenServer.java index 21b9855b2f5..2546cf1d1e4 100644 --- a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/ut/Server.java +++ b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/ut/UsernameTokenServer.java @@ -26,20 +26,20 @@ import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class Server extends AbstractBusTestServerBase { +public class UsernameTokenServer extends AbstractBusTestServerBase { - public Server() { + public UsernameTokenServer() { } protected void run() { - URL busFile = Server.class.getResource("server.xml"); + URL busFile = UsernameTokenServer.class.getResource("server.xml"); Bus busLocal = new SpringBusFactory().createBus(busFile); BusFactory.setDefaultBus(busLocal); setBus(busLocal); try { - new Server(); + new UsernameTokenServer(); } catch (Exception e) { e.printStackTrace(); } diff --git a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/ut/StaxServer.java b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/ut/UsernameTokenStaxServer.java similarity index 84% rename from systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/ut/StaxServer.java rename to systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/ut/UsernameTokenStaxServer.java index 7841793e2de..69095815ad5 100644 --- a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/ut/StaxServer.java +++ b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/ut/UsernameTokenStaxServer.java @@ -26,20 +26,20 @@ import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class StaxServer extends AbstractBusTestServerBase { +public class UsernameTokenStaxServer extends AbstractBusTestServerBase { - public StaxServer() { + public UsernameTokenStaxServer() { } protected void run() { - URL busFile = StaxServer.class.getResource("stax-server.xml"); + URL busFile = UsernameTokenStaxServer.class.getResource("stax-server.xml"); Bus busLocal = new SpringBusFactory().createBus(busFile); BusFactory.setDefaultBus(busLocal); setBus(busLocal); try { - new StaxServer(); + new UsernameTokenStaxServer(); } catch (Exception e) { e.printStackTrace(); } diff --git a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/ut/UsernameTokenTest.java b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/ut/UsernameTokenTest.java index eb45d795394..ad8a6736b4b 100644 --- a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/ut/UsernameTokenTest.java +++ b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/ut/UsernameTokenTest.java @@ -46,10 +46,10 @@ */ @RunWith(value = org.junit.runners.Parameterized.class) public class UsernameTokenTest extends AbstractBusClientServerTestBase { - static final String PORT = allocatePort(Server.class); - static final String PORT2 = allocatePort(Server.class, 2); - static final String STAX_PORT = allocatePort(StaxServer.class); - static final String STAX_PORT2 = allocatePort(StaxServer.class, 2); + static final String PORT = allocatePort(UsernameTokenServer.class); + static final String PORT2 = allocatePort(UsernameTokenServer.class, 2); + static final String STAX_PORT = allocatePort(UsernameTokenStaxServer.class); + static final String STAX_PORT2 = allocatePort(UsernameTokenStaxServer.class, 2); private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt"; private static final QName SERVICE_QNAME = new QName(NAMESPACE, "DoubleItService"); @@ -66,13 +66,13 @@ public static void startServers() throws Exception { "Server failed to launch", // run the server in the same process // set this to false to fork - launchServer(Server.class, true) + launchServer(UsernameTokenServer.class, true) ); assertTrue( "Server failed to launch", // run the server in the same process // set this to false to fork - launchServer(StaxServer.class, true) + launchServer(UsernameTokenStaxServer.class, true) ); } diff --git a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/x509/Server.java b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/x509/X509Server.java similarity index 87% rename from systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/x509/Server.java rename to systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/x509/X509Server.java index 6403468febe..17489f5ed8f 100644 --- a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/x509/Server.java +++ b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/x509/X509Server.java @@ -26,20 +26,20 @@ import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class Server extends AbstractBusTestServerBase { +public class X509Server extends AbstractBusTestServerBase { - public Server() { + public X509Server() { } protected void run() { - URL busFile = Server.class.getResource("server.xml"); + URL busFile = X509Server.class.getResource("server.xml"); Bus busLocal = new SpringBusFactory().createBus(busFile); BusFactory.setDefaultBus(busLocal); setBus(busLocal); try { - new Server(); + new X509Server(); } catch (Exception e) { e.printStackTrace(); } diff --git a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/x509/StaxServer.java b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/x509/X509StaxServer.java similarity index 86% rename from systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/x509/StaxServer.java rename to systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/x509/X509StaxServer.java index 1f8f21fcf61..c83256ff167 100644 --- a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/x509/StaxServer.java +++ b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/x509/X509StaxServer.java @@ -26,20 +26,20 @@ import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class StaxServer extends AbstractBusTestServerBase { +public class X509StaxServer extends AbstractBusTestServerBase { - public StaxServer() { + public X509StaxServer() { } protected void run() { - URL busFile = StaxServer.class.getResource("stax-server.xml"); + URL busFile = X509StaxServer.class.getResource("stax-server.xml"); Bus busLocal = new SpringBusFactory().createBus(busFile); BusFactory.setDefaultBus(busLocal); setBus(busLocal); try { - new StaxServer(); + new X509StaxServer(); } catch (Exception e) { e.printStackTrace(); } diff --git a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/x509/X509TokenTest.java b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/x509/X509TokenTest.java index 56585874a26..37c8d07faa3 100644 --- a/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/x509/X509TokenTest.java +++ b/systests/ws-security-examples/src/test/java/org/apache/cxf/systest/wssec/examples/x509/X509TokenTest.java @@ -46,8 +46,8 @@ */ @RunWith(value = org.junit.runners.Parameterized.class) public class X509TokenTest extends AbstractBusClientServerTestBase { - static final String PORT = allocatePort(Server.class); - static final String STAX_PORT = allocatePort(StaxServer.class); + static final String PORT = allocatePort(X509Server.class); + static final String STAX_PORT = allocatePort(X509StaxServer.class); private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt"; private static final QName SERVICE_QNAME = new QName(NAMESPACE, "DoubleItService"); @@ -64,13 +64,13 @@ public static void startServers() throws Exception { "Server failed to launch", // run the server in the same process // set this to false to fork - launchServer(Server.class, true) + launchServer(X509Server.class, true) ); assertTrue( "Server failed to launch", // run the server in the same process // set this to false to fork - launchServer(StaxServer.class, true) + launchServer(X509StaxServer.class, true) ); } diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/server.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/server.xml index 0f753c0a5a1..6cd60f5dfb7 100644 --- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/server.xml +++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/server.xml @@ -41,22 +41,22 @@ - + - + - + - + @@ -64,7 +64,7 @@ - + @@ -72,7 +72,7 @@ - + @@ -81,17 +81,17 @@ - + - + - + @@ -102,7 +102,7 @@ - + @@ -111,11 +111,11 @@ - + - + diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/stax-server.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/stax-server.xml index b70205c48f7..998caa3da06 100644 --- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/stax-server.xml +++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/saml/stax-server.xml @@ -41,25 +41,25 @@ - + - + - + - + @@ -68,7 +68,7 @@ - + @@ -77,7 +77,7 @@ - + @@ -87,19 +87,19 @@ - + - + - + @@ -111,7 +111,7 @@ - + @@ -125,7 +125,7 @@ - + diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/server.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/server.xml index 602d79f48ea..33c355eb469 100644 --- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/server.xml +++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/server.xml @@ -38,7 +38,7 @@ - + diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/stax-server.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/stax-server.xml index 16de664dc30..4ff8812597f 100644 --- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/stax-server.xml +++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/secconv/stax-server.xml @@ -38,7 +38,7 @@ - + diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/server.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/server.xml index 5cd91ac40ea..de377723257 100644 --- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/server.xml +++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/server.xml @@ -33,28 +33,28 @@ - + - + - + - + - + @@ -62,13 +62,13 @@ - + - + @@ -80,7 +80,7 @@ - + diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/stax-server.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/stax-server.xml index 767263ff52a..c63e1c24600 100644 --- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/stax-server.xml +++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/ut/stax-server.xml @@ -33,32 +33,32 @@ - + - + - + - + - + @@ -67,14 +67,14 @@ - + - + @@ -87,7 +87,7 @@ - + diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/server.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/server.xml index 261e754c515..6f0b9cb0326 100644 --- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/server.xml +++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/server.xml @@ -38,7 +38,7 @@ - + @@ -46,7 +46,7 @@ - + @@ -54,7 +54,7 @@ - + @@ -62,7 +62,7 @@ - + diff --git a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/stax-server.xml b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/stax-server.xml index 03f317eb288..8809992dd75 100644 --- a/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/stax-server.xml +++ b/systests/ws-security-examples/src/test/resources/org/apache/cxf/systest/wssec/examples/x509/stax-server.xml @@ -38,7 +38,7 @@ - + @@ -47,7 +47,7 @@ - + @@ -56,7 +56,7 @@ - + @@ -65,7 +65,7 @@ - + diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/Server.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionServer.java similarity index 88% rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/Server.java rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionServer.java index 9a0561af2a9..8b63cfca9be 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/Server.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionServer.java @@ -26,14 +26,14 @@ import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class Server extends AbstractBusTestServerBase { +public class ActionServer extends AbstractBusTestServerBase { - public Server() { + public ActionServer() { } protected void run() { - URL busFile = Server.class.getResource("server.xml"); + URL busFile = ActionServer.class.getResource("server.xml"); Bus busLocal = new SpringBusFactory().createBus(busFile); BusFactory.setDefaultBus(busLocal); setBus(busLocal); diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionTest.java index 655bda7da5c..5931869f640 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/ActionTest.java @@ -73,8 +73,8 @@ * A set of tests for WS-Security actions (i.e. the non WS-SecurityPolicy approach). */ public class ActionTest extends AbstractBusClientServerTestBase { - public static final String PORT = allocatePort(Server.class); - public static final String PORT2 = allocatePort(Server.class, 2); + public static final String PORT = allocatePort(ActionServer.class); + public static final String PORT2 = allocatePort(ActionServer.class, 2); private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt"; private static final QName SERVICE_QNAME = new QName(NAMESPACE, "DoubleItService"); @@ -88,13 +88,13 @@ public static void startServers() throws Exception { "Server failed to launch", // run the server in the same process // set this to false to fork - launchServer(Server.class, true) + launchServer(ActionServer.class, true) ); assertTrue( "Server failed to launch", // run the server in the same process // set this to false to fork - launchServer(UTServer.class, true) + launchServer(UTActionServer.class, true) ); } @@ -161,7 +161,7 @@ public void testUsernameToken() throws Exception { // Here the Server is adding the WSS4JInInterceptor in code portQName = new QName(NAMESPACE, "DoubleItUsernameTokenPort3"); port = service.getPort(portQName, DoubleItPortType.class); - updateAddressPort(port, UTServer.PORT); + updateAddressPort(port, UTActionServer.PORT); assertEquals(50, port.doubleIt(25)); diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/UTServer.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/UTActionServer.java similarity index 93% rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/UTServer.java rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/UTActionServer.java index f6ed0631819..bc737736d53 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/UTServer.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/action/UTActionServer.java @@ -31,9 +31,9 @@ /** * Test adding the WSS4JInInterceptor in code. */ -public class UTServer extends AbstractBusTestServerBase { +public class UTActionServer extends AbstractBusTestServerBase { - public static final String PORT = allocatePort(UTServer.class); + public static final String PORT = allocatePort(UTActionServer.class); protected void run() { DoubleItPortTypeImpl implementor = new DoubleItPortTypeImpl(); diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/Server.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/AlgorithmSuiteServer.java similarity index 85% rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/Server.java rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/AlgorithmSuiteServer.java index b4b36fadb3d..5b1a0b064cd 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/Server.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/AlgorithmSuiteServer.java @@ -26,20 +26,20 @@ import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class Server extends AbstractBusTestServerBase { +public class AlgorithmSuiteServer extends AbstractBusTestServerBase { - public Server() { + public AlgorithmSuiteServer() { } protected void run() { - URL busFile = Server.class.getResource("server.xml"); + URL busFile = AlgorithmSuiteServer.class.getResource("server.xml"); Bus busLocal = new SpringBusFactory().createBus(busFile); BusFactory.setDefaultBus(busLocal); setBus(busLocal); try { - new Server(); + new AlgorithmSuiteServer(); } catch (Exception e) { e.printStackTrace(); } diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/StaxServer.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/AlgorithmSuiteStaxServer.java similarity index 84% rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/StaxServer.java rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/AlgorithmSuiteStaxServer.java index 546093a8e6f..d3f63c3a94a 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/StaxServer.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/AlgorithmSuiteStaxServer.java @@ -26,20 +26,20 @@ import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class StaxServer extends AbstractBusTestServerBase { +public class AlgorithmSuiteStaxServer extends AbstractBusTestServerBase { - public StaxServer() { + public AlgorithmSuiteStaxServer() { } protected void run() { - URL busFile = StaxServer.class.getResource("stax-server.xml"); + URL busFile = AlgorithmSuiteStaxServer.class.getResource("stax-server.xml"); Bus busLocal = new SpringBusFactory().createBus(busFile); BusFactory.setDefaultBus(busLocal); setBus(busLocal); try { - new StaxServer(); + new AlgorithmSuiteStaxServer(); } catch (Exception e) { e.printStackTrace(); } diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/AlgorithmSuiteTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/AlgorithmSuiteTest.java index bbfe26311a8..2fbaf29b53c 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/AlgorithmSuiteTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/AlgorithmSuiteTest.java @@ -44,7 +44,7 @@ * clients against the DOM server. */ public class AlgorithmSuiteTest extends AbstractBusClientServerTestBase { - static final String PORT = allocatePort(Server.class); + static final String PORT = allocatePort(AlgorithmSuiteServer.class); private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt"; private static final QName SERVICE_QNAME = new QName(NAMESPACE, "DoubleItService"); @@ -55,7 +55,7 @@ public static void startServers() throws Exception { "Server failed to launch", // run the server in the same process // set this to false to fork - launchServer(Server.class, true) + launchServer(AlgorithmSuiteServer.class, true) ); } diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/StaxAlgorithmSuiteTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/StaxAlgorithmSuiteTest.java index aa5e06090fb..11007d66e0e 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/StaxAlgorithmSuiteTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/algsuite/StaxAlgorithmSuiteTest.java @@ -44,7 +44,7 @@ * clients against the StAX server. */ public class StaxAlgorithmSuiteTest extends AbstractBusClientServerTestBase { - static final String PORT = allocatePort(StaxServer.class); + static final String PORT = allocatePort(AlgorithmSuiteStaxServer.class); private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt"; private static final QName SERVICE_QNAME = new QName(NAMESPACE, "DoubleItService"); @@ -55,7 +55,7 @@ public static void startServers() throws Exception { "Server failed to launch", // run the server in the same process // set this to false to fork - launchServer(StaxServer.class, true) + launchServer(AlgorithmSuiteStaxServer.class, true) ); } diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/basicauth/BasicAuthJAASTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/basicauth/BasicAuthJAASTest.java index bbce3a2bb2b..28adf7d7ba1 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/basicauth/BasicAuthJAASTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/basicauth/BasicAuthJAASTest.java @@ -41,7 +41,7 @@ * expected next interceptor */ public class BasicAuthJAASTest extends AbstractBusClientServerTestBase { - static final String PORT = allocatePort(Server.class); + static final String PORT = allocatePort(BasicAuthServer.class); private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt"; private static final QName SERVICE_QNAME = new QName(NAMESPACE, "DoubleItService"); diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/basicauth/Server.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/basicauth/BasicAuthServer.java similarity index 86% rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/basicauth/Server.java rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/basicauth/BasicAuthServer.java index eb0053fb85d..0957b7f3a43 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/basicauth/Server.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/basicauth/BasicAuthServer.java @@ -26,20 +26,20 @@ import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class Server extends AbstractBusTestServerBase { +public class BasicAuthServer extends AbstractBusTestServerBase { - public Server() { + public BasicAuthServer() { } protected void run() { - URL busFile = Server.class.getResource("server.xml"); + URL busFile = BasicAuthServer.class.getResource("server.xml"); Bus busLocal = new SpringBusFactory().createBus(busFile); BusFactory.setDefaultBus(busLocal); setBus(busLocal); try { - new Server(); + new BasicAuthServer(); } catch (Exception e) { e.printStackTrace(); } diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/basicauth/BasicAuthTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/basicauth/BasicAuthTest.java index 12e53abec8e..41f4957dca9 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/basicauth/BasicAuthTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/basicauth/BasicAuthTest.java @@ -46,7 +46,7 @@ * the WS-SecurityPolicy enforcement of whether the credentials are present or not. */ public class BasicAuthTest extends AbstractBusClientServerTestBase { - static final String PORT = allocatePort(Server.class); + static final String PORT = allocatePort(BasicAuthServer.class); private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt"; private static final QName SERVICE_QNAME = new QName(NAMESPACE, "DoubleItService"); @@ -57,7 +57,7 @@ public static void startServers() throws Exception { "Server failed to launch", // run the server in the same process // set this to false to fork - launchServer(Server.class, true) + launchServer(BasicAuthServer.class, true) ); } diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/BindingPropertiesTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/BindingPropertiesTest.java index 595c3b7d206..101f528d0a2 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/BindingPropertiesTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/BindingPropertiesTest.java @@ -47,8 +47,8 @@ */ @RunWith(value = org.junit.runners.Parameterized.class) public class BindingPropertiesTest extends AbstractBusClientServerTestBase { - static final String PORT = allocatePort(Server.class); - static final String STAX_PORT = allocatePort(StaxServer.class); + static final String PORT = allocatePort(BindingServer.class); + static final String STAX_PORT = allocatePort(BindingStaxServer.class); private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt"; private static final QName SERVICE_QNAME = new QName(NAMESPACE, "DoubleItService"); @@ -65,13 +65,13 @@ public static void startServers() throws Exception { "Server failed to launch", // run the server in the same process // set this to false to fork - launchServer(Server.class, true) + launchServer(BindingServer.class, true) ); assertTrue( "Server failed to launch", // run the server in the same process // set this to false to fork - launchServer(StaxServer.class, true) + launchServer(BindingStaxServer.class, true) ); } diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/Server.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/BindingServer.java similarity index 87% rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/Server.java rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/BindingServer.java index 4aaa7b1e190..fb212697970 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/Server.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/BindingServer.java @@ -26,20 +26,20 @@ import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class Server extends AbstractBusTestServerBase { +public class BindingServer extends AbstractBusTestServerBase { - public Server() { + public BindingServer() { } protected void run() { - URL busFile = Server.class.getResource("server.xml"); + URL busFile = BindingServer.class.getResource("server.xml"); Bus busLocal = new SpringBusFactory().createBus(busFile); BusFactory.setDefaultBus(busLocal); setBus(busLocal); try { - new Server(); + new BindingServer(); } catch (Exception e) { e.printStackTrace(); } diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/StaxServer.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/BindingStaxServer.java similarity index 85% rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/StaxServer.java rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/BindingStaxServer.java index 78238b70d1a..bc6e8ad04f6 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/StaxServer.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/bindings/BindingStaxServer.java @@ -26,20 +26,20 @@ import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class StaxServer extends AbstractBusTestServerBase { +public class BindingStaxServer extends AbstractBusTestServerBase { - public StaxServer() { + public BindingStaxServer() { } protected void run() { - URL busFile = StaxServer.class.getResource("stax-server.xml"); + URL busFile = BindingStaxServer.class.getResource("stax-server.xml"); Bus busLocal = new SpringBusFactory().createBus(busFile); BusFactory.setDefaultBus(busLocal); setBus(busLocal); try { - new StaxServer(); + new BindingStaxServer(); } catch (Exception e) { e.printStackTrace(); } diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/cache/Server.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/cache/CachingServer.java similarity index 88% rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/cache/Server.java rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/cache/CachingServer.java index 07ce94c8e2c..fe38223bcd3 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/cache/Server.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/cache/CachingServer.java @@ -26,14 +26,14 @@ import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class Server extends AbstractBusTestServerBase { +public class CachingServer extends AbstractBusTestServerBase { - public Server() { + public CachingServer() { } protected void run() { - URL busFile = Server.class.getResource("server.xml"); + URL busFile = CachingServer.class.getResource("server.xml"); Bus busLocal = new SpringBusFactory().createBus(busFile); BusFactory.setDefaultBus(busLocal); setBus(busLocal); diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/cache/CachingTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/cache/CachingTest.java index fbe3cbc640c..6ac648682be 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/cache/CachingTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/cache/CachingTest.java @@ -55,7 +55,7 @@ */ @RunWith(value = org.junit.runners.Parameterized.class) public class CachingTest extends AbstractBusClientServerTestBase { - public static final String PORT = allocatePort(Server.class); + public static final String PORT = allocatePort(CachingServer.class); private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt"; private static final QName SERVICE_QNAME = new QName(NAMESPACE, "DoubleItService"); @@ -79,7 +79,7 @@ public static void startServers() throws Exception { "Server failed to launch", // run the server in the same process // set this to false to fork - launchServer(Server.class, true) + launchServer(CachingServer.class, true) ); } diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/CryptoCoverageCheckerTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/CryptoCoverageCheckerTest.java index 3ba3cf51428..22a5b86595f 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/CryptoCoverageCheckerTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/CryptoCoverageCheckerTest.java @@ -53,8 +53,8 @@ */ @RunWith(value = org.junit.runners.Parameterized.class) public class CryptoCoverageCheckerTest extends AbstractBusClientServerTestBase { - public static final String PORT = allocatePort(Server.class); - public static final String STAX_PORT = allocatePort(StaxServer.class); + public static final String PORT = allocatePort(CryptoCoverageServer.class); + public static final String STAX_PORT = allocatePort(CryptoCoverageStaxServer.class); private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt"; private static final QName SERVICE_QNAME = new QName(NAMESPACE, "DoubleItService"); @@ -77,13 +77,13 @@ public static void startServers() throws Exception { "Server failed to launch", // run the server in the same process // set this to false to fork - launchServer(Server.class, true) + launchServer(CryptoCoverageServer.class, true) ); assertTrue( "Server failed to launch", // run the server in the same process // set this to false to fork - launchServer(StaxServer.class, true) + launchServer(CryptoCoverageStaxServer.class, true) ); } diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/Server.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/CryptoCoverageServer.java similarity index 87% rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/Server.java rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/CryptoCoverageServer.java index 9a31dcc3d11..d95082d90db 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/Server.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/CryptoCoverageServer.java @@ -26,14 +26,14 @@ import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class Server extends AbstractBusTestServerBase { +public class CryptoCoverageServer extends AbstractBusTestServerBase { - public Server() { + public CryptoCoverageServer() { } protected void run() { - URL busFile = Server.class.getResource("server.xml"); + URL busFile = CryptoCoverageServer.class.getResource("server.xml"); Bus busLocal = new SpringBusFactory().createBus(busFile); BusFactory.setDefaultBus(busLocal); setBus(busLocal); diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/StaxServer.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/CryptoCoverageStaxServer.java similarity index 86% rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/StaxServer.java rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/CryptoCoverageStaxServer.java index 286d682ccb6..bd6299bb88a 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/StaxServer.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/coverage_checker/CryptoCoverageStaxServer.java @@ -26,14 +26,14 @@ import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class StaxServer extends AbstractBusTestServerBase { +public class CryptoCoverageStaxServer extends AbstractBusTestServerBase { - public StaxServer() { + public CryptoCoverageStaxServer() { } protected void run() { - URL busFile = StaxServer.class.getResource("stax-server.xml"); + URL busFile = CryptoCoverageStaxServer.class.getResource("stax-server.xml"); Bus busLocal = new SpringBusFactory().createBus(busFile); BusFactory.setDefaultBus(busLocal); setBus(busLocal); diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/Server.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultServer.java similarity index 87% rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/Server.java rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultServer.java index 07010fe1e99..6ba9dcd3a5f 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/Server.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultServer.java @@ -26,20 +26,20 @@ import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class Server extends AbstractBusTestServerBase { +public class FaultServer extends AbstractBusTestServerBase { - public Server() { + public FaultServer() { } protected void run() { - URL busFile = Server.class.getResource("server.xml"); + URL busFile = FaultServer.class.getResource("server.xml"); Bus busLocal = new SpringBusFactory().createBus(busFile); BusFactory.setDefaultBus(busLocal); setBus(busLocal); try { - new Server(); + new FaultServer(); } catch (Exception e) { e.printStackTrace(); } diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java index 66316a5f5e9..9177c950738 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/fault/FaultTest.java @@ -54,7 +54,7 @@ * A set of tests for (signing and encrypting) SOAP Faults. */ public class FaultTest extends AbstractBusClientServerTestBase { - static final String PORT = allocatePort(Server.class); + static final String PORT = allocatePort(FaultServer.class); private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt"; private static final QName SERVICE_QNAME = new QName(NAMESPACE, "DoubleItService"); @@ -65,7 +65,7 @@ public static void startServers() throws Exception { "Server failed to launch", // run the server in the same process // set this to false to fork - launchServer(Server.class, true) + launchServer(FaultServer.class, true) ); } diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/GCMTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/GCMTest.java index 84c676031ac..f9fb789cfb9 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/GCMTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/GCMTest.java @@ -47,8 +47,8 @@ */ @RunWith(value = org.junit.runners.Parameterized.class) public class GCMTest extends AbstractBusClientServerTestBase { - static final String PORT = allocatePort(Server.class); - static final String STAX_PORT = allocatePort(StaxServer.class); + static final String PORT = allocatePort(GcmServer.class); + static final String STAX_PORT = allocatePort(GcmStaxServer.class); static final String MGF_PORT = allocatePort(MGFServer.class); static final String MGF_STAX_PORT = allocatePort(MGFStaxServer.class); @@ -70,13 +70,13 @@ public static void startServers() throws Exception { "Server failed to launch", // run the server in the same process // set this to false to fork - launchServer(Server.class, true) + launchServer(GcmServer.class, true) ); assertTrue( "Server failed to launch", // run the server in the same process // set this to false to fork - launchServer(StaxServer.class, true) + launchServer(GcmStaxServer.class, true) ); assertTrue( "Server failed to launch", diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/Server.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/GcmServer.java similarity index 88% rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/Server.java rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/GcmServer.java index f8f9c46528d..d418848ca1f 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/Server.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/GcmServer.java @@ -26,20 +26,20 @@ import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class Server extends AbstractBusTestServerBase { +public class GcmServer extends AbstractBusTestServerBase { - public Server() { + public GcmServer() { } protected void run() { - URL busFile = Server.class.getResource("server.xml"); + URL busFile = GcmServer.class.getResource("server.xml"); Bus busLocal = new SpringBusFactory().createBus(busFile); BusFactory.setDefaultBus(busLocal); setBus(busLocal); try { - new Server(); + new GcmServer(); } catch (Exception e) { e.printStackTrace(); } diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/StaxServer.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/GcmStaxServer.java similarity index 86% rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/StaxServer.java rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/GcmStaxServer.java index 666fce1dc60..093e492ab39 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/StaxServer.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/gcm/GcmStaxServer.java @@ -26,20 +26,20 @@ import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class StaxServer extends AbstractBusTestServerBase { +public class GcmStaxServer extends AbstractBusTestServerBase { - public StaxServer() { + public GcmStaxServer() { } protected void run() { - URL busFile = StaxServer.class.getResource("stax-server.xml"); + URL busFile = GcmStaxServer.class.getResource("stax-server.xml"); Bus busLocal = new SpringBusFactory().createBus(busFile); BusFactory.setDefaultBus(busLocal); setBus(busLocal); try { - new StaxServer(); + new GcmStaxServer(); } catch (Exception e) { e.printStackTrace(); } diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/httpget/Server.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/httpget/HTTPGetServer.java similarity index 88% rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/httpget/Server.java rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/httpget/HTTPGetServer.java index 4c83c3abb20..2919944e232 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/httpget/Server.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/httpget/HTTPGetServer.java @@ -26,14 +26,14 @@ import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class Server extends AbstractBusTestServerBase { +public class HTTPGetServer extends AbstractBusTestServerBase { - public Server() { + public HTTPGetServer() { } protected void run() { - URL busFile = Server.class.getResource("server.xml"); + URL busFile = HTTPGetServer.class.getResource("server.xml"); Bus busLocal = new SpringBusFactory().createBus(busFile); BusFactory.setDefaultBus(busLocal); setBus(busLocal); diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/httpget/HTTPGetTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/httpget/HTTPGetTest.java index 456a6bf6c62..98a8f4c5a16 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/httpget/HTTPGetTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/httpget/HTTPGetTest.java @@ -46,7 +46,7 @@ * A set of tests for CXF-4629. */ public class HTTPGetTest extends AbstractBusClientServerTestBase { - public static final String PORT = allocatePort(Server.class); + public static final String PORT = allocatePort(HTTPGetServer.class); private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt"; private static final QName SERVICE_QNAME = new QName(NAMESPACE, "DoubleItService"); @@ -58,7 +58,7 @@ public static void startServers() throws Exception { "Server failed to launch", // run the server in the same process // set this to false to fork - launchServer(Server.class, true) + launchServer(HTTPGetServer.class, true) ); } diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/Server.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/HttpsServer.java similarity index 87% rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/Server.java rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/HttpsServer.java index ca2b5b8b0c4..09bdce15000 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/Server.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/HttpsServer.java @@ -26,20 +26,20 @@ import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class Server extends AbstractBusTestServerBase { +public class HttpsServer extends AbstractBusTestServerBase { - public Server() { + public HttpsServer() { } protected void run() { - URL busFile = Server.class.getResource("server.xml"); + URL busFile = HttpsServer.class.getResource("server.xml"); Bus busLocal = new SpringBusFactory().createBus(busFile); BusFactory.setDefaultBus(busLocal); setBus(busLocal); try { - new Server(); + new HttpsServer(); } catch (Exception e) { e.printStackTrace(); } diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/StaxServer.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/HttpsStaxServer.java similarity index 86% rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/StaxServer.java rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/HttpsStaxServer.java index eed164fbd62..e5ef6a8585e 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/StaxServer.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/HttpsStaxServer.java @@ -26,20 +26,20 @@ import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class StaxServer extends AbstractBusTestServerBase { +public class HttpsStaxServer extends AbstractBusTestServerBase { - public StaxServer() { + public HttpsStaxServer() { } protected void run() { - URL busFile = StaxServer.class.getResource("stax-server.xml"); + URL busFile = HttpsStaxServer.class.getResource("stax-server.xml"); Bus busLocal = new SpringBusFactory().createBus(busFile); BusFactory.setDefaultBus(busLocal); setBus(busLocal); try { - new StaxServer(); + new HttpsStaxServer(); } catch (Exception e) { e.printStackTrace(); } diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/HttpsTokenTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/HttpsTokenTest.java index b1d6ac8cdfe..e69329752d2 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/HttpsTokenTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/https/HttpsTokenTest.java @@ -47,8 +47,8 @@ */ @RunWith(value = org.junit.runners.Parameterized.class) public class HttpsTokenTest extends AbstractBusClientServerTestBase { - static final String PORT = allocatePort(Server.class); - static final String STAX_PORT = allocatePort(StaxServer.class); + static final String PORT = allocatePort(HttpsServer.class); + static final String STAX_PORT = allocatePort(HttpsStaxServer.class); private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt"; private static final QName SERVICE_QNAME = new QName(NAMESPACE, "DoubleItService"); @@ -65,13 +65,13 @@ public static void startServers() throws Exception { "Server failed to launch", // run the server in the same process // set this to false to fork - launchServer(Server.class, true) + launchServer(HttpsServer.class, true) ); assertTrue( "Server failed to launch", // run the server in the same process // set this to false to fork - launchServer(StaxServer.class, true) + launchServer(HttpsStaxServer.class, true) ); } diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/mtom/MTOMSecurityTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/mtom/MTOMSecurityTest.java index d125c398cd0..d611e866464 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/mtom/MTOMSecurityTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/mtom/MTOMSecurityTest.java @@ -45,8 +45,8 @@ * A set of secured MTOM */ public class MTOMSecurityTest extends AbstractBusClientServerTestBase { - public static final String PORT = allocatePort(Server.class); - public static final String STAX_PORT = allocatePort(StaxServer.class); + public static final String PORT = allocatePort(MTOMServer.class); + public static final String STAX_PORT = allocatePort(MTOMStaxServer.class); private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt"; private static final QName SERVICE_QNAME = new QName(NAMESPACE, "DoubleItService"); @@ -57,13 +57,13 @@ public static void startServers() throws Exception { "Server failed to launch", // run the server in the same process // set this to false to fork - launchServer(Server.class, true) + launchServer(MTOMServer.class, true) ); assertTrue( "Server failed to launch", // run the server in the same process // set this to false to fork - launchServer(StaxServer.class, true) + launchServer(MTOMStaxServer.class, true) ); } diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/mtom/Server.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/mtom/MTOMServer.java similarity index 88% rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/mtom/Server.java rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/mtom/MTOMServer.java index b041bb57c3e..1e70fb2d08c 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/mtom/Server.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/mtom/MTOMServer.java @@ -26,14 +26,14 @@ import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class Server extends AbstractBusTestServerBase { +public class MTOMServer extends AbstractBusTestServerBase { - public Server() { + public MTOMServer() { } protected void run() { - URL busFile = Server.class.getResource("server.xml"); + URL busFile = MTOMServer.class.getResource("server.xml"); Bus busLocal = new SpringBusFactory().createBus(busFile); BusFactory.setDefaultBus(busLocal); setBus(busLocal); diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/mtom/StaxServer.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/mtom/MTOMStaxServer.java similarity index 87% rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/mtom/StaxServer.java rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/mtom/MTOMStaxServer.java index 83c6dfb6e5e..921f295cd86 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/mtom/StaxServer.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/mtom/MTOMStaxServer.java @@ -26,14 +26,14 @@ import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class StaxServer extends AbstractBusTestServerBase { +public class MTOMStaxServer extends AbstractBusTestServerBase { - public StaxServer() { + public MTOMStaxServer() { } protected void run() { - URL busFile = StaxServer.class.getResource("stax-server.xml"); + URL busFile = MTOMStaxServer.class.getResource("stax-server.xml"); Bus busLocal = new SpringBusFactory().createBus(busFile); BusFactory.setDefaultBus(busLocal); setBus(busLocal); diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/Server.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/PartsServer.java similarity index 87% rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/Server.java rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/PartsServer.java index 9fd6be15691..d98704c8a9d 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/Server.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/PartsServer.java @@ -26,20 +26,20 @@ import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class Server extends AbstractBusTestServerBase { +public class PartsServer extends AbstractBusTestServerBase { - public Server() { + public PartsServer() { } protected void run() { - URL busFile = Server.class.getResource("server.xml"); + URL busFile = PartsServer.class.getResource("server.xml"); Bus busLocal = new SpringBusFactory().createBus(busFile); BusFactory.setDefaultBus(busLocal); setBus(busLocal); try { - new Server(); + new PartsServer(); } catch (Exception e) { e.printStackTrace(); } diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/StaxServer.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/PartsStaxServer.java similarity index 86% rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/StaxServer.java rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/PartsStaxServer.java index 773da0acc5f..07f8c05594d 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/StaxServer.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/PartsStaxServer.java @@ -26,20 +26,20 @@ import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class StaxServer extends AbstractBusTestServerBase { +public class PartsStaxServer extends AbstractBusTestServerBase { - public StaxServer() { + public PartsStaxServer() { } protected void run() { - URL busFile = StaxServer.class.getResource("stax-server.xml"); + URL busFile = PartsStaxServer.class.getResource("stax-server.xml"); Bus busLocal = new SpringBusFactory().createBus(busFile); BusFactory.setDefaultBus(busLocal); setBus(busLocal); try { - new StaxServer(); + new PartsStaxServer(); } catch (Exception e) { e.printStackTrace(); } diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/PartsTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/PartsTest.java index b8ad1ddc3b4..c13a8b4c264 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/PartsTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/parts/PartsTest.java @@ -51,8 +51,8 @@ */ @RunWith(value = org.junit.runners.Parameterized.class) public class PartsTest extends AbstractBusClientServerTestBase { - static final String PORT = allocatePort(Server.class); - static final String STAX_PORT = allocatePort(StaxServer.class); + static final String PORT = allocatePort(PartsServer.class); + static final String STAX_PORT = allocatePort(PartsStaxServer.class); private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt"; private static final QName SERVICE_QNAME = new QName(NAMESPACE, "DoubleItService"); @@ -69,13 +69,13 @@ public static void startServers() throws Exception { "Server failed to launch", // run the server in the same process // set this to false to fork - launchServer(Server.class, true) + launchServer(PartsServer.class, true) ); assertTrue( "Server failed to launch", // run the server in the same process // set this to false to fork - launchServer(StaxServer.class, true) + launchServer(PartsStaxServer.class, true) ); } diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/password/PasswordPropertiesTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/password/PasswordPropertiesTest.java index c4e5c8f4a28..846419a95ad 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/password/PasswordPropertiesTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/password/PasswordPropertiesTest.java @@ -49,7 +49,7 @@ */ @RunWith(value = org.junit.runners.Parameterized.class) public class PasswordPropertiesTest extends AbstractBusClientServerTestBase { - public static final String PORT = allocatePort(Server.class); + public static final String PORT = allocatePort(PasswordServer.class); private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt"; private static final QName SERVICE_QNAME = new QName(NAMESPACE, "DoubleItService"); @@ -66,7 +66,7 @@ public static void startServers() throws Exception { "Server failed to launch", // run the server in the same process // set this to false to fork - launchServer(Server.class, true) + launchServer(PasswordServer.class, true) ); } diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/password/Server.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/password/PasswordServer.java similarity index 88% rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/password/Server.java rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/password/PasswordServer.java index a403de16866..d21ccc6d010 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/password/Server.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/password/PasswordServer.java @@ -26,14 +26,14 @@ import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class Server extends AbstractBusTestServerBase { +public class PasswordServer extends AbstractBusTestServerBase { - public Server() { + public PasswordServer() { } protected void run() { - URL busFile = Server.class.getResource("server.xml"); + URL busFile = PasswordServer.class.getResource("server.xml"); Bus busLocal = new SpringBusFactory().createBus(busFile); BusFactory.setDefaultBus(busLocal); setBus(busLocal); diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/Server.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/PolicyAlternativeServer.java similarity index 84% rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/Server.java rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/PolicyAlternativeServer.java index 2c94e47b342..41254a96cc4 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/Server.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/PolicyAlternativeServer.java @@ -26,20 +26,20 @@ import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class Server extends AbstractBusTestServerBase { +public class PolicyAlternativeServer extends AbstractBusTestServerBase { - public Server() { + public PolicyAlternativeServer() { } protected void run() { - URL busFile = Server.class.getResource("server.xml"); + URL busFile = PolicyAlternativeServer.class.getResource("server.xml"); Bus busLocal = new SpringBusFactory().createBus(busFile); BusFactory.setDefaultBus(busLocal); setBus(busLocal); try { - new Server(); + new PolicyAlternativeServer(); } catch (Exception e) { e.printStackTrace(); } diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/PolicyAlternativeTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/PolicyAlternativeTest.java index 4cecca20676..7bf4da6e9cf 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/PolicyAlternativeTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/PolicyAlternativeTest.java @@ -48,8 +48,8 @@ */ @RunWith(value = org.junit.runners.Parameterized.class) public class PolicyAlternativeTest extends AbstractBusClientServerTestBase { - static final String PORT = allocatePort(Server.class); - static final String PORT2 = allocatePort(Server.class, 2); + static final String PORT = allocatePort(PolicyAlternativeServer.class); + static final String PORT2 = allocatePort(PolicyAlternativeServer.class, 2); private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt"; private static final QName SERVICE_QNAME = new QName(NAMESPACE, "DoubleItService"); @@ -66,7 +66,7 @@ public static void startServers() throws Exception { "Server failed to launch", // run the server in the same process // set this to false to fork - launchServer(Server.class, true) + launchServer(PolicyAlternativeServer.class, true) ); } diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/handler/PolicyHandlerFaultResponseTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/handler/PolicyHandlerFaultResponseTest.java index e7d3c71123c..f41f4237b9e 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/handler/PolicyHandlerFaultResponseTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/handler/PolicyHandlerFaultResponseTest.java @@ -37,13 +37,13 @@ import static org.junit.Assert.fail; public class PolicyHandlerFaultResponseTest extends AbstractBusClientServerTestBase { - public static final String PORT = Server.PORT; + public static final String PORT = PolicyHandlerServer.PORT; private final QName serviceName = new QName("http://handler.policy.ws.systest.cxf.apache.org/", "HelloPolicyService"); @BeforeClass public static void startServers() throws Exception { - assertTrue("server did not launch correctly", launchServer(Server.class)); + assertTrue("server did not launch correctly", launchServer(PolicyHandlerServer.class)); } diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/handler/Server.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/handler/PolicyHandlerServer.java similarity index 87% rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/handler/Server.java rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/handler/PolicyHandlerServer.java index 5f8457c9419..4c3e4d3fb32 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/handler/Server.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/handler/PolicyHandlerServer.java @@ -22,8 +22,8 @@ import jakarta.xml.ws.Endpoint; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class Server extends AbstractBusTestServerBase { - public static final String PORT = allocatePort(Server.class); +public class PolicyHandlerServer extends AbstractBusTestServerBase { + public static final String PORT = allocatePort(PolicyHandlerServer.class); protected void run() { Object implementor = new HelloServiceImpl(); String address = "http://localhost:" + PORT + "/policytest"; @@ -32,7 +32,7 @@ protected void run() { public static void main(String[] args) { try { - Server s = new Server(); + PolicyHandlerServer s = new PolicyHandlerServer(); s.start(); } catch (Exception ex) { ex.printStackTrace(); diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/operation/Server.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/operation/PolicyOperationServer.java similarity index 85% rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/operation/Server.java rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/operation/PolicyOperationServer.java index ff61ef6ef78..e40cec31212 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/operation/Server.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/operation/PolicyOperationServer.java @@ -26,20 +26,20 @@ import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class Server extends AbstractBusTestServerBase { +public class PolicyOperationServer extends AbstractBusTestServerBase { - public Server() { + public PolicyOperationServer() { } protected void run() { - URL busFile = Server.class.getResource("server.xml"); + URL busFile = PolicyOperationServer.class.getResource("server.xml"); Bus busLocal = new SpringBusFactory().createBus(busFile); BusFactory.setDefaultBus(busLocal); setBus(busLocal); try { - new Server(); + new PolicyOperationServer(); } catch (Exception e) { e.printStackTrace(); } diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/operation/PolicyOperationTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/operation/PolicyOperationTest.java index c7c112a3fcc..4d68b2fafb5 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/operation/PolicyOperationTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/policy/operation/PolicyOperationTest.java @@ -41,7 +41,7 @@ * no-security case passes through without any policy errors. */ public class PolicyOperationTest extends AbstractBusClientServerTestBase { - static final String PORT = allocatePort(Server.class); + static final String PORT = allocatePort(PolicyOperationServer.class); private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt"; private static final QName SERVICE_QNAME = new QName(NAMESPACE, "DoubleItService"); @@ -52,7 +52,7 @@ public static void startServers() throws Exception { "Server failed to launch", // run the server in the same process // set this to false to fork - launchServer(Server.class, true) + launchServer(PolicyOperationServer.class, true) ); } diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/StaxServer.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenServer.java similarity index 87% rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/StaxServer.java rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenServer.java index 09459d4eb7b..9ef51060977 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/StaxServer.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenServer.java @@ -26,20 +26,20 @@ import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class StaxServer extends AbstractBusTestServerBase { +public class SamlTokenServer extends AbstractBusTestServerBase { - public StaxServer() { + public SamlTokenServer() { } protected void run() { - URL busFile = StaxServer.class.getResource("stax-server.xml"); + URL busFile = SamlTokenServer.class.getResource("server.xml"); Bus busLocal = new SpringBusFactory().createBus(busFile); BusFactory.setDefaultBus(busLocal); setBus(busLocal); try { - new StaxServer(); + new SamlTokenServer(); } catch (Exception e) { e.printStackTrace(); } diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/Server.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenStaxServer.java similarity index 85% rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/Server.java rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenStaxServer.java index 888e32773c6..6ec05c205ef 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/Server.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenStaxServer.java @@ -26,20 +26,20 @@ import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class Server extends AbstractBusTestServerBase { +public class SamlTokenStaxServer extends AbstractBusTestServerBase { - public Server() { + public SamlTokenStaxServer() { } protected void run() { - URL busFile = Server.class.getResource("server.xml"); + URL busFile = SamlTokenStaxServer.class.getResource("stax-server.xml"); Bus busLocal = new SpringBusFactory().createBus(busFile); BusFactory.setDefaultBus(busLocal); setBus(busLocal); try { - new Server(); + new SamlTokenStaxServer(); } catch (Exception e) { e.printStackTrace(); } diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java index 7a96347c968..f4892e8ec3c 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/SamlTokenTest.java @@ -64,10 +64,10 @@ */ @RunWith(value = org.junit.runners.Parameterized.class) public class SamlTokenTest extends AbstractBusClientServerTestBase { - static final String PORT = allocatePort(Server.class); - static final String STAX_PORT = allocatePort(StaxServer.class); - static final String PORT2 = allocatePort(Server.class, 2); - static final String STAX_PORT2 = allocatePort(StaxServer.class, 2); + static final String PORT = allocatePort(SamlTokenServer.class); + static final String STAX_PORT = allocatePort(SamlTokenStaxServer.class); + static final String PORT2 = allocatePort(SamlTokenServer.class, 2); + static final String STAX_PORT2 = allocatePort(SamlTokenStaxServer.class, 2); private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt"; private static final QName SERVICE_QNAME = new QName(NAMESPACE, "DoubleItService"); @@ -84,13 +84,13 @@ public static void startServers() throws Exception { "Server failed to launch", // run the server in the same process // set this to false to fork - launchServer(Server.class, true) + launchServer(SamlTokenServer.class, true) ); assertTrue( "Server failed to launch", // run the server in the same process // set this to false to fork - launchServer(StaxServer.class, true) + launchServer(SamlTokenStaxServer.class, true) ); } diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/subjectconf/Server.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/subjectconf/SamlSubjectConfServer.java similarity index 85% rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/subjectconf/Server.java rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/subjectconf/SamlSubjectConfServer.java index c8d432c5372..1e568d1ceae 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/subjectconf/Server.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/subjectconf/SamlSubjectConfServer.java @@ -26,20 +26,20 @@ import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class Server extends AbstractBusTestServerBase { +public class SamlSubjectConfServer extends AbstractBusTestServerBase { - public Server() { + public SamlSubjectConfServer() { } protected void run() { - URL busFile = Server.class.getResource("server.xml"); + URL busFile = SamlSubjectConfServer.class.getResource("server.xml"); Bus busLocal = new SpringBusFactory().createBus(busFile); BusFactory.setDefaultBus(busLocal); setBus(busLocal); try { - new Server(); + new SamlSubjectConfServer(); } catch (Exception e) { e.printStackTrace(); } diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/subjectconf/StaxServer.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/subjectconf/SamlSubjectConfStaxServer.java similarity index 84% rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/subjectconf/StaxServer.java rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/subjectconf/SamlSubjectConfStaxServer.java index 4a2ea83ed0f..b3254914f0c 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/subjectconf/StaxServer.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/subjectconf/SamlSubjectConfStaxServer.java @@ -26,20 +26,20 @@ import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class StaxServer extends AbstractBusTestServerBase { +public class SamlSubjectConfStaxServer extends AbstractBusTestServerBase { - public StaxServer() { + public SamlSubjectConfStaxServer() { } protected void run() { - URL busFile = StaxServer.class.getResource("stax-server.xml"); + URL busFile = SamlSubjectConfStaxServer.class.getResource("stax-server.xml"); Bus busLocal = new SpringBusFactory().createBus(busFile); BusFactory.setDefaultBus(busLocal); setBus(busLocal); try { - new StaxServer(); + new SamlSubjectConfStaxServer(); } catch (Exception e) { e.printStackTrace(); } diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/subjectconf/SamlSubjectConfTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/subjectconf/SamlSubjectConfTest.java index 2db79254602..abb2978f083 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/subjectconf/SamlSubjectConfTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/saml/subjectconf/SamlSubjectConfTest.java @@ -50,8 +50,8 @@ */ @RunWith(value = org.junit.runners.Parameterized.class) public class SamlSubjectConfTest extends AbstractBusClientServerTestBase { - static final String PORT = allocatePort(Server.class); - static final String STAX_PORT = allocatePort(StaxServer.class); + static final String PORT = allocatePort(SamlSubjectConfServer.class); + static final String STAX_PORT = allocatePort(SamlSubjectConfStaxServer.class); private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt"; private static final QName SERVICE_QNAME = new QName(NAMESPACE, "DoubleItService"); @@ -68,13 +68,13 @@ public static void startServers() throws Exception { "Server failed to launch", // run the server in the same process // set this to false to fork - launchServer(Server.class, true) + launchServer(SamlSubjectConfServer.class, true) ); assertTrue( "Server failed to launch", // run the server in the same process // set this to false to fork - launchServer(StaxServer.class, true) + launchServer(SamlSubjectConfStaxServer.class, true) ); } diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/WSSecurityClientTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/WSSecurityClientTest.java index 016b798b8d7..016787f605a 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/WSSecurityClientTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/WSSecurityClientTest.java @@ -73,8 +73,8 @@ */ @RunWith(value = org.junit.runners.Parameterized.class) public class WSSecurityClientTest extends AbstractBusClientServerTestBase { - public static final String PORT = allocatePort(Server.class); - public static final String STAX_PORT = allocatePort(StaxServer.class); + public static final String PORT = allocatePort(WSSecurityServer.class); + public static final String STAX_PORT = allocatePort(WSSecurityStaxServer.class); public static final String DEC_PORT = allocatePort(WSSecurityClientTest.class); private static final java.net.URL WSDL_LOC; @@ -120,13 +120,13 @@ public static void startServers() throws Exception { "Server failed to launch", // run the server in the same process // set this to false to fork - launchServer(Server.class, true) + launchServer(WSSecurityServer.class, true) ); assertTrue( "Server failed to launch", // run the server in the same process // set this to false to fork - launchServer(StaxServer.class, true) + launchServer(WSSecurityStaxServer.class, true) ); createStaticBus(); } diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/Server.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/WSSecurityServer.java similarity index 88% rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/Server.java rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/WSSecurityServer.java index dae642e3ba6..2067691026f 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/Server.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/WSSecurityServer.java @@ -24,8 +24,8 @@ import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class Server extends AbstractBusTestServerBase { - public static final String PORT = allocatePort(Server.class); +public class WSSecurityServer extends AbstractBusTestServerBase { + public static final String PORT = allocatePort(WSSecurityServer.class); protected void run() { SpringBusFactory factory = new SpringBusFactory(); @@ -38,7 +38,7 @@ protected void run() { public static void main(String[] args) { try { - Server s = new Server(); + WSSecurityServer s = new WSSecurityServer(); s.start(); } catch (Exception ex) { ex.printStackTrace(); diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/StaxServer.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/WSSecurityStaxServer.java similarity index 87% rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/StaxServer.java rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/WSSecurityStaxServer.java index 7365e77e8ec..379a35efd6c 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/StaxServer.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/WSSecurityStaxServer.java @@ -24,8 +24,8 @@ import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class StaxServer extends AbstractBusTestServerBase { - public static final String PORT = allocatePort(StaxServer.class); +public class WSSecurityStaxServer extends AbstractBusTestServerBase { + public static final String PORT = allocatePort(WSSecurityStaxServer.class); protected void run() { SpringBusFactory factory = new SpringBusFactory(); @@ -38,7 +38,7 @@ protected void run() { public static void main(String[] args) { try { - StaxServer s = new StaxServer(); + WSSecurityStaxServer s = new WSSecurityStaxServer(); s.start(); } catch (Exception ex) { ex.printStackTrace(); diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/handler/Server.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/handler/WSSecServer.java similarity index 89% rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/handler/Server.java rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/handler/WSSecServer.java index 17f234eddbe..3589a4c88b0 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/handler/Server.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/handler/WSSecServer.java @@ -23,8 +23,8 @@ import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class Server extends AbstractBusTestServerBase { - public static final String PORT = allocatePort(Server.class); +public class WSSecServer extends AbstractBusTestServerBase { + public static final String PORT = allocatePort(WSSecServer.class); protected void run() { SpringBusFactory factory = new SpringBusFactory(); @@ -35,7 +35,7 @@ protected void run() { public static void main(String[] args) { try { - Server s = new Server(); + WSSecServer s = new WSSecServer(); s.start(); } catch (Exception ex) { ex.printStackTrace(); diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/handler/WSSecTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/handler/WSSecTest.java index 064617ef69e..1c80f181a2d 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/handler/WSSecTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/security/handler/WSSecTest.java @@ -35,11 +35,11 @@ import static org.junit.Assert.assertTrue; public class WSSecTest extends AbstractBusClientServerTestBase { - public static final String PORT = allocatePort(Server.class); + public static final String PORT = allocatePort(WSSecServer.class); @BeforeClass public static void startServers() throws Exception { - assertTrue("Server failed to launch", launchServer(Server.class)); + assertTrue("Server failed to launch", launchServer(WSSecServer.class)); } @org.junit.AfterClass diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/PolicyServer.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/SWAActionServer.java similarity index 88% rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/PolicyServer.java rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/SWAActionServer.java index d17f578fc13..f6707a8dc28 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/PolicyServer.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/SWAActionServer.java @@ -26,14 +26,14 @@ import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class PolicyServer extends AbstractBusTestServerBase { +public class SWAActionServer extends AbstractBusTestServerBase { - public PolicyServer() { + public SWAActionServer() { } protected void run() { - URL busFile = PolicyServer.class.getResource("policy-server.xml"); + URL busFile = SWAActionServer.class.getResource("server.xml"); Bus busLocal = new SpringBusFactory().createBus(busFile); BusFactory.setDefaultBus(busLocal); setBus(busLocal); diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/SWAActionTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/SWAActionTest.java index 3acef473fa1..eba2b8ff359 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/SWAActionTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/SWAActionTest.java @@ -41,7 +41,7 @@ * A set of tests for the SwA specification (SOAP with Attachments) */ public class SWAActionTest extends AbstractBusClientServerTestBase { - public static final String PORT = allocatePort(Server.class); + public static final String PORT = allocatePort(SWAActionServer.class); private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt"; private static final QName SERVICE_QNAME = new QName(NAMESPACE, "DoubleItService"); @@ -52,7 +52,7 @@ public static void startServers() throws Exception { "Server failed to launch", // run the server in the same process // set this to false to fork - launchServer(Server.class, true) + launchServer(SWAActionServer.class, true) ); } diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/Server.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/SWAPolicyServer.java similarity index 87% rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/Server.java rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/SWAPolicyServer.java index e5da4bd6388..47b369ef3d2 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/Server.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/SWAPolicyServer.java @@ -26,14 +26,14 @@ import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class Server extends AbstractBusTestServerBase { +public class SWAPolicyServer extends AbstractBusTestServerBase { - public Server() { + public SWAPolicyServer() { } protected void run() { - URL busFile = Server.class.getResource("server.xml"); + URL busFile = SWAPolicyServer.class.getResource("policy-server.xml"); Bus busLocal = new SpringBusFactory().createBus(busFile); BusFactory.setDefaultBus(busLocal); setBus(busLocal); diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/SWAPolicyTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/SWAPolicyTest.java index b5d2d0abcad..33aa54e5bfb 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/SWAPolicyTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/swa/SWAPolicyTest.java @@ -49,7 +49,7 @@ */ @RunWith(value = org.junit.runners.Parameterized.class) public class SWAPolicyTest extends AbstractBusClientServerTestBase { - public static final String PORT = allocatePort(PolicyServer.class); + public static final String PORT = allocatePort(SWAPolicyServer.class); public static final String STAX_PORT = allocatePort(StaxPolicyServer.class); private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt"; @@ -67,7 +67,7 @@ public static void startServers() throws Exception { "Server failed to launch", // run the server in the same process // set this to false to fork - launchServer(PolicyServer.class, true) + launchServer(SWAPolicyServer.class, true) ); assertTrue( "Server failed to launch", diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/Server.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/SupportingTokenServer.java similarity index 85% rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/Server.java rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/SupportingTokenServer.java index 47930af1871..d320f8ffc69 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/Server.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/SupportingTokenServer.java @@ -26,20 +26,20 @@ import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class Server extends AbstractBusTestServerBase { +public class SupportingTokenServer extends AbstractBusTestServerBase { - public Server() { + public SupportingTokenServer() { } protected void run() { - URL busFile = Server.class.getResource("server.xml"); + URL busFile = SupportingTokenServer.class.getResource("server.xml"); Bus busLocal = new SpringBusFactory().createBus(busFile); BusFactory.setDefaultBus(busLocal); setBus(busLocal); try { - new Server(); + new SupportingTokenServer(); } catch (Exception e) { e.printStackTrace(); } diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/StaxServer.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/SupportingTokenStaxServer.java similarity index 84% rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/StaxServer.java rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/SupportingTokenStaxServer.java index 3c96b2b94b0..d0b1e1f4b2a 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/StaxServer.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/SupportingTokenStaxServer.java @@ -26,20 +26,20 @@ import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class StaxServer extends AbstractBusTestServerBase { +public class SupportingTokenStaxServer extends AbstractBusTestServerBase { - public StaxServer() { + public SupportingTokenStaxServer() { } protected void run() { - URL busFile = StaxServer.class.getResource("stax-server.xml"); + URL busFile = SupportingTokenStaxServer.class.getResource("stax-server.xml"); Bus busLocal = new SpringBusFactory().createBus(busFile); BusFactory.setDefaultBus(busLocal); setBus(busLocal); try { - new StaxServer(); + new SupportingTokenStaxServer(); } catch (Exception e) { e.printStackTrace(); } diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/SupportingTokenTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/SupportingTokenTest.java index 595014350da..88bc3c95bfa 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/SupportingTokenTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/tokens/SupportingTokenTest.java @@ -48,9 +48,9 @@ */ @RunWith(value = org.junit.runners.Parameterized.class) public class SupportingTokenTest extends AbstractBusClientServerTestBase { - static final String PORT = allocatePort(Server.class); + static final String PORT = allocatePort(SupportingTokenServer.class); static final String TLS_PORT = allocatePort(TLSServer.class); - static final String STAX_PORT = allocatePort(StaxServer.class); + static final String STAX_PORT = allocatePort(SupportingTokenStaxServer.class); static final String TLS_STAX_PORT = allocatePort(TLSStaxServer.class); private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt"; @@ -68,7 +68,7 @@ public static void startServers() throws Exception { "Server failed to launch", // run the server in the same process // set this to false to fork - launchServer(Server.class, true) + launchServer(SupportingTokenServer.class, true) ); assertTrue( "Server failed to launch", @@ -80,7 +80,7 @@ public static void startServers() throws Exception { "Server failed to launch", // run the server in the same process // set this to false to fork - launchServer(StaxServer.class, true) + launchServer(SupportingTokenStaxServer.class, true) ); assertTrue( "Server failed to launch", diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/StaxPolicyServer.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenPolicyServer.java similarity index 84% rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/StaxPolicyServer.java rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenPolicyServer.java index 12726d93be2..bd672eabb4e 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/StaxPolicyServer.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenPolicyServer.java @@ -26,20 +26,20 @@ import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class StaxPolicyServer extends AbstractBusTestServerBase { +public class UsernameTokenPolicyServer extends AbstractBusTestServerBase { - public StaxPolicyServer() { + public UsernameTokenPolicyServer() { } protected void run() { - URL busFile = StaxPolicyServer.class.getResource("stax-policy-server.xml"); + URL busFile = UsernameTokenPolicyServer.class.getResource("policy-server.xml"); Bus busLocal = new SpringBusFactory().createBus(busFile); BusFactory.setDefaultBus(busLocal); setBus(busLocal); try { - new StaxPolicyServer(); + new UsernameTokenPolicyServer(); } catch (Exception e) { e.printStackTrace(); } diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenPolicyTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenPolicyTest.java index 0f16c5c435b..b7bddd99179 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenPolicyTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenPolicyTest.java @@ -58,8 +58,8 @@ */ @RunWith(value = org.junit.runners.Parameterized.class) public class UsernameTokenPolicyTest extends AbstractBusClientServerTestBase { - static final String PORT = allocatePort(PolicyServer.class); - static final String STAX_PORT = allocatePort(StaxPolicyServer.class); + static final String PORT = allocatePort(UsernameTokenPolicyServer.class); + static final String STAX_PORT = allocatePort(UsernameTokenStaxPolicyServer.class); private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt"; private static final QName SERVICE_QNAME = new QName(NAMESPACE, "DoubleItService"); @@ -76,13 +76,13 @@ public static void startServers() throws Exception { "Server failed to launch", // run the server in the same process // set this to false to fork - launchServer(PolicyServer.class, true) + launchServer(UsernameTokenPolicyServer.class, true) ); assertTrue( "Server failed to launch", // run the server in the same process // set this to false to fork - launchServer(StaxPolicyServer.class, true) + launchServer(UsernameTokenStaxPolicyServer.class, true) ); } diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/PolicyServer.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenServer.java similarity index 86% rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/PolicyServer.java rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenServer.java index 749403b6a04..41de53b5a55 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/PolicyServer.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenServer.java @@ -26,20 +26,20 @@ import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class PolicyServer extends AbstractBusTestServerBase { +public class UsernameTokenServer extends AbstractBusTestServerBase { - public PolicyServer() { + public UsernameTokenServer() { } protected void run() { - URL busFile = PolicyServer.class.getResource("policy-server.xml"); + URL busFile = UsernameTokenServer.class.getResource("server.xml"); Bus busLocal = new SpringBusFactory().createBus(busFile); BusFactory.setDefaultBus(busLocal); setBus(busLocal); try { - new PolicyServer(); + new UsernameTokenServer(); } catch (Exception e) { e.printStackTrace(); } diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/StaxServer.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenStaxPolicyServer.java similarity index 82% rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/StaxServer.java rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenStaxPolicyServer.java index 83e7e2a26af..3b8b7340843 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/StaxServer.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenStaxPolicyServer.java @@ -26,20 +26,20 @@ import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class StaxServer extends AbstractBusTestServerBase { +public class UsernameTokenStaxPolicyServer extends AbstractBusTestServerBase { - public StaxServer() { + public UsernameTokenStaxPolicyServer() { } protected void run() { - URL busFile = StaxServer.class.getResource("stax-server.xml"); + URL busFile = UsernameTokenStaxPolicyServer.class.getResource("stax-policy-server.xml"); Bus busLocal = new SpringBusFactory().createBus(busFile); BusFactory.setDefaultBus(busLocal); setBus(busLocal); try { - new StaxServer(); + new UsernameTokenStaxPolicyServer(); } catch (Exception e) { e.printStackTrace(); } diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/Server.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenStaxServer.java similarity index 84% rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/Server.java rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenStaxServer.java index 2b4ccc7b085..b9aff470a4e 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/Server.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenStaxServer.java @@ -26,20 +26,20 @@ import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class Server extends AbstractBusTestServerBase { +public class UsernameTokenStaxServer extends AbstractBusTestServerBase { - public Server() { + public UsernameTokenStaxServer() { } protected void run() { - URL busFile = Server.class.getResource("server.xml"); + URL busFile = UsernameTokenStaxServer.class.getResource("stax-server.xml"); Bus busLocal = new SpringBusFactory().createBus(busFile); BusFactory.setDefaultBus(busLocal); setBus(busLocal); try { - new Server(); + new UsernameTokenStaxServer(); } catch (Exception e) { e.printStackTrace(); } diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenTest.java index fce54c88221..1d8844e57bf 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenTest.java @@ -65,8 +65,8 @@ */ @RunWith(value = org.junit.runners.Parameterized.class) public class UsernameTokenTest extends AbstractBusClientServerTestBase { - static final String PORT = allocatePort(Server.class); - static final String STAX_PORT = allocatePort(StaxServer.class); + static final String PORT = allocatePort(UsernameTokenServer.class); + static final String STAX_PORT = allocatePort(UsernameTokenStaxServer.class); private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt"; private static final QName SERVICE_QNAME = new QName(NAMESPACE, "DoubleItService"); @@ -83,13 +83,13 @@ public static void startServers() throws Exception { "Server failed to launch", // run the server in the same process // set this to false to fork - launchServer(Server.class, true) + launchServer(UsernameTokenServer.class, true) ); assertTrue( "Server failed to launch", // run the server in the same process // set this to false to fork - launchServer(StaxServer.class, true) + launchServer(UsernameTokenStaxServer.class, true) ); } diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/Server.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCServer.java similarity index 97% rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/Server.java rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCServer.java index 1dbdbabe5ef..015812de4d0 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/Server.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCServer.java @@ -30,15 +30,15 @@ import org.apache.cxf.ws.security.SecurityConstants; -public class Server extends AbstractBusTestServerBase { - static final String PORT = allocatePort(Server.class); - static final String PORT2 = allocatePort(Server.class, 2); +public class WSSCServer extends AbstractBusTestServerBase { + static final String PORT = allocatePort(WSSCServer.class); + static final String PORT2 = allocatePort(WSSCServer.class, 2); - public Server() throws Exception { + public WSSCServer() throws Exception { } - protected Server(String baseUrl) throws Exception { + protected WSSCServer(String baseUrl) throws Exception { doPublish(baseUrl.replace(PORT, PORT2).replace("http", "https") + "SecureConversation_UserNameOverTransport_IPingService", @@ -91,7 +91,7 @@ protected void run() { "org/apache/cxf/systest/ws/wssc/server.xml"); BusFactory.setDefaultBus(busLocal); setBus(busLocal); - new Server("http://localhost:" + PORT + "/"); + new WSSCServer("http://localhost:" + PORT + "/"); } catch (Exception e) { e.printStackTrace(); } diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/StaxServer.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCStaxServer.java similarity index 97% rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/StaxServer.java rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCStaxServer.java index 2a2b689c774..c22250f9872 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/StaxServer.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCStaxServer.java @@ -30,15 +30,15 @@ import org.apache.cxf.ws.security.SecurityConstants; -public class StaxServer extends AbstractBusTestServerBase { - static final String PORT = allocatePort(StaxServer.class); - static final String PORT2 = allocatePort(StaxServer.class, 2); +public class WSSCStaxServer extends AbstractBusTestServerBase { + static final String PORT = allocatePort(WSSCStaxServer.class); + static final String PORT2 = allocatePort(WSSCStaxServer.class, 2); - public StaxServer() throws Exception { + public WSSCStaxServer() throws Exception { } - protected StaxServer(String baseUrl) throws Exception { + protected WSSCStaxServer(String baseUrl) throws Exception { doPublish(baseUrl.replace(PORT, PORT2).replace("http", "https") + "SecureConversation_UserNameOverTransport_IPingService", @@ -91,7 +91,7 @@ protected void run() { "org/apache/cxf/systest/ws/wssc/server.xml"); BusFactory.setDefaultBus(busLocal); setBus(busLocal); - new StaxServer("http://localhost:" + PORT + "/"); + new WSSCStaxServer("http://localhost:" + PORT + "/"); } catch (Exception e) { e.printStackTrace(); } diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCTest.java index 9548069e08a..8003f424b1a 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCTest.java @@ -54,10 +54,10 @@ */ @RunWith(value = org.junit.runners.Parameterized.class) public class WSSCTest extends AbstractBusClientServerTestBase { - static final String PORT = allocatePort(Server.class); - static final String PORT2 = allocatePort(Server.class, 2); - static final String STAX_PORT = allocatePort(StaxServer.class); - static final String STAX_PORT2 = allocatePort(StaxServer.class, 2); + static final String PORT = allocatePort(WSSCServer.class); + static final String PORT2 = allocatePort(WSSCServer.class, 2); + static final String STAX_PORT = allocatePort(WSSCStaxServer.class); + static final String STAX_PORT2 = allocatePort(WSSCStaxServer.class, 2); private static final String OUT = "CXF : ping"; private static wssec.wssc.PingService svc; @@ -101,13 +101,13 @@ public static void startServers() throws Exception { "Server failed to launch", // run the server in the same process // set this to false to fork - launchServer(Server.class, true) + launchServer(WSSCServer.class, true) ); assertTrue( "Server failed to launch", // run the server in the same process // set this to false to fork - launchServer(StaxServer.class, true) + launchServer(WSSCStaxServer.class, true) ); bus = new SpringBusFactory().createBus("org/apache/cxf/systest/ws/wssc/client.xml"); diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10CustomAlgorithmSuiteTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10CustomAlgorithmSuiteTest.java index 06d6a24caa5..73cf98fec22 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10CustomAlgorithmSuiteTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10CustomAlgorithmSuiteTest.java @@ -29,10 +29,10 @@ import org.apache.cxf.BusFactory; import org.apache.cxf.endpoint.Client; import org.apache.cxf.frontend.ClientProxy; -import org.apache.cxf.systest.ws.wssec10.server.Server; import org.apache.cxf.systest.ws.wssec10.server.ServerCustomAlgorithmSuite; -import org.apache.cxf.systest.ws.wssec10.server.StaxServer; import org.apache.cxf.systest.ws.wssec10.server.StaxServerCustomAlgorithmSuite; +import org.apache.cxf.systest.ws.wssec10.server.WSSecurity10Server; +import org.apache.cxf.systest.ws.wssec10.server.WSSecurity10StaxServer; import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; import org.apache.cxf.transport.http.HTTPConduit; import org.apache.cxf.transports.http.configuration.HTTPClientPolicy; @@ -55,10 +55,10 @@ */ @RunWith(value = org.junit.runners.Parameterized.class) public class WSSecurity10CustomAlgorithmSuiteTest extends AbstractBusClientServerTestBase { - static final String PORT = allocatePort(Server.class); - static final String STAX_PORT = allocatePort(StaxServer.class); - static final String SSL_PORT = allocatePort(Server.class, 1); - static final String STAX_SSL_PORT = allocatePort(StaxServer.class, 1); + static final String PORT = allocatePort(WSSecurity10Server.class); + static final String STAX_PORT = allocatePort(WSSecurity10StaxServer.class); + static final String SSL_PORT = allocatePort(WSSecurity10Server.class, 1); + static final String STAX_SSL_PORT = allocatePort(WSSecurity10StaxServer.class, 1); private static final String INPUT = "foo"; diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10Test.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10Test.java index 8a47f65da32..7384ecedbe2 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10Test.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/WSSecurity10Test.java @@ -31,8 +31,8 @@ import org.apache.cxf.BusFactory; import org.apache.cxf.endpoint.Client; import org.apache.cxf.frontend.ClientProxy; -import org.apache.cxf.systest.ws.wssec10.server.Server; -import org.apache.cxf.systest.ws.wssec10.server.StaxServer; +import org.apache.cxf.systest.ws.wssec10.server.WSSecurity10Server; +import org.apache.cxf.systest.ws.wssec10.server.WSSecurity10StaxServer; import org.apache.cxf.test.TestUtilities; import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase; import org.apache.cxf.transport.http.HTTPConduit; @@ -53,10 +53,10 @@ */ @RunWith(value = org.junit.runners.Parameterized.class) public class WSSecurity10Test extends AbstractBusClientServerTestBase { - static final String PORT = allocatePort(Server.class); - static final String STAX_PORT = allocatePort(StaxServer.class); - static final String SSL_PORT = allocatePort(Server.class, 1); - static final String STAX_SSL_PORT = allocatePort(StaxServer.class, 1); + static final String PORT = allocatePort(WSSecurity10Server.class); + static final String STAX_PORT = allocatePort(WSSecurity10StaxServer.class); + static final String SSL_PORT = allocatePort(WSSecurity10Server.class, 1); + static final String STAX_SSL_PORT = allocatePort(WSSecurity10StaxServer.class, 1); private static final String INPUT = "foo"; private static boolean unrestrictedPoliciesInstalled; @@ -116,13 +116,13 @@ public static void startServers() throws Exception { "Server failed to launch", // run the server in the same process // set this to false to fork - launchServer(Server.class, true) + launchServer(WSSecurity10Server.class, true) ); assertTrue( "Server failed to launch", // run the server in the same process // set this to false to fork - launchServer(StaxServer.class, true) + launchServer(WSSecurity10StaxServer.class, true) ); if (unrestrictedPoliciesInstalled) { createStaticBus("org/apache/cxf/systest/ws/wssec10/client.xml"); diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/ServerCustomAlgorithmSuite.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/ServerCustomAlgorithmSuite.java index 7c2bb024b4d..d87ebc63745 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/ServerCustomAlgorithmSuite.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/ServerCustomAlgorithmSuite.java @@ -24,8 +24,8 @@ import org.apache.cxf.testutil.common.AbstractBusTestServerBase; public class ServerCustomAlgorithmSuite extends AbstractBusTestServerBase { - static final String PORT = allocatePort(Server.class); - static final String SSL_PORT = allocatePort(Server.class, 1); + static final String PORT = allocatePort(WSSecurity10Server.class); + static final String SSL_PORT = allocatePort(WSSecurity10Server.class, 1); private static String configFileName = "org/apache/cxf/systest/ws/wssec10/server_customAlgorithmSuite.xml"; diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/StaxServerCustomAlgorithmSuite.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/StaxServerCustomAlgorithmSuite.java index f80929f2f10..f87361c3bfb 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/StaxServerCustomAlgorithmSuite.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/StaxServerCustomAlgorithmSuite.java @@ -24,8 +24,8 @@ import org.apache.cxf.testutil.common.AbstractBusTestServerBase; public class StaxServerCustomAlgorithmSuite extends AbstractBusTestServerBase { - static final String PORT = allocatePort(Server.class); - static final String SSL_PORT = allocatePort(Server.class, 1); + static final String PORT = allocatePort(WSSecurity10Server.class); + static final String SSL_PORT = allocatePort(WSSecurity10Server.class, 1); private static String configFileName = "org/apache/cxf/systest/ws/wssec10/stax-server_customAlgorithmSuite.xml"; diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/Server.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/WSSecurity10Server.java similarity index 86% rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/Server.java rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/WSSecurity10Server.java index cbf153eb0fd..6540790d106 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/Server.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/WSSecurity10Server.java @@ -24,9 +24,9 @@ import org.apache.cxf.test.TestUtilities; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class Server extends AbstractBusTestServerBase { - static final String PORT = allocatePort(Server.class); - static final String SSL_PORT = allocatePort(Server.class, 1); +public class WSSecurity10Server extends AbstractBusTestServerBase { + static final String PORT = allocatePort(WSSecurity10Server.class); + static final String SSL_PORT = allocatePort(WSSecurity10Server.class, 1); private static boolean unrestrictedPoliciesInstalled; private static String configFileName; @@ -40,7 +40,7 @@ public class Server extends AbstractBusTestServerBase { } }; - public Server() throws Exception { + public WSSecurity10Server() throws Exception { } diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/StaxServer.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/WSSecurity10StaxServer.java similarity index 85% rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/StaxServer.java rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/WSSecurity10StaxServer.java index d84afc92a30..0d997cee096 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/StaxServer.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssec10/server/WSSecurity10StaxServer.java @@ -24,9 +24,9 @@ import org.apache.cxf.test.TestUtilities; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class StaxServer extends AbstractBusTestServerBase { - static final String PORT = allocatePort(StaxServer.class); - static final String SSL_PORT = allocatePort(StaxServer.class, 1); +public class WSSecurity10StaxServer extends AbstractBusTestServerBase { + static final String PORT = allocatePort(WSSecurity10StaxServer.class); + static final String SSL_PORT = allocatePort(WSSecurity10StaxServer.class, 1); private static boolean unrestrictedPoliciesInstalled; private static String configFileName; @@ -40,7 +40,7 @@ public class StaxServer extends AbstractBusTestServerBase { } }; - public StaxServer() throws Exception { + public WSSecurity10StaxServer() throws Exception { } diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/StaxServer.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenServer.java similarity index 88% rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/StaxServer.java rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenServer.java index 01a69931380..01196e730c3 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/StaxServer.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenServer.java @@ -26,14 +26,14 @@ import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class StaxServer extends AbstractBusTestServerBase { +public class X509TokenServer extends AbstractBusTestServerBase { - public StaxServer() { + public X509TokenServer() { } protected void run() { - URL busFile = StaxServer.class.getResource("stax-server.xml"); + URL busFile = X509TokenServer.class.getResource("server.xml"); Bus busLocal = new SpringBusFactory().createBus(busFile); BusFactory.setDefaultBus(busLocal); setBus(busLocal); diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/Server.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenStaxServer.java similarity index 86% rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/Server.java rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenStaxServer.java index 69b95b956e0..29d844b87b2 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/Server.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenStaxServer.java @@ -26,14 +26,14 @@ import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class Server extends AbstractBusTestServerBase { +public class X509TokenStaxServer extends AbstractBusTestServerBase { - public Server() { + public X509TokenStaxServer() { } protected void run() { - URL busFile = Server.class.getResource("server.xml"); + URL busFile = X509TokenStaxServer.class.getResource("stax-server.xml"); Bus busLocal = new SpringBusFactory().createBus(busFile); BusFactory.setDefaultBus(busLocal); setBus(busLocal); diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java index b34738db558..834e9a0beae 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/x509/X509TokenTest.java @@ -78,11 +78,11 @@ */ @RunWith(value = org.junit.runners.Parameterized.class) public class X509TokenTest extends AbstractBusClientServerTestBase { - public static final String PORT = allocatePort(Server.class); - public static final String STAX_PORT = allocatePort(StaxServer.class); + public static final String PORT = allocatePort(X509TokenServer.class); + public static final String STAX_PORT = allocatePort(X509TokenStaxServer.class); public static final String INTERMEDIARY_PORT = allocatePort(Intermediary.class); - static final String PORT2 = allocatePort(Server.class, 2); - static final String STAX_PORT2 = allocatePort(StaxServer.class, 2); + static final String PORT2 = allocatePort(X509TokenServer.class, 2); + static final String STAX_PORT2 = allocatePort(X509TokenStaxServer.class, 2); private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt"; private static final QName SERVICE_QNAME = new QName(NAMESPACE, "DoubleItService"); @@ -102,13 +102,13 @@ public static void startServers() throws Exception { "Server failed to launch", // run the server in the same process // set this to false to fork - launchServer(Server.class, true) + launchServer(X509TokenServer.class, true) ); assertTrue( "Server failed to launch", // run the server in the same process // set this to false to fork - launchServer(StaxServer.class, true) + launchServer(X509TokenStaxServer.class, true) ); assertTrue( "Intermediary failed to launch", diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/xkms/Server.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/xkms/NonXKMSServer.java similarity index 88% rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/xkms/Server.java rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/xkms/NonXKMSServer.java index df1e4707227..16f9ef409d7 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/xkms/Server.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/xkms/NonXKMSServer.java @@ -26,14 +26,14 @@ import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class Server extends AbstractBusTestServerBase { +public class NonXKMSServer extends AbstractBusTestServerBase { - public Server() { + public NonXKMSServer() { } protected void run() { - URL busFile = Server.class.getResource("server.xml"); + URL busFile = NonXKMSServer.class.getResource("server.xml"); Bus busLocal = new SpringBusFactory().createBus(busFile); BusFactory.setDefaultBus(busLocal); setBus(busLocal); diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/xkms/StaxServer.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/xkms/XKMSStaxServer.java similarity index 87% rename from systests/ws-security/src/test/java/org/apache/cxf/systest/ws/xkms/StaxServer.java rename to systests/ws-security/src/test/java/org/apache/cxf/systest/ws/xkms/XKMSStaxServer.java index cc0f0c9cc7b..bb2b21e0969 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/xkms/StaxServer.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/xkms/XKMSStaxServer.java @@ -26,14 +26,14 @@ import org.apache.cxf.bus.spring.SpringBusFactory; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class StaxServer extends AbstractBusTestServerBase { +public class XKMSStaxServer extends AbstractBusTestServerBase { - public StaxServer() { + public XKMSStaxServer() { } protected void run() { - URL busFile = StaxServer.class.getResource("stax-server.xml"); + URL busFile = XKMSStaxServer.class.getResource("stax-server.xml"); Bus busLocal = new SpringBusFactory().createBus(busFile); BusFactory.setDefaultBus(busLocal); setBus(busLocal); diff --git a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/xkms/XKMSTest.java b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/xkms/XKMSTest.java index a1e17afa33b..ab65f66929a 100644 --- a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/xkms/XKMSTest.java +++ b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/xkms/XKMSTest.java @@ -65,8 +65,8 @@ */ @RunWith(value = org.junit.runners.Parameterized.class) public class XKMSTest extends AbstractBusClientServerTestBase { - public static final String PORT = allocatePort(Server.class); - public static final String STAX_PORT = allocatePort(StaxServer.class); + public static final String PORT = allocatePort(NonXKMSServer.class); + public static final String STAX_PORT = allocatePort(XKMSStaxServer.class); static final String PORT2 = allocatePort(XKMSServer.class); private static final String NAMESPACE = "http://www.example.org/contract/DoubleIt"; @@ -84,13 +84,13 @@ public static void startServers() throws Exception { "Server failed to launch", // run the server in the same process // set this to false to fork - launchServer(Server.class, true) + launchServer(NonXKMSServer.class, true) ); assertTrue( "Server failed to launch", // run the server in the same process // set this to false to fork - launchServer(StaxServer.class, true) + launchServer(XKMSStaxServer.class, true) ); assertTrue( "Server failed to launch", diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/server.xml index ca91f95bea1..f2cbd719de5 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/server.xml @@ -39,7 +39,7 @@ - + @@ -64,7 +64,7 @@ - + @@ -76,7 +76,7 @@ - + @@ -88,7 +88,7 @@ - + @@ -102,7 +102,7 @@ - + @@ -127,7 +127,7 @@ - + @@ -153,7 +153,7 @@ - + @@ -162,7 +162,7 @@ - + @@ -171,7 +171,7 @@ - + @@ -197,7 +197,7 @@ - + @@ -223,7 +223,7 @@ - + @@ -249,7 +249,7 @@ - + @@ -275,7 +275,7 @@ - + @@ -300,7 +300,7 @@ - + @@ -313,7 +313,7 @@ - + @@ -326,7 +326,7 @@ - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/server.xml index 426cd3f7160..b40493fcef0 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/server.xml @@ -38,7 +38,7 @@ - + @@ -50,7 +50,7 @@ - + @@ -62,7 +62,7 @@ - + @@ -74,7 +74,7 @@ - + @@ -87,7 +87,7 @@ - + @@ -100,7 +100,7 @@ - + @@ -112,7 +112,7 @@ - + @@ -127,7 +127,7 @@ - + @@ -142,7 +142,7 @@ - + @@ -157,7 +157,7 @@ - + @@ -171,7 +171,7 @@ - + @@ -185,7 +185,7 @@ - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/stax-server.xml index 2fd73161957..ba7f8742985 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/stax-server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/algsuite/stax-server.xml @@ -38,7 +38,7 @@ - + @@ -51,7 +51,7 @@ - + @@ -64,7 +64,7 @@ - + @@ -77,7 +77,7 @@ - + @@ -91,7 +91,7 @@ - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/basicauth/server-continuation.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/basicauth/server-continuation.xml index 33653c1dcd0..591238f0cf2 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/basicauth/server-continuation.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/basicauth/server-continuation.xml @@ -38,7 +38,7 @@ - + @@ -50,10 +50,10 @@ - + - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/basicauth/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/basicauth/server.xml index 2e89a7a4fd8..e5a33944c0d 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/basicauth/server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/basicauth/server.xml @@ -38,7 +38,7 @@ - + @@ -55,10 +55,10 @@ - + - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/server.xml index d8a875e7e30..e3ed9d7ab7b 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/server.xml @@ -38,7 +38,7 @@ - + @@ -51,7 +51,7 @@ - + @@ -64,7 +64,7 @@ - + @@ -77,7 +77,7 @@ - + @@ -90,7 +90,7 @@ - + @@ -103,7 +103,7 @@ - + @@ -116,7 +116,7 @@ - + @@ -129,7 +129,7 @@ - + @@ -142,7 +142,7 @@ - + @@ -155,7 +155,7 @@ - + @@ -168,7 +168,7 @@ - + @@ -181,7 +181,7 @@ - + @@ -194,7 +194,7 @@ - + @@ -207,7 +207,7 @@ - + @@ -220,7 +220,7 @@ - + @@ -233,7 +233,7 @@ - + @@ -246,7 +246,7 @@ - + @@ -259,7 +259,7 @@ - + @@ -272,7 +272,7 @@ - + @@ -285,7 +285,7 @@ - + @@ -299,7 +299,7 @@ - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/stax-server.xml index c9230b965c6..bb14ea0dc7b 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/stax-server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/bindings/stax-server.xml @@ -38,7 +38,7 @@ - + @@ -52,7 +52,7 @@ - + @@ -66,7 +66,7 @@ - + @@ -80,7 +80,7 @@ - + @@ -94,7 +94,7 @@ - + @@ -108,7 +108,7 @@ - + @@ -122,7 +122,7 @@ - + @@ -136,7 +136,7 @@ - + @@ -150,7 +150,7 @@ - + @@ -164,7 +164,7 @@ - + @@ -178,7 +178,7 @@ - + @@ -192,7 +192,7 @@ - + @@ -206,7 +206,7 @@ - + @@ -220,7 +220,7 @@ - + @@ -234,7 +234,7 @@ - + @@ -248,7 +248,7 @@ - + @@ -262,7 +262,7 @@ - + @@ -276,7 +276,7 @@ - + @@ -290,7 +290,7 @@ - + @@ -304,7 +304,7 @@ - + @@ -319,7 +319,7 @@ - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/cache/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/cache/server.xml index 599b354d511..582438d188d 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/cache/server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/cache/server.xml @@ -39,14 +39,14 @@ - + - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/server.xml index 7ae0fd66757..71d9a07f8a6 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/server.xml @@ -38,7 +38,7 @@ - + @@ -53,7 +53,7 @@ - + @@ -70,7 +70,7 @@ - + @@ -89,7 +89,7 @@ - + @@ -106,7 +106,7 @@ - + @@ -120,7 +120,7 @@ - + @@ -146,7 +146,7 @@ - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/stax-server.xml index 716683c20b6..9be64308676 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/stax-server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/coverage_checker/stax-server.xml @@ -38,7 +38,7 @@ - + @@ -53,7 +53,7 @@ - + @@ -70,7 +70,7 @@ - + @@ -89,7 +89,7 @@ - + @@ -106,7 +106,7 @@ - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/server.xml index 8f0ecd70656..66fca48e2a7 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/fault/server.xml @@ -33,44 +33,44 @@ - + - + - + - + - + - + - + @@ -95,7 +95,7 @@ - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/server.xml index 75de417a301..89778eeba9d 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/server.xml @@ -38,7 +38,7 @@ - + @@ -46,7 +46,7 @@ - + @@ -55,7 +55,7 @@ - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/stax-server.xml index 90f25d46228..4e7dc734577 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/stax-server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/gcm/stax-server.xml @@ -38,7 +38,7 @@ - + @@ -47,7 +47,7 @@ - + @@ -57,7 +57,7 @@ - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/httpget/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/httpget/server.xml index 32184f1c06c..a88d9f66ecf 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/httpget/server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/httpget/server.xml @@ -38,13 +38,13 @@ - + - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/server.xml index e0a6be33624..345b8041014 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/server.xml @@ -38,7 +38,7 @@ - + @@ -55,49 +55,49 @@ - + - + - + - + - + - + - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/stax-server.xml index 902da535eb0..4d03890a65e 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/stax-server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/https/stax-server.xml @@ -38,7 +38,7 @@ - + @@ -55,7 +55,7 @@ - + @@ -65,7 +65,7 @@ - + @@ -75,7 +75,7 @@ - + @@ -85,7 +85,7 @@ - + @@ -95,7 +95,7 @@ - + @@ -105,7 +105,7 @@ - + @@ -115,7 +115,7 @@ - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/mtom/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/mtom/server.xml index 7f5a37367f0..e80d620fcb4 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/mtom/server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/mtom/server.xml @@ -40,7 +40,7 @@ @@ -73,7 +73,7 @@ @@ -105,7 +105,7 @@ - + @@ -115,7 +115,7 @@ - + @@ -123,7 +123,7 @@ - + @@ -153,7 +153,7 @@ - + @@ -163,7 +163,7 @@ - + @@ -173,7 +173,7 @@ - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/mtom/stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/mtom/stax-server.xml index 162d07aea0b..d3b2cac02ae 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/mtom/stax-server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/mtom/stax-server.xml @@ -35,7 +35,7 @@ - + @@ -46,7 +46,7 @@ - + @@ -57,7 +57,7 @@ - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/server.xml index e5c8792ec15..4a28ac652b6 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/server.xml @@ -38,7 +38,7 @@ - + @@ -51,7 +51,7 @@ - + @@ -64,7 +64,7 @@ - + @@ -77,7 +77,7 @@ - + @@ -90,7 +90,7 @@ - + @@ -103,7 +103,7 @@ - + @@ -116,7 +116,7 @@ - + @@ -129,7 +129,7 @@ - + @@ -142,7 +142,7 @@ - + @@ -155,7 +155,7 @@ - + @@ -169,7 +169,7 @@ - + @@ -183,7 +183,7 @@ - + @@ -197,7 +197,7 @@ - + @@ -211,7 +211,7 @@ - + @@ -225,7 +225,7 @@ - + @@ -239,7 +239,7 @@ - + @@ -253,7 +253,7 @@ - + @@ -269,7 +269,7 @@ @@ -287,7 +287,7 @@ @@ -305,7 +305,7 @@ @@ -323,7 +323,7 @@ diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/stax-server.xml index 28bc9fb78d6..f7c180a6f8a 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/stax-server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/parts/stax-server.xml @@ -38,7 +38,7 @@ - + @@ -52,7 +52,7 @@ - + @@ -66,7 +66,7 @@ - + @@ -80,7 +80,7 @@ - + @@ -94,7 +94,7 @@ - + @@ -108,7 +108,7 @@ - + @@ -122,7 +122,7 @@ - + @@ -136,7 +136,7 @@ - + @@ -150,7 +150,7 @@ - + @@ -164,7 +164,7 @@ - + @@ -179,7 +179,7 @@ - + @@ -194,7 +194,7 @@ - + @@ -209,7 +209,7 @@ - + @@ -224,7 +224,7 @@ - + @@ -239,7 +239,7 @@ - + @@ -254,7 +254,7 @@ - + @@ -271,7 +271,7 @@ @@ -290,7 +290,7 @@ @@ -309,7 +309,7 @@ @@ -328,7 +328,7 @@ diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/password/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/password/server.xml index 05d23961c66..f9a8dfab464 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/password/server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/password/server.xml @@ -40,7 +40,7 @@ @@ -49,7 +49,7 @@ @@ -59,7 +59,7 @@ diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/operation/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/operation/server.xml index 079ac303437..6b62865318b 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/operation/server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/operation/server.xml @@ -34,7 +34,7 @@ - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server.xml index 8286a41c5a1..7f7f91ad080 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/policy/server.xml @@ -38,7 +38,7 @@ - + @@ -52,7 +52,7 @@ - + @@ -65,7 +65,7 @@ - + @@ -78,7 +78,7 @@ - + @@ -91,7 +91,7 @@ - + @@ -101,7 +101,7 @@ - + @@ -112,7 +112,7 @@ - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server.xml index 6d4f7fe73d4..933ea74da38 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/server.xml @@ -39,7 +39,7 @@ - + @@ -56,11 +56,11 @@ - + - + @@ -69,28 +69,28 @@ - + - + - + - + @@ -100,7 +100,7 @@ - + @@ -115,35 +115,35 @@ - + - + - + - + - + @@ -153,7 +153,7 @@ - + @@ -163,14 +163,14 @@ - + - + @@ -180,7 +180,7 @@ - + @@ -190,7 +190,7 @@ - + @@ -199,14 +199,14 @@ - + - + @@ -264,7 +264,7 @@ - + @@ -274,7 +274,7 @@ - + @@ -282,7 +282,7 @@ - + @@ -290,7 +290,7 @@ - + @@ -299,7 +299,7 @@ - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/stax-server.xml index f695d910f16..0cff9d171f2 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/stax-server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/stax-server.xml @@ -39,7 +39,7 @@ - + @@ -51,12 +51,12 @@ - + - + @@ -66,7 +66,7 @@ - + @@ -74,7 +74,7 @@ - + @@ -83,7 +83,7 @@ - + @@ -92,7 +92,7 @@ - + @@ -104,7 +104,7 @@ - + @@ -121,7 +121,7 @@ - + @@ -129,7 +129,7 @@ - + @@ -137,7 +137,7 @@ - + @@ -145,7 +145,7 @@ - + @@ -153,7 +153,7 @@ - + @@ -165,7 +165,7 @@ - + @@ -177,7 +177,7 @@ - + @@ -185,7 +185,7 @@ - + @@ -197,7 +197,7 @@ - + @@ -209,7 +209,7 @@ - + @@ -219,7 +219,7 @@ - + @@ -227,7 +227,7 @@ - + @@ -286,7 +286,7 @@ - + @@ -298,7 +298,7 @@ - + @@ -307,7 +307,7 @@ - + @@ -316,7 +316,7 @@ - + @@ -326,7 +326,7 @@ - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/subjectconf/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/subjectconf/server.xml index c62aa24a84a..bf51c5a0853 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/subjectconf/server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/subjectconf/server.xml @@ -39,7 +39,7 @@ - + @@ -52,13 +52,13 @@ - + - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/subjectconf/stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/subjectconf/stax-server.xml index 45e0f9ac96f..30ea7914585 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/subjectconf/stax-server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/saml/subjectconf/stax-server.xml @@ -39,7 +39,7 @@ - + @@ -52,14 +52,14 @@ - + - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/server.xml index d9f8c316d1c..98fcef21f98 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/handler/server.xml @@ -46,7 +46,7 @@ - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/server.xml index 42a41d9fe0a..8b44ebe9e2c 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/server.xml @@ -38,7 +38,7 @@ This endpoint is configured to read the username and password tokens and validate them using a password callback handler. --> - + @@ -63,7 +63,7 @@ This endpoint is configured to work with public key certificates on both client (Alice) and service (Bob) side. --> - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/stax-server.xml index 4e27beaa9eb..7406fb76449 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/stax-server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/security/stax-server.xml @@ -38,7 +38,7 @@ This endpoint is configured to read the username and password tokens and validate them using a password callback handler. --> - + @@ -63,7 +63,7 @@ This endpoint is configured to work with public key certificates on both client (Alice) and service (Bob) side. --> - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/policy-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/policy-server.xml index 29273499327..42e922c08c5 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/policy-server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/policy-server.xml @@ -36,7 +36,7 @@ @@ -47,7 +47,7 @@ @@ -58,7 +58,7 @@ @@ -69,7 +69,7 @@ @@ -80,7 +80,7 @@ @@ -91,7 +91,7 @@ @@ -102,7 +102,7 @@ diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/server.xml index 675a45de02c..12af4323f3a 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/swa/server.xml @@ -36,7 +36,7 @@ @@ -66,7 +66,7 @@ @@ -96,7 +96,7 @@ @@ -126,7 +126,7 @@ @@ -156,7 +156,7 @@ diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/server.xml index 76918509e7a..09bce048a57 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/server.xml @@ -38,7 +38,7 @@ - + @@ -51,7 +51,7 @@ - + @@ -64,7 +64,7 @@ - + @@ -77,7 +77,7 @@ - + @@ -90,7 +90,7 @@ - + @@ -103,7 +103,7 @@ - + @@ -116,7 +116,7 @@ - + @@ -129,7 +129,7 @@ - + @@ -142,7 +142,7 @@ - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/stax-server.xml index e82095eca57..14ad6f63514 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/stax-server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/tokens/stax-server.xml @@ -38,7 +38,7 @@ - + @@ -52,7 +52,7 @@ - + @@ -66,7 +66,7 @@ - + @@ -80,7 +80,7 @@ - + @@ -94,7 +94,7 @@ - + @@ -108,7 +108,7 @@ - + @@ -122,7 +122,7 @@ - + @@ -136,7 +136,7 @@ - + @@ -150,7 +150,7 @@ - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/policy-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/policy-server.xml index 231480e7d3a..282036a079d 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/policy-server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/policy-server.xml @@ -38,7 +38,7 @@ - + @@ -50,7 +50,7 @@ - + @@ -60,7 +60,7 @@ - + @@ -76,7 +76,7 @@ - + @@ -90,7 +90,7 @@ - + @@ -100,7 +100,7 @@ - + @@ -110,7 +110,7 @@ - + @@ -120,7 +120,7 @@ - + @@ -130,7 +130,7 @@ - + @@ -140,7 +140,7 @@ - + @@ -150,7 +150,7 @@ - + @@ -160,7 +160,7 @@ - + @@ -170,7 +170,7 @@ - + @@ -180,7 +180,7 @@ - + @@ -190,7 +190,7 @@ - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server.xml index 3f552f6e404..79fd0d00bbb 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/server.xml @@ -38,7 +38,7 @@ - + @@ -55,58 +55,58 @@ - + - + - + - + - + - + - + - + - + - + @@ -156,7 +156,7 @@ - + @@ -190,7 +190,7 @@ - + @@ -208,7 +208,7 @@ - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/stax-policy-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/stax-policy-server.xml index 55d64dffa2f..251582d5a6c 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/stax-policy-server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/stax-policy-server.xml @@ -38,7 +38,7 @@ - + @@ -50,7 +50,7 @@ - + @@ -61,7 +61,7 @@ - + @@ -72,7 +72,7 @@ - + @@ -83,7 +83,7 @@ - + @@ -94,7 +94,7 @@ - + @@ -105,7 +105,7 @@ - + @@ -116,7 +116,7 @@ - + @@ -127,7 +127,7 @@ - + @@ -138,7 +138,7 @@ - + @@ -149,7 +149,7 @@ - + @@ -160,7 +160,7 @@ - + @@ -171,7 +171,7 @@ - + @@ -182,7 +182,7 @@ - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/stax-server.xml index f4cf20cfced..2cad5075e04 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/stax-server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/ut/stax-server.xml @@ -38,7 +38,7 @@ - + @@ -55,45 +55,45 @@ - + - + - + - + - + - + - + @@ -101,7 +101,7 @@ - + @@ -109,13 +109,13 @@ - + - + @@ -166,7 +166,7 @@ - + @@ -201,7 +201,7 @@ - + @@ -220,7 +220,7 @@ - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/server.xml index 98702b50bc9..4b7bf5cee60 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssc/server.xml @@ -40,7 +40,7 @@ - + @@ -51,7 +51,7 @@ - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server.xml index d4fb525e5d0..8f11a5e8653 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server.xml @@ -39,7 +39,7 @@ - + @@ -56,13 +56,13 @@ - + - + @@ -71,7 +71,7 @@ - + @@ -83,7 +83,7 @@ - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_customAlgorithmSuite.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_customAlgorithmSuite.xml index bf52655718b..6dea1306b15 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_customAlgorithmSuite.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_customAlgorithmSuite.xml @@ -39,7 +39,7 @@ - + @@ -56,7 +56,7 @@ - + @@ -68,7 +68,7 @@ - + @@ -84,7 +84,7 @@ - + @@ -96,7 +96,7 @@ - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_restricted.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_restricted.xml index 753c7072732..3b33a90d9cc 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_restricted.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/server_restricted.xml @@ -39,7 +39,7 @@ - + @@ -56,13 +56,13 @@ - + - + @@ -71,7 +71,7 @@ - + @@ -83,7 +83,7 @@ - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/stax-server.xml index 879907468ab..a84576f75fb 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/stax-server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/stax-server.xml @@ -39,7 +39,7 @@ - + @@ -56,14 +56,14 @@ - + - + @@ -73,7 +73,7 @@ - + @@ -86,7 +86,7 @@ - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/stax-server_customAlgorithmSuite.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/stax-server_customAlgorithmSuite.xml index bef86046504..2a415183a19 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/stax-server_customAlgorithmSuite.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/stax-server_customAlgorithmSuite.xml @@ -39,7 +39,7 @@ - + @@ -56,7 +56,7 @@ - + @@ -69,7 +69,7 @@ - + @@ -86,7 +86,7 @@ - + @@ -99,7 +99,7 @@ - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/stax-server_restricted.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/stax-server_restricted.xml index 4da1754ce81..03b496c57fb 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/stax-server_restricted.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/wssec10/stax-server_restricted.xml @@ -39,7 +39,7 @@ - + @@ -56,14 +56,14 @@ - + - + @@ -73,7 +73,7 @@ - + @@ -86,7 +86,7 @@ - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server.xml index cc2f1749eb2..4814f37fcf8 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/server.xml @@ -39,7 +39,7 @@ - + @@ -56,44 +56,44 @@ - + - + - + - + - + - + - + @@ -104,50 +104,50 @@ - + - + - + - + - + - + - + - + @@ -155,7 +155,7 @@ - + @@ -163,7 +163,7 @@ - + @@ -171,7 +171,7 @@ - + @@ -179,7 +179,7 @@ - + @@ -187,7 +187,7 @@ - + @@ -195,7 +195,7 @@ - + @@ -203,7 +203,7 @@ - + @@ -212,7 +212,7 @@ - + @@ -220,7 +220,7 @@ - + @@ -228,7 +228,7 @@ - + @@ -236,7 +236,7 @@ - + @@ -244,7 +244,7 @@ - + @@ -252,21 +252,21 @@ - + - + - + @@ -274,14 +274,14 @@ - + - + @@ -289,7 +289,7 @@ - + @@ -297,7 +297,7 @@ - + @@ -305,68 +305,68 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -377,7 +377,7 @@ - + @@ -388,7 +388,7 @@ - + @@ -399,7 +399,7 @@ - + @@ -410,7 +410,7 @@ - + @@ -421,13 +421,13 @@ - + - + \ No newline at end of file diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/stax-server.xml index 30beb9d0f9b..87d79bb5112 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/stax-server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/x509/stax-server.xml @@ -39,7 +39,7 @@ - + @@ -56,7 +56,7 @@ - + @@ -64,42 +64,42 @@ - + - + - + - + - + - + @@ -111,49 +111,49 @@ - + - + - + - + - + - + - + @@ -161,7 +161,7 @@ - + @@ -170,7 +170,7 @@ - + @@ -179,7 +179,7 @@ - + @@ -188,7 +188,7 @@ - + @@ -197,7 +197,7 @@ - + @@ -206,7 +206,7 @@ - + @@ -215,7 +215,7 @@ - + @@ -224,7 +224,7 @@ - + @@ -233,7 +233,7 @@ - + @@ -242,7 +242,7 @@ - + @@ -251,7 +251,7 @@ - + @@ -260,7 +260,7 @@ - + @@ -269,7 +269,7 @@ - + @@ -278,7 +278,7 @@ - + @@ -286,7 +286,7 @@ - + @@ -294,7 +294,7 @@ - + @@ -303,7 +303,7 @@ - + @@ -311,7 +311,7 @@ - + @@ -320,7 +320,7 @@ - + @@ -329,7 +329,7 @@ - + @@ -338,77 +338,77 @@ - + - + - + - + - + - + - + - + - + - + - + @@ -420,7 +420,7 @@ - + @@ -432,7 +432,7 @@ - + @@ -444,7 +444,7 @@ - + @@ -456,7 +456,7 @@ - + @@ -468,7 +468,7 @@ - + @@ -476,7 +476,7 @@ - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/server.xml index 1e46f2ca8e0..7179fc9fccd 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/server.xml @@ -39,13 +39,13 @@ - + - + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/stax-server.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/stax-server.xml index 13a4a7fb2ed..3ada1ee8788 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/stax-server.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/xkms/stax-server.xml @@ -39,14 +39,14 @@ - + - + diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_fromjava/WSAFromJavaTest.java b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_fromjava/WSAFromJavaTest.java index 24f6cd67ada..de1a77dea34 100644 --- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_fromjava/WSAFromJavaTest.java +++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_fromjava/WSAFromJavaTest.java @@ -38,7 +38,7 @@ import org.apache.cxf.systest.ws.addr_fromjava.client.AddNumberImpl; import org.apache.cxf.systest.ws.addr_fromjava.client.AddNumberImplService; import org.apache.cxf.systest.ws.addr_fromjava.client.AddNumbersException_Exception; -import org.apache.cxf.systest.ws.addr_fromjava.server.Server; +import org.apache.cxf.systest.ws.addr_fromjava.server.WSAFromJavaServer; import org.junit.Before; import org.junit.BeforeClass; @@ -50,7 +50,7 @@ import static org.junit.Assert.fail; public class WSAFromJavaTest extends AbstractWSATestBase { - static final String PORT = allocatePort(Server.class); + static final String PORT = allocatePort(WSAFromJavaServer.class); @Before public void setUp() throws Exception { @@ -59,7 +59,7 @@ public void setUp() throws Exception { @BeforeClass public static void startServers() throws Exception { - assertTrue("server did not launch correctly", launchServer(Server.class, true)); + assertTrue("server did not launch correctly", launchServer(WSAFromJavaServer.class, true)); } @Test diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_fromjava/server/Server.java b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_fromjava/server/WSAFromJavaServer.java similarity index 90% rename from systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_fromjava/server/Server.java rename to systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_fromjava/server/WSAFromJavaServer.java index 3963be8ef9f..56ed8e162c7 100644 --- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_fromjava/server/Server.java +++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_fromjava/server/WSAFromJavaServer.java @@ -24,8 +24,8 @@ import org.apache.cxf.testutil.common.AbstractBusTestServerBase; import org.apache.cxf.ws.addressing.WSAddressingFeature; -public class Server extends AbstractBusTestServerBase { - static final String PORT = allocatePort(Server.class); +public class WSAFromJavaServer extends AbstractBusTestServerBase { + static final String PORT = allocatePort(WSAFromJavaServer.class); EndpointImpl ep1; EndpointImpl ep2; @@ -49,7 +49,7 @@ public void tearDown() { } public static void main(String[] args) { try { - Server s = new Server(); + WSAFromJavaServer s = new WSAFromJavaServer(); s.start(); } catch (Exception ex) { ex.printStackTrace(); diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_fromwsdl/Server.java b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_fromwsdl/WSAFromWSDLServer.java similarity index 95% rename from systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_fromwsdl/Server.java rename to systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_fromwsdl/WSAFromWSDLServer.java index 74b29fd8c5e..a179e7dcdf0 100644 --- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_fromwsdl/Server.java +++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_fromwsdl/WSAFromWSDLServer.java @@ -30,8 +30,8 @@ import org.apache.cxf.testutil.common.AbstractBusTestServerBase; import org.apache.cxf.ws.addressing.WSAddressingFeature; -public class Server extends AbstractBusTestServerBase { - static final String PORT = allocatePort(Server.class); +public class WSAFromWSDLServer extends AbstractBusTestServerBase { + static final String PORT = allocatePort(WSAFromWSDLServer.class); List eps = new LinkedList<>(); @WebService(serviceName = "AddNumbersService", @@ -110,7 +110,7 @@ private String getWsdl() { public static void main(String[] args) { try { - Server s = new Server(); + WSAFromWSDLServer s = new WSAFromWSDLServer(); s.start(); } catch (Exception ex) { ex.printStackTrace(); diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_fromwsdl/WSAFromWSDLTest.java b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_fromwsdl/WSAFromWSDLTest.java index 18b87d33fc1..ede3f795796 100644 --- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_fromwsdl/WSAFromWSDLTest.java +++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_fromwsdl/WSAFromWSDLTest.java @@ -45,8 +45,8 @@ import static org.junit.Assert.assertTrue; public class WSAFromWSDLTest extends AbstractWSATestBase { - static final String PORT = allocatePort(Server.class); - static final String INVALID_PORT = allocatePort(Server.class, 1); + static final String PORT = allocatePort(WSAFromWSDLServer.class); + static final String INVALID_PORT = allocatePort(WSAFromWSDLServer.class, 1); private static final String BASE_URI = "http://apache.org/cxf/systest/ws/addr_feature/" + "AddNumbersPortType/"; @@ -61,7 +61,7 @@ public void setUp() throws Exception { @BeforeClass public static void startServers() throws Exception { - assertTrue("server did not launch correctly", launchServer(Server.class)); + assertTrue("server did not launch correctly", launchServer(WSAFromWSDLServer.class)); } @Test diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_responses/WSAResponsesClientServerTest.java b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_responses/WSAResponsesClientServerTest.java index e9a0ec44878..89da238420e 100644 --- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_responses/WSAResponsesClientServerTest.java +++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_responses/WSAResponsesClientServerTest.java @@ -34,7 +34,7 @@ import static org.junit.Assert.fail; public class WSAResponsesClientServerTest extends AbstractWSATestBase { - static final String PORT = allocatePort(Server.class); + static final String PORT = allocatePort(WSAResponsesServer.class); @Before public void setUp() throws Exception { createBus(); @@ -42,7 +42,7 @@ public void setUp() throws Exception { @BeforeClass public static void startServers() throws Exception { - assertTrue("server did not launch correctly", launchServer(Server.class, true)); + assertTrue("server did not launch correctly", launchServer(WSAResponsesServer.class, true)); } @Test diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_responses/Server.java b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_responses/WSAResponsesServer.java similarity index 91% rename from systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_responses/Server.java rename to systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_responses/WSAResponsesServer.java index 8697f011fa6..1507b103e1a 100644 --- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_responses/Server.java +++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_responses/WSAResponsesServer.java @@ -23,8 +23,8 @@ import org.apache.cxf.jaxws.EndpointImpl; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class Server extends AbstractBusTestServerBase { - static final String PORT = allocatePort(Server.class); +public class WSAResponsesServer extends AbstractBusTestServerBase { + static final String PORT = allocatePort(WSAResponsesServer.class); EndpointImpl ep; protected void run() { Object implementor = new HelloImpl(); @@ -44,7 +44,7 @@ public void tearDown() throws Exception { public static void main(String[] args) { try { - Server s = new Server(); + WSAResponsesServer s = new WSAResponsesServer(); s.start(); } catch (Exception ex) { ex.printStackTrace(); diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/Server.java b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/WSAPureWsdlServer.java similarity index 96% rename from systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/Server.java rename to systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/WSAPureWsdlServer.java index 25fc850dfed..53d96416a87 100644 --- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/Server.java +++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/WSAPureWsdlServer.java @@ -46,8 +46,8 @@ import org.apache.cxf.staxutils.StaxUtils; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class Server extends AbstractBusTestServerBase { - static final String PORT = allocatePort(Server.class); +public class WSAPureWsdlServer extends AbstractBusTestServerBase { + static final String PORT = allocatePort(WSAPureWsdlServer.class); List eps = new LinkedList<>(); protected void run() { @@ -84,7 +84,7 @@ private String getWsdl() { public static void main(String[] args) { try { - Server s = new Server(); + WSAPureWsdlServer s = new WSAPureWsdlServer(); s.start(); } catch (Exception ex) { ex.printStackTrace(); diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/WSAPureWsdlTest.java b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/WSAPureWsdlTest.java index af42ca75266..4a966115947 100644 --- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/WSAPureWsdlTest.java +++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/WSAPureWsdlTest.java @@ -59,8 +59,8 @@ import static org.junit.Assert.fail; public class WSAPureWsdlTest extends AbstractWSATestBase { - static final String PORT = allocatePort(Server.class); - static final String PORT2 = allocatePort(Server.class, 1); + static final String PORT = allocatePort(WSAPureWsdlServer.class); + static final String PORT2 = allocatePort(WSAPureWsdlServer.class, 1); private final QName serviceName = new QName("http://apache.org/cxf/systest/ws/addr_feature/", "AddNumbersService"); @@ -72,7 +72,7 @@ public void setUp() throws Exception { @BeforeClass public static void startServers() throws Exception { - assertTrue("server did not launch correctly", launchServer(Server.class, true)); + assertTrue("server did not launch correctly", launchServer(WSAPureWsdlServer.class, true)); } @Test diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/jaxwsmm/WSDLAddrPolicyAttachmentJaxwsMMProviderTest.java b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/jaxwsmm/WSDLAddrPolicyAttachmentJaxwsMMProviderTest.java index 3045e981180..398caf0ba3b 100644 --- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/jaxwsmm/WSDLAddrPolicyAttachmentJaxwsMMProviderTest.java +++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/addr_wsdl/jaxwsmm/WSDLAddrPolicyAttachmentJaxwsMMProviderTest.java @@ -47,7 +47,7 @@ import static org.junit.Assert.assertTrue; public class WSDLAddrPolicyAttachmentJaxwsMMProviderTest extends AbstractBusClientServerTestBase { - public static final String PORT = allocatePort(Server.class); + public static final String PORT = allocatePort(PolicyAttachmentServer.class); public static final String DECOUPLED = allocatePort("decoupled"); private static final Logger LOG = LogUtils.getLogger(WSDLAddrPolicyAttachmentJaxwsMMProviderTest.class); @@ -57,7 +57,7 @@ public class WSDLAddrPolicyAttachmentJaxwsMMProviderTest extends AbstractBusClie private static final String WSDL_ADDRESS = ADDRESS + "?wsdl"; private static final QName ENDPOINT_NAME = new QName("http://messaging/", "AsyncMessagingService"); - public static class Server extends AbstractBusTestServerBase { + public static class PolicyAttachmentServer extends AbstractBusTestServerBase { protected void run() { SpringBusFactory bf = new SpringBusFactory(); @@ -77,7 +77,7 @@ protected void run() { public static void main(String[] args) { try { - Server s = new Server(); + PolicyAttachmentServer s = new PolicyAttachmentServer(); s.start(); } catch (Exception ex) { ex.printStackTrace(); @@ -90,7 +90,7 @@ public static void main(String[] args) { @BeforeClass public static void startServers() throws Exception { - assertTrue("server did not launch correctly", launchServer(Server.class, true)); + assertTrue("server did not launch correctly", launchServer(PolicyAttachmentServer.class, true)); } private static void testInterceptors(Bus b) { diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/mex/Server.java b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/mex/MEXServer.java similarity index 92% rename from systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/mex/Server.java rename to systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/mex/MEXServer.java index 1c9917b86d6..7d0d263d19f 100644 --- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/mex/Server.java +++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/mex/MEXServer.java @@ -24,8 +24,8 @@ import org.apache.cxf.jaxws.EndpointImpl; import org.apache.cxf.testutil.common.AbstractBusTestServerBase; -public class Server extends AbstractBusTestServerBase { - static final String PORT = allocatePort(Server.class); +public class MEXServer extends AbstractBusTestServerBase { + static final String PORT = allocatePort(MEXServer.class); EndpointImpl ep; protected void run() { @@ -58,7 +58,7 @@ private String getWsdl() { public static void main(String[] args) { try { - Server s = new Server(); + MEXServer s = new MEXServer(); s.start(); } catch (Exception ex) { ex.printStackTrace(); diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/mex/MEXTest.java b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/mex/MEXTest.java index 2449da20d34..282b93eb8d4 100644 --- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/mex/MEXTest.java +++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/mex/MEXTest.java @@ -37,10 +37,10 @@ * */ public class MEXTest extends AbstractWSATestBase { - static final String PORT = Server.PORT; + static final String PORT = MEXServer.PORT; @BeforeClass public static void startServers() throws Exception { - assertTrue("server did not launch correctly", launchServer(Server.class, true)); + assertTrue("server did not launch correctly", launchServer(MEXServer.class, true)); createStaticBus(); } diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/AddressingAnonymousPolicyTest.java b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/AddressingAnonymousPolicyTest.java index f84b2b9a51b..1b65d264abc 100644 --- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/AddressingAnonymousPolicyTest.java +++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/AddressingAnonymousPolicyTest.java @@ -49,20 +49,20 @@ * WS-RM in response to Policies defined for the endpoint via an external policy attachment. */ public class AddressingAnonymousPolicyTest extends AbstractBusClientServerTestBase { - public static final String PORT = allocatePort(Server.class); + public static final String PORT = allocatePort(AddressingAnonymousPolicyServer.class); public static final String TEMPDIR = FileUtils.getDefaultTempDir().toURI().toString(); private static final Logger LOG = LogUtils.getLogger(AddressingAnonymousPolicyTest.class); - public static class Server extends AbstractBusTestServerBase { + public static class AddressingAnonymousPolicyServer extends AbstractBusTestServerBase { String tmpDir = TEMPDIR; Endpoint ep; - public Server() { + public AddressingAnonymousPolicyServer() { } - public Server(String dir) { + public AddressingAnonymousPolicyServer(String dir) { tmpDir = dir; } - public Server(String[] args) { + public AddressingAnonymousPolicyServer(String[] args) { tmpDir = args[0]; } protected void run() { @@ -92,7 +92,7 @@ public void tearDown() { public static void main(String[] args) { try { - Server s = new Server(args[0]); + AddressingAnonymousPolicyServer s = new AddressingAnonymousPolicyServer(args[0]); s.start(); } catch (Exception ex) { ex.printStackTrace(); @@ -108,7 +108,7 @@ public static void startServers() throws Exception { PolicyTestHelper.updatePolicyRef("addr-external-anonymous-client.xml", ":9020", ":" + PORT); PolicyTestHelper.updatePolicyRef("addr-external-anonymous-server.xml", ":9020", ":" + PORT); System.setProperty("client.temp.location", TEMPDIR); - assertTrue("server did not launch correctly", launchServer(Server.class, null, + assertTrue("server did not launch correctly", launchServer(AddressingAnonymousPolicyServer.class, null, new String[] {TEMPDIR})); } diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/AddressingInlinePolicyTest.java b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/AddressingInlinePolicyTest.java index dbc27427627..251195e9df4 100644 --- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/AddressingInlinePolicyTest.java +++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/AddressingInlinePolicyTest.java @@ -52,11 +52,11 @@ * WS-RM in response to Policies defined for the endpoint via an inline policy in addr-inline-policy.xml. */ public class AddressingInlinePolicyTest extends AbstractBusClientServerTestBase { - public static final String PORT = allocatePort(Server.class); + public static final String PORT = allocatePort(AddressingInlinePolicyServer.class); private static final Logger LOG = LogUtils.getLogger(AddressingInlinePolicyTest.class); - public static class Server extends AbstractBusTestServerBase { + public static class AddressingInlinePolicyServer extends AbstractBusTestServerBase { Endpoint ep; protected void run() { @@ -78,7 +78,7 @@ public void tearDown() { public static void main(String[] args) { try { - Server s = new Server(); + AddressingInlinePolicyServer s = new AddressingInlinePolicyServer(); s.start(); } catch (Exception ex) { ex.printStackTrace(); @@ -92,7 +92,7 @@ public static void main(String[] args) { @BeforeClass public static void startServers() throws Exception { TestUtil.getNewPortNumber("decoupled"); - assertTrue("server did not launch correctly", launchServer(Server.class, true)); + assertTrue("server did not launch correctly", launchServer(AddressingInlinePolicyServer.class, true)); } @Test diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/AddressingOptionalPolicyTest.java b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/AddressingOptionalPolicyTest.java index 68810fd171a..66e2963acc6 100644 --- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/AddressingOptionalPolicyTest.java +++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/AddressingOptionalPolicyTest.java @@ -56,20 +56,20 @@ * WS-RM in response to Policies defined for the endpoint via an external policy attachment. */ public class AddressingOptionalPolicyTest extends AbstractBusClientServerTestBase { - public static final String PORT = allocatePort(Server.class); + public static final String PORT = allocatePort(AddressingOptionalPolicyServer.class); public static final String TEMPDIR = FileUtils.getDefaultTempDir().toURI().toString(); private static final Logger LOG = LogUtils.getLogger(AddressingOptionalPolicyTest.class); - public static class Server extends AbstractBusTestServerBase { + public static class AddressingOptionalPolicyServer extends AbstractBusTestServerBase { String tmpDir = TEMPDIR; Endpoint ep; - public Server() { + public AddressingOptionalPolicyServer() { } - public Server(String dir) { + public AddressingOptionalPolicyServer(String dir) { tmpDir = dir; } - public Server(String[] args) { + public AddressingOptionalPolicyServer(String[] args) { tmpDir = args[0]; } protected void run() { @@ -99,7 +99,7 @@ public void tearDown() { public static void main(String[] args) { try { - Server s = new Server(args[0]); + AddressingOptionalPolicyServer s = new AddressingOptionalPolicyServer(args[0]); s.start(); } catch (Exception ex) { ex.printStackTrace(); @@ -115,7 +115,7 @@ public static void startServers() throws Exception { TestUtil.getNewPortNumber("decoupled"); PolicyTestHelper.updatePolicyRef("addr-optional-external.xml", ":9020", ":" + PORT); System.setProperty("temp.location", TEMPDIR); - assertTrue("server did not launch correctly", launchServer(Server.class, null, + assertTrue("server did not launch correctly", launchServer(AddressingOptionalPolicyServer.class, null, new String[] {TEMPDIR})); } diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/AddressingPolicy0705Test.java b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/AddressingPolicy0705Test.java index 81353772ec8..6ad442b6fe5 100644 --- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/AddressingPolicy0705Test.java +++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/AddressingPolicy0705Test.java @@ -52,20 +52,20 @@ // REVISIT this class is copied from AddressingPolicyTest to use the wsam-2007/05 namespace // consolidate this class with the original public class AddressingPolicy0705Test extends AbstractBusClientServerTestBase { - public static final String PORT = allocatePort(Server.class); + public static final String PORT = allocatePort(AddressingPolicy0705Server.class); public static final String TEMPDIR = FileUtils.getDefaultTempDir().toURI().toString(); private static final Logger LOG = LogUtils.getLogger(AddressingPolicy0705Test.class); - public static class Server extends AbstractBusTestServerBase { + public static class AddressingPolicy0705Server extends AbstractBusTestServerBase { String tmpDir = TEMPDIR; Endpoint ep; - public Server() { + public AddressingPolicy0705Server() { } - public Server(String dir) { + public AddressingPolicy0705Server(String dir) { tmpDir = dir; } - public Server(String[] args) { + public AddressingPolicy0705Server(String[] args) { tmpDir = args[0]; } protected void run() { @@ -95,7 +95,7 @@ public void tearDown() { public static void main(String[] args) { try { - Server s = new Server(args[0]); + AddressingPolicy0705Server s = new AddressingPolicy0705Server(args[0]); s.start(); } catch (Exception ex) { ex.printStackTrace(); @@ -112,7 +112,7 @@ public static void startServers() throws Exception { PolicyTestHelper.updatePolicyRef("addr-external0705.xml", ":9020", ":" + PORT); System.setProperty("temp.location", TEMPDIR); - assertTrue("server did not launch correctly", launchServer(Server.class, null, + assertTrue("server did not launch correctly", launchServer(AddressingPolicy0705Server.class, null, new String[] {TEMPDIR}, true)); } diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/AddressingPolicyExternalAttachmentWsdl11Test.java b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/AddressingPolicyExternalAttachmentWsdl11Test.java index e3f9b05b6d7..11234042f7d 100644 --- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/AddressingPolicyExternalAttachmentWsdl11Test.java +++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/AddressingPolicyExternalAttachmentWsdl11Test.java @@ -48,20 +48,20 @@ * WS-RM in response to Policies defined for the endpoint via an external policy attachment. */ public class AddressingPolicyExternalAttachmentWsdl11Test extends AbstractBusClientServerTestBase { - public static final String PORT = allocatePort(Server.class); + public static final String PORT = allocatePort(AddressingPolicyExternalAttachmentServer.class); public static final String TEMPDIR = FileUtils.getDefaultTempDir().toURI().toString(); private static final Logger LOG = LogUtils.getLogger(AddressingPolicyExternalAttachmentWsdl11Test.class); - public static class Server extends AbstractBusTestServerBase { + public static class AddressingPolicyExternalAttachmentServer extends AbstractBusTestServerBase { String tmpDir = TEMPDIR; Endpoint ep; - public Server() { + public AddressingPolicyExternalAttachmentServer() { } - public Server(String dir) { + public AddressingPolicyExternalAttachmentServer(String dir) { tmpDir = dir; } - public Server(String[] args) { + public AddressingPolicyExternalAttachmentServer(String[] args) { tmpDir = args[0]; } protected void run() { @@ -91,7 +91,7 @@ public void tearDown() { public static void main(String[] args) { try { - Server s = new Server(args[0]); + AddressingPolicyExternalAttachmentServer s = new AddressingPolicyExternalAttachmentServer(args[0]); s.start(); } catch (Exception ex) { ex.printStackTrace(); @@ -108,7 +108,7 @@ public static void startServers() throws Exception { PolicyTestHelper.updatePolicyRef("addr-external-wsdl11.xml", ":9020", ":" + PORT); System.setProperty("temp.location", TEMPDIR); - assertTrue("server did not launch correctly", launchServer(Server.class, null, + assertTrue("server did not launch correctly", launchServer(AddressingPolicyExternalAttachmentServer.class, null, new String[] {TEMPDIR}, true)); } diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/AddressingPolicyTest.java b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/AddressingPolicyTest.java index 5032a2a4623..15fa2e48e53 100644 --- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/AddressingPolicyTest.java +++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/AddressingPolicyTest.java @@ -50,20 +50,20 @@ * WS-RM in response to Policies defined for the endpoint via an external policy attachment. */ public class AddressingPolicyTest extends AbstractBusClientServerTestBase { - public static final String PORT = allocatePort(Server.class); + public static final String PORT = allocatePort(AddressingPolicyServer.class); public static final String TEMPDIR = FileUtils.getDefaultTempDir().toURI().toString(); private static final Logger LOG = LogUtils.getLogger(AddressingPolicyTest.class); - public static class Server extends AbstractBusTestServerBase { + public static class AddressingPolicyServer extends AbstractBusTestServerBase { String tmpDir = TEMPDIR; Endpoint ep; - public Server() { + public AddressingPolicyServer() { } - public Server(String dir) { + public AddressingPolicyServer(String dir) { tmpDir = dir; } - public Server(String[] args) { + public AddressingPolicyServer(String[] args) { tmpDir = args[0]; } protected void run() { @@ -93,7 +93,7 @@ public void tearDown() { public static void main(String[] args) { try { - Server s = new Server(args[0]); + AddressingPolicyServer s = new AddressingPolicyServer(args[0]); s.start(); } catch (Exception ex) { ex.printStackTrace(); @@ -110,7 +110,7 @@ public static void startServers() throws Exception { PolicyTestHelper.updatePolicyRef("addr-external.xml", ":9020", ":" + PORT); System.setProperty("temp.location", TEMPDIR); - assertTrue("server did not launch correctly", launchServer(Server.class, null, + assertTrue("server did not launch correctly", launchServer(AddressingPolicyServer.class, null, new String[] {TEMPDIR}, true)); } diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/HTTPClientPolicyTest.java b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/HTTPClientPolicyTest.java index 70918391ec2..30f4dfa1e85 100644 --- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/HTTPClientPolicyTest.java +++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/HTTPClientPolicyTest.java @@ -63,7 +63,7 @@ * the use of multiple compatible or incompatible assertions. */ public class HTTPClientPolicyTest extends AbstractBusClientServerTestBase { - public static final String PORT = allocatePort(Server.class); + public static final String PORT = allocatePort(HTTPClientPolicyServer.class); private static final Logger LOG = LogUtils.getLogger(HTTPClientPolicyTest.class); private static final String POLICY_ENGINE_ENABLED_CFG = @@ -73,7 +73,7 @@ public class HTTPClientPolicyTest extends AbstractBusClientServerTestBase { private static final QName GREETER_QNAME = new QName("http://cxf.apache.org/greeter_control", "BasicGreeterService"); - public static class Server extends AbstractBusTestServerBase { + public static class HTTPClientPolicyServer extends AbstractBusTestServerBase { Endpoint ep; protected void run() { SpringBusFactory bf = new SpringBusFactory(); @@ -99,7 +99,7 @@ public void tearDown() { public static void main(String[] args) { try { - Server s = new Server(); + HTTPClientPolicyServer s = new HTTPClientPolicyServer(); s.start(); } catch (Exception ex) { ex.printStackTrace(); @@ -112,7 +112,7 @@ public static void main(String[] args) { @BeforeClass public static void startServers() throws Exception { - assertTrue("server did not launch correctly", launchServer(Server.class)); + assertTrue("server did not launch correctly", launchServer(HTTPClientPolicyServer.class)); } @Test diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/HTTPServerPolicyTest.java b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/HTTPServerPolicyTest.java index 2ad730a8e26..ef1c1424652 100644 --- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/HTTPServerPolicyTest.java +++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/HTTPServerPolicyTest.java @@ -54,11 +54,11 @@ * the use of multiple compatible or incompatible assertions. */ public class HTTPServerPolicyTest extends AbstractBusClientServerTestBase { - public static final String PORT = allocatePort(Server.class); + public static final String PORT = allocatePort(HTTPServerPolicyServer.class); private static final Logger LOG = LogUtils.getLogger(HTTPServerPolicyTest.class); - public static class Server extends AbstractBusTestServerBase { + public static class HTTPServerPolicyServer extends AbstractBusTestServerBase { Endpoint ep; protected void run() { SpringBusFactory bf = new SpringBusFactory(); @@ -84,7 +84,7 @@ public void tearDown() { public static void main(String[] args) { try { - Server s = new Server(); + HTTPServerPolicyServer s = new HTTPServerPolicyServer(); s.start(); } catch (Exception ex) { ex.printStackTrace(); @@ -97,7 +97,7 @@ public static void main(String[] args) { @BeforeClass public static void startServers() throws Exception { - assertTrue("server did not launch correctly", launchServer(Server.class)); + assertTrue("server did not launch correctly", launchServer(HTTPServerPolicyServer.class)); } @Test diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/NestedAddressingPolicyTest.java b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/NestedAddressingPolicyTest.java index 6d8025ca6d5..ffb9bddbc2c 100644 --- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/NestedAddressingPolicyTest.java +++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/NestedAddressingPolicyTest.java @@ -43,11 +43,11 @@ import static org.junit.Assert.fail; public class NestedAddressingPolicyTest extends AbstractBusClientServerTestBase { - public static final String PORT = allocatePort(Server.class); + public static final String PORT = allocatePort(NestedAddressingPolicyServer.class); private static final Logger LOG = LogUtils.getLogger(HTTPServerPolicyTest.class); - public static class Server extends AbstractBusTestServerBase { + public static class NestedAddressingPolicyServer extends AbstractBusTestServerBase { protected void run() { SpringBusFactory bf = new SpringBusFactory(); @@ -70,7 +70,7 @@ protected void run() { public static void main(String[] args) { try { - Server s = new Server(); + NestedAddressingPolicyServer s = new NestedAddressingPolicyServer(); s.start(); } catch (Exception ex) { ex.printStackTrace(); @@ -83,7 +83,7 @@ public static void main(String[] args) { @BeforeClass public static void startServers() throws Exception { - assertTrue("server did not launch correctly", launchServer(Server.class)); + assertTrue("server did not launch correctly", launchServer(NestedAddressingPolicyServer.class)); } @Test diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/RM10PolicyWsdlTest.java b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/RM10PolicyWsdlTest.java index 363a14e34ef..4946b5edc67 100644 --- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/RM10PolicyWsdlTest.java +++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/RM10PolicyWsdlTest.java @@ -45,15 +45,15 @@ */ public class RM10PolicyWsdlTest extends RMPolicyWsdlTestBase { - public static final String PORT = allocatePort(Server.class); + public static final String PORT = allocatePort(RM10PolicyServer.class); private static final Logger LOG = LogUtils.getLogger(RM10PolicyWsdlTest.class); - public static class Server extends ServerBase { + public static class RM10PolicyServer extends ServerBase { public static void main(String[] args) { try { - Server s = new Server(); + RM10PolicyServer s = new RM10PolicyServer(); s.start(); } catch (Exception ex) { ex.printStackTrace(); @@ -73,7 +73,7 @@ protected String getConfigPath() { @BeforeClass public static void startServers() throws Exception { TestUtil.getNewPortNumber("decoupled"); - assertTrue("server did not launch correctly", launchServer(Server.class, true)); + assertTrue("server did not launch correctly", launchServer(RM10PolicyServer.class, true)); } @Test diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/RM12PolicyWsdlTest.java b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/RM12PolicyWsdlTest.java index 1c3e185aabc..cb48d2654e6 100644 --- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/RM12PolicyWsdlTest.java +++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/RM12PolicyWsdlTest.java @@ -45,15 +45,15 @@ */ public class RM12PolicyWsdlTest extends RMPolicyWsdlTestBase { - public static final String PORT = allocatePort(Server.class); + public static final String PORT = allocatePort(RM12PolicyServer.class); private static final Logger LOG = LogUtils.getLogger(RM12PolicyWsdlTest.class); - public static class Server extends ServerBase { + public static class RM12PolicyServer extends ServerBase { public static void main(String[] args) { try { - Server s = new Server(); + RM12PolicyServer s = new RM12PolicyServer(); s.start(); } catch (Exception ex) { ex.printStackTrace(); @@ -73,7 +73,7 @@ protected String getConfigPath() { @BeforeClass public static void startServers() throws Exception { TestUtil.getNewPortNumber("decoupled"); - assertTrue("server did not launch correctly", launchServer(Server.class, true)); + assertTrue("server did not launch correctly", launchServer(RM12PolicyServer.class, true)); } @Test diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/RMPolicyTest.java b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/RMPolicyTest.java index 9bd98a3aece..f4b7923b34a 100644 --- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/RMPolicyTest.java +++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/RMPolicyTest.java @@ -56,7 +56,7 @@ * in response to Policies defined for the endpoint via an external policy attachment. */ public class RMPolicyTest extends AbstractBusClientServerTestBase { - public static final String PORT = allocatePort(Server.class); + public static final String PORT = allocatePort(RMPolicyServer.class); public static final String TEMPDIR = FileUtils.getDefaultTempDir().toURI().toString(); private static final Logger LOG = LogUtils.getLogger(RMPolicyTest.class); @@ -72,15 +72,15 @@ public class RMPolicyTest extends AbstractBusClientServerTestBase { private static final String GREETER_FAULT_ACTION = "http://cxf.apache.org/greeter_control/Greeter/pingMe/Fault/faultDetail"; - public static class Server extends AbstractBusTestServerBase { + public static class RMPolicyServer extends AbstractBusTestServerBase { String tmpDir = TEMPDIR; Endpoint ep; - public Server() { + public RMPolicyServer() { } - public Server(String dir) { + public RMPolicyServer(String dir) { tmpDir = dir; } - public Server(String[] args) { + public RMPolicyServer(String[] args) { tmpDir = args[0]; } protected void run() { @@ -110,7 +110,7 @@ public static void main(String[] args) { if (args.length == 0) { args = new String[] {TEMPDIR}; } - Server s = new Server(args[0]); + RMPolicyServer s = new RMPolicyServer(args[0]); s.start(); } catch (Exception ex) { ex.printStackTrace(); @@ -127,7 +127,7 @@ public static void startServers() throws Exception { PolicyTestHelper.updatePolicyRef("rm-external.xml", ":9020", ":" + PORT); System.setProperty("temp.location", TEMPDIR); - assertTrue("server did not launch correctly", launchServer(Server.class, null, + assertTrue("server did not launch correctly", launchServer(RMPolicyServer.class, null, new String[] {TEMPDIR})); } diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/rm10wsdl_server.xml b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/rm10wsdl_server.xml index fa4719a6b6c..2084fa28b5e 100644 --- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/rm10wsdl_server.xml +++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/rm10wsdl_server.xml @@ -38,7 +38,7 @@ - + @@ -46,7 +46,7 @@ - + diff --git a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/rm12wsdl_server.xml b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/rm12wsdl_server.xml index 5fbb2ba9c80..d4025f2c900 100644 --- a/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/rm12wsdl_server.xml +++ b/systests/ws-specs/src/test/java/org/apache/cxf/systest/ws/policy/rm12wsdl_server.xml @@ -38,7 +38,7 @@ - + @@ -46,7 +46,7 @@ - + diff --git a/testutils/src/main/java/org/apache/cxf/testutil/common/TestUtil.java b/testutils/src/main/java/org/apache/cxf/testutil/common/TestUtil.java index b22caa6889d..fad15c17f5f 100644 --- a/testutils/src/main/java/org/apache/cxf/testutil/common/TestUtil.java +++ b/testutils/src/main/java/org/apache/cxf/testutil/common/TestUtil.java @@ -29,8 +29,10 @@ import java.net.URISyntaxException; import java.net.URL; import java.net.URLClassLoader; +import java.util.Map; import java.util.Properties; import java.util.Random; +import java.util.concurrent.ConcurrentHashMap; import java.util.logging.Logger; import jakarta.xml.ws.BindingProvider; @@ -43,6 +45,7 @@ public final class TestUtil { private static final Logger LOG = LogUtils.getL7dLogger(TestUtil.class); private static int portNum = -1; private static Properties ports = new Properties(); + private static Map names = new ConcurrentHashMap<>(); @SuppressWarnings("unused") private static ServerSocket lock; @@ -143,6 +146,12 @@ public static String getNewPortNumber(String name) { } private static void applyNames(String fullName, String simpleName, String p) { + final String existing = names.putIfAbsent(simpleName, fullName); + if (existing != null && !existing.equalsIgnoreCase(fullName)) { + throw new IllegalArgumentException("The port naming conflict detected. " + + "Attempt to register named port [" + simpleName + "] for [" + fullName + + "] but it is already associated with [" + existing + "]"); + } ports.setProperty("testutil.ports." + fullName, p); ports.setProperty("testutil.ports." + simpleName, p); System.setProperty("testutil.ports." + fullName, p);