Merge pull request #144 from jamezp/WFARQ-44-2.0

WFARQ-44 switch order while StandaloneCommandBuilder is built
wildfly · Jun 29, 2018 · ba9b375 · ba9b375
2 parents 6e8e674 + 7adc308
commit ba9b375
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/...va/org/jboss/as/arquillian/container/domain/managed/ManagedDomainDeployableContainer.java b/...va/org/jboss/as/arquillian/container/domain/managed/ManagedDomainDeployableContainer.java
@@ -84,10 +84,6 @@ protected void startInternal() throws LifecycleException {
                         .setHostControllerJavaOptions(javaOpts);
             }
 
-            if (config.isSetupCleanServerBaseDir() || config.getCleanServerBaseDir() != null) {
-                setupCleanServerDirectories(commandBuilder, config.getCleanServerBaseDir());
-            }
-
             final String modulesPath = config.getModulePath();
             if (modulesPath != null && !modulesPath.isEmpty()) {
                 commandBuilder.addModuleDirs(modulesPath.split(Pattern.quote(File.pathSeparator)));
@@ -110,6 +106,10 @@ protected void startInternal() throws LifecycleException {
                 commandBuilder.addServerArguments(serverArgs.split("\\s+"));
             }
 
+            if (config.isSetupCleanServerBaseDir() || config.getCleanServerBaseDir() != null) {
+                setupCleanServerDirectories(commandBuilder, config.getCleanServerBaseDir());
+            }
+
             // Previous versions of arquillian set the jboss.home.dir property in the JVM properties.
             // Some tests may rely on this behavior, but could be considered to be removed as all the scripts add this
             // property after the modules path (-mp) has been defined. The command builder will set the property after

diff --git a/...d/src/main/java/org/jboss/as/arquillian/container/managed/ManagedDeployableContainer.java b/...d/src/main/java/org/jboss/as/arquillian/container/managed/ManagedDeployableContainer.java
@@ -107,11 +107,6 @@ protected void startInternal() throws LifecycleException {
                 commandBuilder.addJavaOption("-ea");
             }
 
-            // Create a clean server base to run the container; ARQ-638
-            if (config.isSetupCleanServerBaseDir() || config.getCleanServerBaseDir() != null) {
-                setupCleanServerDirectories(commandBuilder, config.getCleanServerBaseDir());
-            }
-
             if (config.isAdminOnly())
                 commandBuilder.setAdminOnly();
 
@@ -123,6 +118,11 @@ protected void startInternal() throws LifecycleException {
                 commandBuilder.setServerConfiguration(config.getServerConfig());
             }
 
+            // Create a clean server base to run the container; ARQ-638
+            if (config.isSetupCleanServerBaseDir() || config.getCleanServerBaseDir() != null) {
+                setupCleanServerDirectories(commandBuilder, config.getCleanServerBaseDir());
+            }
+
             // Previous versions of arquillian set the jboss.home.dir property in the JVM properties.
             // Some tests may rely on this behavior, but could be considered to be removed as all the scripts add this
             // property after the modules path (-mp) has been defined. The command builder will set the property after