Author: asoldano Date: 2014-02-17 08:50:15 -0500 (Mon, 17 Feb 2014) New Revision: 18380 Modified: stack/cxf/branches/jbossws-cxf-4.2.x/ stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java Log: Merged revisions 18378-18379 via svnmerge from https://svn.jboss.org/repos/jbossws/stack/cxf/trunk ....... r18378 | asoldano | 2014-02-17 14:34:56 +0100 (Mon, 17 Feb 2014) | 2 lines Use proper JMX management port on WFLY 8 ....... r18379 | asoldano | 2014-02-17 14:43:38 +0100 (Mon, 17 Feb 2014) | 2 lines Fixing previous commit ....... Property changes on: stack/cxf/branches/jbossws-cxf-4.2.x ___________________________________________________________________ Modified: svnmerge-integrated - /stack/cxf/trunk:1-18082,18093,18095-18103,18105-18116,18118-18156,18158-18163,18165,18167-18196,18198-18224,18227-18228,18230-18238,18242-18248,18251-18253,18255-18267,18269,18272-18273,18276,18282-18284,18287-18289,18293-18294,18297,18300-18303,18307-18308,18310,18313-18323,18325 + /stack/cxf/trunk:1-18082,18093,18095-18103,18105-18116,18118-18156,18158-18163,18165,18167-18196,18198-18224,18227-18228,18230-18238,18242-18248,18251-18253,18255-18267,18269,18272-18273,18276,18282-18284,18287-18289,18293-18294,18297,18300-18303,18307-18308,18310,18313-18323,18325,18378-18379 Modified: svn:mergeinfo - /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/branches/ropalka:16301-16305,16966-17008 /stack/cxf/branches/ropalka_JBWS-3550:16747-16757 /stack/cxf/trunk:18093,18095-18096,18154,18177-18185,18269,18272,18289,18325 + /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/branches/ropalka:16301-16305,16966-17008 /stack/cxf/branches/ropalka_JBWS-3550:16747-16757 /stack/cxf/trunk:18093,18095-18096,18154,18177-18185,18269,18272,18289,18325,18378-18379 Modified: stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java =================================================================== --- stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2014-02-17 13:43:38 UTC (rev 18379) +++ stack/cxf/branches/jbossws-cxf-4.2.x/modules/testsuite/test-utils/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2014-02-17 13:50:15 UTC (rev 18380) @@ -246,10 +246,14 @@ if (server == null) { String integrationTarget = getIntegrationTarget(); - if (integrationTarget.startsWith("jboss7") || integrationTarget.startsWith("wildfly8") || integrationTarget.startsWith("jboss8")) + if (integrationTarget.startsWith("jboss7")) { - server = getAS7ServerConnection(integrationTarget); + server = getServerConnection("service:jmx:remoting-jmx://" + getServerHost() + ":" + 9999); } + else if (integrationTarget.startsWith("wildfly8")) + { + server = getServerConnection("service:jmx:http-remoting-jmx://" + getServerHost() + ":" + 9990); + } else { throw new IllegalStateException("Unsupported target container: " + integrationTarget); @@ -260,9 +264,9 @@ return server; } - private static MBeanServerConnection getAS7ServerConnection(String integrationTarget) + private static MBeanServerConnection getServerConnection(String jmxServiceUrl) { - final String urlString = System.getProperty("jmx.service.url", "service:jmx:remoting-jmx://" + getServerHost() + ":" + 9999); + final String urlString = System.getProperty("jmx.service.url", jmxServiceUrl); JMXServiceURL serviceURL = null; JMXConnector connector = null; try