January 2015 - jbossws-commits - Jboss List Archives

JBossWS SVN: r19364 - in stack/cxf/branches/arquillian/modules/testsuite/cxf-tests: src/test/scripts and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2015-01-13 02:24:05 -0500 (Tue, 13 Jan 2015) New Revision: 19364 Removed: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/scripts/jboss-home-bin-script-permissions.groovy Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/pom.xml Log: Also remove persmission script from cxf-tests Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/pom.xml =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/pom.xml 2015-01-12 21:08:41 UTC (rev 19363) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/pom.xml 2015-01-13 07:24:05 UTC (rev 19364) @@ -123,21 +123,6 @@ </properties> </configuration> </execution> - <execution> - <id>jboss-home-bin-script-permissions</id> - <phase>pre-integration-test</phase> - <goals> - <goal>execute</goal> - </goals> - <configuration> - <source> - ${basedir}/src/test/scripts/jboss-home-bin-script-permissions.groovy - </source> - <properties> - <jbossHome>${jboss.home}</jbossHome> - </properties> - </configuration> - </execution> </executions> </plugin> <plugin>  Deleted: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/scripts/jboss-home-bin-script-permissions.groovy =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/scripts/jboss-home-bin-script-permissions.groovy 2015-01-12 21:08:41 UTC (rev 19363) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/scripts/jboss-home-bin-script-permissions.groovy 2015-01-13 07:24:05 UTC (rev 19364) @@ -1,18 +0,0 @@ - -/* - * Set execute permission on needed server scripts. - */ - String[] scriptList = [ "wsconsume.bat", - "wsconsume.sh", - "wsprovide.bat", - "wsprovide.sh", - "appclient.bat", - "appclient.sh" - ] - for (n in scriptList) { - def cmd = "chmod +x " + project.properties['jbossHome'] + "/bin/" + n - println cmd - cmd.execute() - def tmp = "touch /tmp/" + n - tmp.execute() - }

10 years, 8 months

1
0
0 / 0

JBossWS SVN: r19363 - in stack/cxf/branches/arquillian/modules: testsuite and 66 other directories.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2015-01-12 16:08:41 -0500 (Mon, 12 Jan 2015) New Revision: 19363 Added: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/etc/container.properties stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/etc/container.properties Removed: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/etc/jboss-ejb-client.properties stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/etc/server.jndi.properties stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/etc/jboss-ejb-client.properties stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/etc/server.jndi.properties stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webservice/WebServiceBase.java Modified: stack/cxf/branches/arquillian/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTest.java stack/cxf/branches/arquillian/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/pom.xml stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/etc/arquillian.xml stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/BusTestCase.java stack/cxf/branches/arquillian/modules/testsuite/pom.xml stack/cxf/branches/arquillian/modules/testsuite/shared-tests/pom.xml stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/etc/arquillian.xml stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/helper/TestServlet.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/complex/ComplexTestCase.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/holder/HolderTestCase.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1178/JBWS1178TestCaseForked.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581TestCase.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1582/JBWS1582TestCase.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1666/TestClient.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1822/JBWS1822TestCase.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase1/client/JBWS2074TestCase.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase2/client/JBWS2074TestCase.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase3/client/JBWS2074TestCase.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase4/client/JBWS2074TestCase.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2150/JBWS2150TestCaseForked.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2268/JBWS2268TestCase.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2527/JBWS2527TestCase.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2634/JBWS2634TestCase.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3140/JBWS3140TestCase.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3223/TestServlet.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3282/HandlerChainTestCaseForked.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3287/JBWS3287TestCase.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3736/JBWS3736TestCase.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionEJB3TestCase.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionServletTestCase.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefTestCase.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webservice/WebServiceEJB3TestCase.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webservice/WebServiceJSETestCase.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefTestCase.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webservicerefsec/WebServiceRefSecTestCase.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/publish/EndpointPublishServlet.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/holder/META-INF/wsdl/HolderService.wsdl stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws1581/META-INF/wsdl/TestService.wsdl stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws1841/META-INF/wsdl/TestService.wsdl stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws1969/META-INF/wsdl/echo/TestService.wsdl stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2307/WEB-INF-client/wsdl/HelloService.wsdl stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2307/WEB-INF-service/wsdl/HelloService.wsdl stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/TestService.wsdl stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2419/WEB-INF/wsdl/SOAP12Service.wsdl stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2449/META-INF/wsdl/test.wsdl stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2527/WEB-INF-client/wsdl/HelloService.wsdl stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2527/WEB-INF-service/wsdl/HelloService.wsdl stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2591/wsdl/JBWS2591TestService.wsdl stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2957/WEB-INF/wsdl/HelloService.wsdl stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3140/wsdl/TestEndpoint.wsdl stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3223/WEB-INF/wsdl/TestService.wsdl stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3401/WEB-INF/wsdl/TestService.wsdl stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/addressing/META-INF/wsdl/TestService.wsdl stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/advanced/retail/META-INF/wsdl/CCVerificationService.wsdl stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/advanced/retail/META-INF/wsdl/OrderMgmtService.wsdl stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/advanced/retail/META-INF/wsdl/ProfileMgmtService.wsdl stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/asynchronous/WEB-INF/wsdl/TestService.wsdl stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/serviceref/META-INF/wsdl/Endpoint.wsdl stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webparam/META-INF/wsdl/PingService.wsdl stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webresult/META-INF/wsdl/CustomerService.wsdl stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webserviceref/META-INF/wsdl/Endpoint.wsdl stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webserviceref/META-INF/wsdl/MultipleEndpoint.wsdl stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webservicerefsec/WEB-INF/wsdl/Endpoint.wsdl stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/publish/WEB-INF/wsdl/EndpointImpl3.xml stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/saaj/jbws3084/WEB-INF/wsdl/SaajService.wsdl stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/scripts/jbws-testsuite-shared-default.groovy Log: Changes for running the shared-testsuite default container instance with a port offset; added a mechanism for getting the port number in the testsuite; revisited the MBean server and EJB3 client lookup configuration; temporary changes to a bunch of wsdls to use the new port numbers (will have to be replaced by prop references). cxf specific testsuite still to be updated. Modified: stack/cxf/branches/arquillian/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTest.java =================================================================== --- stack/cxf/branches/arquillian/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTest.java 2015-01-12 21:08:41 UTC (rev 19363) @@ -23,7 +23,6 @@ import java.io.File; import java.io.IOException; -import java.io.InputStream; import java.io.OutputStream; import java.net.MalformedURLException; import java.net.URL; @@ -35,8 +34,6 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; -import java.util.Map.Entry; -import java.util.Properties; import java.util.StringTokenizer; import javax.management.MBeanServerConnection; @@ -67,8 +64,10 @@ { protected static Logger log = Logger.getLogger(JBossWSTest.class.getName()); public static final String SYSPROP_COPY_JOB_TIMEOUT = "test.copy.job.timeout"; + public static final String CXF_TESTS_GROUP_QUALIFIER = "cxf-tests"; + public static final String SHARED_TESTS_GROUP_QUALIFIER = "shared-tests"; private static final int COPY_JOB_TIMEOUT = Integer.getInteger(SYSPROP_COPY_JOB_TIMEOUT, File.pathSeparatorChar == ':' ? 5000 : 60000); //60s on Windows, 5s on UNIX and Mac - + public JBossWSTest() { } @@ -227,6 +226,16 @@ return JBossWSTestHelper.getServerHost(); } + public static int getServerPort() + { + return JBossWSTestHelper.getServerPort(); + } + + public static int getServerPort(String groupQualifier, String containerQualifier) + { + return JBossWSTestHelper.getServerPort(groupQualifier, containerQualifier); + } + public static File getArchiveFile(String archive) { return JBossWSTestHelper.getArchiveFile(archive); @@ -258,31 +267,26 @@ return new File(parent, filename); } - private static Hashtable<String, String> getEnvironment(final String resourceName) throws IOException { - final Hashtable<String, String> env = new Hashtable<String, String>(); - final InputStream is = JBossWSTest.class.getClassLoader().getResourceAsStream(resourceName); - if (is != null) { - final Properties props = new Properties(); - props.load(is); - Entry<Object, Object> entry; - final Iterator<Entry<Object, Object>> entries = props.entrySet().iterator(); - while (entries.hasNext()) { - entry = entries.next(); - env.put((String)entry.getKey(), (String)entry.getValue()); - } - } - return env; - } - /** Get the server remote env context * Every test calling this method have to ensure InitialContext.close() * method is called at end of test to clean up all associated caches. */ public static InitialContext getServerInitialContext() throws NamingException, IOException { - final Hashtable<String, String> env = getEnvironment("server.jndi.properties"); - return new InitialContext(env); + return getServerInitialContext(null, null); } + + public static InitialContext getServerInitialContext(String groupQualifier, String containerQualifier) throws NamingException, IOException + { + final Hashtable<String, String> env = new Hashtable<String, String>(); + env.put("java.naming.factory.initial", "org.jboss.naming.remote.client.InitialContextFactory"); + env.put("java.naming.factory.url.pkgs", "org.jboss.ejb.client.naming:org.jboss.naming.remote.client"); + env.put("jboss.naming.client.connect.options.org.xnio.Options.SASL_POLICY_NOPLAINTEXT", "false"); + env.put("jboss.naming.client.security.callback.handler.class", "org.jboss.wsf.test.CallbackHandler"); + env.put("jboss.naming.client.ejb.context", "true"); + env.put("java.naming.provider.url", "http-remoting://" + getServerHost() + ":" + getServerPort(groupQualifier, containerQualifier)); + return new InitialContext(env); + } public static void assertEquals(Element expElement, Element wasElement, boolean ignoreWhitespace) { Modified: stack/cxf/branches/arquillian/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java =================================================================== --- stack/cxf/branches/arquillian/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2015-01-12 21:08:41 UTC (rev 19363) @@ -23,13 +23,19 @@ import java.io.File; import java.io.IOException; +import java.io.InputStream; import java.io.OutputStream; import java.net.Inet6Address; import java.net.InetAddress; import java.net.MalformedURLException; import java.net.URL; import java.net.UnknownHostException; +import java.util.Hashtable; +import java.util.Iterator; import java.util.Map; +import java.util.Properties; +import java.util.Map.Entry; +import java.util.WeakHashMap; import javax.management.MBeanServerConnection; import javax.management.remote.JMXConnector; @@ -63,6 +69,9 @@ private static final String SYSPROP_JBOSS_BIND_ADDRESS = "jboss.bind.address"; private static final String SYSPROP_TEST_ARCHIVE_DIRECTORY = "test.archive.directory"; private static final String SYSPROP_TEST_RESOURCES_DIRECTORY = "test.resources.directory"; + private static final String SYSPROP_DEFAULT_CONTAINER_QUALIFIER = "default.container.qualifier"; + private static final String SYSPROP_DEFAULT_CONTAINER_GROUP_QUALIFIER = "default.container.group.qualifier"; + private static final String SYSPROP_CONTAINER_PORT_OFFSET_PREFIX = "port-offset."; private static final String SYSPROP_AS_SERVER_CONN_RETRIEVAL_ATTEMPTS = "test.as.server.connection.retrieval.attempts"; private static final String TEST_USERNAME = "test.username"; private static final String TEST_PASSWORD = "test.password"; @@ -74,7 +83,8 @@ private static final String implInfo; private static volatile Deployer deployer; - private static volatile MBeanServerConnection server; + + private static WeakHashMap<ClassLoader, Hashtable<String, String>> containerEnvs = new WeakHashMap<ClassLoader, Hashtable<String,String>>(); static { integrationTarget = System.getProperty(SYSPROP_JBOSSWS_INTEGRATION_TARGET); @@ -196,7 +206,60 @@ final String host = System.getProperty(SYSPROP_JBOSS_BIND_ADDRESS, "localhost"); return toIPv6URLFormat(host); } - + + public static int getServerPort() + { + return getServerPort(null, null); + } + + public static int getServerPort(String groupQualifier, String containerQualifier) + { + return 8080 + getContainerPortOffset(groupQualifier, containerQualifier); + } + + protected static int getContainerPortOffset(String groupQualifier, String containerQualifier) + { + Hashtable<String, String> env = getContainerEnvironment(); + + if (groupQualifier == null) { + groupQualifier = env.get(SYSPROP_DEFAULT_CONTAINER_GROUP_QUALIFIER); + } + if (containerQualifier == null) { + containerQualifier = env.get(SYSPROP_DEFAULT_CONTAINER_QUALIFIER); + } + String offset = env.get(SYSPROP_CONTAINER_PORT_OFFSET_PREFIX + groupQualifier + "." + containerQualifier); + return offset != null ? Integer.valueOf(offset) : 0; + } + + private static Hashtable<String, String> getContainerEnvironment() { + Hashtable<String, String> env; + ClassLoader tccl = Thread.currentThread().getContextClassLoader(); + synchronized (containerEnvs) + { + env = containerEnvs.get(tccl); + if (env == null) { + env = new Hashtable<String, String>(); + final InputStream is = tccl.getResourceAsStream("container.properties"); + try { + if (is != null) { + final Properties props = new Properties(); + props.load(is); + Entry<Object, Object> entry; + final Iterator<Entry<Object, Object>> entries = props.entrySet().iterator(); + while (entries.hasNext()) { + entry = entries.next(); + env.put((String)entry.getKey(), (String)entry.getValue()); + } + } + } catch (IOException e) { + throw new RuntimeException(e); + } + containerEnvs.put(tccl, env); + } + return env; + } + } + private static String toIPv6URLFormat(final String host) { try @@ -221,27 +284,25 @@ throw new RuntimeException(e); } } - + public static MBeanServerConnection getServer() { - if (server == null) + return getServer(null, null); + } + + public static MBeanServerConnection getServer(String groupQualifier, String containerQualifier) + { + int portOffset = getContainerPortOffset(groupQualifier, containerQualifier); + String integrationTarget = getIntegrationTarget(); + MBeanServerConnection server; + if (integrationTarget.startsWith("wildfly")) { - synchronized (JBossWSTestHelper.class) - { - if (server == null) - { - String integrationTarget = getIntegrationTarget(); - if (integrationTarget.startsWith("wildfly")) - { - server = getServerConnection("service:jmx:http-remoting-jmx://" + getServerHost() + ":" + 9990); - } - else - { - throw new IllegalStateException("Unsupported target container: " + integrationTarget); - } - } - } + server = getServerConnection("service:jmx:http-remoting-jmx://" + getServerHost() + ":" + (9990 + portOffset)); } + else + { + throw new IllegalStateException("Unsupported target container: " + integrationTarget); + } return server; } Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/pom.xml =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/pom.xml 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/pom.xml 2015-01-12 21:08:41 UTC (rev 19363) @@ -294,7 +294,7 @@ <jbossHome>${jboss.home}</jbossHome>  - <port>9990</port> + <port>9990</port>  </configuration> </execution> <execution> @@ -304,12 +304,12 @@ <goal>start</goal> </goals> <configuration> - <jvmArgs>-server -XX:+UseCompressedOops -Xms48m -Xmx384m -XX:MaxPermSize=192m -Djboss.socket.binding.port-offset=10000 ${additionalJvmArgs}</jvmArgs> + <jvmArgs>-server -XX:+UseCompressedOops -Xms48m -Xmx384m -XX:MaxPermSize=192m -Djboss.socket.binding.port-offset=${port-offset.cxf-tests.ssl-mutual-auth} ${additionalJvmArgs}</jvmArgs> <serverConfig>jbws-testsuite-ssl-mutual-auth.xml</serverConfig> <jbossHome>${jboss.home}</jbossHome>  - <port>19990</port> + <port>19990</port>  </configuration> </execution> <execution> @@ -319,12 +319,12 @@ <goal>start</goal> </goals> <configuration> - <jvmArgs>-server -XX:+UseCompressedOops -Xms48m -Xmx384m -XX:MaxPermSize=192m -Djboss.socket.binding.port-offset=20000 ${additionalJvmArgs}</jvmArgs> + <jvmArgs>-server -XX:+UseCompressedOops -Xms48m -Xmx384m -XX:MaxPermSize=192m -Djboss.socket.binding.port-offset=${port-offset.cxf-tests.default-config-tests} ${additionalJvmArgs}</jvmArgs> <serverConfig>jbws-testsuite-default-config-tests.xml</serverConfig> <jbossHome>${jboss.home}</jbossHome>  - <port>29990</port> + <port>29990</port>  </configuration> </execution> </executions> Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/etc/arquillian.xml =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/etc/arquillian.xml 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/etc/arquillian.xml 2015-01-12 21:08:41 UTC (rev 19363) @@ -11,37 +11,37 @@ <property name="allowConnectingToRunningServer">true</property> <property name="managementAddress">${jboss.bind.address:localhost}</property> <property name="jbossArguments">${jbossArguments}</property> - <property name="managementPort">${as.managementPort:9990}</property> + <property name="managementPort">${as.managementPort:9990}</property>   - <property name="waitForPorts">${as.debug.port:8787} ${as.managementPort:9990}</property> + <property name="waitForPorts">${as.debug.port:8787} ${as.managementPort:9990}</property>  <property name="waitForPortsTimeoutInSeconds">8</property> </configuration> </container> <container qualifier="ssl-mutual-auth" mode="manual"> <configuration> <property name="jbossHome">${jboss.home}</property> - <property name="javaVmArguments">-server -XX:+UseCompressedOops -Xms48m -Xmx384m -XX:MaxPermSize=192m -Djboss.socket.binding.port-offset=10000 ${additionalJvmArgs}</property> + <property name="javaVmArguments">-server -XX:+UseCompressedOops -Xms48m -Xmx384m -XX:MaxPermSize=192m -Djboss.socket.binding.port-offset=${port-offset.cxf-tests.ssl-mutual-auth} ${additionalJvmArgs}</property> <property name="serverConfig">jbws-testsuite-ssl-mutual-auth.xml</property> <property name="allowConnectingToRunningServer">true</property> <property name="managementAddress">${jboss.bind.address:localhost}</property> <property name="jbossArguments">${jbossArguments}</property> - <property name="managementPort">${as.managementPort:19990}</property> + <property name="managementPort">${as.managementPort:19990}</property>   - <property name="waitForPorts">${as.debug.port:18787} ${as.managementPort:19990}</property> + <property name="waitForPorts">${as.debug.port:18787} ${as.managementPort:19990}</property>  <property name="waitForPortsTimeoutInSeconds">8</property> </configuration> </container> <container qualifier="default-config-tests" mode="manual"> <configuration> <property name="jbossHome">${jboss.home}</property> - <property name="javaVmArguments">-server -XX:+UseCompressedOops -Xms48m -Xmx384m -XX:MaxPermSize=192m -Djboss.socket.binding.port-offset=20000 ${additionalJvmArgs}</property> + <property name="javaVmArguments">-server -XX:+UseCompressedOops -Xms48m -Xmx384m -XX:MaxPermSize=192m -Djboss.socket.binding.port-offset=${port-offset.cxf-tests.default-config-tests} ${additionalJvmArgs}</property> <property name="serverConfig">jbws-testsuite-default-config-tests.xml</property> <property name="allowConnectingToRunningServer">true</property> <property name="managementAddress">${jboss.bind.address:localhost}</property> <property name="jbossArguments">${jbossArguments}</property> - <property name="managementPort">${as.managementPort:29990}</property> + <property name="managementPort">${as.managementPort:29990}</property>   - <property name="waitForPorts">${as.debug.port:28787} ${as.managementPort:29990}</property> + <property name="waitForPorts">${as.debug.port:28787} ${as.managementPort:29990}</property>  <property name="waitForPortsTimeoutInSeconds">8</property> </configuration> </container> Added: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/etc/container.properties =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/etc/container.properties (rev 0) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/etc/container.properties 2015-01-12 21:08:41 UTC (rev 19363) @@ -0,0 +1,7 @@ +default.container.qualifier=jboss +default.container.group.qualifier=cxf-tests +port-offset.cxf-tests.jboss=(a)port-offset.cxf-tests.jboss@ +port-offset.cxf-tests.ssl-mutual-auth=(a)port-offset.cxf-tests.ssl-mutual-auth@ +port-offset.cxf-tests.default-config-tests=(a)port-offset.cxf-tests.default-config-tests@ +port-offset.shared-tests.jboss=(a)port-offset.shared-tests.jboss@ +port-offset.shared-tests.default-config-tests=(a)port-offset.shared-tests.default-config-tests@ \ No newline at end of file Property changes on: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/etc/container.properties ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Rev Date Added: svn:eol-style + native Deleted: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/etc/jboss-ejb-client.properties =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/etc/jboss-ejb-client.properties 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/etc/jboss-ejb-client.properties 2015-01-12 21:08:41 UTC (rev 19363) @@ -1,7 +0,0 @@ -remote.connectionprovider.create.options.org.xnio.Options.SSL_ENABLED=false -remote.connections=default -remote.connection.default.host=(a)jboss.bind.address@ -remote.connection.default.port=(a)remote.port@ -remote.connection.default.connect.options.org.xnio.Options.SASL_POLICY_NOANONYMOUS=false -remote.connection.default.connect.options.org.xnio.Options.SASL_POLICY_NOPLAINTEXT=false -callback.handler.class=org.jboss.wsf.test.CallbackHandler Deleted: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/etc/server.jndi.properties =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/etc/server.jndi.properties 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/etc/server.jndi.properties 2015-01-12 21:08:41 UTC (rev 19363) @@ -1,5 +0,0 @@ -java.naming.factory.initial=org.jboss.naming.remote.client.InitialContextFactory -java.naming.factory.url.pkgs=org.jboss.ejb.client.naming:org.jboss.naming.remote.client -java.naming.provider.url=@remote.protocol@://@jboss.bind.address@:@remote.port@ -jboss.naming.client.connect.options.org.xnio.Options.SASL_POLICY_NOPLAINTEXT=false -jboss.naming.client.security.callback.handler.class=org.jboss.wsf.test.CallbackHandler Modified: stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/BusTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/BusTestCase.java 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/cxf-tests/src/test/java/org/jboss/test/ws/jaxws/cxf/bus/BusTestCase.java 2015-01-12 21:08:41 UTC (rev 19363) @@ -249,7 +249,7 @@ { String host = getServerHost(); iniCtx = getServerInitialContext(); - Object obj = iniCtx.lookup("ejb:/jaxws-cxf-bus-ejb3-client//EJB3Client!" + EJB3ClientRemoteInterface.class.getName()); + Object obj = iniCtx.lookup("jaxws-cxf-bus-ejb3-client//EJB3Client!" + EJB3ClientRemoteInterface.class.getName()); EJB3ClientRemoteInterface ejb3Remote = (EJB3ClientRemoteInterface)obj; ejb3Remote.testBusCreation(); ejb3Remote.testSOAPConnection(host); Modified: stack/cxf/branches/arquillian/modules/testsuite/pom.xml =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/pom.xml 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/pom.xml 2015-01-12 21:08:41 UTC (rev 19363) @@ -31,8 +31,11 @@ <gnu.getopt.version>1.0.13</gnu.getopt.version> <bc.version>1.49</bc.version> <log4j.version>1.2.14</log4j.version> - <remote.port>4447</remote.port> - <remote.protocol>remote</remote.protocol> + <port-offset.cxf-tests.jboss>0</port-offset.cxf-tests.jboss> + <port-offset.cxf-tests.ssl-mutual-auth>10000</port-offset.cxf-tests.ssl-mutual-auth> + <port-offset.cxf-tests.default-config-tests>20000</port-offset.cxf-tests.default-config-tests> + <port-offset.shared-tests.jboss>30000</port-offset.shared-tests.jboss> + <port-offset.shared-tests.default-config-tests>40000</port-offset.shared-tests.default-config-tests> </properties>  @@ -723,10 +726,6 @@ --> <profile> <id>wildfly800</id> - <properties> - <remote.port>8080</remote.port> - <remote.protocol>http-remoting</remote.protocol> - </properties> <dependencies> <dependency> <groupId>org.jboss.ws</groupId> @@ -822,10 +821,6 @@ --> <profile> <id>wildfly810</id> - <properties> - <remote.port>8080</remote.port> - <remote.protocol>http-remoting</remote.protocol> - </properties> <dependencies> <dependency> <groupId>org.jboss.ws</groupId> @@ -921,10 +916,6 @@ --> <profile> <id>wildfly900</id> - <properties> - <remote.port>8080</remote.port> - <remote.protocol>http-remoting</remote.protocol> - </properties> <dependencies> <dependency> <groupId>org.wildfly</groupId> Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/pom.xml =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/pom.xml 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/pom.xml 2015-01-12 21:08:41 UTC (rev 19363) @@ -211,10 +211,10 @@ <goal>start</goal> </goals> <configuration> - <jvmArgs>-server -XX:+UseCompressedOops -Xms64m -Xmx512m -XX:MaxPermSize=256m ${additionalJvmArgs}</jvmArgs> + <jvmArgs>-server -XX:+UseCompressedOops -Xms64m -Xmx512m -XX:MaxPermSize=256m -Djboss.socket.binding.port-offset=${port-offset.shared-tests.jboss} ${additionalJvmArgs}</jvmArgs> <serverConfig>jbws-testsuite-shared-default.xml</serverConfig> <jbossHome>${jboss.home}</jbossHome> - <port>9990</port> + <port>39990</port>  </configuration> </execution> <execution> @@ -224,10 +224,10 @@ <goal>start</goal> </goals> <configuration> - <jvmArgs>-server -XX:+UseCompressedOops -Xms48m -Xmx384m -XX:MaxPermSize=192m -Djboss.socket.binding.port-offset=20000 ${additionalJvmArgs}</jvmArgs> + <jvmArgs>-server -XX:+UseCompressedOops -Xms48m -Xmx384m -XX:MaxPermSize=192m -Djboss.socket.binding.port-offset=${port-offset.shared-tests.default-config-tests} ${additionalJvmArgs}</jvmArgs> <serverConfig>jbws-testsuite-shared-default-config-tests.xml</serverConfig> <jbossHome>${jboss.home}</jbossHome> - <port>29990</port> + <port>49990</port>  </configuration> </execution> </executions> Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/etc/arquillian.xml =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/etc/arquillian.xml 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/etc/arquillian.xml 2015-01-12 21:08:41 UTC (rev 19363) @@ -6,24 +6,24 @@ <container qualifier="jboss" default="true"> <configuration> <property name="jbossHome">${jboss.home}</property> - <property name="javaVmArguments">-server -XX:+UseCompressedOops -Xms64m -Xmx512m -XX:MaxPermSize=256m -Djavax.wsdl.factory.WSDLFactory=com.ibm.wsdl.factory.WSDLFactoryImpl</property> + <property name="javaVmArguments">-server -XX:+UseCompressedOops -Xms64m -Xmx512m -XX:MaxPermSize=256m -Djboss.socket.binding.port-offset=${port-offset.shared-tests.jboss} -Djavax.wsdl.factory.WSDLFactory=com.ibm.wsdl.factory.WSDLFactoryImpl</property> <property name="serverConfig">jbws-testsuite-shared-default.xml</property> <property name="allowConnectingToRunningServer">true</property> - <property name="managementPort">${as.managementPort:9990}</property> + <property name="managementPort">${as.managementPort:39990}</property>   - <property name="waitForPorts">${as.debug.port:8787} ${as.managementPort:9990}</property> + <property name="waitForPorts">${as.debug.port:38787} ${as.managementPort:39990}</property>  <property name="waitForPortsTimeoutInSeconds">8</property> </configuration> </container> <container qualifier="default-config-tests" mode="manual"> <configuration> <property name="jbossHome">${jboss.home}</property> - <property name="javaVmArguments">-server -XX:+UseCompressedOops -Xms48m -Xmx384m -XX:MaxPermSize=192m -Djboss.socket.binding.port-offset=20000 -Djavax.wsdl.factory.WSDLFactory=com.ibm.wsdl.factory.WSDLFactoryImpl</property> + <property name="javaVmArguments">-server -XX:+UseCompressedOops -Xms48m -Xmx384m -XX:MaxPermSize=192m -Djboss.socket.binding.port-offset=${port-offset.shared-tests.default-config-tests} -Djavax.wsdl.factory.WSDLFactory=com.ibm.wsdl.factory.WSDLFactoryImpl</property> <property name="serverConfig">jbws-testsuite-shared-default-config-tests.xml</property> <property name="allowConnectingToRunningServer">true</property> - <property name="managementPort">${as.managementPort:29990}</property> + <property name="managementPort">${as.managementPort:49990}</property>   - <property name="waitForPorts">${as.debug.port:28787} ${as.managementPort:29990}</property> + <property name="waitForPorts">${as.debug.port:48787} ${as.managementPort:49990}</property>  <property name="waitForPortsTimeoutInSeconds">8</property> </configuration> </container> Added: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/etc/container.properties =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/etc/container.properties (rev 0) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/etc/container.properties 2015-01-12 21:08:41 UTC (rev 19363) @@ -0,0 +1,7 @@ +default.container.qualifier=jboss +default.container.group.qualifier=shared-tests +port-offset.cxf-tests.jboss=(a)port-offset.cxf-tests.jboss@ +port-offset.cxf-tests.ssl-mutual-auth=(a)port-offset.cxf-tests.ssl-mutual-auth@ +port-offset.cxf-tests.default-config-tests=(a)port-offset.cxf-tests.default-config-tests@ +port-offset.shared-tests.jboss=(a)port-offset.shared-tests.jboss@ +port-offset.shared-tests.default-config-tests=(a)port-offset.shared-tests.default-config-tests@ \ No newline at end of file Property changes on: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/etc/container.properties ___________________________________________________________________ Added: svn:mime-type + text/plain Added: svn:keywords + Rev Date Added: svn:eol-style + native Deleted: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/etc/jboss-ejb-client.properties =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/etc/jboss-ejb-client.properties 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/etc/jboss-ejb-client.properties 2015-01-12 21:08:41 UTC (rev 19363) @@ -1,7 +0,0 @@ -remote.connectionprovider.create.options.org.xnio.Options.SSL_ENABLED=false -remote.connections=default -remote.connection.default.host=(a)jboss.bind.address@ -remote.connection.default.port=(a)remote.port@ -remote.connection.default.connect.options.org.xnio.Options.SASL_POLICY_NOANONYMOUS=false -remote.connection.default.connect.options.org.xnio.Options.SASL_POLICY_NOPLAINTEXT=false -callback.handler.class=org.jboss.wsf.test.CallbackHandler Deleted: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/etc/server.jndi.properties =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/etc/server.jndi.properties 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/etc/server.jndi.properties 2015-01-12 21:08:41 UTC (rev 19363) @@ -1,5 +0,0 @@ -java.naming.factory.initial=org.jboss.naming.remote.client.InitialContextFactory -java.naming.factory.url.pkgs=org.jboss.ejb.client.naming:org.jboss.naming.remote.client -java.naming.provider.url=@remote.protocol@://@jboss.bind.address@:@remote.port@ -jboss.naming.client.connect.options.org.xnio.Options.SASL_POLICY_NOPLAINTEXT=false -jboss.naming.client.security.callback.handler.class=org.jboss.wsf.test.CallbackHandler Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/helper/TestServlet.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/helper/TestServlet.java 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/helper/TestServlet.java 2015-01-12 21:08:41 UTC (rev 19363) @@ -75,7 +75,7 @@ { ClientHelper helper = (ClientHelper) Class.forName(helperClassName).newInstance(); String jbossBindAddress = toIPv6URLFormat(System.getProperty("jboss.bind.address", "localhost")); - helper.setTargetEndpoint("http://" + jbossBindAddress + ":8080" + path); + helper.setTargetEndpoint("http://" + jbossBindAddress + ":" + req.getLocalPort() + path); List<String> failedTests = new LinkedList<String>(); List<String> errorTests = new LinkedList<String>(); Method[] methods = helper.getClass().getMethods(); Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/complex/ComplexTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/complex/ComplexTestCase.java 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/complex/ComplexTestCase.java 2015-01-12 21:08:41 UTC (rev 19363) @@ -30,6 +30,7 @@ import javax.xml.datatype.DatatypeFactory; import javax.xml.datatype.XMLGregorianCalendar; import javax.xml.namespace.QName; +import javax.xml.ws.BindingProvider; import javax.xml.ws.Service; import org.jboss.arquillian.container.test.api.Deployment; @@ -80,6 +81,7 @@ QName serviceName = new QName("http://complex.jaxws.ws.test.jboss.org/", "RegistrationService"); Service service = Service.create(wsdlURL, serviceName); port = (Registration) service.getPort(Registration.class); + ((BindingProvider)port).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, baseURL + "/RegistrationService"); } catch (Exception e) { System.out.println(e); } Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/holder/HolderTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/holder/HolderTestCase.java 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/holder/HolderTestCase.java 2015-01-12 21:08:41 UTC (rev 19363) @@ -25,6 +25,7 @@ import java.net.URL; import javax.xml.namespace.QName; +import javax.xml.ws.BindingProvider; import javax.xml.ws.Holder; import javax.xml.ws.Service; @@ -70,6 +71,7 @@ QName serviceName = new QName("http://holder.jaxws.ws.test.jboss.org/", "HolderService"); Service service = Service.create(wsdlURL, serviceName); port = (org.jboss.test.ws.jaxws.holder.Holder)service.getPort(org.jboss.test.ws.jaxws.holder.Holder.class); + ((BindingProvider)port).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY, baseURL + "/HolderService"); } @Test Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1178/JBWS1178TestCaseForked.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1178/JBWS1178TestCaseForked.java 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1178/JBWS1178TestCaseForked.java 2015-01-12 21:08:41 UTC (rev 19363) @@ -64,8 +64,6 @@ private static final String WAR_DEPLOYMENT = "jaxws-jbws1178.war"; private final ObjectName objectName = ObjectNameFactory.create("jboss.ws:service=ServerConfig"); private String webServiceHost; - //TODO:Look at how to fix this issue - private String baseURL = "http://localhost:8080/jaxws-jbws1178"; @Deployment(name = WAR_DEPLOYMENT, testable = false, managed=false) public static WebArchive createDeployments() { @@ -103,7 +101,7 @@ { InetAddress inetAddr = InetAddress.getByName(getServerHost()); String hostAddress = inetAddr instanceof Inet6Address ? "[" + inetAddr.getHostAddress() + "]" : inetAddr.getHostAddress(); - URL wsdlURL = new URL(baseURL + "/testpattern?wsdl"); + URL wsdlURL = new URL("http://" + hostAddress + ":" + getServerPort() + "/jaxws-jbws1178/testpattern?wsdl"); QName serviceName = new QName("http://org.jboss.ws/jbws1178", "EndpointService"); Service service = Service.create(wsdlURL, serviceName); @@ -119,7 +117,8 @@ public void testHostName() throws Exception { InetAddress inetAddr = InetAddress.getByName(getServerHost()); - URL wsdlURL = new URL(baseURL + "/testpattern?wsdl"); + String hostAddress = inetAddr instanceof Inet6Address ? "[" + inetAddr.getHostAddress() + "]" : inetAddr.getHostAddress(); + URL wsdlURL = new URL("http://" + hostAddress + ":" + getServerPort() + "/jaxws-jbws1178/testpattern?wsdl"); QName serviceName = new QName("http://org.jboss.ws/jbws1178", "EndpointService"); Service service = Service.create(wsdlURL, serviceName); Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1190/JBWS1190TestCase.java 2015-01-12 21:08:41 UTC (rev 19363) @@ -22,26 +22,19 @@ package org.jboss.test.ws.jaxws.jbws1190; import java.io.File; -import java.util.LinkedList; -import java.util.List; import javax.management.MBeanServerConnection; import javax.management.ObjectName; -import org.junit.Test; -import org.junit.runner.RunWith; import org.jboss.arquillian.container.test.api.Deployment; import org.jboss.arquillian.container.test.api.RunAsClient; import org.jboss.arquillian.junit.Arquillian; -import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.shrinkwrap.api.spec.WebArchive; - import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestHelper; -import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; -import org.jboss.wsf.test.JBossWSTestSetup; +import org.junit.Test; +import org.junit.runner.RunWith; /** * WSDL generated for JSR-181 POJO does not take 'transport-guarantee' in web.xml into account Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581TestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581TestCase.java 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581TestCase.java 2015-01-12 21:08:41 UTC (rev 19363) @@ -157,7 +157,7 @@ try { iniCtx = getServerInitialContext(); - EJB3Remote remote = (EJB3Remote)iniCtx.lookup("ejb:/jaxws-jbws1581-ejb3//EJB3Bean!" + EJB3Remote.class.getName()); + EJB3Remote remote = (EJB3Remote)iniCtx.lookup("jaxws-jbws1581-ejb3//EJB3Bean!" + EJB3Remote.class.getName()); String retStr = remote.runTest("Hello World!"); assertEquals("Hello World!", retStr); } Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1582/JBWS1582TestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1582/JBWS1582TestCase.java 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1582/JBWS1582TestCase.java 2015-01-12 21:08:41 UTC (rev 19363) @@ -61,7 +61,7 @@ @ArquillianResource Deployer deployer; - + @Deployment(name="jaxws-jbws1582-attacked", testable = false, managed=false) public static WebArchive createDeployment() { WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-jbws1582-attacked.war"); @@ -93,7 +93,7 @@ @OperateOnDeployment("jaxws-jbws1582") public void testLegalAccess() throws Exception { - String endpointURL = "http://" + baseURL.getHost() + ":8080/jaxws-jbws1582/TestService"; + String endpointURL = "http://" + baseURL.getHost() + ":" + baseURL.getPort() + "/jaxws-jbws1582/TestService"; URL wsdlURL = new URL(endpointURL + "?wsdl"); QName serviceName = new QName(targetNS, "EndpointService"); @@ -153,12 +153,13 @@ final String CRNL = "\r\n"; String content = getContent(new FileInputStream(getResourceFile(requestFile))); Socket socket = new Socket(); - socket.connect(new InetSocketAddress(getServerHost(), 8080)); + socket.connect(new InetSocketAddress(getServerHost(), getServerPort())); OutputStream out = socket.getOutputStream(); // send an HTTP request to the endpoint out.write(("POST /jaxws-jbws1582/TestService HTTP/1.0" + CRNL).getBytes()); - out.write(("Host: " + getServerHost() + ":8080" + CRNL).getBytes()); + //out.write(("Host: " + getServerHost() + ":8080" + CRNL).getBytes()); + out.write(("Host: " + getServerHost() + ":" + getServerPort() + CRNL).getBytes()); out.write(("Content-Type: text/xml" + CRNL).getBytes()); out.write(("Content-Length: " + content.length() + CRNL).getBytes()); out.write((CRNL).getBytes()); Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1666/JBWS1666TestCase.java 2015-01-12 21:08:41 UTC (rev 19363) @@ -98,14 +98,18 @@ @OperateOnDeployment("jaxws-jbws1666") public void testClientInTestsuiteJVM() throws Exception { - String resStr = TestClient.testPortAccess(getServerHost()); + String resStr = TestClient.testPortAccess(getServerHost(), getServerPort()); assertEquals(TestClient.REQ_STR, resStr); } + @Test + @RunAsClient public void testClientUsingJBossModules() throws Exception { runJBossModulesClient("jaxws-jbws1666-client.jar"); } + @Test + @RunAsClient public void testClientUsingJBossModulesWithJBossWSClientAggregationModule() throws Exception { if (!isIntegrationCXF()) { return; @@ -125,7 +129,7 @@ //java -jar $JBOSS_HOME/jboss-modules.jar -mp $JBOSS_HOME/modules -jar client.jar String props = " -Dlog4j.output.dir=" + System.getProperty("log4j.output.dir") + " -jar " + jbmjar + " -mp " + jbm; - final String command = javaCmd + props + " -jar " + f.getAbsolutePath() + " " + getServerHost(); + final String command = javaCmd + props + " -jar " + f.getAbsolutePath() + " " + getServerHost() + " " + getServerPort(); ByteArrayOutputStream bout = new ByteArrayOutputStream(); executeCommand(command, bout); //check result (includes check on Provider impl, which might be affected by missing javax.xml.ws.api module dependency Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1666/TestClient.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1666/TestClient.java 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1666/TestClient.java 2015-01-12 21:08:41 UTC (rev 19363) @@ -31,9 +31,9 @@ { public static final String REQ_STR = "Hello World!"; - public static String testPortAccess(String serverHost) throws Exception + public static String testPortAccess(String serverHost, int serverPort) throws Exception { - URL wsdlURL = new URL("http://" + serverHost + ":8080/jaxws-jbws1666?wsdl"); + URL wsdlURL = new URL("http://" + serverHost + ":" + serverPort + "/jaxws-jbws1666?wsdl"); QName serviceName = new QName("http://org.jboss.ws/jbws1666", "TestEndpointImplService"); Service service = Service.create(wsdlURL, serviceName); @@ -46,7 +46,8 @@ public static void main(String[] args) throws Exception { String serverHost = args[0]; - String resStr = testPortAccess(serverHost); + String serverPort = args[1]; + String resStr = testPortAccess(serverHost, Integer.valueOf(serverPort)); System.out.println(Provider.provider().getClass().getName() + ", " + resStr); //wait a bit before returning as the log processing can be aysnch, the test client Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1822/JBWS1822TestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1822/JBWS1822TestCase.java 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1822/JBWS1822TestCase.java 2015-01-12 21:08:41 UTC (rev 19363) @@ -100,7 +100,7 @@ private EJB3RemoteIface getProxy() throws Exception { QName serviceName = new QName("http://jbossws.org/JBWS1822", "EndpointService"); - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws1822?wsdl"); + URL wsdlURL = new URL("http://" + getServerHost() + ":" + getServerPort() + "/jaxws-jbws1822?wsdl"); Service service = Service.create(wsdlURL, serviceName); return (EJB3RemoteIface)service.getPort(EJB3RemoteIface.class); } Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1841/JBWS1841TestCase.java 2015-01-12 21:08:41 UTC (rev 19363) @@ -96,7 +96,7 @@ port = Service.create(wsdlURL, serviceName).getPort(EndpointInterface.class); ctx = getServerInitialContext(); - remote = (StatelessRemote) ctx.lookup("ejb:/jaxws-jbws1841//" + StatelessBean.class.getSimpleName() + "!" + StatelessRemote.class.getName()); + remote = (StatelessRemote) ctx.lookup("jaxws-jbws1841//" + StatelessBean.class.getSimpleName() + "!" + StatelessRemote.class.getName()); } @Test Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase1/client/JBWS2074TestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase1/client/JBWS2074TestCase.java 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase1/client/JBWS2074TestCase.java 2015-01-12 21:08:41 UTC (rev 19363) @@ -87,7 +87,7 @@ public void executeTest() throws Exception { - String endpointAddress = "http://" + getServerHost() + ":8080/jaxws-jbws2074-usecase1/Service"; + String endpointAddress = "http://" + getServerHost() + ":" + getServerPort() + "/jaxws-jbws2074-usecase1/Service"; QName serviceName = new QName("http://ws.jboss.org/jbws2074", "POJOService"); Service service = Service.create(new URL(endpointAddress + "?wsdl"), serviceName); POJOIface port = (POJOIface)service.getPort(POJOIface.class); Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase2/client/JBWS2074TestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase2/client/JBWS2074TestCase.java 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase2/client/JBWS2074TestCase.java 2015-01-12 21:08:41 UTC (rev 19363) @@ -85,7 +85,7 @@ public void executeTest() throws Exception { - String endpointAddress = "http://" + getServerHost() + ":8080/jaxws-jbws2074-usecase2/Service"; + String endpointAddress = "http://" + getServerHost() + ":" + getServerPort() + "/jaxws-jbws2074-usecase2/Service"; QName serviceName = new QName("http://ws.jboss.org/jbws2074", "EJB3Service"); Service service = Service.create(new URL(endpointAddress + "?wsdl"), serviceName); EJB3Iface port = (EJB3Iface)service.getPort(EJB3Iface.class); Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase3/client/JBWS2074TestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase3/client/JBWS2074TestCase.java 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase3/client/JBWS2074TestCase.java 2015-01-12 21:08:41 UTC (rev 19363) @@ -84,7 +84,7 @@ public void executeTest() throws Exception { - String endpointAddress = "http://" + getServerHost() + ":8080/jaxws-jbws2074-usecase3/Service"; + String endpointAddress = "http://" + getServerHost() + ":" + getServerPort() + "/jaxws-jbws2074-usecase3/Service"; QName serviceName = new QName("http://ws.jboss.org/jbws2074", "POJOService"); Service service = Service.create(new URL(endpointAddress + "?wsdl"), serviceName); POJOIface port = (POJOIface)service.getPort(POJOIface.class); Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase4/client/JBWS2074TestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase4/client/JBWS2074TestCase.java 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2074/usecase4/client/JBWS2074TestCase.java 2015-01-12 21:08:41 UTC (rev 19363) @@ -88,7 +88,7 @@ public void executeTest() throws Exception { - String endpointAddress = "http://" + getServerHost() + ":8080/jaxws-jbws2074-usecase4/Service"; + String endpointAddress = "http://" + getServerHost() + ":" + getServerPort() + "/jaxws-jbws2074-usecase4/Service"; QName serviceName = new QName("http://ws.jboss.org/jbws2074", "EJB3Service"); Service service = Service.create(new URL(endpointAddress + "?wsdl"), serviceName); EJB3Iface port = (EJB3Iface)service.getPort(EJB3Iface.class); Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2150/JBWS2150TestCaseForked.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2150/JBWS2150TestCaseForked.java 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2150/JBWS2150TestCaseForked.java 2015-01-12 21:08:41 UTC (rev 19363) @@ -31,7 +31,9 @@ import java.util.Map.Entry; import javax.management.Attribute; +import javax.management.MBeanServerConnection; import javax.management.ObjectName; +import javax.naming.NamingException; import javax.wsdl.Definition; import javax.wsdl.Import; import javax.wsdl.Port; @@ -85,6 +87,8 @@ protected static int webServiceSecurePort; protected static String webServicePath; protected static String webServiceUriScheme; + + private static MBeanServerConnection mbeanServer; @ArquillianResource Deployer deployer; @@ -178,23 +182,25 @@ final Map<String, String> wsdlLocationsMap = new HashMap<String, String>(); final Map<String, String> importMap = new HashMap<String, String>(); final String serverHost = getServerHost(); - wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidURL?wsdl", getWebServiceHost()); - wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidURL?wsdl", getWebServiceHost()); - wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidSecureURL?wsdl", getWebServiceHost()); - wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidSecureURL?wsdl", getWebServiceHost()); - importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidURL?wsdl", "http://" + getWebServiceHost() + ":8080/jaxws-jbws2150/ValidURL?wsdl=inner.wsdl"); - importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidURL?wsdl", "http://" + getWebServiceHost() + ":8080/jaxws-jbws2150/InvalidURL?wsdl=inner.wsdl"); - importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidSecureURL?wsdl", "https://" + getWebServiceHost() + ":8443/jaxws-jbws2150/ValidSecureURL?wsdl=inner.wsdl"); - importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidSecureURL?wsdl", "https://" + getWebServiceHost() + ":8443/jaxws-jbws2150/InvalidSecureURL?wsdl=inner.wsdl"); + final int serverPort = getServerPort(); + final int serverSecurePort = serverPort + 363; //8443 = 8080 + 363 + wsdlLocationsMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/ValidURL?wsdl", getWebServiceHost()); + wsdlLocationsMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/InvalidURL?wsdl", getWebServiceHost()); + wsdlLocationsMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/ValidSecureURL?wsdl", getWebServiceHost()); + wsdlLocationsMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/InvalidSecureURL?wsdl", getWebServiceHost()); + importMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/ValidURL?wsdl", "http://" + getWebServiceHost() + ":" + serverPort + "/jaxws-jbws2150/ValidURL?wsdl=inner.wsdl"); + importMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/InvalidURL?wsdl", "http://" + getWebServiceHost() + ":" + serverPort + "/jaxws-jbws2150/InvalidURL?wsdl=inner.wsdl"); + importMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/ValidSecureURL?wsdl", "https://" + getWebServiceHost() + ":" + serverSecurePort + "/jaxws-jbws2150/ValidSecureURL?wsdl=inner.wsdl"); + importMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/InvalidSecureURL?wsdl", "https://" + getWebServiceHost() + ":" + serverSecurePort + "/jaxws-jbws2150/InvalidSecureURL?wsdl=inner.wsdl"); if (isTestsuiteServerHostLocalhost()) { - wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidURL?wsdl", getWebServiceHost()); - wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidURL?wsdl", getWebServiceHost()); - wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidSecureURL?wsdl", getWebServiceHost()); - wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidSecureURL?wsdl", getWebServiceHost()); - importMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidURL?wsdl", "http://" + getWebServiceHost() + ":8080/jaxws-jbws2150/ValidURL?wsdl=inner.wsdl"); - importMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidURL?wsdl", "http://" + getWebServiceHost() + ":8080/jaxws-jbws2150/InvalidURL?wsdl=inner.wsdl"); - importMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidSecureURL?wsdl", "https://" + getWebServiceHost() + ":8443/jaxws-jbws2150/ValidSecureURL?wsdl=inner.wsdl"); - importMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidSecureURL?wsdl", "https://" + getWebServiceHost() + ":8443/jaxws-jbws2150/InvalidSecureURL?wsdl=inner.wsdl"); + wsdlLocationsMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150/ValidURL?wsdl", getWebServiceHost()); + wsdlLocationsMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150/InvalidURL?wsdl", getWebServiceHost()); + wsdlLocationsMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150/ValidSecureURL?wsdl", getWebServiceHost()); + wsdlLocationsMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150/InvalidSecureURL?wsdl", getWebServiceHost()); + importMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150/ValidURL?wsdl", "http://" + getWebServiceHost() + ":" + serverPort + "/jaxws-jbws2150/ValidURL?wsdl=inner.wsdl"); + importMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150/InvalidURL?wsdl", "http://" + getWebServiceHost() + ":" + serverPort + "/jaxws-jbws2150/InvalidURL?wsdl=inner.wsdl"); + importMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150/ValidSecureURL?wsdl", "https://" + getWebServiceHost() + ":" + serverSecurePort + "/jaxws-jbws2150/ValidSecureURL?wsdl=inner.wsdl"); + importMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150/InvalidSecureURL?wsdl", "https://" + getWebServiceHost() + ":" + serverSecurePort + "/jaxws-jbws2150/InvalidSecureURL?wsdl=inner.wsdl"); } for (Entry<String, String> entry : wsdlLocationsMap.entrySet()) { @@ -203,7 +209,7 @@ Definition definition = getWSDLDefinition(wsdlLocation); String address = getPortAddress(definition, "ValidURLService", "ValidURLPort"); - assertEquals("http://" + host + ":8080/jaxws-jbws2150/ValidURL", address); + assertEquals("http://" + host + ":" + serverPort + "/jaxws-jbws2150/ValidURL", address); //avoid invoking on https endpoints as that would require getting the imported wsdl using https... if (!wsdlLocation.contains("Secure")) { ServiceIface endpoint = getEndpoint(wsdlLocation, "ValidURLService"); @@ -211,17 +217,17 @@ } address = getPortAddress(definition, "InvalidURLService", "InvalidURLPort"); - assertEquals("http://" + host + ":8080/jaxws-jbws2150/InvalidURL", address); + assertEquals("http://" + host + ":" + serverPort + "/jaxws-jbws2150/InvalidURL", address); if (!wsdlLocation.contains("Secure")) { ServiceIface endpoint = getEndpoint(wsdlLocation, "InvalidURLService"); assertEquals(endpoint.echo("hello"), "hello"); } address = getPortAddress(definition, "ValidSecureURLService", "ValidSecureURLPort"); - assertEquals("https://" + host + ":8443/jaxws-jbws2150/ValidSecureURL", address); + assertEquals("https://" + host + ":" + serverSecurePort + "/jaxws-jbws2150/ValidSecureURL", address); address = getPortAddress(definition, "InvalidSecureURLService", "InvalidSecureURLPort"); - assertEquals("https://" + host + ":8443/jaxws-jbws2150/InvalidSecureURL", address); + assertEquals("https://" + host + ":" + serverSecurePort + "/jaxws-jbws2150/InvalidSecureURL", address); //check wsdl import address rewrite (we expect a rewritten version of the same base address used to fetch the wsdl) assertEquals(importMap.get(wsdlLocation), getWsdlImportAddress(definition)); @@ -254,23 +260,25 @@ final Map<String, String> wsdlLocationsMap = new HashMap<String, String>(); final Map<String, String> importMap = new HashMap<String, String>(); final String serverHost = getServerHost(); - wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidURL?wsdl", testWebServiceHost); - wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidURL?wsdl", testWebServiceHost); - wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidSecureURL?wsdl", testWebServiceHost); - wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidSecureURL?wsdl", testWebServiceHost); - importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidURL?wsdl", "http://" + testWebServiceHost + ":8080/jaxws-jbws2150/ValidURL?wsdl=inner.wsdl"); - importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidURL?wsdl", "http://" + testWebServiceHost + ":8080/jaxws-jbws2150/InvalidURL?wsdl=inner.wsdl"); - importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidSecureURL?wsdl", "https://" + testWebServiceHost + ":8443/jaxws-jbws2150/ValidSecureURL?wsdl=inner.wsdl"); - importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidSecureURL?wsdl", "https://" + testWebServiceHost + ":8443/jaxws-jbws2150/InvalidSecureURL?wsdl=inner.wsdl"); + final int serverPort = getServerPort(); + final int serverSecurePort = serverPort + 363; //8443 = 8080 + 363 + wsdlLocationsMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/ValidURL?wsdl", testWebServiceHost); + wsdlLocationsMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/InvalidURL?wsdl", testWebServiceHost); + wsdlLocationsMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/ValidSecureURL?wsdl", testWebServiceHost); + wsdlLocationsMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/InvalidSecureURL?wsdl", testWebServiceHost); + importMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/ValidURL?wsdl", "http://" + testWebServiceHost + ":" + serverPort + "/jaxws-jbws2150/ValidURL?wsdl=inner.wsdl"); + importMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/InvalidURL?wsdl", "http://" + testWebServiceHost + ":" + serverPort + "/jaxws-jbws2150/InvalidURL?wsdl=inner.wsdl"); + importMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/ValidSecureURL?wsdl", "https://" + testWebServiceHost + ":" + serverSecurePort + "/jaxws-jbws2150/ValidSecureURL?wsdl=inner.wsdl"); + importMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/InvalidSecureURL?wsdl", "https://" + testWebServiceHost + ":" + serverSecurePort + "/jaxws-jbws2150/InvalidSecureURL?wsdl=inner.wsdl"); if (isTestsuiteServerHostLocalhost()) { - wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidURL?wsdl", testWebServiceHost); - wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidURL?wsdl", testWebServiceHost); - wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidSecureURL?wsdl", testWebServiceHost); - wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidSecureURL?wsdl", testWebServiceHost); - importMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidURL?wsdl", "http://" + testWebServiceHost + ":8080/jaxws-jbws2150/ValidURL?wsdl=inner.wsdl"); - importMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidURL?wsdl", "http://" + testWebServiceHost + ":8080/jaxws-jbws2150/InvalidURL?wsdl=inner.wsdl"); - importMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidSecureURL?wsdl", "https://" + testWebServiceHost + ":8443/jaxws-jbws2150/ValidSecureURL?wsdl=inner.wsdl"); - importMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidSecureURL?wsdl", "https://" + testWebServiceHost + ":8443/jaxws-jbws2150/InvalidSecureURL?wsdl=inner.wsdl"); + wsdlLocationsMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150/ValidURL?wsdl", testWebServiceHost); + wsdlLocationsMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150/InvalidURL?wsdl", testWebServiceHost); + wsdlLocationsMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150/ValidSecureURL?wsdl", testWebServiceHost); + wsdlLocationsMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150/InvalidSecureURL?wsdl", testWebServiceHost); + importMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150/ValidURL?wsdl", "http://" + testWebServiceHost + ":" + serverPort + "/jaxws-jbws2150/ValidURL?wsdl=inner.wsdl"); + importMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150/InvalidURL?wsdl", "http://" + testWebServiceHost + ":" + serverPort + "/jaxws-jbws2150/InvalidURL?wsdl=inner.wsdl"); + importMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150/ValidSecureURL?wsdl", "https://" + testWebServiceHost + ":" + serverSecurePort + "/jaxws-jbws2150/ValidSecureURL?wsdl=inner.wsdl"); + importMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150/InvalidSecureURL?wsdl", "https://" + testWebServiceHost + ":" + serverSecurePort + "/jaxws-jbws2150/InvalidSecureURL?wsdl=inner.wsdl"); } for (Entry<String, String> entry : wsdlLocationsMap.entrySet()) { @@ -279,16 +287,16 @@ Definition definition = getWSDLDefinition(wsdlLocation); String address = getPortAddress(definition, "ValidURLService", "ValidURLPort"); - assertEquals("http://" + host + ":8080/jaxws-jbws2150/ValidURL", address); + assertEquals("http://" + host + ":" + serverPort + "/jaxws-jbws2150/ValidURL", address); address = getPortAddress(definition, "InvalidURLService", "InvalidURLPort"); - assertEquals("http://" + host + ":8080/jaxws-jbws2150/InvalidURL", address); + assertEquals("http://" + host + ":" + serverPort + "/jaxws-jbws2150/InvalidURL", address); address = getPortAddress(definition, "ValidSecureURLService", "ValidSecureURLPort"); - assertEquals("https://" + host + ":8443/jaxws-jbws2150/ValidSecureURL", address); + assertEquals("https://" + host + ":" + serverSecurePort + "/jaxws-jbws2150/ValidSecureURL", address); address = getPortAddress(definition, "InvalidSecureURLService", "InvalidSecureURLPort"); - assertEquals("https://" + host + ":8443/jaxws-jbws2150/InvalidSecureURL", address); + assertEquals("https://" + host + ":" + serverSecurePort + "/jaxws-jbws2150/InvalidSecureURL", address); //check wsdl import address rewrite (we expect a rewritten version of the same base address used to fetch the wsdl) assertEquals(importMap.get(wsdlLocation), getWsdlImportAddress(definition)); @@ -319,23 +327,25 @@ final Map<String, String> wsdlLocationsMap = new HashMap<String, String>(); final Map<String, String> importMap = new HashMap<String, String>(); final String serverHost = getServerHost(); - wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidURL?wsdl", serverHost); - wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidURL?wsdl", serverHost); - wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidSecureURL?wsdl", serverHost); - wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidSecureURL?wsdl", serverHost); - importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidURL?wsdl", "http://" + serverHost + ":8080/jaxws-jbws2150/ValidURL?wsdl=inner.wsdl"); - importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidURL?wsdl", "http://" + serverHost + ":8080/jaxws-jbws2150/InvalidURL?wsdl=inner.wsdl"); - importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidSecureURL?wsdl", "https://" + serverHost + ":8443/jaxws-jbws2150/ValidSecureURL?wsdl=inner.wsdl"); - importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidSecureURL?wsdl", "https://" + serverHost + ":8443/jaxws-jbws2150/InvalidSecureURL?wsdl=inner.wsdl"); + final int serverPort = getServerPort(); + final int serverSecurePort = serverPort + 363; //8080 + 363 = 8443 + wsdlLocationsMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/ValidURL?wsdl", serverHost); + wsdlLocationsMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/InvalidURL?wsdl", serverHost); + wsdlLocationsMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/ValidSecureURL?wsdl", serverHost); + wsdlLocationsMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/InvalidSecureURL?wsdl", serverHost); + importMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/ValidURL?wsdl", "http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/ValidURL?wsdl=inner.wsdl"); + importMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/InvalidURL?wsdl", "http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/InvalidURL?wsdl=inner.wsdl"); + importMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/ValidSecureURL?wsdl", "https://" + serverHost + ":" + serverSecurePort + "/jaxws-jbws2150/ValidSecureURL?wsdl=inner.wsdl"); + importMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/InvalidSecureURL?wsdl", "https://" + serverHost + ":" + serverSecurePort + "/jaxws-jbws2150/InvalidSecureURL?wsdl=inner.wsdl"); if (isTestsuiteServerHostLocalhost()) { - wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidURL?wsdl", "127.0.0.1"); - wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidURL?wsdl", "127.0.0.1"); - wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidSecureURL?wsdl", "127.0.0.1"); - wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidSecureURL?wsdl", "127.0.0.1"); - importMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidURL?wsdl", "http://127.0.0.1:8080/jaxws-jbws2150/ValidURL?wsdl=inner.wsdl"); - importMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidURL?wsdl", "http://127.0.0.1:8080/jaxws-jbws2150/InvalidURL?wsdl=inner.wsdl"); - importMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidSecureURL?wsdl", "https://127.0.0.1:8443/jaxws-jbws2150/ValidSecureURL?wsdl=inner.wsdl"); - importMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidSecureURL?wsdl", "https://127.0.0.1:8443/jaxws-jbws2150/InvalidSecureURL?wsdl=inner.wsdl"); + wsdlLocationsMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150/ValidURL?wsdl", "127.0.0.1"); + wsdlLocationsMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150/InvalidURL?wsdl", "127.0.0.1"); + wsdlLocationsMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150/ValidSecureURL?wsdl", "127.0.0.1"); + wsdlLocationsMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150/InvalidSecureURL?wsdl", "127.0.0.1"); + importMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150/ValidURL?wsdl", "http://127.0.0.1:" + serverPort + "/jaxws-jbws2150/ValidURL?wsdl=inner.wsdl"); + importMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150/InvalidURL?wsdl", "http://127.0.0.1:" + serverPort + "/jaxws-jbws2150/InvalidURL?wsdl=inner.wsdl"); + importMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150/ValidSecureURL?wsdl", "https://127.0.0.1:" + serverSecurePort + "/jaxws-jbws2150/ValidSecureURL?wsdl=inner.wsdl"); + importMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150/InvalidSecureURL?wsdl", "https://127.0.0.1:" + serverSecurePort + "/jaxws-jbws2150/InvalidSecureURL?wsdl=inner.wsdl"); } for (Entry<String, String> entry : wsdlLocationsMap.entrySet()) { @@ -344,10 +354,10 @@ Definition definition = getWSDLDefinition(wsdlLocation); String address = getPortAddress(definition, "ValidURLService", "ValidURLPort"); - assertEquals("http://" + host + ":8080/jaxws-jbws2150/ValidURL", address); + assertEquals("http://" + host + ":" + serverPort + "/jaxws-jbws2150/ValidURL", address); address = getPortAddress(definition, "InvalidURLService", "InvalidURLPort"); - assertEquals("http://" + host + ":8080/jaxws-jbws2150/InvalidURL", address); + assertEquals("http://" + host + ":" + serverPort + "/jaxws-jbws2150/InvalidURL", address); //no further checks on the ports forcing https even when getting the wsdl over http //as there's no way to tell which port to use for the secure access given the invoked wsdl address (on http) @@ -382,23 +392,25 @@ final Map<String, String> wsdlLocationsSecMap = new HashMap<String, String>(); final Map<String, String> importMap = new HashMap<String, String>(); final String serverHost = getServerHost(); - wsdlLocationsSecMap.put("http://" + serverHost + ":8080/jaxws-jbws2150-sec/ValidURL?wsdl", getWebServiceHost()); - wsdlLocationsSecMap.put("http://" + serverHost + ":8080/jaxws-jbws2150-sec/InvalidURL?wsdl", getWebServiceHost()); - wsdlLocationsSecMap.put("http://" + serverHost + ":8080/jaxws-jbws2150-sec/ValidSecureURL?wsdl", getWebServiceHost()); - wsdlLocationsSecMap.put("http://" + serverHost + ":8080/jaxws-jbws2150-sec/InvalidSecureURL?wsdl", getWebServiceHost()); - importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150-sec/ValidURL?wsdl", "https://" + getWebServiceHost() + ":8443/jaxws-jbws2150-sec/ValidURL?wsdl=inner.wsdl"); - importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150-sec/InvalidURL?wsdl", "https://" + getWebServiceHost() + ":8443/jaxws-jbws2150-sec/InvalidURL?wsdl=inner.wsdl"); - importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150-sec/ValidSecureURL?wsdl", "https://" + getWebServiceHost() + ":8443/jaxws-jbws2150-sec/ValidSecureURL?wsdl=inner.wsdl"); - importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150-sec/InvalidSecureURL?wsdl", "https://" + getWebServiceHost() + ":8443/jaxws-jbws2150-sec/InvalidSecureURL?wsdl=inner.wsdl"); + final int serverPort = getServerPort(); + final int serverSecurePort = serverPort + 363; //8443 = 8080 + 363 + wsdlLocationsSecMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150-sec/ValidURL?wsdl", getWebServiceHost()); + wsdlLocationsSecMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150-sec/InvalidURL?wsdl", getWebServiceHost()); + wsdlLocationsSecMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150-sec/ValidSecureURL?wsdl", getWebServiceHost()); + wsdlLocationsSecMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150-sec/InvalidSecureURL?wsdl", getWebServiceHost()); + importMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150-sec/ValidURL?wsdl", "https://" + getWebServiceHost() + ":" + serverSecurePort + "/jaxws-jbws2150-sec/ValidURL?wsdl=inner.wsdl"); + importMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150-sec/InvalidURL?wsdl", "https://" + getWebServiceHost() + ":" + serverSecurePort + "/jaxws-jbws2150-sec/InvalidURL?wsdl=inner.wsdl"); + importMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150-sec/ValidSecureURL?wsdl", "https://" + getWebServiceHost() + ":" + serverSecurePort + "/jaxws-jbws2150-sec/ValidSecureURL?wsdl=inner.wsdl"); + importMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150-sec/InvalidSecureURL?wsdl", "https://" + getWebServiceHost() + ":" + serverSecurePort + "/jaxws-jbws2150-sec/InvalidSecureURL?wsdl=inner.wsdl"); if (isTestsuiteServerHostLocalhost()) { - wsdlLocationsSecMap.put("http://127.0.0.1:8080/jaxws-jbws2150-sec/ValidURL?wsdl", getWebServiceHost()); - wsdlLocationsSecMap.put("http://127.0.0.1:8080/jaxws-jbws2150-sec/InvalidURL?wsdl", getWebServiceHost()); - wsdlLocationsSecMap.put("http://127.0.0.1:8080/jaxws-jbws2150-sec/ValidSecureURL?wsdl", getWebServiceHost()); - wsdlLocationsSecMap.put("http://127.0.0.1:8080/jaxws-jbws2150-sec/InvalidSecureURL?wsdl", getWebServiceHost()); - importMap.put("http://127.0.0.1:8080/jaxws-jbws2150-sec/ValidURL?wsdl", "https://" + getWebServiceHost() + ":8443/jaxws-jbws2150-sec/ValidURL?wsdl=inner.wsdl"); - importMap.put("http://127.0.0.1:8080/jaxws-jbws2150-sec/InvalidURL?wsdl", "https://" + getWebServiceHost() + ":8443/jaxws-jbws2150-sec/InvalidURL?wsdl=inner.wsdl"); - importMap.put("http://127.0.0.1:8080/jaxws-jbws2150-sec/ValidSecureURL?wsdl", "https://" + getWebServiceHost() + ":8443/jaxws-jbws2150-sec/ValidSecureURL?wsdl=inner.wsdl"); - importMap.put("http://127.0.0.1:8080/jaxws-jbws2150-sec/InvalidSecureURL?wsdl", "https://" + getWebServiceHost() + ":8443/jaxws-jbws2150-sec/InvalidSecureURL?wsdl=inner.wsdl"); + wsdlLocationsSecMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150-sec/ValidURL?wsdl", getWebServiceHost()); + wsdlLocationsSecMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150-sec/InvalidURL?wsdl", getWebServiceHost()); + wsdlLocationsSecMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150-sec/ValidSecureURL?wsdl", getWebServiceHost()); + wsdlLocationsSecMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150-sec/InvalidSecureURL?wsdl", getWebServiceHost()); + importMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150-sec/ValidURL?wsdl", "https://" + getWebServiceHost() + ":" + serverSecurePort + "/jaxws-jbws2150-sec/ValidURL?wsdl=inner.wsdl"); + importMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150-sec/InvalidURL?wsdl", "https://" + getWebServiceHost() + ":" + serverSecurePort + "/jaxws-jbws2150-sec/InvalidURL?wsdl=inner.wsdl"); + importMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150-sec/ValidSecureURL?wsdl", "https://" + getWebServiceHost() + ":" + serverSecurePort + "/jaxws-jbws2150-sec/ValidSecureURL?wsdl=inner.wsdl"); + importMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150-sec/InvalidSecureURL?wsdl", "https://" + getWebServiceHost() + ":" + serverSecurePort + "/jaxws-jbws2150-sec/InvalidSecureURL?wsdl=inner.wsdl"); } for (Entry<String, String> entry : wsdlLocationsSecMap.entrySet()) { @@ -407,16 +419,16 @@ Definition definition = getWSDLDefinition(wsdlLocationSec); String address = getPortAddress(definition, "ValidURLService", "ValidURLPort"); - assertEquals("https://" + host + ":8443/jaxws-jbws2150-sec/ValidURL", address); + assertEquals("https://" + host + ":" + serverSecurePort + "/jaxws-jbws2150-sec/ValidURL", address); address = getPortAddress(definition, "InvalidURLService", "InvalidURLPort"); - assertEquals("https://" + host + ":8443/jaxws-jbws2150-sec/InvalidURL", address); + assertEquals("https://" + host + ":" + serverSecurePort + "/jaxws-jbws2150-sec/InvalidURL", address); address = getPortAddress(definition, "ValidSecureURLService", "ValidSecureURLPort"); - assertEquals("https://" + host + ":8443/jaxws-jbws2150-sec/ValidSecureURL", address); + assertEquals("https://" + host + ":" + serverSecurePort + "/jaxws-jbws2150-sec/ValidSecureURL", address); address = getPortAddress(definition, "InvalidSecureURLService", "InvalidSecureURLPort"); - assertEquals("https://" + host + ":8443/jaxws-jbws2150-sec/InvalidSecureURL", address); + assertEquals("https://" + host + ":" + serverSecurePort + "/jaxws-jbws2150-sec/InvalidSecureURL", address); //check wsdl import address rewrite (we expect a rewritten version of the same base address used to fetch the wsdl) assertEquals(importMap.get(wsdlLocationSec), getWsdlImportAddress(definition)); @@ -448,23 +460,25 @@ final Map<String, String> wsdlLocationsSecMap = new HashMap<String, String>(); final Map<String, String> importMap = new HashMap<String, String>(); final String serverHost = getServerHost(); - wsdlLocationsSecMap.put("http://" + serverHost + ":8080/jaxws-jbws2150-sec/ValidURL?wsdl", testWebServiceHost); - wsdlLocationsSecMap.put("http://" + serverHost + ":8080/jaxws-jbws2150-sec/InvalidURL?wsdl", testWebServiceHost); - wsdlLocationsSecMap.put("http://" + serverHost + ":8080/jaxws-jbws2150-sec/ValidSecureURL?wsdl", testWebServiceHost); - wsdlLocationsSecMap.put("http://" + serverHost + ":8080/jaxws-jbws2150-sec/InvalidSecureURL?wsdl", testWebServiceHost); - importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150-sec/ValidURL?wsdl", "https://" + testWebServiceHost + ":8443/jaxws-jbws2150-sec/ValidURL?wsdl=inner.wsdl"); - importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150-sec/InvalidURL?wsdl", "https://" + testWebServiceHost + ":8443/jaxws-jbws2150-sec/InvalidURL?wsdl=inner.wsdl"); - importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150-sec/ValidSecureURL?wsdl", "https://" + testWebServiceHost + ":8443/jaxws-jbws2150-sec/ValidSecureURL?wsdl=inner.wsdl"); - importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150-sec/InvalidSecureURL?wsdl", "https://" + testWebServiceHost + ":8443/jaxws-jbws2150-sec/InvalidSecureURL?wsdl=inner.wsdl"); + final int serverPort = getServerPort(); + final int serverSecurePort = serverPort + 363; //8443 = 8080 + 363 + wsdlLocationsSecMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150-sec/ValidURL?wsdl", testWebServiceHost); + wsdlLocationsSecMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150-sec/InvalidURL?wsdl", testWebServiceHost); + wsdlLocationsSecMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150-sec/ValidSecureURL?wsdl", testWebServiceHost); + wsdlLocationsSecMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150-sec/InvalidSecureURL?wsdl", testWebServiceHost); + importMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150-sec/ValidURL?wsdl", "https://" + testWebServiceHost + ":" + serverSecurePort + "/jaxws-jbws2150-sec/ValidURL?wsdl=inner.wsdl"); + importMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150-sec/InvalidURL?wsdl", "https://" + testWebServiceHost + ":" + serverSecurePort + "/jaxws-jbws2150-sec/InvalidURL?wsdl=inner.wsdl"); + importMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150-sec/ValidSecureURL?wsdl", "https://" + testWebServiceHost + ":" + serverSecurePort + "/jaxws-jbws2150-sec/ValidSecureURL?wsdl=inner.wsdl"); + importMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150-sec/InvalidSecureURL?wsdl", "https://" + testWebServiceHost + ":" + serverSecurePort + "/jaxws-jbws2150-sec/InvalidSecureURL?wsdl=inner.wsdl"); if (isTestsuiteServerHostLocalhost()) { - wsdlLocationsSecMap.put("http://127.0.0.1:8080/jaxws-jbws2150-sec/ValidURL?wsdl", testWebServiceHost); - wsdlLocationsSecMap.put("http://127.0.0.1:8080/jaxws-jbws2150-sec/InvalidURL?wsdl", testWebServiceHost); - wsdlLocationsSecMap.put("http://127.0.0.1:8080/jaxws-jbws2150-sec/ValidSecureURL?wsdl", testWebServiceHost); - wsdlLocationsSecMap.put("http://127.0.0.1:8080/jaxws-jbws2150-sec/InvalidSecureURL?wsdl", testWebServiceHost); - importMap.put("http://127.0.0.1:8080/jaxws-jbws2150-sec/ValidURL?wsdl", "https://" + testWebServiceHost + ":8443/jaxws-jbws2150-sec/ValidURL?wsdl=inner.wsdl"); - importMap.put("http://127.0.0.1:8080/jaxws-jbws2150-sec/InvalidURL?wsdl", "https://" + testWebServiceHost + ":8443/jaxws-jbws2150-sec/InvalidURL?wsdl=inner.wsdl"); - importMap.put("http://127.0.0.1:8080/jaxws-jbws2150-sec/ValidSecureURL?wsdl", "https://" + testWebServiceHost + ":8443/jaxws-jbws2150-sec/ValidSecureURL?wsdl=inner.wsdl"); - importMap.put("http://127.0.0.1:8080/jaxws-jbws2150-sec/InvalidSecureURL?wsdl", "https://" + testWebServiceHost + ":8443/jaxws-jbws2150-sec/InvalidSecureURL?wsdl=inner.wsdl"); + wsdlLocationsSecMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150-sec/ValidURL?wsdl", testWebServiceHost); + wsdlLocationsSecMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150-sec/InvalidURL?wsdl", testWebServiceHost); + wsdlLocationsSecMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150-sec/ValidSecureURL?wsdl", testWebServiceHost); + wsdlLocationsSecMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150-sec/InvalidSecureURL?wsdl", testWebServiceHost); + importMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150-sec/ValidURL?wsdl", "https://" + testWebServiceHost + ":" + serverSecurePort + "/jaxws-jbws2150-sec/ValidURL?wsdl=inner.wsdl"); + importMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150-sec/InvalidURL?wsdl", "https://" + testWebServiceHost + ":" + serverSecurePort + "/jaxws-jbws2150-sec/InvalidURL?wsdl=inner.wsdl"); + importMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150-sec/ValidSecureURL?wsdl", "https://" + testWebServiceHost + ":" + serverSecurePort + "/jaxws-jbws2150-sec/ValidSecureURL?wsdl=inner.wsdl"); + importMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150-sec/InvalidSecureURL?wsdl", "https://" + testWebServiceHost + ":" + serverSecurePort + "/jaxws-jbws2150-sec/InvalidSecureURL?wsdl=inner.wsdl"); } for (Entry<String, String> entry : wsdlLocationsSecMap.entrySet()) { @@ -473,16 +487,16 @@ Definition definition = getWSDLDefinition(wsdlLocationSec); String address = getPortAddress(definition, "ValidURLService", "ValidURLPort"); - assertEquals("https://" + host + ":8443/jaxws-jbws2150-sec/ValidURL", address); + assertEquals("https://" + host + ":" + serverSecurePort + "/jaxws-jbws2150-sec/ValidURL", address); address = getPortAddress(definition, "InvalidURLService", "InvalidURLPort"); - assertEquals("https://" + host + ":8443/jaxws-jbws2150-sec/InvalidURL", address); + assertEquals("https://" + host + ":" + serverSecurePort + "/jaxws-jbws2150-sec/InvalidURL", address); address = getPortAddress(definition, "ValidSecureURLService", "ValidSecureURLPort"); - assertEquals("https://" + host + ":8443/jaxws-jbws2150-sec/ValidSecureURL", address); + assertEquals("https://" + host + ":" + serverSecurePort + "/jaxws-jbws2150-sec/ValidSecureURL", address); address = getPortAddress(definition, "InvalidSecureURLService", "InvalidSecureURLPort"); - assertEquals("https://" + host + ":8443/jaxws-jbws2150-sec/InvalidSecureURL", address); + assertEquals("https://" + host + ":" + serverSecurePort + "/jaxws-jbws2150-sec/InvalidSecureURL", address); //check wsdl import address rewrite (we expect a rewritten version of the same base address used to fetch the wsdl) assertEquals(importMap.get(wsdlLocationSec), getWsdlImportAddress(definition)); @@ -512,23 +526,25 @@ final Map<String, String> wsdlLocationsMap = new HashMap<String, String>(); final Map<String, String> importMap = new HashMap<String, String>(); final String serverHost = getServerHost(); - wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidURL?wsdl", getWebServiceHost()); - wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidURL?wsdl", getWebServiceHost()); - wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidSecureURL?wsdl", getWebServiceHost()); - wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidSecureURL?wsdl", getWebServiceHost()); - importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidURL?wsdl", "http://somehost:80/somepath?wsdl=inner.wsdl"); - importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidURL?wsdl", "http://" + getWebServiceHost() + ":8080/jaxws-jbws2150/InvalidURL?wsdl=inner.wsdl"); - importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidSecureURL?wsdl", "https://somehost:443/some-secure-path?wsdl=inner.wsdl"); - importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidSecureURL?wsdl", "https://" + getWebServiceHost() + ":8443/jaxws-jbws2150/InvalidSecureURL?wsdl=inner.wsdl"); + final int serverPort = getServerPort(); + final int serverSecurePort = serverPort + 363; //8443 = 8080 + 363 + wsdlLocationsMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/ValidURL?wsdl", getWebServiceHost()); + wsdlLocationsMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/InvalidURL?wsdl", getWebServiceHost()); + wsdlLocationsMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/ValidSecureURL?wsdl", getWebServiceHost()); + wsdlLocationsMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/InvalidSecureURL?wsdl", getWebServiceHost()); + importMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/ValidURL?wsdl", "http://somehost:80/somepath?wsdl=inner.wsdl"); + importMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/InvalidURL?wsdl", "http://" + getWebServiceHost() + ":" + serverPort + "/jaxws-jbws2150/InvalidURL?wsdl=inner.wsdl"); + importMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/ValidSecureURL?wsdl", "https://somehost:443/some-secure-path?wsdl=inner.wsdl"); + importMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/InvalidSecureURL?wsdl", "https://" + getWebServiceHost() + ":" + serverSecurePort + "/jaxws-jbws2150/InvalidSecureURL?wsdl=inner.wsdl"); if (isTestsuiteServerHostLocalhost()) { - wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidURL?wsdl", getWebServiceHost()); - wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidURL?wsdl", getWebServiceHost()); - wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidSecureURL?wsdl", getWebServiceHost()); - wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidSecureURL?wsdl", getWebServiceHost()); - importMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidURL?wsdl", "http://somehost:80/somepath?wsdl=inner.wsdl"); - importMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidURL?wsdl", "http://" + getWebServiceHost() + ":8080/jaxws-jbws2150/InvalidURL?wsdl=inner.wsdl"); - importMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidSecureURL?wsdl", "https://somehost:443/some-secure-path?wsdl=inner.wsdl"); - importMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidSecureURL?wsdl", "https://" + getWebServiceHost() + ":8443/jaxws-jbws2150/InvalidSecureURL?wsdl=inner.wsdl"); + wsdlLocationsMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150/ValidURL?wsdl", getWebServiceHost()); + wsdlLocationsMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150/InvalidURL?wsdl", getWebServiceHost()); + wsdlLocationsMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150/ValidSecureURL?wsdl", getWebServiceHost()); + wsdlLocationsMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150/InvalidSecureURL?wsdl", getWebServiceHost()); + importMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150/ValidURL?wsdl", "http://somehost:80/somepath?wsdl=inner.wsdl"); + importMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150/InvalidURL?wsdl", "http://" + getWebServiceHost() + ":" + serverPort + "/jaxws-jbws2150/InvalidURL?wsdl=inner.wsdl"); + importMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150/ValidSecureURL?wsdl", "https://somehost:443/some-secure-path?wsdl=inner.wsdl"); + importMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150/InvalidSecureURL?wsdl", "https://" + getWebServiceHost() + ":" + serverSecurePort + "/jaxws-jbws2150/InvalidSecureURL?wsdl=inner.wsdl"); } for (Entry<String, String> entry : wsdlLocationsMap.entrySet()) { @@ -540,13 +556,13 @@ assertEquals("http://somehost:80/somepath", address); address = getPortAddress(definition, "InvalidURLService", "InvalidURLPort"); - assertEquals("http://" + host + ":8080/jaxws-jbws2150/InvalidURL", address); + assertEquals("http://" + host + ":" + serverPort + "/jaxws-jbws2150/InvalidURL", address); address = getPortAddress(definition, "ValidSecureURLService", "ValidSecureURLPort"); assertEquals("https://somehost:443/some-secure-path", address); address = getPortAddress(definition, "InvalidSecureURLService", "InvalidSecureURLPort"); - assertEquals("https://" + host + ":8443/jaxws-jbws2150/InvalidSecureURL", address); + assertEquals("https://" + host + ":" + serverSecurePort + "/jaxws-jbws2150/InvalidSecureURL", address); //check wsdl import address rewrite; here we expect an address using the same base as the one for the port corresponding to the address used to fetch the wsdl assertEquals(importMap.get(wsdlLocation), getWsdlImportAddress(definition)); @@ -657,7 +673,7 @@ deployer.deploy("dep-jaxws-jbws2150-codefirst"); try { - Definition definition = getWSDLDefinition("http://" + getServerHost() + ":8080/jaxws-jbws2150-codefirst/CodeFirstService?wsdl"); + Definition definition = getWSDLDefinition("http://" + getServerHost() + ":" + getServerPort() + "/jaxws-jbws2150-codefirst/CodeFirstService?wsdl"); String address = getPortAddress(definition, "CodeFirstService", "CodeFirstPort"); assertEquals("https://" + testWebServiceHost + "/jaxws-jbws2150-codefirst/CodeFirstService", address); } @@ -742,32 +758,34 @@ try { final String serverHost = getServerHost(); + final int serverPort = getServerPort(); + final int serverSecurePort = serverPort + 363; //8443 = 8080 + 363 final List<String> wsdlLocations = new LinkedList<String>(); final Map<String, String> importMap = new HashMap<String, String>(); - wsdlLocations.add("http://" + serverHost + ":8080/jaxws-jbws2150/ValidURL?wsdl"); - wsdlLocations.add("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidURL?wsdl"); - wsdlLocations.add("http://" + serverHost + ":8080/jaxws-jbws2150/ValidSecureURL?wsdl"); - wsdlLocations.add("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidSecureURL?wsdl"); - importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidURL?wsdl", "http://" + serverHost + ":8080/" + expectedContext + "/ValidURL?wsdl=inner.wsdl"); - importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidURL?wsdl", "http://" + serverHost + ":8080/" + expectedContext + "/InvalidURL?wsdl=inner.wsdl"); - importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidSecureURL?wsdl", "https://" + serverHost + ":8443/" + expectedContext + "/ValidSecureURL?wsdl=inner.wsdl"); - importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidSecureURL?wsdl", "https://" + serverHost + ":8443/" + expectedContext + "/InvalidSecureURL?wsdl=inner.wsdl"); + wsdlLocations.add("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/ValidURL?wsdl"); + wsdlLocations.add("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/InvalidURL?wsdl"); + wsdlLocations.add("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/ValidSecureURL?wsdl"); + wsdlLocations.add("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/InvalidSecureURL?wsdl"); + importMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/ValidURL?wsdl", "http://" + serverHost + ":" + serverPort + "/" + expectedContext + "/ValidURL?wsdl=inner.wsdl"); + importMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/InvalidURL?wsdl", "http://" + serverHost + ":" + serverPort + "/" + expectedContext + "/InvalidURL?wsdl=inner.wsdl"); + importMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/ValidSecureURL?wsdl", "https://" + serverHost + ":" + serverSecurePort + "/" + expectedContext + "/ValidSecureURL?wsdl=inner.wsdl"); + importMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/InvalidSecureURL?wsdl", "https://" + serverHost + ":" + serverSecurePort + "/" + expectedContext + "/InvalidSecureURL?wsdl=inner.wsdl"); for (final String wsdlLocation : wsdlLocations) { Definition definition = getWSDLDefinition(wsdlLocation); String address = getPortAddress(definition, "ValidURLService", "ValidURLPort"); - assertEquals("http://" + serverHost + ":8080/" + expectedContext + "/ValidURL", address); + assertEquals("http://" + serverHost + ":" + serverPort + "/" + expectedContext + "/ValidURL", address); address = getPortAddress(definition, "InvalidURLService", "InvalidURLPort"); - assertEquals("http://" + serverHost + ":8080/" + expectedContext + "/InvalidURL", address); + assertEquals("http://" + serverHost + ":" + serverPort + "/" + expectedContext + "/InvalidURL", address); address = getPortAddress(definition, "ValidSecureURLService", "ValidSecureURLPort"); - assertEquals("https://" + serverHost + ":8443/" + expectedContext + "/ValidSecureURL", address); + assertEquals("https://" + serverHost + ":" + serverSecurePort + "/" + expectedContext + "/ValidSecureURL", address); address = getPortAddress(definition, "InvalidSecureURLService", "InvalidSecureURLPort"); - assertEquals("https://" + serverHost + ":8443/" + expectedContext + "/InvalidSecureURL", address); + assertEquals("https://" + serverHost + ":" + serverSecurePort + "/" + expectedContext + "/InvalidSecureURL", address); //check wsdl import address rewrite (we expect a rewritten version of the same base address used to fetch the wsdl) assertEquals(importMap.get(wsdlLocation), getWsdlImportAddress(definition)); @@ -798,11 +816,12 @@ try { final String serverHost = getServerHost(); - final String wsdlLocation = "http://" + serverHost + ":8080/jaxws-jbws2150-codefirst/CodeFirstService?wsdl"; + final int serverPort = getServerPort(); + final String wsdlLocation = "http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150-codefirst/CodeFirstService?wsdl"; Definition definition = getWSDLDefinition(wsdlLocation); String address = getPortAddress(definition, "CodeFirstService", "CodeFirstPort"); - assertEquals("http://" + serverHost + ":8080/" + expectedContext +"/CodeFirstService", address); + assertEquals("http://" + serverHost + ":" + serverPort + "/" + expectedContext +"/CodeFirstService", address); } finally { @@ -831,15 +850,16 @@ try { String serverHost = getServerHost(); - final String wsdlLocation = "http://" + serverHost + ":8080/jaxws-jbws2150-codefirst/CodeFirstService?wsdl"; + int serverPort = getServerPort(); + final String wsdlLocation = "http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150-codefirst/CodeFirstService?wsdl"; Definition definition = getWSDLDefinition(wsdlLocation); String address = getPortAddress(definition, "CodeFirstService", "CodeFirstPort"); - assertEquals("http://" + serverHost + ":8080/" + expectedContext +"/CodeFirstService", address); + assertEquals("http://" + serverHost + ":" + serverPort + "/" + expectedContext +"/CodeFirstService", address); if (isTestsuiteServerHostLocalhost()) { - definition = getWSDLDefinition("http://127.0.0.1:8080/jaxws-jbws2150-codefirst/CodeFirstService?wsdl"); + definition = getWSDLDefinition("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150-codefirst/CodeFirstService?wsdl"); address = getPortAddress(definition, "CodeFirstService", "CodeFirstPort"); - assertEquals("http://127.0.0.1:8080/" + expectedContext +"/CodeFirstService", address); + assertEquals("http://127.0.0.1:" + serverPort + "/" + expectedContext +"/CodeFirstService", address); } } finally @@ -870,23 +890,25 @@ final Map<String, String> wsdlLocationsMap = new HashMap<String, String>(); final Map<String, String> importMap = new HashMap<String, String>(); final String serverHost = getServerHost(); - wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidURL?wsdl", serverHost); - wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidURL?wsdl", serverHost); - wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidSecureURL?wsdl", serverHost); - wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidSecureURL?wsdl", serverHost); - importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidURL?wsdl", "http://" + serverHost + ":8080/" + expectedContext + "/ValidURL?wsdl=inner.wsdl"); - importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidURL?wsdl", "http://" + serverHost + ":8080/" + expectedContext + "/InvalidURL?wsdl=inner.wsdl"); - importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidSecureURL?wsdl", "https://" + serverHost + ":8443/" + expectedContext + "/ValidSecureURL?wsdl=inner.wsdl"); - importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidSecureURL?wsdl", "https://" + serverHost + ":8443/" + expectedContext + "/InvalidSecureURL?wsdl=inner.wsdl"); + final int serverPort = getServerPort(); + final int serverSecurePort = serverPort + 363; // 8080 + 363 = 8443 + wsdlLocationsMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/ValidURL?wsdl", serverHost); + wsdlLocationsMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/InvalidURL?wsdl", serverHost); + wsdlLocationsMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/ValidSecureURL?wsdl", serverHost); + wsdlLocationsMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/InvalidSecureURL?wsdl", serverHost); + importMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/ValidURL?wsdl", "http://" + serverHost + ":" + serverPort + "/" + expectedContext + "/ValidURL?wsdl=inner.wsdl"); + importMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/InvalidURL?wsdl", "http://" + serverHost + ":" + serverPort + "/" + expectedContext + "/InvalidURL?wsdl=inner.wsdl"); + importMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/ValidSecureURL?wsdl", "https://" + serverHost + ":" + serverSecurePort + "/" + expectedContext + "/ValidSecureURL?wsdl=inner.wsdl"); + importMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/InvalidSecureURL?wsdl", "https://" + serverHost + ":" + serverSecurePort + "/" + expectedContext + "/InvalidSecureURL?wsdl=inner.wsdl"); if (isTestsuiteServerHostLocalhost()) { - wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidURL?wsdl", "127.0.0.1"); - wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidURL?wsdl", "127.0.0.1"); - wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidSecureURL?wsdl", "127.0.0.1"); - wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidSecureURL?wsdl", "127.0.0.1"); - importMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidURL?wsdl", "http://127.0.0.1:8080/" + expectedContext + "/ValidURL?wsdl=inner.wsdl"); - importMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidURL?wsdl", "http://127.0.0.1:8080/" + expectedContext + "/InvalidURL?wsdl=inner.wsdl"); - importMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidSecureURL?wsdl", "https://127.0.0.1:8443/" + expectedContext + "/ValidSecureURL?wsdl=inner.wsdl"); - importMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidSecureURL?wsdl", "https://127.0.0.1:8443/" + expectedContext + "/InvalidSecureURL?wsdl=inner.wsdl"); + wsdlLocationsMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150/ValidURL?wsdl", "127.0.0.1"); + wsdlLocationsMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150/InvalidURL?wsdl", "127.0.0.1"); + wsdlLocationsMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150/ValidSecureURL?wsdl", "127.0.0.1"); + wsdlLocationsMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150/InvalidSecureURL?wsdl", "127.0.0.1"); + importMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150/ValidURL?wsdl", "http://127.0.0.1:" + serverPort + "/" + expectedContext + "/ValidURL?wsdl=inner.wsdl"); + importMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150/InvalidURL?wsdl", "http://127.0.0.1:" + serverPort + "/" + expectedContext + "/InvalidURL?wsdl=inner.wsdl"); + importMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150/ValidSecureURL?wsdl", "https://127.0.0.1:" + serverSecurePort + "/" + expectedContext + "/ValidSecureURL?wsdl=inner.wsdl"); + importMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150/InvalidSecureURL?wsdl", "https://127.0.0.1:" + serverSecurePort + "/" + expectedContext + "/InvalidSecureURL?wsdl=inner.wsdl"); } for (Entry<String, String> entry : wsdlLocationsMap.entrySet()) { String wsdlLocation = entry.getKey(); @@ -894,16 +916,16 @@ Definition definition = getWSDLDefinition(wsdlLocation); String address = getPortAddress(definition, "ValidURLService", "ValidURLPort"); - assertEquals("http://" + host + ":8080/" + expectedContext + "/ValidURL", address); + assertEquals("http://" + host + ":" + serverPort + "/" + expectedContext + "/ValidURL", address); address = getPortAddress(definition, "InvalidURLService", "InvalidURLPort"); - assertEquals("http://" + host + ":8080/" + expectedContext + "/InvalidURL", address); + assertEquals("http://" + host + ":" + serverPort + "/" + expectedContext + "/InvalidURL", address); address = getPortAddress(definition, "ValidSecureURLService", "ValidSecureURLPort"); - assertEquals("http://" + host + ":8080/" + expectedContext + "/ValidSecureURL", address); + assertEquals("http://" + host + ":" + serverPort + "/" + expectedContext + "/ValidSecureURL", address); address = getPortAddress(definition, "InvalidSecureURLService", "InvalidSecureURLPort"); - assertEquals("http://" + host + ":8080/" + expectedContext + "/InvalidSecureURL", address); + assertEquals("http://" + host + ":" + serverPort + "/" + expectedContext + "/InvalidSecureURL", address); //check wsdl import address rewrite (we expect a rewritten version of the same base address used to fetch the wsdl) if (!wsdlLocation.contains("Secure")) { @@ -937,23 +959,24 @@ final Map<String, String> wsdlLocationsMap = new HashMap<String, String>(); final Map<String, String> importMap = new HashMap<String, String>(); final String serverHost = getServerHost(); - wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidURL?wsdl", getWebServiceHost()); - wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidURL?wsdl", getWebServiceHost()); - wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidSecureURL?wsdl", getWebServiceHost()); - wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidSecureURL?wsdl", getWebServiceHost()); - importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidURL?wsdl", "https://" + getWebServiceHost() + ":8192/jaxws-jbws2150/ValidURL?wsdl=inner.wsdl"); - importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidURL?wsdl", "https://" + getWebServiceHost() + ":8192/jaxws-jbws2150/InvalidURL?wsdl=inner.wsdl"); - importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidSecureURL?wsdl", "https://" + getWebServiceHost() + ":8192/jaxws-jbws2150/ValidSecureURL?wsdl=inner.wsdl"); - importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidSecureURL?wsdl", "https://" + getWebServiceHost() + ":8192/jaxws-jbws2150/InvalidSecureURL?wsdl=inner.wsdl"); + final int serverPort = getServerPort(); + wsdlLocationsMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/ValidURL?wsdl", getWebServiceHost()); + wsdlLocationsMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/InvalidURL?wsdl", getWebServiceHost()); + wsdlLocationsMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/ValidSecureURL?wsdl", getWebServiceHost()); + wsdlLocationsMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/InvalidSecureURL?wsdl", getWebServiceHost()); + importMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/ValidURL?wsdl", "https://" + getWebServiceHost() + ":8192/jaxws-jbws2150/ValidURL?wsdl=inner.wsdl"); + importMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/InvalidURL?wsdl", "https://" + getWebServiceHost() + ":8192/jaxws-jbws2150/InvalidURL?wsdl=inner.wsdl"); + importMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/ValidSecureURL?wsdl", "https://" + getWebServiceHost() + ":8192/jaxws-jbws2150/ValidSecureURL?wsdl=inner.wsdl"); + importMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/InvalidSecureURL?wsdl", "https://" + getWebServiceHost() + ":8192/jaxws-jbws2150/InvalidSecureURL?wsdl=inner.wsdl"); if (isTestsuiteServerHostLocalhost()) { - wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidURL?wsdl", getWebServiceHost()); - wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidURL?wsdl", getWebServiceHost()); - wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidSecureURL?wsdl", getWebServiceHost()); - wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidSecureURL?wsdl", getWebServiceHost()); - importMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidURL?wsdl", "https://" + getWebServiceHost() + ":8192/jaxws-jbws2150/ValidURL?wsdl=inner.wsdl"); - importMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidURL?wsdl", "https://" + getWebServiceHost() + ":8192/jaxws-jbws2150/InvalidURL?wsdl=inner.wsdl"); - importMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidSecureURL?wsdl", "https://" + getWebServiceHost() + ":8192/jaxws-jbws2150/ValidSecureURL?wsdl=inner.wsdl"); - importMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidSecureURL?wsdl", "https://" + getWebServiceHost() + ":8192/jaxws-jbws2150/InvalidSecureURL?wsdl=inner.wsdl"); + wsdlLocationsMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150/ValidURL?wsdl", getWebServiceHost()); + wsdlLocationsMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150/InvalidURL?wsdl", getWebServiceHost()); + wsdlLocationsMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150/ValidSecureURL?wsdl", getWebServiceHost()); + wsdlLocationsMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150/InvalidSecureURL?wsdl", getWebServiceHost()); + importMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150/ValidURL?wsdl", "https://" + getWebServiceHost() + ":8192/jaxws-jbws2150/ValidURL?wsdl=inner.wsdl"); + importMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150/InvalidURL?wsdl", "https://" + getWebServiceHost() + ":8192/jaxws-jbws2150/InvalidURL?wsdl=inner.wsdl"); + importMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150/ValidSecureURL?wsdl", "https://" + getWebServiceHost() + ":8192/jaxws-jbws2150/ValidSecureURL?wsdl=inner.wsdl"); + importMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150/InvalidSecureURL?wsdl", "https://" + getWebServiceHost() + ":8192/jaxws-jbws2150/InvalidSecureURL?wsdl=inner.wsdl"); } for (Entry<String, String> entry : wsdlLocationsMap.entrySet()) { @@ -1005,23 +1028,25 @@ final Map<String, String> wsdlLocationsMap = new HashMap<String, String>(); final Map<String, String> importMap = new HashMap<String, String>(); final String serverHost = getServerHost(); - wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidURL?wsdl", testWebServiceHost); - wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidURL?wsdl", testWebServiceHost); - wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidSecureURL?wsdl", testWebServiceHost); - wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidSecureURL?wsdl", testWebServiceHost); - importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidURL?wsdl", "https://" + testWebServiceHost + ":8443/jaxws-jbws2150/ValidURL?wsdl=inner.wsdl"); - importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidURL?wsdl", "https://" + testWebServiceHost + ":8443/jaxws-jbws2150/InvalidURL?wsdl=inner.wsdl"); - importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidSecureURL?wsdl", "https://" + testWebServiceHost + ":8443/jaxws-jbws2150/ValidSecureURL?wsdl=inner.wsdl"); - importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidSecureURL?wsdl", "https://" + testWebServiceHost + ":8443/jaxws-jbws2150/InvalidSecureURL?wsdl=inner.wsdl"); + final int serverPort = getServerPort(); + final int serverSecurePort = serverPort + 363; //8080 + 363 = 8443 + wsdlLocationsMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/ValidURL?wsdl", testWebServiceHost); + wsdlLocationsMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/InvalidURL?wsdl", testWebServiceHost); + wsdlLocationsMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/ValidSecureURL?wsdl", testWebServiceHost); + wsdlLocationsMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/InvalidSecureURL?wsdl", testWebServiceHost); + importMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/ValidURL?wsdl", "https://" + testWebServiceHost + ":" + serverSecurePort + "/jaxws-jbws2150/ValidURL?wsdl=inner.wsdl"); + importMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/InvalidURL?wsdl", "https://" + testWebServiceHost + ":" + serverSecurePort + "/jaxws-jbws2150/InvalidURL?wsdl=inner.wsdl"); + importMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/ValidSecureURL?wsdl", "https://" + testWebServiceHost + ":" + serverSecurePort + "/jaxws-jbws2150/ValidSecureURL?wsdl=inner.wsdl"); + importMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/InvalidSecureURL?wsdl", "https://" + testWebServiceHost + ":" + serverSecurePort + "/jaxws-jbws2150/InvalidSecureURL?wsdl=inner.wsdl"); if (isTestsuiteServerHostLocalhost()) { - wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidURL?wsdl", testWebServiceHost); - wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidURL?wsdl", testWebServiceHost); - wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidSecureURL?wsdl", testWebServiceHost); - wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidSecureURL?wsdl", testWebServiceHost); - importMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidURL?wsdl", "https://" + testWebServiceHost + ":8443/jaxws-jbws2150/ValidURL?wsdl=inner.wsdl"); - importMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidURL?wsdl", "https://" + testWebServiceHost + ":8443/jaxws-jbws2150/InvalidURL?wsdl=inner.wsdl"); - importMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidSecureURL?wsdl", "https://" + testWebServiceHost + ":8443/jaxws-jbws2150/ValidSecureURL?wsdl=inner.wsdl"); - importMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidSecureURL?wsdl", "https://" + testWebServiceHost + ":8443/jaxws-jbws2150/InvalidSecureURL?wsdl=inner.wsdl"); + wsdlLocationsMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150/ValidURL?wsdl", testWebServiceHost); + wsdlLocationsMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150/InvalidURL?wsdl", testWebServiceHost); + wsdlLocationsMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150/ValidSecureURL?wsdl", testWebServiceHost); + wsdlLocationsMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150/InvalidSecureURL?wsdl", testWebServiceHost); + importMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150/ValidURL?wsdl", "https://" + testWebServiceHost + ":" + serverSecurePort + "/jaxws-jbws2150/ValidURL?wsdl=inner.wsdl"); + importMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150/InvalidURL?wsdl", "https://" + testWebServiceHost + ":" + serverSecurePort + "/jaxws-jbws2150/InvalidURL?wsdl=inner.wsdl"); + importMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150/ValidSecureURL?wsdl", "https://" + testWebServiceHost + ":" + serverSecurePort + "/jaxws-jbws2150/ValidSecureURL?wsdl=inner.wsdl"); + importMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150/InvalidSecureURL?wsdl", "https://" + testWebServiceHost + ":" + serverSecurePort + "/jaxws-jbws2150/InvalidSecureURL?wsdl=inner.wsdl"); } for (Entry<String, String> entry : wsdlLocationsMap.entrySet()) { @@ -1030,16 +1055,16 @@ Definition definition = getWSDLDefinition(wsdlLocation); String address = getPortAddress(definition, "ValidURLService", "ValidURLPort"); - assertEquals("https://" + host + ":8443/jaxws-jbws2150/ValidURL", address); + assertEquals("https://" + host + ":" + serverSecurePort + "/jaxws-jbws2150/ValidURL", address); address = getPortAddress(definition, "InvalidURLService", "InvalidURLPort"); - assertEquals("https://" + host + ":8443/jaxws-jbws2150/InvalidURL", address); + assertEquals("https://" + host + ":" + serverSecurePort + "/jaxws-jbws2150/InvalidURL", address); address = getPortAddress(definition, "ValidSecureURLService", "ValidSecureURLPort"); - assertEquals("https://" + host + ":8443/jaxws-jbws2150/ValidSecureURL", address); + assertEquals("https://" + host + ":" + serverSecurePort + "/jaxws-jbws2150/ValidSecureURL", address); address = getPortAddress(definition, "InvalidSecureURLService", "InvalidSecureURLPort"); - assertEquals("https://" + host + ":8443/jaxws-jbws2150/InvalidSecureURL", address); + assertEquals("https://" + host + ":" + serverSecurePort + "/jaxws-jbws2150/InvalidSecureURL", address); //check wsdl import address rewrite (we expect a rewritten version of the same base address used to fetch the wsdl) assertEquals(importMap.get(wsdlLocation), getWsdlImportAddress(definition)); @@ -1070,23 +1095,24 @@ final Map<String, String> wsdlLocationsMap = new HashMap<String, String>(); final Map<String, String> importMap = new HashMap<String, String>(); final String serverHost = getServerHost(); - wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidURL?wsdl", serverHost); - wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidURL?wsdl", serverHost); - wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidSecureURL?wsdl", serverHost); - wsdlLocationsMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidSecureURL?wsdl", serverHost); - importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidURL?wsdl", "http://" + serverHost + ":8080/jaxws-jbws2150/ValidURL?wsdl=inner.wsdl"); - importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidURL?wsdl", "http://" + serverHost + ":8080/jaxws-jbws2150/InvalidURL?wsdl=inner.wsdl"); - importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidSecureURL?wsdl", "http://" + serverHost + ":8080/jaxws-jbws2150/ValidSecureURL?wsdl=inner.wsdl"); - importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidSecureURL?wsdl", "http://" + serverHost + ":8080/jaxws-jbws2150/InvalidSecureURL?wsdl=inner.wsdl"); + final int serverPort = getServerPort(); + wsdlLocationsMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/ValidURL?wsdl", serverHost); + wsdlLocationsMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/InvalidURL?wsdl", serverHost); + wsdlLocationsMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/ValidSecureURL?wsdl", serverHost); + wsdlLocationsMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/InvalidSecureURL?wsdl", serverHost); + importMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/ValidURL?wsdl", "http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/ValidURL?wsdl=inner.wsdl"); + importMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/InvalidURL?wsdl", "http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/InvalidURL?wsdl=inner.wsdl"); + importMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/ValidSecureURL?wsdl", "http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/ValidSecureURL?wsdl=inner.wsdl"); + importMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/InvalidSecureURL?wsdl", "http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/InvalidSecureURL?wsdl=inner.wsdl"); if (isTestsuiteServerHostLocalhost()) { - wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidURL?wsdl", "127.0.0.1"); - wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidURL?wsdl", "127.0.0.1"); - wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidSecureURL?wsdl", "127.0.0.1"); - wsdlLocationsMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidSecureURL?wsdl", "127.0.0.1"); - importMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidURL?wsdl", "http://127.0.0.1:8080/jaxws-jbws2150/ValidURL?wsdl=inner.wsdl"); - importMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidURL?wsdl", "http://127.0.0.1:8080/jaxws-jbws2150/InvalidURL?wsdl=inner.wsdl"); - importMap.put("http://127.0.0.1:8080/jaxws-jbws2150/ValidSecureURL?wsdl", "http://127.0.0.1:8080/jaxws-jbws2150/ValidSecureURL?wsdl=inner.wsdl"); - importMap.put("http://127.0.0.1:8080/jaxws-jbws2150/InvalidSecureURL?wsdl", "http://127.0.0.1:8080/jaxws-jbws2150/InvalidSecureURL?wsdl=inner.wsdl"); + wsdlLocationsMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150/ValidURL?wsdl", "127.0.0.1"); + wsdlLocationsMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150/InvalidURL?wsdl", "127.0.0.1"); + wsdlLocationsMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150/ValidSecureURL?wsdl", "127.0.0.1"); + wsdlLocationsMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150/InvalidSecureURL?wsdl", "127.0.0.1"); + importMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150/ValidURL?wsdl", "http://127.0.0.1:" + serverPort + "/jaxws-jbws2150/ValidURL?wsdl=inner.wsdl"); + importMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150/InvalidURL?wsdl", "http://127.0.0.1:" + serverPort + "/jaxws-jbws2150/InvalidURL?wsdl=inner.wsdl"); + importMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150/ValidSecureURL?wsdl", "http://127.0.0.1:" + serverPort + "/jaxws-jbws2150/ValidSecureURL?wsdl=inner.wsdl"); + importMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150/InvalidSecureURL?wsdl", "http://127.0.0.1:" + serverPort + "/jaxws-jbws2150/InvalidSecureURL?wsdl=inner.wsdl"); } for (Entry<String, String> entry : wsdlLocationsMap.entrySet()) { @@ -1095,16 +1121,16 @@ Definition definition = getWSDLDefinition(wsdlLocation); String address = getPortAddress(definition, "ValidURLService", "ValidURLPort"); - assertEquals("http://" + host + ":8080/jaxws-jbws2150/ValidURL", address); + assertEquals("http://" + host + ":" + serverPort + "/jaxws-jbws2150/ValidURL", address); address = getPortAddress(definition, "InvalidURLService", "InvalidURLPort"); - assertEquals("http://" + host + ":8080/jaxws-jbws2150/InvalidURL", address); + assertEquals("http://" + host + ":" + serverPort + "/jaxws-jbws2150/InvalidURL", address); address = getPortAddress(definition, "ValidSecureURLService", "ValidSecureURLPort"); - assertEquals("http://" + host + ":8080/jaxws-jbws2150/ValidSecureURL", address); + assertEquals("http://" + host + ":" + serverPort + "/jaxws-jbws2150/ValidSecureURL", address); address = getPortAddress(definition, "InvalidSecureURLService", "InvalidSecureURLPort"); - assertEquals("http://" + host + ":8080/jaxws-jbws2150/InvalidSecureURL", address); + assertEquals("http://" + host + ":" + serverPort + "/jaxws-jbws2150/InvalidSecureURL", address); assertEquals(importMap.get(wsdlLocation), getWsdlImportAddress(definition)); } @@ -1135,23 +1161,24 @@ final Map<String, String> wsdlLocationsSecMap = new HashMap<String, String>(); final Map<String, String> importMap = new HashMap<String, String>(); final String serverHost = getServerHost(); - wsdlLocationsSecMap.put("http://" + serverHost + ":8080/jaxws-jbws2150-sec/ValidURL?wsdl", getWebServiceHost()); - wsdlLocationsSecMap.put("http://" + serverHost + ":8080/jaxws-jbws2150-sec/InvalidURL?wsdl", getWebServiceHost()); - wsdlLocationsSecMap.put("http://" + serverHost + ":8080/jaxws-jbws2150-sec/ValidSecureURL?wsdl", getWebServiceHost()); - wsdlLocationsSecMap.put("http://" + serverHost + ":8080/jaxws-jbws2150-sec/InvalidSecureURL?wsdl", getWebServiceHost()); - importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150-sec/ValidURL?wsdl", "http://" + getWebServiceHost() + "/jaxws-jbws2150-sec/ValidURL?wsdl=inner.wsdl"); - importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150-sec/InvalidURL?wsdl", "http://" + getWebServiceHost() + "/jaxws-jbws2150-sec/InvalidURL?wsdl=inner.wsdl"); - importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150-sec/ValidSecureURL?wsdl", "http://" + getWebServiceHost() + "/jaxws-jbws2150-sec/ValidSecureURL?wsdl=inner.wsdl"); - importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150-sec/InvalidSecureURL?wsdl", "http://" + getWebServiceHost() + "/jaxws-jbws2150-sec/InvalidSecureURL?wsdl=inner.wsdl"); + final int serverPort = getServerPort(); + wsdlLocationsSecMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150-sec/ValidURL?wsdl", getWebServiceHost()); + wsdlLocationsSecMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150-sec/InvalidURL?wsdl", getWebServiceHost()); + wsdlLocationsSecMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150-sec/ValidSecureURL?wsdl", getWebServiceHost()); + wsdlLocationsSecMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150-sec/InvalidSecureURL?wsdl", getWebServiceHost()); + importMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150-sec/ValidURL?wsdl", "http://" + getWebServiceHost() + "/jaxws-jbws2150-sec/ValidURL?wsdl=inner.wsdl"); + importMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150-sec/InvalidURL?wsdl", "http://" + getWebServiceHost() + "/jaxws-jbws2150-sec/InvalidURL?wsdl=inner.wsdl"); + importMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150-sec/ValidSecureURL?wsdl", "http://" + getWebServiceHost() + "/jaxws-jbws2150-sec/ValidSecureURL?wsdl=inner.wsdl"); + importMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150-sec/InvalidSecureURL?wsdl", "http://" + getWebServiceHost() + "/jaxws-jbws2150-sec/InvalidSecureURL?wsdl=inner.wsdl"); if (isTestsuiteServerHostLocalhost()) { - wsdlLocationsSecMap.put("http://127.0.0.1:8080/jaxws-jbws2150-sec/ValidURL?wsdl", getWebServiceHost()); - wsdlLocationsSecMap.put("http://127.0.0.1:8080/jaxws-jbws2150-sec/InvalidURL?wsdl", getWebServiceHost()); - wsdlLocationsSecMap.put("http://127.0.0.1:8080/jaxws-jbws2150-sec/ValidSecureURL?wsdl", getWebServiceHost()); - wsdlLocationsSecMap.put("http://127.0.0.1:8080/jaxws-jbws2150-sec/InvalidSecureURL?wsdl", getWebServiceHost()); - importMap.put("http://127.0.0.1:8080/jaxws-jbws2150-sec/ValidURL?wsdl", "http://" + getWebServiceHost() + "/jaxws-jbws2150-sec/ValidURL?wsdl=inner.wsdl"); - importMap.put("http://127.0.0.1:8080/jaxws-jbws2150-sec/InvalidURL?wsdl", "http://" + getWebServiceHost() + "/jaxws-jbws2150-sec/InvalidURL?wsdl=inner.wsdl"); - importMap.put("http://127.0.0.1:8080/jaxws-jbws2150-sec/ValidSecureURL?wsdl", "http://" + getWebServiceHost() + "/jaxws-jbws2150-sec/ValidSecureURL?wsdl=inner.wsdl"); - importMap.put("http://127.0.0.1:8080/jaxws-jbws2150-sec/InvalidSecureURL?wsdl", "http://" + getWebServiceHost() + "/jaxws-jbws2150-sec/InvalidSecureURL?wsdl=inner.wsdl"); + wsdlLocationsSecMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150-sec/ValidURL?wsdl", getWebServiceHost()); + wsdlLocationsSecMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150-sec/InvalidURL?wsdl", getWebServiceHost()); + wsdlLocationsSecMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150-sec/ValidSecureURL?wsdl", getWebServiceHost()); + wsdlLocationsSecMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150-sec/InvalidSecureURL?wsdl", getWebServiceHost()); + importMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150-sec/ValidURL?wsdl", "http://" + getWebServiceHost() + "/jaxws-jbws2150-sec/ValidURL?wsdl=inner.wsdl"); + importMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150-sec/InvalidURL?wsdl", "http://" + getWebServiceHost() + "/jaxws-jbws2150-sec/InvalidURL?wsdl=inner.wsdl"); + importMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150-sec/ValidSecureURL?wsdl", "http://" + getWebServiceHost() + "/jaxws-jbws2150-sec/ValidSecureURL?wsdl=inner.wsdl"); + importMap.put("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150-sec/InvalidSecureURL?wsdl", "http://" + getWebServiceHost() + "/jaxws-jbws2150-sec/InvalidSecureURL?wsdl=inner.wsdl"); } for (Entry<String, String> entry : wsdlLocationsSecMap.entrySet()) { @@ -1201,32 +1228,34 @@ try { final String serverHost = getServerHost(); + final int serverPort = getServerPort(); + final int serverSecurePort = serverPort + 363; //8080 + 363 = 8443 final List<String> wsdlLocations = new LinkedList<String>(); final Map<String, String> importMap = new HashMap<String, String>(); - wsdlLocations.add("http://" + serverHost + ":8080/jaxws-jbws2150/ValidURL?wsdl"); - wsdlLocations.add("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidURL?wsdl"); - wsdlLocations.add("http://" + serverHost + ":8080/jaxws-jbws2150/ValidSecureURL?wsdl"); - wsdlLocations.add("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidSecureURL?wsdl"); - importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidURL?wsdl", "https://" + serverHost + ":8443/" + expectedContext + "/ValidURL?wsdl=inner.wsdl"); - importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidURL?wsdl", "https://" + serverHost + ":8443/" + expectedContext + "/InvalidURL?wsdl=inner.wsdl"); - importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/ValidSecureURL?wsdl", "https://" + serverHost + ":8443/" + expectedContext + "/ValidSecureURL?wsdl=inner.wsdl"); - importMap.put("http://" + serverHost + ":8080/jaxws-jbws2150/InvalidSecureURL?wsdl", "https://" + serverHost + ":8443/" + expectedContext + "/InvalidSecureURL?wsdl=inner.wsdl"); + wsdlLocations.add("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/ValidURL?wsdl"); + wsdlLocations.add("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/InvalidURL?wsdl"); + wsdlLocations.add("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/ValidSecureURL?wsdl"); + wsdlLocations.add("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/InvalidSecureURL?wsdl"); + importMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/ValidURL?wsdl", "https://" + serverHost + ":" + serverSecurePort + "/" + expectedContext + "/ValidURL?wsdl=inner.wsdl"); + importMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/InvalidURL?wsdl", "https://" + serverHost + ":" + serverSecurePort + "/" + expectedContext + "/InvalidURL?wsdl=inner.wsdl"); + importMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/ValidSecureURL?wsdl", "https://" + serverHost + ":" + serverSecurePort + "/" + expectedContext + "/ValidSecureURL?wsdl=inner.wsdl"); + importMap.put("http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150/InvalidSecureURL?wsdl", "https://" + serverHost + ":" + serverSecurePort + "/" + expectedContext + "/InvalidSecureURL?wsdl=inner.wsdl"); for (final String wsdlLocation : wsdlLocations) { Definition definition = getWSDLDefinition(wsdlLocation); String address = getPortAddress(definition, "ValidURLService", "ValidURLPort"); - assertEquals("https://" + serverHost + ":8443/" + expectedContext + "/ValidURL", address); + assertEquals("https://" + serverHost + ":" + serverSecurePort + "/" + expectedContext + "/ValidURL", address); address = getPortAddress(definition, "InvalidURLService", "InvalidURLPort"); - assertEquals("https://" + serverHost + ":8443/" + expectedContext + "/InvalidURL", address); + assertEquals("https://" + serverHost + ":" + serverSecurePort + "/" + expectedContext + "/InvalidURL", address); address = getPortAddress(definition, "ValidSecureURLService", "ValidSecureURLPort"); - assertEquals("https://" + serverHost + ":8443/" + expectedContext + "/ValidSecureURL", address); + assertEquals("https://" + serverHost + ":" + serverSecurePort + "/" + expectedContext + "/ValidSecureURL", address); address = getPortAddress(definition, "InvalidSecureURLService", "InvalidSecureURLPort"); - assertEquals("https://" + serverHost + ":8443/" + expectedContext + "/InvalidSecureURL", address); + assertEquals("https://" + serverHost + ":" + serverSecurePort + "/" + expectedContext + "/InvalidSecureURL", address); //check wsdl import address rewrite (we expect a rewritten version of the same base address used to fetch the wsdl) assertEquals(importMap.get(wsdlLocation), getWsdlImportAddress(definition)); @@ -1260,15 +1289,17 @@ try { String serverHost = getServerHost(); - final String wsdlLocation = "http://" + serverHost + ":8080/jaxws-jbws2150-codefirst/CodeFirstService?wsdl"; + final int serverPort = getServerPort(); + final int serverSecurePort = serverPort + 363; //8080 + 363 = 8443 + final String wsdlLocation = "http://" + serverHost + ":" + serverPort + "/jaxws-jbws2150-codefirst/CodeFirstService?wsdl"; Definition definition = getWSDLDefinition(wsdlLocation); String address = getPortAddress(definition, "CodeFirstService", "CodeFirstPort"); - assertEquals("https://" + serverHost + ":8443/" + expectedContext +"/CodeFirstService", address); + assertEquals("https://" + serverHost + ":" + serverSecurePort + "/" + expectedContext +"/CodeFirstService", address); if (isTestsuiteServerHostLocalhost()) { - definition = getWSDLDefinition("http://127.0.0.1:8080/jaxws-jbws2150-codefirst/CodeFirstService?wsdl"); + definition = getWSDLDefinition("http://127.0.0.1:" + serverPort + "/jaxws-jbws2150-codefirst/CodeFirstService?wsdl"); address = getPortAddress(definition, "CodeFirstService", "CodeFirstPort"); - assertEquals("https://127.0.0.1:8443/" + expectedContext +"/CodeFirstService", address); + assertEquals("https://127.0.0.1:" + serverSecurePort + "/" + expectedContext +"/CodeFirstService", address); } } finally @@ -1280,12 +1311,13 @@ } private void checkWsdlAndInvokeCodeFirstEndpoint(String testHost, String expectedWsdlHost, boolean setTargetAddress) throws Exception { - final String addr = "http://" + testHost + ":8080/jaxws-jbws2150-codefirst/CodeFirstService"; + final int serverPort = getServerPort(); + final String addr = "http://" + testHost + ":" + serverPort + "/jaxws-jbws2150-codefirst/CodeFirstService"; final String wsdlLocation = addr + "?wsdl"; Definition definition = getWSDLDefinition(wsdlLocation); String address = getPortAddress(definition, "CodeFirstService", "CodeFirstPort"); - assertEquals("http://" + expectedWsdlHost + ":8080/jaxws-jbws2150-codefirst/CodeFirstService", address); + assertEquals("http://" + expectedWsdlHost + ":" + serverPort + "/jaxws-jbws2150-codefirst/CodeFirstService", address); ServiceIface endpoint = getEndpoint(wsdlLocation, "CodeFirstService"); if (setTargetAddress) { @@ -1378,4 +1410,10 @@ return null; } + public static MBeanServerConnection getServer() throws NamingException { + if (mbeanServer == null) { + mbeanServer = JBossWSTest.getServer(); + } + return mbeanServer; + } } Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2268/JBWS2268TestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2268/JBWS2268TestCase.java 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2268/JBWS2268TestCase.java 2015-01-12 21:08:41 UTC (rev 19363) @@ -68,7 +68,7 @@ private EndpointInterface getProxy() throws Exception { QName serviceName = new QName("http://www.jboss.org/test/ws/jaxws/jbws2268", "EndpointService"); - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws2268?wsdl"); + URL wsdlURL = new URL("http://" + getServerHost() + ":" + getServerPort() + "/jaxws-jbws2268?wsdl"); Service service = Service.create(wsdlURL, serviceName); return (EndpointInterface)service.getPort(EndpointInterface.class); Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.java 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2307/JBWS2307MTOMTestCase.java 2015-01-12 21:08:41 UTC (rev 19363) @@ -125,7 +125,7 @@ @OperateOnDeployment(CLIENT_DEPLOYMENT) public void testMTOM() throws Exception { - assertEquals("true", IOUtils.readAndCloseStream(new URL("http://" + baseURL.getHost() + ":8080/jaxws-jbws2307-client/jbws2307?mtom=true").openStream())); + assertEquals("true", IOUtils.readAndCloseStream(new URL("http://" + baseURL.getHost() + ":" + baseURL.getPort() + "/jaxws-jbws2307-client/jbws2307?mtom=true").openStream())); } @Test @@ -133,7 +133,7 @@ @OperateOnDeployment(CLIENT_DEPLOYMENT) public void testClient() throws Exception { - HttpURLConnection con = (HttpURLConnection)new URL("http://" + baseURL.getHost() + ":8080/jaxws-jbws2307-client/jbws2307").openConnection(); + HttpURLConnection con = (HttpURLConnection)new URL("http://" + baseURL.getHost() + ":" + baseURL.getPort() + "/jaxws-jbws2307-client/jbws2307").openConnection(); BufferedReader isr = new BufferedReader(new InputStreamReader(con.getInputStream())); assertEquals("true", isr.readLine()); } @@ -145,8 +145,8 @@ { try { deployer.deploy(CLIENT_3_DEPLOYMENT); - assertEquals("true", IOUtils.readAndCloseStream(new URL("http://" + baseURL.getHost() + ":8080/jaxws-jbws2307-client-3/jbws2307?mtom=true").openStream())); - HttpURLConnection con = (HttpURLConnection)new URL("http://" + baseURL.getHost() + ":8080/jaxws-jbws2307-client-3/jbws2307").openConnection(); + assertEquals("true", IOUtils.readAndCloseStream(new URL("http://" + baseURL.getHost() + ":" + baseURL.getPort() + "/jaxws-jbws2307-client-3/jbws2307?mtom=true").openStream())); + HttpURLConnection con = (HttpURLConnection)new URL("http://" + baseURL.getHost() + ":" + baseURL.getPort() + "/jaxws-jbws2307-client-3/jbws2307").openConnection(); BufferedReader isr = new BufferedReader(new InputStreamReader(con.getInputStream())); assertEquals("true", isr.readLine()); } finally { @@ -161,7 +161,7 @@ { try { deployer.deploy(CLIENT_2_DEPLOYMENT); - URL url = new URL("http://" + baseURL.getHost() + ":8080/jaxws-jbws2307-client-2/jbws2307?mtom=true"); + URL url = new URL("http://" + baseURL.getHost() + ":" + baseURL.getPort() + "/jaxws-jbws2307-client-2/jbws2307?mtom=true"); final HttpURLConnection c = (HttpURLConnection)url.openConnection(); c.connect(); assertEquals(500, c.getResponseCode()); Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2527/JBWS2527TestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2527/JBWS2527TestCase.java 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2527/JBWS2527TestCase.java 2015-01-12 21:08:41 UTC (rev 19363) @@ -95,7 +95,7 @@ { deployer.deploy("jaxws-jbws2527-service"); deployer.deploy("jaxws-jbws2527-client"); - assertEquals("true", IOUtils.readAndCloseStream(new URL("http://" + getServerHost() + ":8080/jaxws-jbws2527-client/jbws2527").openStream())); + assertEquals("true", IOUtils.readAndCloseStream(new URL("http://" + getServerHost() + ":" + getServerPort() + "/jaxws-jbws2527-client/jbws2527").openStream())); } finally { Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2634/JBWS2634TestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2634/JBWS2634TestCase.java 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2634/JBWS2634TestCase.java 2015-01-12 21:08:41 UTC (rev 19363) @@ -111,7 +111,7 @@ public void testEjb3EndpointInjection() throws Exception { QName serviceName = new QName("http://jbossws.org/JBWS2634", "EJB3Service"); - URL wsdlURL = new URL("http://" + baseURL.getHost() + ":8080//jaxws-jbws2634-ejb3/EJB3Service?wsdl"); + URL wsdlURL = new URL("http://" + baseURL.getHost() + ":" + baseURL.getPort() + "/jaxws-jbws2634-ejb3/EJB3Service?wsdl"); Service service = Service.create(wsdlURL, serviceName); EndpointIface proxy = (EndpointIface)service.getPort(EndpointIface.class); Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3140/JBWS3140TestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3140/JBWS3140TestCase.java 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3140/JBWS3140TestCase.java 2015-01-12 21:08:41 UTC (rev 19363) @@ -119,7 +119,7 @@ try { deployer.deploy("jbws3140-responses-server"); deployer.deploy("jbws3140-client"); - String result = IOUtils.readAndCloseStream(new URL("http://" + getServerHost() + ":8080/jbws3140-client/ServletTest" + "?mtom=small").openStream()); + String result = IOUtils.readAndCloseStream(new URL("http://" + getServerHost() + ":" + getServerPort() + "/jbws3140-client/ServletTest" + "?mtom=small").openStream()); assertTrue("SOAPFaultException is expected but received: " + result, result.indexOf("SOAPFaultException") > -1); String expectedDetail = "A header representing a Message Addressing Property is not valid"; assertTrue("Expected message wasn't found in response: " + result, result.indexOf(expectedDetail) > -1); @@ -136,7 +136,7 @@ try { deployer.deploy("jbws3140-server"); deployer.deploy("jbws3140-client"); - String result = IOUtils.readAndCloseStream(new URL("http://" + getServerHost() + ":8080/jbws3140-client/ServletTest" + "?mtom=small").openStream()); + String result = IOUtils.readAndCloseStream(new URL("http://" + getServerHost() + ":" + getServerPort() + "/jbws3140-client/ServletTest" + "?mtom=small").openStream()); String expected ="--ClientMTOMEnabled--ServerMTOMEnabled--ServerAddressingEnabled--ClientAddressingEnabled"; assertTrue("Expected string wasn't found in response: " + result, result.indexOf(expected) > -1); } finally { Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3223/TestServlet.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3223/TestServlet.java 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3223/TestServlet.java 2015-01-12 21:08:41 UTC (rev 19363) @@ -42,7 +42,7 @@ String param = req.getParameter("param"); boolean clCheck = Boolean.parseBoolean(req.getParameter("clCheck")); Client client = new Client(clCheck); - URL wsdlURL = new URL("http://" + getHost() + ":8080/jaxws-jbws3223?wsdl"); + URL wsdlURL = new URL("http://" + getHost() + ":" + req.getLocalPort() + "/jaxws-jbws3223?wsdl"); String retStr = client.run(param, wsdlURL); // Return the result Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3282/HandlerChainTestCaseForked.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3282/HandlerChainTestCaseForked.java 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3282/HandlerChainTestCaseForked.java 2015-01-12 21:08:41 UTC (rev 19363) @@ -101,14 +101,14 @@ try { deployer.deploy(DEP); QName serviceName = new QName(targetNS, "Endpoint2ImplService"); - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws3282-f/ep2?wsdl"); + URL wsdlURL = new URL("http://" + getServerHost() + ":" + getServerPort() + "/jaxws-jbws3282-f/ep2?wsdl"); Service service = Service.create(wsdlURL, serviceName); Endpoint port = (Endpoint)service.getPort(Endpoint.class); String resStr = port.echo("Kermit"); assertEquals("Kermit|EpIn|endpoint2|EpOut", resStr); serviceName = new QName(targetNS, "Endpoint3ImplService"); - wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws3282-f/ep3?wsdl"); + wsdlURL = new URL("http://" + getServerHost() + ":" + getServerPort() + "/jaxws-jbws3282-f/ep3?wsdl"); service = Service.create(wsdlURL, serviceName); port = (Endpoint)service.getPort(Endpoint.class); resStr = port.echo("Kermit"); @@ -127,14 +127,14 @@ try { deployer.deploy(DEP); QName serviceName = new QName(targetNS, "Endpoint2ImplService"); - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws3282-f/ep2?wsdl"); + URL wsdlURL = new URL("http://" + getServerHost() + ":" + getServerPort() + "/jaxws-jbws3282-f/ep2?wsdl"); Service service = Service.create(wsdlURL, serviceName); Endpoint port = (Endpoint)service.getPort(Endpoint.class); String resStr = port.echo("Kermit"); assertEquals("Kermit|EpIn|RoutIn|endpoint2|RoutOut|EpOut", resStr); serviceName = new QName(targetNS, "Endpoint3ImplService"); - wsdlURL = new URL("http://" + getServerHost() + ":8080/jaxws-jbws3282-f/ep3?wsdl"); + wsdlURL = new URL("http://" + getServerHost() + ":" + getServerPort() + "/jaxws-jbws3282-f/ep3?wsdl"); service = Service.create(wsdlURL, serviceName); port = (Endpoint)service.getPort(Endpoint.class); resStr = port.echo("Kermit"); @@ -153,7 +153,7 @@ { URL url = new URL("http://" + getServerHost() - + ":8080/jaxws-jbws3832-f-inContainer-client?path=/jaxws-jbws3282-f&method=" + test + + ":" + getServerPort() + "/jaxws-jbws3832-f-inContainer-client?path=/jaxws-jbws3282-f&method=" + test + "&helper=" + Helper.class.getName()); return IOUtils.readAndCloseStream(url.openStream()); } Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3287/JBWS3287TestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3287/JBWS3287TestCase.java 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3287/JBWS3287TestCase.java 2015-01-12 21:08:41 UTC (rev 19363) @@ -134,7 +134,7 @@ private void runTestInternal(String path) throws Exception { QName serviceName = new QName(targetNS, "EndpointImplService"); - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/" + path); + URL wsdlURL = new URL("http://" + getServerHost() + ":" + getServerPort() + "/" + path); Service service = Service.create(wsdlURL, serviceName); Endpoint port = (Endpoint)service.getPort(Endpoint.class); Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3736/JBWS3736TestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3736/JBWS3736TestCase.java 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws3736/JBWS3736TestCase.java 2015-01-12 21:08:41 UTC (rev 19363) @@ -83,6 +83,6 @@ //we expect the published wsdl to have the https protocol in the soap:address because the original wsdl provided //in the deployment has that. This shows that the reference to the wsdl in endpoint interface has been processed //when rewriting the soap:address. If we got http protocol here, the fix won't be in place. - assertTrue(wsdl.contains("https://localhost:8443/jaxws-jbws3736")); + assertTrue(wsdl.contains("https://" + getServerHost() + ":" + (getServerPort() + 363) + "/jaxws-jbws3736")); } } Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws944/JBWS944TestCase.java 2015-01-12 21:08:41 UTC (rev 19363) @@ -75,7 +75,7 @@ InitialContext iniCtx = null; try { iniCtx = getServerInitialContext(); - EJB3RemoteBusinessInterface ejb3Remote = (EJB3RemoteBusinessInterface)iniCtx.lookup("ejb:/jaxws-jbws944//FooBean01!" + EJB3RemoteBusinessInterface.class.getName()); + EJB3RemoteBusinessInterface ejb3Remote = (EJB3RemoteBusinessInterface)iniCtx.lookup("jaxws-jbws944//FooBean01!" + EJB3RemoteBusinessInterface.class.getName()); String helloWorld = "Hello world!"; Object retObj = ejb3Remote.echo(helloWorld); @@ -99,7 +99,7 @@ InitialContext iniCtx = null; try { iniCtx = getServerInitialContext(); - Object obj = iniCtx.lookup("ejb:/jaxws-jbws944//FooBean01!" + EJB3RemoteHome.class.getName()); + Object obj = iniCtx.lookup("jaxws-jbws944//FooBean01!" + EJB3RemoteHome.class.getName()); EJB3RemoteHome ejb3Home = (EJB3RemoteHome)PortableRemoteObject.narrow(obj, EJB3RemoteHome.class); EJB3RemoteInterface ejb3Remote = ejb3Home.create(); Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws981/JBWS981TestCase.java 2015-01-12 21:08:41 UTC (rev 19363) @@ -63,6 +63,7 @@ @RunAsClient public void testCall() throws Exception { + System.out.println("** " + baseURL); URL wsdlURL = new URL(baseURL + "/jaxws-jbws981/EndpointService/EJB3Bean?wsdl"); QName serviceName = new QName("http://www.jboss.org/test/ws/jaxws/jbws981", "EndpointService"); Service.create(wsdlURL, serviceName); Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java 2015-01-12 21:08:41 UTC (rev 19363) @@ -104,7 +104,7 @@ @RunAsClient public void testEJB3Endpoint() throws Exception { - String soapAddress = "http://" + baseURL.getHost() + ":8080/earejb3/EndpointService/Endpoint"; + String soapAddress = "http://" + baseURL.getHost() + ":" + baseURL.getPort() + "/earejb3/EndpointService/Endpoint"; QName serviceName = new QName("http://eardeployment.jaxws/", "EndpointService"); Service service = Service.create(new URL(soapAddress + "?wsdl"), serviceName); Endpoint port = service.getPort(Endpoint.class); @@ -146,7 +146,7 @@ @RunAsClient public void testEJB3EndpointPublishedWsdl() throws Exception { - String soapAddress = "http://" + baseURL.getHost() + ":8080/earejb3/EndpointService/Endpoint"; + String soapAddress = "http://" + baseURL.getHost() + ":" + baseURL.getPort() + "/earejb3/EndpointService/Endpoint"; QName serviceName = new QName("http://eardeployment.jaxws/", "EndpointService"); File file = new File(getWsdlFileDir().getAbsolutePath() + File.separator + "jaxws-samples-eardeployment.ear" + File.separator @@ -198,7 +198,7 @@ { if (wsdlFileDir == null) { - URL url = new URL("http://" + baseURL.getHost() + ":8080/earjse/support"); + URL url = new URL(baseURL + "/support"); wsdlFileDir = new File(IOUtils.readAndCloseStream(url.openStream()), "wsdl"); } return wsdlFileDir; Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionEJB3TestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionEJB3TestCase.java 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionEJB3TestCase.java 2015-01-12 21:08:41 UTC (rev 19363) @@ -65,11 +65,11 @@ protected ExceptionHelper getHelper() { - return new ExceptionEJB3Helper("http://" + getServerHost() + ":8080/jaxws-samples-exception/ExceptionEndpointEJB3Impl"); + return new ExceptionEJB3Helper("http://" + getServerHost() + ":" + getServerPort() + "/jaxws-samples-exception/ExceptionEndpointEJB3Impl"); } protected SOAP12ExceptionHelper getSOAP12Helper() { - return new SOAP12ExceptionEJB3Helper("http://" + getServerHost() + ":8080/jaxws-samples-exception/SOAP12ExceptionEndpointEJB3Impl"); + return new SOAP12ExceptionEJB3Helper("http://" + getServerHost() + ":" + getServerPort() + "/jaxws-samples-exception/SOAP12ExceptionEndpointEJB3Impl"); } } Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionServletTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionServletTestCase.java 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionServletTestCase.java 2015-01-12 21:08:41 UTC (rev 19363) @@ -113,7 +113,7 @@ private String runTestInContainer(String test) throws Exception { URL url = new URL("http://" + getServerHost() - + ":8080/jaxws-samples-exception-client?path=/jaxws-samples-exception-jse/ExceptionEndpointService&method=" + test + + ":" + getServerPort() + "/jaxws-samples-exception-client?path=/jaxws-samples-exception-jse/ExceptionEndpointService&method=" + test + "&helper=" + ExceptionHelper.class.getName()); return IOUtils.readAndCloseStream(url.openStream()); } @@ -121,7 +121,7 @@ private String runTestInContainerSOAP12(String test) throws Exception { URL url = new URL("http://" + getServerHost() - + ":8080/jaxws-samples-exception-client?path=/jaxws-samples-exception-jse/SOAP12ExceptionEndpointService&method=" + test + + ":" + getServerPort() + "/jaxws-samples-exception-client?path=/jaxws-samples-exception-jse/SOAP12ExceptionEndpointService&method=" + test + "&helper=" + SOAP12ExceptionHelper.class.getName()); return IOUtils.readAndCloseStream(url.openStream()); } Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/exception/ExceptionTestCase.java 2015-01-12 21:08:41 UTC (rev 19363) @@ -162,11 +162,11 @@ protected ExceptionHelper getHelper() { - return new ExceptionHelper("http://" + getServerHost() + ":8080/jaxws-samples-exception-jse-plain/ExceptionEndpointService"); + return new ExceptionHelper("http://" + getServerHost() + ":" + getServerPort() + "/jaxws-samples-exception-jse-plain/ExceptionEndpointService"); } protected SOAP12ExceptionHelper getSOAP12Helper() { - return new SOAP12ExceptionHelper("http://" + getServerHost() + ":8080/jaxws-samples-exception-jse-plain/SOAP12ExceptionEndpointService"); + return new SOAP12ExceptionHelper("http://" + getServerHost() + ":" + getServerPort() + "/jaxws-samples-exception-jse-plain/SOAP12ExceptionEndpointService"); } } Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefTestCase.java 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/serviceref/ServiceRefTestCase.java 2015-01-12 21:08:41 UTC (rev 19363) @@ -215,7 +215,7 @@ try { iniCtx = getServerInitialContext(); - EJBRemote ejbRemote = (EJBRemote)iniCtx.lookup("ejb:/jaxws-samples-serviceref-ejbclient//EJBClient!" + EJBRemote.class.getName()); + EJBRemote ejbRemote = (EJBRemote)iniCtx.lookup("jaxws-samples-serviceref-ejbclient//EJBClient!" + EJBRemote.class.getName()); String helloWorld = "Hello World!"; Object retObj = ejbRemote.echo(helloWorld); @@ -235,7 +235,7 @@ @OperateOnDeployment("jaxws-samples-serviceref-servlet-client") public void testServletClient() throws Exception { - URL url = new URL("http://" + baseURL.getHost() + ":8080/jaxws-samples-serviceref-servlet-client?echo=HelloWorld"); + URL url = new URL("http://" + baseURL.getHost() + ":" + baseURL.getPort() + "/jaxws-samples-serviceref-servlet-client?echo=HelloWorld"); assertEquals("HelloWorld", IOUtils.readAndCloseStream(url.openStream())); } } Deleted: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webservice/WebServiceBase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webservice/WebServiceBase.java 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webservice/WebServiceBase.java 2015-01-12 21:08:41 UTC (rev 19363) @@ -1,77 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.test.ws.jaxws.samples.webservice; - -import java.net.MalformedURLException; -import java.net.URL; -import javax.xml.namespace.QName; -import javax.xml.ws.Service; - -import org.jboss.wsf.test.JBossWSTest; - -/** - * Base testing class for @WebService - * - * @author <a href="mailto:jason.greene@jboss.com">Jason T. Greene</a> - */ -public class WebServiceBase extends JBossWSTest -{ - - private EndpointInterface getPort(String endpointURI) throws MalformedURLException - { - QName serviceName = new QName("http://www.openuri.org/2004/04/HelloWorld", "EndpointService"); - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/" + endpointURI + "?wsdl"); - - Service service = Service.create(wsdlURL, serviceName); - return service.getPort(EndpointInterface.class); - } - - private EndpointInterface03 getPort03(String endpointURI) throws MalformedURLException - { - QName serviceName = new QName("http://www.openuri.org/2004/04/HelloWorld", "EndpointService"); - URL wsdlURL = new URL("http://" + getServerHost() + ":8080/" + endpointURI + "?wsdl"); - - Service service = Service.create(wsdlURL, serviceName); - return service.getPort(EndpointInterface03.class); - } - - public void webServiceTest(String endpointURI) throws Exception - { - String helloWorld = "Hello world!"; - Object retObj = getPort(endpointURI).echo(helloWorld); - assertEquals(helloWorld, retObj); - } - - public void webServiceWsdlLocationTest(String endpointURI) throws Exception - { - String helloWorld = "Hello world!"; - Object retObj = getPort(endpointURI).echo(helloWorld); - assertEquals(helloWorld, retObj); - } - - public void webServiceEndpointInterfaceTest(String endpointURI) throws Exception - { - String helloWorld = "Hello Interface!"; - Object retObj = getPort03(endpointURI).echo(helloWorld); - assertEquals(helloWorld, retObj); - } -} Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webservice/WebServiceEJB3TestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webservice/WebServiceEJB3TestCase.java 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webservice/WebServiceEJB3TestCase.java 2015-01-12 21:08:41 UTC (rev 19363) @@ -22,14 +22,20 @@ package org.jboss.test.ws.jaxws.samples.webservice; import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; -import org.jboss.arquillian.container.test.api.Deployer; +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; import org.jboss.arquillian.container.test.api.RunAsClient; import org.jboss.arquillian.junit.Arquillian; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.JavaArchive; +import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestHelper; import org.junit.Test; import org.junit.runner.RunWith; @@ -43,14 +49,14 @@ * @since 29-Apr-2005 */ @RunWith(Arquillian.class) -public class WebServiceEJB3TestCase extends WebServiceBase +public class WebServiceEJB3TestCase extends JBossWSTest { @ArquillianResource - Deployer deployer; + private URL baseURL; private static final String WEBSERVICE_02 = "jaxws-samples-webservice02-ejb3"; - @Deployment(name = WEBSERVICE_02, testable = false, managed = false) + @Deployment(name = WEBSERVICE_02, testable = false) public static JavaArchive createDeployment2() { JavaArchive archive = ShrinkWrap.create(JavaArchive.class, WEBSERVICE_02 + ".jar"); archive @@ -63,7 +69,7 @@ private static final String WEBSERVICE_01 = "jaxws-samples-webservice01-ejb3"; - @Deployment(name = WEBSERVICE_01, testable = false, managed = false) + @Deployment(name = WEBSERVICE_01, testable = false) public static JavaArchive createDeployment1() { JavaArchive archive = ShrinkWrap.create(JavaArchive.class, WEBSERVICE_01 + ".jar"); archive @@ -75,7 +81,7 @@ private static final String WEBSERVICE_03 = "jaxws-samples-webservice03-ejb3"; - @Deployment(name = WEBSERVICE_03, testable = false, managed = false) + @Deployment(name = WEBSERVICE_03, testable = false) public static JavaArchive createDeployment3() { JavaArchive archive = ShrinkWrap.create(JavaArchive.class, WEBSERVICE_03 + ".jar"); archive @@ -85,49 +91,67 @@ .addClass(org.jboss.test.ws.jaxws.samples.webservice.EndpointInterface03.class); return archive; } + + private EndpointInterface getPort(String endpointURI) throws MalformedURLException + { + QName serviceName = new QName("http://www.openuri.org/2004/04/HelloWorld", "EndpointService"); + URL wsdlURL = new URL("http://" + baseURL.getHost() + ":" + baseURL.getPort() + "/" + endpointURI + "?wsdl"); + Service service = Service.create(wsdlURL, serviceName); + return service.getPort(EndpointInterface.class); + } + + private EndpointInterface03 getPort03(String endpointURI) throws MalformedURLException + { + QName serviceName = new QName("http://www.openuri.org/2004/04/HelloWorld", "EndpointService"); + URL wsdlURL = new URL("http://" + baseURL.getHost() + ":" + baseURL.getPort() + "/" + endpointURI + "?wsdl"); + + Service service = Service.create(wsdlURL, serviceName); + return service.getPort(EndpointInterface03.class); + } + + public void webServiceTest(String endpointURI) throws Exception + { + String helloWorld = "Hello world!"; + Object retObj = getPort(endpointURI).echo(helloWorld); + assertEquals(helloWorld, retObj); + } + + public void webServiceWsdlLocationTest(String endpointURI) throws Exception + { + String helloWorld = "Hello world!"; + Object retObj = getPort(endpointURI).echo(helloWorld); + assertEquals(helloWorld, retObj); + } + + public void webServiceEndpointInterfaceTest(String endpointURI) throws Exception + { + String helloWorld = "Hello Interface!"; + Object retObj = getPort03(endpointURI).echo(helloWorld); + assertEquals(helloWorld, retObj); + } + @Test @RunAsClient + @OperateOnDeployment(WEBSERVICE_01) public void testWebServiceTest() throws Exception { - deployer.deploy(WEBSERVICE_01); - try - { - webServiceTest("jaxws-samples-webservice01-ejb3"); - } - finally - { - deployer.undeploy(WEBSERVICE_01); - } + webServiceTest("jaxws-samples-webservice01-ejb3"); } @Test @RunAsClient + @OperateOnDeployment(WEBSERVICE_02) public void testWebServiceWsdlLocationTest() throws Exception { - deployer.deploy(WEBSERVICE_02); - try - { - webServiceWsdlLocationTest("jaxws-samples-webservice02-ejb3"); - } - finally - { - deployer.undeploy(WEBSERVICE_02); - } + webServiceWsdlLocationTest("jaxws-samples-webservice02-ejb3"); } @Test @RunAsClient + @OperateOnDeployment(WEBSERVICE_03) public void testWebServiceEndpointInterfaceTest() throws Exception { - deployer.deploy(WEBSERVICE_03); - try - { - webServiceEndpointInterfaceTest("jaxws-samples-webservice03-ejb3"); - } - finally - { - deployer.undeploy(WEBSERVICE_03); - } + webServiceEndpointInterfaceTest("jaxws-samples-webservice03-ejb3"); } } Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webservice/WebServiceJSETestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webservice/WebServiceJSETestCase.java 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webservice/WebServiceJSETestCase.java 2015-01-12 21:08:41 UTC (rev 19363) @@ -22,14 +22,20 @@ package org.jboss.test.ws.jaxws.samples.webservice; import java.io.File; +import java.net.MalformedURLException; +import java.net.URL; -import org.jboss.arquillian.container.test.api.Deployer; +import javax.xml.namespace.QName; +import javax.xml.ws.Service; + import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; import org.jboss.arquillian.container.test.api.RunAsClient; import org.jboss.arquillian.junit.Arquillian; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestHelper; import org.junit.Test; import org.junit.runner.RunWith; @@ -42,14 +48,14 @@ * @since 29-Apr-2005 */ @RunWith(Arquillian.class) -public class WebServiceJSETestCase extends WebServiceBase +public class WebServiceJSETestCase extends JBossWSTest { @ArquillianResource - Deployer deployer; + private URL baseURL; private static final String WEBSERVICE_03 = "jaxws-samples-webservice03-jse"; - @Deployment(name = WEBSERVICE_03, testable = false, managed = false) + @Deployment(name = WEBSERVICE_03, testable = false) public static WebArchive createClientDeployment3() { WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-samples-webservice03-jse.war"); archive @@ -62,7 +68,7 @@ private static final String WEBSERVICE_02 = "jaxws-samples-webservice02-jse"; - @Deployment(name = WEBSERVICE_02, testable = false, managed = false) + @Deployment(name = WEBSERVICE_02, testable = false) public static WebArchive createClientDeployment2() { WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-samples-webservice02-jse.war"); archive @@ -75,7 +81,7 @@ private static final String WEBSERVICE_01 = "jaxws-samples-webservice01-jse"; - @Deployment(name = WEBSERVICE_01, testable = false, managed = false) + @Deployment(name = WEBSERVICE_01, testable = false) public static WebArchive createClientDeployment1() { WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-samples-webservice01-jse.war"); archive @@ -84,50 +90,68 @@ .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/webservice/WEB-INF01/web.xml")); return archive; } + + private EndpointInterface getPort(String endpointURI) throws MalformedURLException + { + QName serviceName = new QName("http://www.openuri.org/2004/04/HelloWorld", "EndpointService"); + URL wsdlURL = new URL("http://" + baseURL.getHost() + ":" + baseURL.getPort() + "/" + endpointURI + "?wsdl"); + Service service = Service.create(wsdlURL, serviceName); + return service.getPort(EndpointInterface.class); + } + + private EndpointInterface03 getPort03(String endpointURI) throws MalformedURLException + { + QName serviceName = new QName("http://www.openuri.org/2004/04/HelloWorld", "EndpointService"); + URL wsdlURL = new URL("http://" + getServerHost() + ":" + baseURL.getPort() + "/" + endpointURI + "?wsdl"); + + Service service = Service.create(wsdlURL, serviceName); + return service.getPort(EndpointInterface03.class); + } + + public void webServiceTest(String endpointURI) throws Exception + { + String helloWorld = "Hello world!"; + Object retObj = getPort(endpointURI).echo(helloWorld); + assertEquals(helloWorld, retObj); + } + + public void webServiceWsdlLocationTest(String endpointURI) throws Exception + { + String helloWorld = "Hello world!"; + Object retObj = getPort(endpointURI).echo(helloWorld); + assertEquals(helloWorld, retObj); + } + + public void webServiceEndpointInterfaceTest(String endpointURI) throws Exception + { + String helloWorld = "Hello Interface!"; + Object retObj = getPort03(endpointURI).echo(helloWorld); + assertEquals(helloWorld, retObj); + } + @Test @RunAsClient + @OperateOnDeployment(WEBSERVICE_01) public void testWebServiceTest() throws Exception { - deployer.deploy(WEBSERVICE_01); - try - { - webServiceTest("jaxws-samples-webservice01-jse"); - } - finally - { - deployer.undeploy(WEBSERVICE_01); - } + webServiceTest("jaxws-samples-webservice01-jse"); } @Test @RunAsClient + @OperateOnDeployment(WEBSERVICE_02) public void testWebServiceWsdlLocation() throws Exception { - deployer.deploy(WEBSERVICE_02); - try - { - webServiceWsdlLocationTest("jaxws-samples-webservice02-jse"); - } - finally - { - deployer.undeploy(WEBSERVICE_02); - } + webServiceWsdlLocationTest("jaxws-samples-webservice02-jse"); } @Test @RunAsClient + @OperateOnDeployment(WEBSERVICE_03) public void testWebServiceEndpointInterface() throws Exception { - deployer.deploy(WEBSERVICE_03); - try - { - webServiceEndpointInterfaceTest("jaxws-samples-webservice03-jse"); - } - finally - { - deployer.undeploy(WEBSERVICE_03); - } + webServiceEndpointInterfaceTest("jaxws-samples-webservice03-jse"); } } Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefTestCase.java 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webserviceref/WebServiceRefTestCase.java 2015-01-12 21:08:41 UTC (rev 19363) @@ -210,7 +210,7 @@ try { iniCtx = getServerInitialContext(); - EJB3Remote ejb3Remote = (EJB3Remote)iniCtx.lookup("ejb:/jaxws-samples-webserviceref-ejb3-client//EJB3Client!" + EJB3Remote.class.getName()); + EJB3Remote ejb3Remote = (EJB3Remote)iniCtx.lookup("jaxws-samples-webserviceref-ejb3-client//EJB3Client!" + EJB3Remote.class.getName()); String helloWorld = "Hello World!"; Object retObj = ejb3Remote.echo(helloWorld); Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webservicerefsec/WebServiceRefSecTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webservicerefsec/WebServiceRefSecTestCase.java 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/webservicerefsec/WebServiceRefSecTestCase.java 2015-01-12 21:08:41 UTC (rev 19363) @@ -78,7 +78,7 @@ @OperateOnDeployment("jaxws-samples-webservicerefsec-servlet-client") public void testServletClient() throws Exception { - URL url = new URL("http://" + baseURL.getHost() + ":8080/jaxws-samples-webservicerefsec-servlet-client?echo=HelloWorld"); + URL url = new URL("http://" + baseURL.getHost() + ":" + baseURL.getPort() + "/jaxws-samples-webservicerefsec-servlet-client?echo=HelloWorld"); assertEquals("HelloWorld", IOUtils.readAndCloseStream(url.openStream())); } } Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/publish/EndpointPublishServlet.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/publish/EndpointPublishServlet.java 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/publish/EndpointPublishServlet.java 2015-01-12 21:08:41 UTC (rev 19363) @@ -85,11 +85,12 @@ //call endpoint String jbossBindAddress = toIPv6URLFormat(System.getProperty("jboss.bind.address", "localhost")); - invoke(new URL("http://" + jbossBindAddress + ":8080/ep-publish-test/pattern?wsdl"), new QName("http://publish.ws.test.jboss.org/", "EndpointService")); - invoke(new URL("http://" + jbossBindAddress + ":8080/ep-publish-test/pattern2?wsdl"), new QName("http://publish.ws.test.jboss.org/", "EndpointService2")); - invoke(new URL("http://" + jbossBindAddress + ":8080/ep-publish-test/pattern3?wsdl"), new QName("http://publish.ws.test.jboss.org/", "EndpointService3")); - invoke(new URL("http://" + jbossBindAddress + ":8080/ep-publish-test/pattern4?wsdl"), new QName("http://publish.ws.test.jboss.org/", "EndpointService4")); - invoke(new URL("http://" + jbossBindAddress + ":8080/ep-publish-test/pattern5?wsdl"), new QName("http://publish.ws.test.jboss.org/", "EndpointService5")); + int port = req.getLocalPort(); + invoke(new URL("http://" + jbossBindAddress + ":" + port + "/ep-publish-test/pattern?wsdl"), new QName("http://publish.ws.test.jboss.org/", "EndpointService")); + invoke(new URL("http://" + jbossBindAddress + ":" + port + "/ep-publish-test/pattern2?wsdl"), new QName("http://publish.ws.test.jboss.org/", "EndpointService2")); + invoke(new URL("http://" + jbossBindAddress + ":" + port + "/ep-publish-test/pattern3?wsdl"), new QName("http://publish.ws.test.jboss.org/", "EndpointService3")); + invoke(new URL("http://" + jbossBindAddress + ":" + port + "/ep-publish-test/pattern4?wsdl"), new QName("http://publish.ws.test.jboss.org/", "EndpointService4")); + invoke(new URL("http://" + jbossBindAddress + ":" + port + "/ep-publish-test/pattern5?wsdl"), new QName("http://publish.ws.test.jboss.org/", "EndpointService5")); res.getWriter().print("1"); } Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/complex/META-INF/wsdl/RegistrationService.wsdl 2015-01-12 21:08:41 UTC (rev 19363) @@ -7,7 +7,7 @@ <import namespace="http://types.complex.jaxws.ws.test.jboss.org/" location="Registration_PortType.wsdl"/> <service name="RegistrationService"> <port name="RegistrationPort" binding="ns1:RegistrationBinding"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-complex/RegistrationService"/> + <soap:address location="http://@jboss.bind.address@:38080/jaxws-complex/RegistrationService"/> </port> </service> -</definitions> \ No newline at end of file +</definitions> Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/holder/META-INF/wsdl/HolderService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/holder/META-INF/wsdl/HolderService.wsdl 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/holder/META-INF/wsdl/HolderService.wsdl 2015-01-12 21:08:41 UTC (rev 19363) @@ -193,7 +193,7 @@ </binding> <service name='HolderService'> <port binding='tns:HolderBinding' name='HolderPort'> - <soap:address location='http://@jboss.bind.address@:8080/jaxws-holder/HolderService'/> + <soap:address location='http://@jboss.bind.address@:38080/jaxws-holder/HolderService'/> </port> </service> </definitions> Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws1581/META-INF/wsdl/TestService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws1581/META-INF/wsdl/TestService.wsdl 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws1581/META-INF/wsdl/TestService.wsdl 2015-01-12 21:08:41 UTC (rev 19363) @@ -27,7 +27,7 @@ </binding> <service name='EndpointService'> <port binding='tns:EndpointBeanBinding' name='EndpointBeanPort'> - <soap:address location='http://@jboss.bind.address@:8080/jaxws-jbws1581-pojo'/> + <soap:address location='http://@jboss.bind.address@:38080/jaxws-jbws1581-pojo'/> </port> </service> -</definitions> \ No newline at end of file +</definitions> Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws1841/META-INF/wsdl/TestService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws1841/META-INF/wsdl/TestService.wsdl 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws1841/META-INF/wsdl/TestService.wsdl 2015-01-12 21:08:41 UTC (rev 19363) @@ -33,7 +33,7 @@ <service name='EndpointService'> <port binding='tns:EndpointInterfaceBinding' name='EJB3BeanPort'> - <soap:address location='http://@jboss.bind.address@:8080/jaxws-jbws1841/EndpointService/EJB3Bean'/> + <soap:address location='http://@jboss.bind.address@:38080/jaxws-jbws1841/EndpointService/EJB3Bean'/> </port> </service> -</definitions> \ No newline at end of file +</definitions> Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws1969/META-INF/wsdl/echo/TestService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws1969/META-INF/wsdl/echo/TestService.wsdl 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws1969/META-INF/wsdl/echo/TestService.wsdl 2015-01-12 21:08:41 UTC (rev 19363) @@ -38,7 +38,7 @@ </binding> <service name='EndpointService'> <port binding='tns:EndpointBinding' name='EndpointPort'> - <soap:address location='http://127.0.0.1:8080/jaxws-jbws1969'/> + <soap:address location='http://127.0.0.1:38080/jaxws-jbws1969'/> </port> </service> </definitions> Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2307/WEB-INF-client/wsdl/HelloService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2307/WEB-INF-client/wsdl/HelloService.wsdl 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2307/WEB-INF-client/wsdl/HelloService.wsdl 2015-01-12 21:08:41 UTC (rev 19363) @@ -71,4 +71,4 @@ </binding> <service name="HelloService"> <port name="HelloPort" binding="tns:HelloBinding"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-jbws2307-service/jaxws/Hello"/></port></service></definitions> \ No newline at end of file + <soap:address location="http://@jboss.bind.address@:38080/jaxws-jbws2307-service/jaxws/Hello"/></port></service></definitions> Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2307/WEB-INF-service/wsdl/HelloService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2307/WEB-INF-service/wsdl/HelloService.wsdl 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2307/WEB-INF-service/wsdl/HelloService.wsdl 2015-01-12 21:08:41 UTC (rev 19363) @@ -71,4 +71,4 @@ </binding> <service name="HelloService"> <port name="HelloPort" binding="tns:HelloBinding"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-jbws2307-service/jaxws/Hello"/></port></service></definitions> \ No newline at end of file + <soap:address location="http://@jboss.bind.address@:38080/jaxws-jbws2307-service/jaxws/Hello"/></port></service></definitions> Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/TestService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/TestService.wsdl 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2412/WEB-INF/wsdl/TestService.wsdl 2015-01-12 21:08:41 UTC (rev 19363) @@ -45,7 +45,7 @@ </binding> <service name='TestEndpointService'> <port binding='tns:TestEndpointBinding' name='TestEndpointPort'> - <soap:address location='http://127.0.0.1:8080/jaxws-jbws2412'/> + <soap:address location='http://127.0.0.1:38080/jaxws-jbws2412'/> </port> </service> -</definitions> \ No newline at end of file +</definitions> Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2419/WEB-INF/wsdl/SOAP12Service.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2419/WEB-INF/wsdl/SOAP12Service.wsdl 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2419/WEB-INF/wsdl/SOAP12Service.wsdl 2015-01-12 21:08:41 UTC (rev 19363) @@ -32,7 +32,7 @@ </binding> <service name="SOAP12EndpointBeanService"> <port name="SOAP12EndpointPort" binding="tns:SOAP12EndpointBinding"> - <soap12:address location="http://127.0.0.1:8080/jaxws-jbws2419/soap12"/> + <soap12:address location="http://127.0.0.1:38080/jaxws-jbws2419/soap12"/> </port> </service> </definitions> Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2449/META-INF/wsdl/test.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2449/META-INF/wsdl/test.wsdl 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2449/META-INF/wsdl/test.wsdl 2015-01-12 21:08:41 UTC (rev 19363) @@ -48,7 +48,7 @@ </binding> <service name='EndpointService'> <port binding='tns:EndpointBinding' name='EndpointPort'> - <soap:address location='http://127.0.0.1:8080/jaxws-jbws2449'/> + <soap:address location='http://127.0.0.1:38080/jaxws-jbws2449'/> </port> </service> -</definitions> \ No newline at end of file +</definitions> Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2527/WEB-INF-client/wsdl/HelloService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2527/WEB-INF-client/wsdl/HelloService.wsdl 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2527/WEB-INF-client/wsdl/HelloService.wsdl 2015-01-12 21:08:41 UTC (rev 19363) @@ -71,4 +71,4 @@ </binding> <service name="HelloService"> <port name="HelloPort" binding="tns:HelloBinding"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-jbws2527-service/jaxws/Hello"/></port></service></definitions> \ No newline at end of file + <soap:address location="http://@jboss.bind.address@:38080/jaxws-jbws2527-service/jaxws/Hello"/></port></service></definitions> Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2527/WEB-INF-service/wsdl/HelloService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2527/WEB-INF-service/wsdl/HelloService.wsdl 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2527/WEB-INF-service/wsdl/HelloService.wsdl 2015-01-12 21:08:41 UTC (rev 19363) @@ -71,4 +71,4 @@ </binding> <service name="HelloService"> <port name="HelloPort" binding="tns:HelloBinding"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-jbws2527-service/jaxws/Hello"/></port></service></definitions> \ No newline at end of file + <soap:address location="http://@jboss.bind.address@:38080/jaxws-jbws2527-service/jaxws/Hello"/></port></service></definitions> Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2591/wsdl/JBWS2591TestService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2591/wsdl/JBWS2591TestService.wsdl 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2591/wsdl/JBWS2591TestService.wsdl 2015-01-12 21:08:41 UTC (rev 19363) @@ -31,7 +31,7 @@ </binding> <service name="MarshallTestService"> <port name="MarshallTestPort2" binding="tns:NewSchemaTestSoapBinding"> - <soap:address location="http://@jboss.bind.address@:8080/W2JDLMarshallTest/jaxws/NewSchemaTest" /> + <soap:address location="http://@jboss.bind.address@:38080/W2JDLMarshallTest/jaxws/NewSchemaTest" /> </port> </service> </definitions> Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2957/WEB-INF/wsdl/HelloService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2957/WEB-INF/wsdl/HelloService.wsdl 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws2957/WEB-INF/wsdl/HelloService.wsdl 2015-01-12 21:08:41 UTC (rev 19363) @@ -25,7 +25,7 @@ </binding> <service name="Service"> <port binding="tns:HelloIfaceBinding" name="HelloImplPort"> - <soap:address location="http://@jboss.bind.address@:8080/foo/bar"/> + <soap:address location="http://@jboss.bind.address@:38080/foo/bar"/> </port> </service> -</definitions> \ No newline at end of file +</definitions> Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3140/wsdl/TestEndpoint.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3140/wsdl/TestEndpoint.wsdl 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3140/wsdl/TestEndpoint.wsdl 2015-01-12 21:08:41 UTC (rev 19363) @@ -63,7 +63,7 @@ <service name="TestEndpointService"> <port name="MTOMTestPort" binding="tns:MTOMBindind"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws3140-server"/> + <soap:address location="http://@jboss.bind.address@:38080/jaxws3140-server"/> </port> </service> </definitions> Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3223/WEB-INF/wsdl/TestService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3223/WEB-INF/wsdl/TestService.wsdl 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3223/WEB-INF/wsdl/TestService.wsdl 2015-01-12 21:08:41 UTC (rev 19363) @@ -29,7 +29,7 @@ </binding> <service name="EndpointService"> <port name="EndpointInterfacePort" binding="tns:EndpointInterfaceBinding"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-jbws3223"/> + <soap:address location="http://@jboss.bind.address@:38080/jaxws-jbws3223"/> </port> </service> </definitions> Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3401/WEB-INF/wsdl/TestService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3401/WEB-INF/wsdl/TestService.wsdl 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/jbws3401/WEB-INF/wsdl/TestService.wsdl 2015-01-12 21:08:41 UTC (rev 19363) @@ -45,7 +45,7 @@ </binding> <service name='TestEndpointService'> <port binding='tns:TestEndpointBinding' name='TestEndpointPort'> - <soap:address location='http://127.0.0.1:8080/jaxws-jbws3401'/> + <soap:address location='http://127.0.0.1:38080/jaxws-jbws3401'/> </port> </service> -</definitions> \ No newline at end of file +</definitions> Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/addressing/META-INF/wsdl/TestService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/addressing/META-INF/wsdl/TestService.wsdl 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/addressing/META-INF/wsdl/TestService.wsdl 2015-01-12 21:08:41 UTC (rev 19363) @@ -56,7 +56,7 @@ </binding> <service name='TestService'> <port binding='tns:StatefulEndpointBinding' name='StatefulEndpointPort'> - <soap:address location='http://@jboss.bind.address@:8080/jaxws-samples-wsaddressing/TestService'/> + <soap:address location='http://@jboss.bind.address@:38080/jaxws-samples-wsaddressing/TestService'/> </port> </service> -</definitions> \ No newline at end of file +</definitions> Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/advanced/retail/META-INF/wsdl/CCVerificationService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/advanced/retail/META-INF/wsdl/CCVerificationService.wsdl 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/advanced/retail/META-INF/wsdl/CCVerificationService.wsdl 2015-01-12 21:08:41 UTC (rev 19363) @@ -41,7 +41,7 @@ </binding> <service name="CCVerificationService"> <port binding="tns:CCVerificationBinding" name="CCVerificationPort"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-retail/CCVerificationBean"/> + <soap:address location="http://@jboss.bind.address@:38080/jaxws-samples-retail/CCVerificationBean"/> </port> </service> </definitions> Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/advanced/retail/META-INF/wsdl/OrderMgmtService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/advanced/retail/META-INF/wsdl/OrderMgmtService.wsdl 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/advanced/retail/META-INF/wsdl/OrderMgmtService.wsdl 2015-01-12 21:08:41 UTC (rev 19363) @@ -59,7 +59,7 @@ </binding> <service name="OrderMgmtService"> <port binding="tns:OrderMgmtBinding" name="OrderMgmtPort"> - <soap:address location="http://@jboss.bind.address@:8080/jaxws-samples-retail/OrderMgmtService/OrderMgmtBean"/> + <soap:address location="http://@jboss.bind.address@:38080/jaxws-samples-retail/OrderMgmtService/OrderMgmtBean"/> </port> </service> </definitions> Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/advanced/retail/META-INF/wsdl/ProfileMgmtService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/advanced/retail/META-INF/wsdl/ProfileMgmtService.wsdl 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/advanced/retail/META-INF/wsdl/ProfileMgmtService.wsdl 2015-01-12 21:08:41 UTC (rev 19363) @@ -52,7 +52,7 @@ </binding> <service name='ProfileMgmtService'> <port binding='tns:ProfileMgmtBinding' name='ProfileMgmtPort'> - <soap:address location='http://@jboss.bind.address@:8080/jaxws-samples-retail/ProfileMgmtService/ProfileMgmtBean'/> + <soap:address location='http://@jboss.bind.address@:38080/jaxws-samples-retail/ProfileMgmtService/ProfileMgmtBean'/> </port> </service> </definitions> Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/asynchronous/WEB-INF/wsdl/TestService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/asynchronous/WEB-INF/wsdl/TestService.wsdl 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/asynchronous/WEB-INF/wsdl/TestService.wsdl 2015-01-12 21:08:41 UTC (rev 19363) @@ -38,7 +38,7 @@ </binding> <service name='EndpointService'> <port binding='tns:EndpointBinding' name='EndpointPort'> - <soap:address location='http://tdvaio:8080/jaxws-samples-asynchronous/Endpoint'/> + <soap:address location='http://tdvaio:38080/jaxws-samples-asynchronous/Endpoint'/> </port> </service> -</definitions> \ No newline at end of file +</definitions> Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/serviceref/META-INF/wsdl/Endpoint.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/serviceref/META-INF/wsdl/Endpoint.wsdl 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/serviceref/META-INF/wsdl/Endpoint.wsdl 2015-01-12 21:08:41 UTC (rev 19363) @@ -26,7 +26,7 @@ </binding> <service name='EndpointService'> <port binding='tns:EndpointBinding' name='EndpointPort'> - <soap:address location='http://@jboss.bind.address@:8080/jaxws-samples-serviceref'/> + <soap:address location='http://@jboss.bind.address@:38080/jaxws-samples-serviceref'/> </port> </service> </definitions> \ No newline at end of file Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webparam/META-INF/wsdl/PingService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webparam/META-INF/wsdl/PingService.wsdl 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webparam/META-INF/wsdl/PingService.wsdl 2015-01-12 21:08:41 UTC (rev 19363) @@ -89,7 +89,7 @@ <service name='PingServiceService'> <port binding='tns:PingServiceBinding' name='PingServicePort'> - <soap:address location='http://@jboss.bind.address@:8080/jaxws-samples-webparam'/> + <soap:address location='http://@jboss.bind.address@:38080/jaxws-samples-webparam'/> </port> </service> -</definitions> \ No newline at end of file +</definitions> Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webresult/META-INF/wsdl/CustomerService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webresult/META-INF/wsdl/CustomerService.wsdl 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webresult/META-INF/wsdl/CustomerService.wsdl 2015-01-12 21:08:41 UTC (rev 19363) @@ -47,7 +47,7 @@ <service name='CustomerServiceService'> <port binding='tns:CustomerServiceBinding' name='CustomerServicePort'> - <soap:address location='http://@jboss.bind.address@:8080/jaxws-samples-webresult'/> + <soap:address location='http://@jboss.bind.address@:38080/jaxws-samples-webresult'/> </port> </service> -</definitions> \ No newline at end of file +</definitions> Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webserviceref/META-INF/wsdl/Endpoint.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webserviceref/META-INF/wsdl/Endpoint.wsdl 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webserviceref/META-INF/wsdl/Endpoint.wsdl 2015-01-12 21:08:41 UTC (rev 19363) @@ -32,7 +32,7 @@ <service name='EndpointService'> <port binding='tns:EndpointBinding' name='EndpointPort'> - <soap:address location='http://@jboss.bind.address@:8080/jaxws-samples-webserviceref'/> + <soap:address location='http://@jboss.bind.address@:38080/jaxws-samples-webserviceref'/> </port> </service> Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webserviceref/META-INF/wsdl/MultipleEndpoint.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webserviceref/META-INF/wsdl/MultipleEndpoint.wsdl 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webserviceref/META-INF/wsdl/MultipleEndpoint.wsdl 2015-01-12 21:08:41 UTC (rev 19363) @@ -45,10 +45,10 @@ <service name='EndpointService'> <port binding='tns:EndpointBinding' name='EndpointPort'> - <soap:address location='http://@jboss.bind.address@:8080/jaxws-samples-webserviceref'/> + <soap:address location='http://@jboss.bind.address@:38080/jaxws-samples-webserviceref'/> </port> <port binding='tns:EndpointBinding2' name='EndpointPort2'> - <soap:address location='http://@jboss.bind.address@:8080/jaxws-samples-webserviceref'/> + <soap:address location='http://@jboss.bind.address@:38080/jaxws-samples-webserviceref'/> </port> </service> Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webservicerefsec/WEB-INF/wsdl/Endpoint.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webservicerefsec/WEB-INF/wsdl/Endpoint.wsdl 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/jaxws/samples/webservicerefsec/WEB-INF/wsdl/Endpoint.wsdl 2015-01-12 21:08:41 UTC (rev 19363) @@ -29,7 +29,7 @@ <service name='EndpointService'> <port binding='tns:EndpointBinding' name='EndpointPort'> - <soap:address location='http://@jboss.bind.address@:8080/jaxws-samples-webservicerefsec'/> + <soap:address location='http://@jboss.bind.address@:38080/jaxws-samples-webservicerefsec'/> </port> </service> Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/publish/WEB-INF/wsdl/EndpointImpl3.xml =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/publish/WEB-INF/wsdl/EndpointImpl3.xml 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/publish/WEB-INF/wsdl/EndpointImpl3.xml 2015-01-12 21:08:41 UTC (rev 19363) @@ -30,7 +30,7 @@ </wsdl:binding> <wsdl:service name="EndpointService3"> <wsdl:port binding="tns:EndpointService3SoapBinding" name="EndpointPort3"> - <soap:address location="http://localhost:8080/ep-publish-test/pattern3"/> + <soap:address location="http://localhost:38080/ep-publish-test/pattern3"/> </wsdl:port> </wsdl:service> -</wsdl:definitions> \ No newline at end of file +</wsdl:definitions> Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/saaj/jbws3084/WEB-INF/wsdl/SaajService.wsdl =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/saaj/jbws3084/WEB-INF/wsdl/SaajService.wsdl 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/resources/saaj/jbws3084/WEB-INF/wsdl/SaajService.wsdl 2015-01-12 21:08:41 UTC (rev 19363) @@ -48,7 +48,7 @@ <wsdl:service name="SaajService"> <wsdl:port name="SaajServicePort" binding="tns:SaajServiceSoapBinding"> - <soap:address location="http://@jboss.bind.address@:8080/SaajService"/> + <soap:address location="http://@jboss.bind.address@:38080/SaajService"/> </wsdl:port> </wsdl:service> Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/scripts/jbws-testsuite-shared-default.groovy =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/scripts/jbws-testsuite-shared-default.groovy 2015-01-12 07:09:46 UTC (rev 19362) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/scripts/jbws-testsuite-shared-default.groovy 2015-01-12 21:08:41 UTC (rev 19363) @@ -90,6 +90,28 @@ bLoginModuleBasicAuth.appendNode('module-option', ['name':'rolesProperties','value':project.properties['testResourcesDir'] + '/jaxws/samples/securityDomain/jbossws-roles.properties']) /** + * Add a https connector like this: + * + * <security-realm name="jbws-test-https-realm"> + * <server-identities> + * <ssl> + * <keystore path="/mnt/ssd/jbossws/stack/cxf/trunk/modules/testsuite/cxf-tests/target/test-classes/test.keystore" keystore-password="changeit" alias="tomcat"/> + * </ssl> + * </server-identities> + * </security-realm> + * + */ + +def securityRealms = root.management.'security-realms'[0] +def securityRealm = securityRealms.appendNode('security-realm', ['name':'jbws-test-https-realm']) +def serverIdentities = securityRealm.appendNode('server-identities') +def ssl = serverIdentities.appendNode('ssl') +ssl.appendNode('keystore', ['path':project.properties['keystorePath'],'keystore-password':'changeit','alias':'tomcat']) + +def server = root.profile.subsystem.server[0] +server.appendNode('https-listener', ['name':'jbws-test-https-listener','socket-binding':'https','security-realm':'jbws-test-https-realm']) + +/** * Save the configuration to a new file */

10 years, 8 months

1
0
0 / 0

JBossWS SVN: r19362 - in stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws: samples/eardeployment and 1 other directory.

by jbossws-commits＠lists.jboss.org

Author: jim.ma Date: 2015-01-12 02:09:46 -0500 (Mon, 12 Jan 2015) New Revision: 19362 Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2957/JBWS2957TestCase.java stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java Log: Fix EarTestCase and JBWS2957TestCase Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2957/JBWS2957TestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2957/JBWS2957TestCase.java 2015-01-12 05:57:12 UTC (rev 19361) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2957/JBWS2957TestCase.java 2015-01-12 07:09:46 UTC (rev 19362) @@ -31,9 +31,7 @@ import org.jboss.arquillian.container.test.api.RunAsClient; import org.jboss.arquillian.junit.Arquillian; import org.jboss.arquillian.test.api.ArquillianResource; -import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.api.ShrinkWrap; -import org.jboss.shrinkwrap.api.exporter.ZipExporter; import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.shrinkwrap.api.spec.WebArchive; @@ -61,18 +59,16 @@ .addManifest() .addClass(org.jboss.test.ws.jaxws.jbws2957.common.HelloIface.class) .addClass(org.jboss.test.ws.jaxws.jbws2957.common.HelloImpl.class); - JBossWSTestHelper.writeToFile(archive1); WebArchive archive2 = ShrinkWrap.create(WebArchive.class, "jaxws-jbws2957-ejbinwarwebinflib_web.war"); archive2 .addManifest() - .addAsLibrary(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-jbws2957-ejbinwarwebinflib_ejb.jar")) + .addAsLibraries(archive1) .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2957/WEB-INF/ejb-jar.xml"), "ejb-jar.xml") .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws2957/WEB-INF/wsdl/HelloService.wsdl"), "wsdl/HelloService.wsdl"); - JBossWSTestHelper.writeToFile(archive2); EnterpriseArchive archive = ShrinkWrap.create(EnterpriseArchive.class, "jaxws-jbws2957-ejbinwarwebinflib.ear"); - archive.addManifest().addAsResource(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-jbws2957-ejbinwarwebinflib_web.war")); + archive.addManifest().addAsModule(archive2); return archive; } Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java 2015-01-12 05:57:12 UTC (rev 19361) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/eardeployment/EarTestCase.java 2015-01-12 07:09:46 UTC (rev 19362) @@ -36,10 +36,8 @@ import org.jboss.arquillian.container.test.api.RunAsClient; import org.jboss.arquillian.junit.Arquillian; import org.jboss.arquillian.test.api.ArquillianResource; -import org.jboss.shrinkwrap.api.Archive; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; -import org.jboss.shrinkwrap.api.exporter.ZipExporter; import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.shrinkwrap.api.spec.WebArchive; @@ -81,7 +79,6 @@ .addClass(org.jboss.test.ws.jaxws.samples.eardeployment.EJB3Bean.class) .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/eardeployment/WEB-INF/wsdl/Endpoint.wsdl"), "wsdl/Endpoint.wsdl") .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/eardeployment/WEB-INF/wsdl/TestService.xsd"), "wsdl/TestService.xsd"); - JBossWSTestHelper.writeToFile(archive1); WebArchive archive2 = ShrinkWrap.create(WebArchive.class, "jaxws-samples-eardeployment-pojo.war"); archive2 @@ -93,13 +90,12 @@ .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/eardeployment/WEB-INF/wsdl/Endpoint.wsdl"), "wsdl/Endpoint.wsdl") .addAsWebInfResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/eardeployment/WEB-INF/wsdl/TestService.xsd"), "wsdl/TestService.xsd") .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/eardeployment/WEB-INF/web.xml")); - JBossWSTestHelper.writeToFile(archive2); EnterpriseArchive archive = ShrinkWrap.create(EnterpriseArchive.class, "jaxws-samples-eardeployment.ear"); archive .addManifest() - .addAsResource(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-samples-eardeployment-ejb3.jar")) - .addAsResource(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-samples-eardeployment-pojo.war")) + .addAsModule(archive1) + .addAsModule(archive2) .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/samples/eardeployment/META-INF/permissions.xml"), "permissions.xml"); return archive; }

10 years, 8 months

1
0
0 / 0

JBossWS SVN: r19361 - stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1822.

by jbossws-commits＠lists.jboss.org

Author: jim.ma Date: 2015-01-12 00:57:12 -0500 (Mon, 12 Jan 2015) New Revision: 19361 Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1822/JBWS1822TestCase.java Log: Fix JBWS1822TestCase Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1822/JBWS1822TestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1822/JBWS1822TestCase.java 2015-01-12 05:44:03 UTC (rev 19360) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1822/JBWS1822TestCase.java 2015-01-12 05:57:12 UTC (rev 19361) @@ -53,14 +53,13 @@ { @ArquillianResource Deployer deployer; - + static JavaArchive archive1 = null; static { - JavaArchive archive1 = ShrinkWrap.create(JavaArchive.class, "jaxws-jbws1822-shared.jar"); + archive1 = ShrinkWrap.create(JavaArchive.class, "jaxws-jbws1822-shared.jar"); archive1 .addManifest() .addClass(org.jboss.test.ws.jaxws.jbws1822.shared.BeanIface.class) .addClass(org.jboss.test.ws.jaxws.jbws1822.shared.BeanImpl.class); - JBossWSTestHelper.writeToFile(archive1); } @Deployment(name = "jaxws-jbws1822-two-ejb-modules", testable = false, managed = false) @@ -70,13 +69,13 @@ .addManifest() .addClass(org.jboss.test.ws.jaxws.jbws1822.webservice.EJB3Bean.class) .addClass(org.jboss.test.ws.jaxws.jbws1822.webservice.EJB3RemoteIface.class); - JBossWSTestHelper.writeToFile(archive3); + // JBossWSTestHelper.writeToFile(archive3); EnterpriseArchive archive = ShrinkWrap.create(EnterpriseArchive.class, "jaxws-jbws1822-two-ejb-modules.ear"); archive .addManifest() - .addAsResource(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-jbws1822-one-ejb3-inside.jar")) - .addAsResource(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-jbws1822-shared.jar")); + .addAsModule(archive3) + .addAsModule(archive1); return archive; } @@ -94,7 +93,7 @@ EnterpriseArchive archive = ShrinkWrap.create(EnterpriseArchive.class, "jaxws-jbws1822-one-ejb-module.ear"); archive .addManifest() - .addAsResource(new File(JBossWSTestHelper.getTestArchiveDir(), "jaxws-jbws1822-two-ejb3-inside.jar")); + .addAsModule(archive2); return archive; }

10 years, 8 months

1
0
0 / 0

JBossWS SVN: r19360 - stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1581.

by jbossws-commits＠lists.jboss.org

Author: jim.ma Date: 2015-01-12 00:44:03 -0500 (Mon, 12 Jan 2015) New Revision: 19360 Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581TestCase.java Log: Fix JBWS1581TestCase Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581TestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581TestCase.java 2015-01-09 14:48:13 UTC (rev 19359) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws1581/JBWS1581TestCase.java 2015-01-12 05:44:03 UTC (rev 19360) @@ -64,14 +64,7 @@ @Deployment(name = WAR_DEPLOYMENT, order = 1, testable = false, managed = false) public static WebArchive createDeployment1() { - WebArchive archive = ShrinkWrap.create(WebArchive.class, WAR_DEPLOYMENT + ".war"); - archive - .addManifest() - .addClass(org.jboss.test.ws.jaxws.jbws1581.EndpointBean.class) - .addClass(org.jboss.test.ws.jaxws.jbws1581.EndpointInterface.class) - .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws1581/WEB-INF/web.xml")); - JBossWSTestHelper.writeToFile(archive); - return archive; + return createWarDeployment(); } @Deployment(name="jaxws-jbws1581-ejb3", order=2, testable = false) @@ -93,9 +86,20 @@ EnterpriseArchive archive = ShrinkWrap.create(EnterpriseArchive.class, EAR_DEPLOYMENT + ".ear"); archive .addManifest() - .addAsResource(new File(JBossWSTestHelper.getTestArchiveDir(), WAR_DEPLOYMENT + ".war")); + .addAsModule(createWarDeployment()); return archive; } + + private static WebArchive createWarDeployment() { + WebArchive archive = ShrinkWrap.create(WebArchive.class, WAR_DEPLOYMENT + ".war"); + archive + .addManifest() + .addClass(org.jboss.test.ws.jaxws.jbws1581.EndpointBean.class) + .addClass(org.jboss.test.ws.jaxws.jbws1581.EndpointInterface.class) + .setWebXML(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/jbws1581/WEB-INF/web.xml")); + return archive; + } + @Test @RunAsClient public void testWSDLAccessWar() throws Exception {

10 years, 8 months

1
0
0 / 0

JBossWS SVN: r19359 - in stack/cxf/branches/arquillian/modules/testsuite/shared-tests: src/test/etc and 1 other directories.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2015-01-09 09:48:13 -0500 (Fri, 09 Jan 2015) New Revision: 19359 Added: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/scripts/jbws-testsuite-shared-default-config-tests.groovy stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/scripts/jbws-testsuite-shared-default.groovy Removed: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/scripts/jbws-testsuite-default-config-tests.groovy stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/scripts/jbws-testsuite-default.groovy Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/pom.xml stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/etc/arquillian.xml Log: Use different script and log file names for shared-testsuite run Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/pom.xml =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/pom.xml 2015-01-09 11:08:42 UTC (rev 19358) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/pom.xml 2015-01-09 14:48:13 UTC (rev 19359) @@ -62,11 +62,11 @@ <goal>execute</goal> </goals> <configuration> - <source>${basedir}/src/test/scripts/jbws-testsuite-default.groovy</source> + <source>${basedir}/src/test/scripts/jbws-testsuite-shared-default.groovy</source> <properties> <inputFile>${jboss.home}/standalone/configuration/standalone.xml</inputFile> - <outputFile>${jboss.home}/standalone/configuration/jbws-testsuite-default.xml</outputFile> - <serverLog>jbws-testsuite-default.log</serverLog> + <outputFile>${jboss.home}/standalone/configuration/jbws-testsuite-shared-default.xml</outputFile> + <serverLog>jbws-testsuite-shared-default.log</serverLog> <usersPropFile>${project.build.directory}/test-classes/jbossws-users.properties</usersPropFile> <rolesPropFile>${project.build.directory}/test-classes/jbossws-roles.properties</rolesPropFile> <keystorePath>${project.build.directory}/test-classes/test.keystore</keystorePath> @@ -81,11 +81,11 @@ <goal>execute</goal> </goals> <configuration> - <source>${basedir}/src/test/scripts/jbws-testsuite-default-config-tests.groovy</source> + <source>${basedir}/src/test/scripts/jbws-testsuite-shared-default-config-tests.groovy</source> <properties> <inputFile>${jboss.home}/standalone/configuration/standalone.xml</inputFile> - <outputFile>${jboss.home}/standalone/configuration/jbws-testsuite-default-config-tests.xml</outputFile> - <serverLog>jbws-testsuite-default-config-tests.log</serverLog> + <outputFile>${jboss.home}/standalone/configuration/jbws-testsuite-shared-default-config-tests.xml</outputFile> + <serverLog>jbws-testsuite-shared-default-config-tests.log</serverLog> </properties> </configuration> </execution> @@ -212,7 +212,7 @@ </goals> <configuration> <jvmArgs>-server -XX:+UseCompressedOops -Xms64m -Xmx512m -XX:MaxPermSize=256m ${additionalJvmArgs}</jvmArgs> - <serverConfig>jbws-testsuite-default.xml</serverConfig> + <serverConfig>jbws-testsuite-shared-default.xml</serverConfig> <jbossHome>${jboss.home}</jbossHome> <port>9990</port> </configuration> @@ -225,7 +225,7 @@ </goals> <configuration> <jvmArgs>-server -XX:+UseCompressedOops -Xms48m -Xmx384m -XX:MaxPermSize=192m -Djboss.socket.binding.port-offset=20000 ${additionalJvmArgs}</jvmArgs> - <serverConfig>jbws-testsuite-default-config-tests.xml</serverConfig> + <serverConfig>jbws-testsuite-shared-default-config-tests.xml</serverConfig> <jbossHome>${jboss.home}</jbossHome> <port>29990</port> </configuration> Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/etc/arquillian.xml =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/etc/arquillian.xml 2015-01-09 11:08:42 UTC (rev 19358) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/etc/arquillian.xml 2015-01-09 14:48:13 UTC (rev 19359) @@ -7,7 +7,7 @@ <configuration> <property name="jbossHome">${jboss.home}</property> <property name="javaVmArguments">-server -XX:+UseCompressedOops -Xms64m -Xmx512m -XX:MaxPermSize=256m -Djavax.wsdl.factory.WSDLFactory=com.ibm.wsdl.factory.WSDLFactoryImpl</property> - <property name="serverConfig">jbws-testsuite-default.xml</property> + <property name="serverConfig">jbws-testsuite-shared-default.xml</property> <property name="allowConnectingToRunningServer">true</property> <property name="managementPort">${as.managementPort:9990}</property>  @@ -19,7 +19,7 @@ <configuration> <property name="jbossHome">${jboss.home}</property> <property name="javaVmArguments">-server -XX:+UseCompressedOops -Xms48m -Xmx384m -XX:MaxPermSize=192m -Djboss.socket.binding.port-offset=20000 -Djavax.wsdl.factory.WSDLFactory=com.ibm.wsdl.factory.WSDLFactoryImpl</property> - <property name="serverConfig">jbws-testsuite-default-config-tests.xml</property> + <property name="serverConfig">jbws-testsuite-shared-default-config-tests.xml</property> <property name="allowConnectingToRunningServer">true</property> <property name="managementPort">${as.managementPort:29990}</property>  Deleted: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/scripts/jbws-testsuite-default-config-tests.groovy =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/scripts/jbws-testsuite-default-config-tests.groovy 2015-01-09 11:08:42 UTC (rev 19358) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/scripts/jbws-testsuite-default-config-tests.groovy 2015-01-09 14:48:13 UTC (rev 19359) @@ -1,44 +0,0 @@ -def root = new XmlParser().parse(project.properties['inputFile']) - -/** - * Fix logging: remove CONSOLE handler and set a specific log file - * - */ -def logHandlers = root.profile.subsystem.'root-logger'.handlers[0] -def consoleHandler = logHandlers.find{it.@name == 'CONSOLE'} -logHandlers.remove(consoleHandler) -def file = root.profile.subsystem.'periodic-rotating-file-handler'.file[0] -file.attributes()['path'] = project.properties['serverLog'] - -/** - * Add a security-domain block like this: - * - * <security-domain name="JBossWS" cache-type="default"> - * <authentication> - * <login-module code="UsersRoles" flag="required"> - * <module-option name="usersProperties" value="/mnt/ssd/jbossws/stack/cxf/trunk/modules/testsuite/cxf-tests/target/test-classes/jbossws-users.properties"/> - * <module-option name="unauthenticatedIdentity" value="anonymous"/> - * <module-option name="rolesProperties" value="/mnt/ssd/jbossws/stack/cxf/trunk/modules/testsuite/cxf-tests/target/test-classes/jbossws-roles.properties"/> - * </login-module> - * </authentication> - * </security-domain> - * - */ - -def securityDomains = root.profile.subsystem.'security-domains'[0] -def securityDomain = securityDomains.appendNode('security-domain', ['name':'JBossWS','cache-type':'default']) -def authentication = securityDomain.appendNode('authentication') -def loginModule = authentication.appendNode('login-module', ['code':'UsersRoles','flag':'required']) -loginModule.appendNode('module-option', ['name':'unauthenticatedIdentity','value':'anonymous']) -loginModule.appendNode('module-option', ['name':'usersProperties','value':project.properties['usersPropFile']]) -loginModule.appendNode('module-option', ['name':'rolesProperties','value':project.properties['rolesPropFile']]) - -/** - * Save the configuration to a new file - */ - -def writer = new StringWriter() -writer.println('<?xml version="1.0" encoding="UTF-8"?>') -new XmlNodePrinter(new PrintWriter(writer)).print(root) -def f = new File(project.properties['outputFile']) -f.write(writer.toString()) Deleted: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/scripts/jbws-testsuite-default.groovy =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/scripts/jbws-testsuite-default.groovy 2015-01-09 11:08:42 UTC (rev 19358) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/scripts/jbws-testsuite-default.groovy 2015-01-09 14:48:13 UTC (rev 19359) @@ -1,100 +0,0 @@ -def root = new XmlParser().parse(project.properties['inputFile']) - -/** - * Fix logging: remove CONSOLE handler and set a specific log file - * - */ -def logHandlers = root.profile.subsystem.'root-logger'.handlers[0] -def consoleHandler = logHandlers.find{it.@name == 'CONSOLE'} -logHandlers.remove(consoleHandler) -def file = root.profile.subsystem.'periodic-rotating-file-handler'.file[0] -file.attributes()['path'] = project.properties['serverLog'] - -/** - * Add a security-domain block like this: - * - * <security-domain name="JBossWS" cache-type="default"> - * <authentication> - * <login-module code="UsersRoles" flag="required"> - * <module-option name="usersProperties" value="/mnt/ssd/jbossws/stack/cxf/trunk/modules/testsuite/cxf-tests/target/test-classes/jbossws-users.properties"/> - * <module-option name="unauthenticatedIdentity" value="anonymous"/> - * <module-option name="rolesProperties" value="/mnt/ssd/jbossws/stack/cxf/trunk/modules/testsuite/cxf-tests/target/test-classes/jbossws-roles.properties"/> - * </login-module> - * </authentication> - * </security-domain> - * - */ -def securityDomains = root.profile.subsystem.'security-domains'[0] -def securityDomain = securityDomains.appendNode('security-domain', ['name':'JBossWS','cache-type':'default']) -def authentication = securityDomain.appendNode('authentication') -def loginModule = authentication.appendNode('login-module', ['code':'UsersRoles','flag':'required']) -loginModule.appendNode('module-option', ['name':'unauthenticatedIdentity','value':'anonymous']) -loginModule.appendNode('module-option', ['name':'usersProperties','value':project.properties['usersPropFile']]) -loginModule.appendNode('module-option', ['name':'rolesProperties','value':project.properties['rolesPropFile']]) - -/** - * Settings for modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2937/JBWS2937TestCase.java - * Add a security-domain block like this: - * - * <security-domain name="handlerauth-security-domain" cache-type="default"> - * <authentication> - * <login-module code="UsersRoles" flag="required"> - * <module-option name="usersProperties" value="/jaxws/handlerauth/jbossws-users.properties"/> - * <module-option name="rolesProperties" value="/jaxws/handlerauth/jbossws-roles.properties"/> - * </login-module> - * </authentication> - * </security-domain> - */ -def securityDomainBasicAuth = securityDomains.appendNode('security-domain', ['name':'handlerauth-security-domain','cache-type':'default']) -def authenticationBasicAuth = securityDomainBasicAuth.appendNode('authentication') -def loginModuleBasicAuth = authenticationBasicAuth.appendNode('login-module', ['code':'UsersRoles','flag':'required']) -loginModuleBasicAuth.appendNode('module-option', ['name':'usersProperties','value':project.properties['testResourcesDir'] + '/jaxws/handlerauth/jbossws-users.properties']) -loginModuleBasicAuth.appendNode('module-option', ['name':'rolesProperties','value':project.properties['testResourcesDir'] + '/jaxws/handlerauth/jbossws-roles.properties']) - -/** - * Settings for modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/PermitAllTestCase.java - * Add a security-domain block like this: - * - * <security-domain name="JBossWSSecurityDomainPermitAllTest" cache-type="default"> - * <authentication> - * <login-module code="UsersRoles" flag="required"> - * <module-option name="usersProperties" value="/jaxws/samples/securityDomain/jbossws-users.properties"/> - * <module-option name="rolesProperties" value="/jaxws/samples/securityDomain/jbossws-roles.properties"/> - * </login-module> - * </authentication> - * </security-domain> - */ -def aSecurityDomainBasicAuth = securityDomains.appendNode('security-domain', ['name':'JBossWSSecurityDomainPermitAllTest','cache-type':'default']) -def aAuthenticationBasicAuth = aSecurityDomainBasicAuth.appendNode('authentication') -def aLoginModuleBasicAuth = aAuthenticationBasicAuth.appendNode('login-module', ['code':'UsersRoles','flag':'required']) -aLoginModuleBasicAuth.appendNode('module-option', ['name':'usersProperties','value':project.properties['testResourcesDir'] + '/jaxws/samples/securityDomain/jbossws-users.properties']) -aLoginModuleBasicAuth.appendNode('module-option', ['name':'rolesProperties','value':project.properties['testResourcesDir'] + '/jaxws/samples/securityDomain/jbossws-roles.properties']) - -/** - * Settings for modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecurityDomainTestCase.java - * Add a security-domain block like this: - * - * <security-domain name="JBossWSSecurityDomainTest" cache-type="default"> - * <authentication> - * <login-module code="UsersRoles" flag="required"> - * <module-option name="usersProperties" value="/jaxws/samples/securityDomain/jbossws-users.properties"/> - * <module-option name="rolesProperties" value="/jaxws/samples/securityDomain/jbossws-roles.properties"/> - * </login-module> - * </authentication> - * </security-domain> - */ -def bSecurityDomainBasicAuth = securityDomains.appendNode('security-domain', ['name':'JBossWSSecurityDomainTest','cache-type':'default']) -def bAuthenticationBasicAuth = bSecurityDomainBasicAuth.appendNode('authentication') -def bLoginModuleBasicAuth = bAuthenticationBasicAuth.appendNode('login-module', ['code':'UsersRoles','flag':'required']) -bLoginModuleBasicAuth.appendNode('module-option', ['name':'usersProperties','value':project.properties['testResourcesDir'] + '/jaxws/samples/securityDomain/jbossws-users.properties']) -bLoginModuleBasicAuth.appendNode('module-option', ['name':'rolesProperties','value':project.properties['testResourcesDir'] + '/jaxws/samples/securityDomain/jbossws-roles.properties']) - -/** - * Save the configuration to a new file - */ - -def writer = new StringWriter() -writer.println('<?xml version="1.0" encoding="UTF-8"?>') -new XmlNodePrinter(new PrintWriter(writer)).print(root) -def f = new File(project.properties['outputFile']) -f.write(writer.toString()) Added: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/scripts/jbws-testsuite-shared-default-config-tests.groovy =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/scripts/jbws-testsuite-shared-default-config-tests.groovy (rev 0) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/scripts/jbws-testsuite-shared-default-config-tests.groovy 2015-01-09 14:48:13 UTC (rev 19359) @@ -0,0 +1,44 @@ +def root = new XmlParser().parse(project.properties['inputFile']) + +/** + * Fix logging: remove CONSOLE handler and set a specific log file + * + */ +def logHandlers = root.profile.subsystem.'root-logger'.handlers[0] +def consoleHandler = logHandlers.find{it.@name == 'CONSOLE'} +logHandlers.remove(consoleHandler) +def file = root.profile.subsystem.'periodic-rotating-file-handler'.file[0] +file.attributes()['path'] = project.properties['serverLog'] + +/** + * Add a security-domain block like this: + * + * <security-domain name="JBossWS" cache-type="default"> + * <authentication> + * <login-module code="UsersRoles" flag="required"> + * <module-option name="usersProperties" value="/mnt/ssd/jbossws/stack/cxf/trunk/modules/testsuite/cxf-tests/target/test-classes/jbossws-users.properties"/> + * <module-option name="unauthenticatedIdentity" value="anonymous"/> + * <module-option name="rolesProperties" value="/mnt/ssd/jbossws/stack/cxf/trunk/modules/testsuite/cxf-tests/target/test-classes/jbossws-roles.properties"/> + * </login-module> + * </authentication> + * </security-domain> + * + */ + +def securityDomains = root.profile.subsystem.'security-domains'[0] +def securityDomain = securityDomains.appendNode('security-domain', ['name':'JBossWS','cache-type':'default']) +def authentication = securityDomain.appendNode('authentication') +def loginModule = authentication.appendNode('login-module', ['code':'UsersRoles','flag':'required']) +loginModule.appendNode('module-option', ['name':'unauthenticatedIdentity','value':'anonymous']) +loginModule.appendNode('module-option', ['name':'usersProperties','value':project.properties['usersPropFile']]) +loginModule.appendNode('module-option', ['name':'rolesProperties','value':project.properties['rolesPropFile']]) + +/** + * Save the configuration to a new file + */ + +def writer = new StringWriter() +writer.println('<?xml version="1.0" encoding="UTF-8"?>') +new XmlNodePrinter(new PrintWriter(writer)).print(root) +def f = new File(project.properties['outputFile']) +f.write(writer.toString()) Added: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/scripts/jbws-testsuite-shared-default.groovy =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/scripts/jbws-testsuite-shared-default.groovy (rev 0) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/scripts/jbws-testsuite-shared-default.groovy 2015-01-09 14:48:13 UTC (rev 19359) @@ -0,0 +1,100 @@ +def root = new XmlParser().parse(project.properties['inputFile']) + +/** + * Fix logging: remove CONSOLE handler and set a specific log file + * + */ +def logHandlers = root.profile.subsystem.'root-logger'.handlers[0] +def consoleHandler = logHandlers.find{it.@name == 'CONSOLE'} +logHandlers.remove(consoleHandler) +def file = root.profile.subsystem.'periodic-rotating-file-handler'.file[0] +file.attributes()['path'] = project.properties['serverLog'] + +/** + * Add a security-domain block like this: + * + * <security-domain name="JBossWS" cache-type="default"> + * <authentication> + * <login-module code="UsersRoles" flag="required"> + * <module-option name="usersProperties" value="/mnt/ssd/jbossws/stack/cxf/trunk/modules/testsuite/cxf-tests/target/test-classes/jbossws-users.properties"/> + * <module-option name="unauthenticatedIdentity" value="anonymous"/> + * <module-option name="rolesProperties" value="/mnt/ssd/jbossws/stack/cxf/trunk/modules/testsuite/cxf-tests/target/test-classes/jbossws-roles.properties"/> + * </login-module> + * </authentication> + * </security-domain> + * + */ +def securityDomains = root.profile.subsystem.'security-domains'[0] +def securityDomain = securityDomains.appendNode('security-domain', ['name':'JBossWS','cache-type':'default']) +def authentication = securityDomain.appendNode('authentication') +def loginModule = authentication.appendNode('login-module', ['code':'UsersRoles','flag':'required']) +loginModule.appendNode('module-option', ['name':'unauthenticatedIdentity','value':'anonymous']) +loginModule.appendNode('module-option', ['name':'usersProperties','value':project.properties['usersPropFile']]) +loginModule.appendNode('module-option', ['name':'rolesProperties','value':project.properties['rolesPropFile']]) + +/** + * Settings for modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/jbws2937/JBWS2937TestCase.java + * Add a security-domain block like this: + * + * <security-domain name="handlerauth-security-domain" cache-type="default"> + * <authentication> + * <login-module code="UsersRoles" flag="required"> + * <module-option name="usersProperties" value="/jaxws/handlerauth/jbossws-users.properties"/> + * <module-option name="rolesProperties" value="/jaxws/handlerauth/jbossws-roles.properties"/> + * </login-module> + * </authentication> + * </security-domain> + */ +def securityDomainBasicAuth = securityDomains.appendNode('security-domain', ['name':'handlerauth-security-domain','cache-type':'default']) +def authenticationBasicAuth = securityDomainBasicAuth.appendNode('authentication') +def loginModuleBasicAuth = authenticationBasicAuth.appendNode('login-module', ['code':'UsersRoles','flag':'required']) +loginModuleBasicAuth.appendNode('module-option', ['name':'usersProperties','value':project.properties['testResourcesDir'] + '/jaxws/handlerauth/jbossws-users.properties']) +loginModuleBasicAuth.appendNode('module-option', ['name':'rolesProperties','value':project.properties['testResourcesDir'] + '/jaxws/handlerauth/jbossws-roles.properties']) + +/** + * Settings for modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/PermitAllTestCase.java + * Add a security-domain block like this: + * + * <security-domain name="JBossWSSecurityDomainPermitAllTest" cache-type="default"> + * <authentication> + * <login-module code="UsersRoles" flag="required"> + * <module-option name="usersProperties" value="/jaxws/samples/securityDomain/jbossws-users.properties"/> + * <module-option name="rolesProperties" value="/jaxws/samples/securityDomain/jbossws-roles.properties"/> + * </login-module> + * </authentication> + * </security-domain> + */ +def aSecurityDomainBasicAuth = securityDomains.appendNode('security-domain', ['name':'JBossWSSecurityDomainPermitAllTest','cache-type':'default']) +def aAuthenticationBasicAuth = aSecurityDomainBasicAuth.appendNode('authentication') +def aLoginModuleBasicAuth = aAuthenticationBasicAuth.appendNode('login-module', ['code':'UsersRoles','flag':'required']) +aLoginModuleBasicAuth.appendNode('module-option', ['name':'usersProperties','value':project.properties['testResourcesDir'] + '/jaxws/samples/securityDomain/jbossws-users.properties']) +aLoginModuleBasicAuth.appendNode('module-option', ['name':'rolesProperties','value':project.properties['testResourcesDir'] + '/jaxws/samples/securityDomain/jbossws-roles.properties']) + +/** + * Settings for modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/samples/securityDomain/SecurityDomainTestCase.java + * Add a security-domain block like this: + * + * <security-domain name="JBossWSSecurityDomainTest" cache-type="default"> + * <authentication> + * <login-module code="UsersRoles" flag="required"> + * <module-option name="usersProperties" value="/jaxws/samples/securityDomain/jbossws-users.properties"/> + * <module-option name="rolesProperties" value="/jaxws/samples/securityDomain/jbossws-roles.properties"/> + * </login-module> + * </authentication> + * </security-domain> + */ +def bSecurityDomainBasicAuth = securityDomains.appendNode('security-domain', ['name':'JBossWSSecurityDomainTest','cache-type':'default']) +def bAuthenticationBasicAuth = bSecurityDomainBasicAuth.appendNode('authentication') +def bLoginModuleBasicAuth = bAuthenticationBasicAuth.appendNode('login-module', ['code':'UsersRoles','flag':'required']) +bLoginModuleBasicAuth.appendNode('module-option', ['name':'usersProperties','value':project.properties['testResourcesDir'] + '/jaxws/samples/securityDomain/jbossws-users.properties']) +bLoginModuleBasicAuth.appendNode('module-option', ['name':'rolesProperties','value':project.properties['testResourcesDir'] + '/jaxws/samples/securityDomain/jbossws-roles.properties']) + +/** + * Save the configuration to a new file + */ + +def writer = new StringWriter() +writer.println('<?xml version="1.0" encoding="UTF-8"?>') +new XmlNodePrinter(new PrintWriter(writer)).print(root) +def f = new File(project.properties['outputFile']) +f.write(writer.toString())

10 years, 8 months

1
0
0 / 0

JBossWS SVN: r19358 - stack/cxf/branches/arquillian/modules/testsuite/shared-tests.

by jbossws-commits＠lists.jboss.org

Author: asoldano Date: 2015-01-09 06:08:42 -0500 (Fri, 09 Jan 2015) New Revision: 19358 Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/pom.xml Log: Remove useless container startup Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/pom.xml =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/pom.xml 2015-01-09 09:52:13 UTC (rev 19357) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/pom.xml 2015-01-09 11:08:42 UTC (rev 19358) @@ -218,19 +218,6 @@ </configuration> </execution> <execution> - <id>ssl-mutual-auth</id> - <phase>pre-integration-test</phase> - <goals> - <goal>start</goal> - </goals> - <configuration> - <jvmArgs>-server -XX:+UseCompressedOops -Xms48m -Xmx384m -XX:MaxPermSize=192m -Djboss.socket.binding.port-offset=10000 ${additionalJvmArgs}</jvmArgs> - <serverConfig>jbws-testsuite-ssl-mutual-auth.xml</serverConfig> - <jbossHome>${jboss.home}</jbossHome> - <port>19990</port> - </configuration> - </execution> - <execution> <id>default-config-tests</id> <phase>pre-integration-test</phase> <goals>

10 years, 8 months

1
0
0 / 0

JBossWS SVN: r19357 - stack/cxf/branches/arquillian/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: jim.ma Date: 2015-01-09 04:52:13 -0500 (Fri, 09 Jan 2015) New Revision: 19357 Modified: stack/cxf/branches/arquillian/modules/testsuite/pom.xml Log: Enable fixed tests Modified: stack/cxf/branches/arquillian/modules/testsuite/pom.xml =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/pom.xml 2015-01-09 09:49:57 UTC (rev 19356) +++ stack/cxf/branches/arquillian/modules/testsuite/pom.xml 2015-01-09 09:52:13 UTC (rev 19357) @@ -908,11 +908,6 @@  <exclude>org/jboss/test/ws/jaxws/samples/wsse/kerberos/*TestCase*</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxws/jbws2937/JBWS2937TestCase*</exclude> - </excludes> </configuration> </plugin>

10 years, 8 months

1
0
0 / 0

JBossWS SVN: r19356 - stack/cxf/branches/arquillian/modules/testsuite.

by jbossws-commits＠lists.jboss.org

Author: jim.ma Date: 2015-01-09 04:49:57 -0500 (Fri, 09 Jan 2015) New Revision: 19356 Modified: stack/cxf/branches/arquillian/modules/testsuite/pom.xml Log: Enable fixed tests Modified: stack/cxf/branches/arquillian/modules/testsuite/pom.xml =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/pom.xml 2015-01-09 09:47:20 UTC (rev 19355) +++ stack/cxf/branches/arquillian/modules/testsuite/pom.xml 2015-01-09 09:49:57 UTC (rev 19356) @@ -809,11 +809,6 @@  <exclude>org/jboss/test/ws/jaxws/samples/wsse/kerberos/*TestCase*</exclude> - -  - <exclude>org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCase*</exclude> - <exclude>org/jboss/test/ws/jaxws/jbws2937/JBWS2937TestCase*</exclude> - </excludes> </configuration> </plugin>

10 years, 8 months

1
0
0 / 0

JBossWS SVN: r19355 - stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig.

by jbossws-commits＠lists.jboss.org

Author: jim.ma Date: 2015-01-09 04:47:20 -0500 (Fri, 09 Jan 2015) New Revision: 19355 Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCase.java Log: Fix ClientConfigurationTestCase Modified: stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCase.java =================================================================== --- stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCase.java 2015-01-09 09:27:58 UTC (rev 19354) +++ stack/cxf/branches/arquillian/modules/testsuite/shared-tests/src/test/java/org/jboss/test/ws/jaxws/clientConfig/ClientConfigurationTestCase.java 2015-01-09 09:47:20 UTC (rev 19355) @@ -23,29 +23,23 @@ import java.io.File; import java.net.URL; -import java.util.LinkedList; -import java.util.List; +import java.net.URLClassLoader; -import org.junit.Test; -import org.junit.runner.RunWith; import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OperateOnDeployment; import org.jboss.arquillian.container.test.api.RunAsClient; import org.jboss.arquillian.junit.Arquillian; import org.jboss.arquillian.test.api.ArquillianResource; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.spec.JavaArchive; import org.jboss.shrinkwrap.api.spec.WebArchive; -import org.jboss.shrinkwrap.api.spec.JavaArchive; -import org.jboss.arquillian.container.test.api.OperateOnDeployment; -import org.jboss.shrinkwrap.api.exporter.ZipExporter; - -import org.jboss.arquillian.junit.Arquillian; -import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.ws.common.IOUtils; import org.jboss.wsf.test.JBossWSTest; import org.jboss.wsf.test.JBossWSTestHelper; -import org.jboss.wsf.test.JBossWSTestHelper.BaseDeployment; -import org.jboss.wsf.test.JBossWSTestSetup; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; import org.junit.runner.RunWith; /** @@ -59,19 +53,29 @@ { @ArquillianResource private URL baseURL; + + private ClassLoader originalClassLoader = null; - @Deployment(name = "jaxws-clientConfig-client", order = 1, testable = false) - public static JavaArchive createDeployment1() { - JavaArchive archive = ShrinkWrap.create(JavaArchive.class, "jaxws-clientConfig-client.jar"); - archive - .addManifest() - .addAsResource("org/jboss/test/ws/jaxws/clientConfig/jaxws-client-config.xml", "jaxws-client-config.xml") - .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/clientConfig/META-INF/jaxws-client-config.xml"), "jaxws-client-config.xml"); - return archive; + + @Before + public void setupClientClassPath() throws Exception { + originalClassLoader = Thread.currentThread().getContextClassLoader(); + + URLClassLoader cl = new URLClassLoader(new URL[] { createClientJar() }, + originalClassLoader); + Thread.currentThread().setContextClassLoader(cl); + + } + + + @After + public void restoreClassPath() { + Thread.currentThread().setContextClassLoader(originalClassLoader); } - - @Deployment(name = "jaxws-clientConfig-inContainer-client", order = 2, testable = false) - public static WebArchive createDeployment2() { + + + @Deployment(name = "jaxws-clientConfig-inContainer-client", order = 1, testable = false) + public static WebArchive createDeployment() { WebArchive archive = ShrinkWrap.create(WebArchive.class, "jaxws-clientConfig-inContainer-client.war"); archive .setManifest(new StringAsset("Manifest-Version: 1.0\n" @@ -92,8 +96,8 @@ return archive; } - @Deployment(name = "jaxws-clientConfig", order = 3, testable = false) - public static WebArchive createDeployment3() { + @Deployment(name = "jaxws-clientConfig", order = 2, testable = false) + public static WebArchive createDeployment2() { WebArchive archive = ShrinkWrap.create(WebArchive.class,"jaxws-clientConfig.war"); archive .addManifest() @@ -104,7 +108,7 @@ @Test @RunAsClient - @OperateOnDeployment("jaxws-clientConfig-client") + @OperateOnDeployment("jaxws-clientConfig") public void testClientConfigurer() { if (isIntegrationCXF()) { assertTrue(getHelper().testClientConfigurer()); @@ -113,7 +117,7 @@ @Test @RunAsClient - @OperateOnDeployment("jaxws-clientConfig-inContainer-client") + @OperateOnDeployment(value = "jaxws-clientConfig-inContainer-client") public void testClientConfigurerInContainer() throws Exception { if (isIntegrationCXF()) { assertEquals("1", runTestInContainer("testClientConfigurer")); @@ -127,56 +131,56 @@ */ @Test @RunAsClient - @OperateOnDeployment("jaxws-clientConfig-inContainer-client") + @OperateOnDeployment("jaxws-clientConfig") public void testCustomClientConfigurationFromFile() throws Exception { assertTrue(getHelper().testCustomClientConfigurationFromFile()); } @Test @RunAsClient - @OperateOnDeployment("jaxws-clientConfig-client") + @OperateOnDeployment("jaxws-clientConfig") public void testCustomClientConfigurationOnDispatchFromFile() throws Exception { assertTrue(getHelper().testCustomClientConfigurationOnDispatchFromFile()); } @Test @RunAsClient - @OperateOnDeployment("jaxws-clientConfig-inContainer-client") + @OperateOnDeployment(value = "jaxws-clientConfig-inContainer-client") public void testCustomClientConfigurationFromFileInContainer() throws Exception { assertEquals("1", runTestInContainer("testCustomClientConfigurationFromFile")); } @Test @RunAsClient - @OperateOnDeployment("jaxws-clientConfig-inContainer-client") + @OperateOnDeployment(value = "jaxws-clientConfig-inContainer-client") public void testCustomClientConfigurationOnDispatchFromFileInContainer() throws Exception { assertEquals("1", runTestInContainer("testCustomClientConfigurationOnDispatchFromFile")); } @Test @RunAsClient - @OperateOnDeployment("jaxws-clientConfig-client") + @OperateOnDeployment("jaxws-clientConfig") public void testCustomClientConfigurationFromFileUsingFeature() throws Exception { assertTrue(getHelper().testCustomClientConfigurationFromFileUsingFeature()); } @Test @RunAsClient - @OperateOnDeployment("jaxws-clientConfig-inContainer-client") + @OperateOnDeployment("jaxws-clientConfig") public void testCustomClientConfigurationFromFileUsingFeatureOnDispatch() throws Exception { assertTrue(getHelper().testCustomClientConfigurationFromFileUsingFeatureOnDispatch()); } @Test @RunAsClient - @OperateOnDeployment("jaxws-clientConfig-inContainer-client") + @OperateOnDeployment(value = "jaxws-clientConfig-inContainer-client") public void testCustomClientConfigurationFromFileUsingFeatureInContainer() throws Exception { assertEquals("1", runTestInContainer("testCustomClientConfigurationFromFileUsingFeature")); } @Test @RunAsClient - @OperateOnDeployment("jaxws-clientConfig-inContainer-client") + @OperateOnDeployment(value = "jaxws-clientConfig-inContainer-client") public void testCustomClientConfigurationFromFileUsingFeatureOnDispatchInContainer() throws Exception { assertEquals("1", runTestInContainer("testCustomClientConfigurationFromFileUsingFeatureOnDispatch")); } @@ -188,7 +192,7 @@ */ @Test @RunAsClient - @OperateOnDeployment("jaxws-clientConfig-client") + @OperateOnDeployment("jaxws-clientConfig") public void testConfigurationChange() throws Exception { assertTrue(getHelper().testConfigurationChange()); } @@ -196,7 +200,7 @@ @Test @RunAsClient - @OperateOnDeployment("jaxws-clientConfig-client") + @OperateOnDeployment("jaxws-clientConfig") public void testConfigurationChangeOnDispatch() throws Exception { assertTrue(getHelper().testConfigurationChangeOnDispatch()); } @@ -215,12 +219,21 @@ assertEquals("1", runTestInContainer("testConfigurationChangeOnDispatch")); } - // ------------------------- + private URL createClientJar() throws Exception { + String clientJarName = "jaxws-clientConfig-client.jar"; + JavaArchive archive = ShrinkWrap.create(JavaArchive.class, clientJarName); + archive + .addManifest() + .addAsResource("org/jboss/test/ws/jaxws/clientConfig/jaxws-client-config.xml", "jaxws-client-config.xml") + .addAsManifestResource(new File(JBossWSTestHelper.getTestResourcesDir() + "/jaxws/clientConfig/META-INF/jaxws-client-config.xml"), "jaxws-client-config.xml"); + JBossWSTestHelper.writeToFile(archive); + return JBossWSTest.getArchiveURL(clientJarName); + } + private Helper getHelper() { Helper helper = new Helper(); - //helper.setTargetEndpoint(baseURL + "/EndpointImpl"); - helper.setTargetEndpoint("http://" + getServerHost() + ":8080/jaxws-clientConfig/EndpointImpl"); + helper.setTargetEndpoint(baseURL + "/EndpointImpl"); return helper; }

10 years, 8 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbossws-commits January 2015