Author: asoldano Date: 2015-03-09 10:16:20 -0400 (Mon, 09 Mar 2015) New Revision: 19537 Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/etc/arquillian.xml stack/cxf/trunk/modules/testsuite/shared-tests/src/test/etc/arquillian.xml Log: [JBWS-3668] fix arquillian.xml in shared and spring testsuites to allow -Djboss.bind.address usage Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/etc/arquillian.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/etc/arquillian.xml 2015-03-09 08:50:21 UTC (rev 19536) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/etc/arquillian.xml 2015-03-09 14:16:20 UTC (rev 19537) @@ -6,9 +6,11 @@ <container qualifier="jboss" default="true"> <configuration> <property name="jbossHome">${jboss.home}</property> - <property name="javaVmArguments">-server -XX:+UseCompressedOops -Xms64m -Xmx512m -XX:MaxPermSize=256m -Djboss.socket.binding.port-offset=${port-offset.cxf-spring-tests.jboss} -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.cxf-spring-tests.jboss} ${additionalJvmArgs}</property> <property name="serverConfig">jbws-testsuite-spring-default.xml</property> <property name="allowConnectingToRunningServer">true</property> + <property name="managementAddress">${jboss.bind.address:localhost}</property> + <property name="jbossArguments">${jbossArguments}</property> <property name="managementPort">${add_int(port-offset.cxf-spring-tests.jboss,9990)}</property> <!-- AS7-4070 --> <property name="waitForPorts">${add_int(port-offset.cxf-spring-tests.jboss,8787)} ${add_int(port-offset.cxf-spring-tests.jboss,9990)}</property> Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/etc/arquillian.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/etc/arquillian.xml 2015-03-09 08:50:21 UTC (rev 19536) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/etc/arquillian.xml 2015-03-09 14:16:20 UTC (rev 19537) @@ -6,9 +6,11 @@ <container qualifier="jboss" default="true"> <configuration> <property name="jbossHome">${jboss.home}</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="javaVmArguments">-server -XX:+UseCompressedOops -Xms64m -Xmx512m -XX:MaxPermSize=256m -Djboss.socket.binding.port-offset=${port-offset.shared-tests.jboss} ${additionalJvmArgs}</property> <property name="serverConfig">jbws-testsuite-shared-default.xml</property> <property name="allowConnectingToRunningServer">true</property> + <property name="managementAddress">${jboss.bind.address:localhost}</property> + <property name="jbossArguments">${jbossArguments}</property> <property name="managementPort">${add_int(port-offset.shared-tests.jboss,9990)}</property> <!-- AS7-4070 --> <property name="waitForPorts">${add_int(port-offset.shared-tests.jboss,8787)} ${add_int(port-offset.shared-tests.jboss,9990)}</property> @@ -18,9 +20,11 @@ <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=${port-offset.shared-tests.default-config-tests} -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} ${additionalJvmArgs}</property> <property name="serverConfig">jbws-testsuite-shared-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">${add_int(port-offset.shared-tests.default-config-tests,9990)}</property> <!-- AS7-4070 --> <property name="waitForPorts">${add_int(port-offset.shared-tests.default-config-tests,8787)} ${add_int(port-offset.shared-tests.default-config-tests,9990)}</property> @@ -30,9 +34,11 @@ <container qualifier="address-rewrite" mode="manual"> <configuration> <property name="jbossHome">${jboss.home}</property> - <property name="javaVmArguments">-server -XX:+UseCompressedOops -Xms32m -Xmx256m -XX:MaxPermSize=96m -Djboss.socket.binding.port-offset=${port-offset.shared-tests.address-rewrite} -Djavax.wsdl.factory.WSDLFactory=com.ibm.wsdl.factory.WSDLFactoryImpl</property> + <property name="javaVmArguments">-server -XX:+UseCompressedOops -Xms32m -Xmx256m -XX:MaxPermSize=96m -Djboss.socket.binding.port-offset=${port-offset.shared-tests.address-rewrite} ${additionalJvmArgs}</property> <property name="serverConfig">jbws-testsuite-shared-address-rewrite.xml</property> <property name="allowConnectingToRunningServer">true</property> + <property name="managementAddress">${jboss.bind.address:localhost}</property> + <property name="jbossArguments">${jbossArguments}</property> <property name="managementPort">${add_int(port-offset.shared-tests.address-rewrite,9990)}</property> <!-- AS7-4070 --> <property name="waitForPorts">${add_int(port-offset.shared-tests.address-rewrite,8787)} ${add_int(port-offset.shared-tests.address-rewrite,9990)}</property>