From 7adc308d0bb5c9f9485558222420c08c9697dc61 Mon Sep 17 00:00:00 2001 From: vramik Date: Mon, 14 May 2018 11:06:14 +0200 Subject: [PATCH] WFARQ-44 switch order while StandaloneCommandBuilder is built --- .../managed/ManagedDomainDeployableContainer.java | 8 ++++---- .../container/managed/ManagedDeployableContainer.java | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/container-managed-domain/src/main/java/org/jboss/as/arquillian/container/domain/managed/ManagedDomainDeployableContainer.java b/container-managed-domain/src/main/java/org/jboss/as/arquillian/container/domain/managed/ManagedDomainDeployableContainer.java index ff43ede9..6c831bcc 100644 --- a/container-managed-domain/src/main/java/org/jboss/as/arquillian/container/domain/managed/ManagedDomainDeployableContainer.java +++ b/container-managed-domain/src/main/java/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/container-managed/src/main/java/org/jboss/as/arquillian/container/managed/ManagedDeployableContainer.java b/container-managed/src/main/java/org/jboss/as/arquillian/container/managed/ManagedDeployableContainer.java index 9ca8c6ba..3214df3a 100644 --- a/container-managed/src/main/java/org/jboss/as/arquillian/container/managed/ManagedDeployableContainer.java +++ b/container-managed/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