[WFLY-9122] Fixed Dwm servers not in manual mode

wildfly · Mar 22, 2018 · a31a790 · a31a790
1 parent e3bd11e
commit a31a790
Show file tree

Hide file tree

Showing 6 changed files with 321 additions and 252 deletions.
diff --git a/testsuite/integration/manualmode/src/test/config/arq/arquillian.xml b/testsuite/integration/manualmode/src/test/config/arq/arquillian.xml
@@ -231,35 +231,35 @@
             </configuration>
         </container>
 
-        <container qualifier="dwm-container-0">
+        <container qualifier="dwm-container-manual-0" default="false" mode="manual">
             <configuration>
-                <property name="jbossHome">${basedir}/target/jbossas-dwm-0</property>
+                <property name="jbossHome">${basedir}/target/jbossas-dwm-manual-0</property>
                 <!-- AS7-2493 different jboss.node.name must be specified -->
-                <property name="javaVmArguments">${server.jvm.args} -Djboss.inst=${basedir}/target/jbossas-dwm-0 -Djboss.node.name=node-0 -Djboss.socket.binding.port-offset=200</property>
+                <property name="javaVmArguments">${server.jvm.args} -Djboss.inst=${basedir}/target/jbossas-dwm-manual-0 -Djboss.node.name=node-0</property>
                 <property name="serverConfig">${jboss.server.config.file.name:standalone-ha.xml}</property>
                 <property name="jbossArguments">${jboss.args}</property>
                 <property name="allowConnectingToRunningServer">true</property>
                 <property name="managementAddress">${node0:127.0.0.1}</property>
-                <property name="managementPort">${as.managementPort:10190}</property>
+                <property name="managementPort">${as.managementPort:9990}</property>
 
                 <!-- AS7-4070 -->
-                <property name="waitForPorts">${as.debug.port:8987} ${as.managementPort:10190}</property>
+                <property name="waitForPorts">${as.debug.port:8787} ${as.managementPort:9990}</property>
                 <property name="waitForPortsTimeoutInSeconds">8</property>
             </configuration>
         </container>
 
-        <container qualifier="dwm-container-1">
+        <container qualifier="dwm-container-manual-1" default="false" mode="manual">
             <configuration>
-                <property name="jbossHome">${basedir}/target/jbossas-dwm-1</property>
-                <property name="javaVmArguments">${server.jvm.args} -Djboss.inst=${basedir}/target/jbossas-dwm-1 -Djboss.node.name=node-1 -Djboss.socket.binding.port-offset=300</property>
+                <property name="jbossHome">${basedir}/target/jbossas-dwm-manual-1</property>
+                <property name="javaVmArguments">${server.jvm.args} -Djboss.inst=${basedir}/target/jbossas-dwm-manual-1 -Djboss.node.name=node-1 -Djboss.socket.binding.port-offset=100</property>
                 <property name="serverConfig">${jboss.server.config.file.name:standalone-ha.xml}</property>
                 <property name="jbossArguments">-b=${node1} -bmanagement=${node1} -bprivate=${node1} -bunsecure=${node1} ${jboss.args}</property>
                 <property name="allowConnectingToRunningServer">true</property>
                 <property name="managementAddress">${node1:127.0.0.1}</property>
-                <property name="managementPort">${as.managementPort.node1:10290}</property>
+                <property name="managementPort">${as.managementPort.node1:10090}</property>
 
                 <!-- AS7-4070 -->
-                <property name="waitForPorts">${as.debug.port.node1:9087} ${as.managementPort.node1:10290}</property>
+                <property name="waitForPorts">${as.debug.port.node1:8887} ${as.managementPort.node1:10090}</property>
                 <property name="waitForPortsTimeoutInSeconds">8</property>
             </configuration>
         </container>