Author: alessio.soldano(a)jboss.com Date: 2012-01-25 06:04:21 -0500 (Wed, 25 Jan 2012) New Revision: 15516 Modified: shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java Log: [JBWS-3388] Use remoting-jmx on AS 7.1.0 Modified: shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java =================================================================== --- shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2012-01-25 08:59:35 UTC (rev 15515) +++ shared-testsuite/trunk/src/main/java/org/jboss/wsf/test/JBossWSTestHelper.java 2012-01-25 11:04:21 UTC (rev 15516) @@ -197,7 +197,7 @@ String integrationTarget = getIntegrationTarget(); if (integrationTarget.startsWith("jboss7")) { - server = getAS7ServerConnection(); + server = getAS7ServerConnection(integrationTarget); } else { @@ -207,10 +207,15 @@ return server; } - private static MBeanServerConnection getAS7ServerConnection() + private static MBeanServerConnection getAS7ServerConnection(String integrationTarget) { String host = getServerHost(); - String urlString = System.getProperty("jmx.service.url", "service:jmx:rmi:///jndi/rmi://" + host + ":" + 1090 + "/jmxrmi"); + String urlString; + if (integrationTarget.startsWith("jboss70")) { + urlString = System.getProperty("jmx.service.url", "service:jmx:rmi:///jndi/rmi://" + host + ":" + 1090 + "/jmxrmi"); + } else { + urlString = System.getProperty("jmx.service.url", "service:jmx:remoting-jmx://" + host + ":" + 9999); + } try { JMXServiceURL serviceURL = new JMXServiceURL(urlString); return JMXConnectorFactory.connect(serviceURL, null).getMBeanServerConnection();