This is an automated email from the ASF dual-hosted git repository.
clebertsuconic pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/activemq-artemis.git
The following commit(s) were added to refs/heads/main by this push:
new 02e0b14dfd ARTEMIS-5118 Expose HelperCreate on the CLI Jar
02e0b14dfd is described below
commit 02e0b14dfd434ea86a8bdb5c7081fd45e80336ec
Author: Clebert Suconic <[email protected]>
AuthorDate: Mon Oct 21 10:36:49 2024 -0400
ARTEMIS-5118 Expose HelperCreate on the CLI Jar
---
.../activemq/artemis/cli/commands}/helper/HelperBase.java | 10 +++++-----
.../activemq/artemis/cli/commands}/helper/HelperCreate.java | 10 +++++-----
.../org/apache/activemq/artemis/utils/RealServerTestBase.java | 7 +++++++
.../tests/compatibility/distribution/RollingUpgradeTest.java | 8 ++++----
.../tests/smoke/bridgeTransfer/BridgeTransferingTest.java | 6 +++---
.../brokerConnection/BrokerConnectionBridgeSecurityTest.java | 6 +++---
.../brokerConnection/BrokerConnectionMirrorSecurityTest.java | 6 +++---
.../tests/smoke/brokerConnection/DivertQueueMirrorTest.java | 4 ++--
.../tests/smoke/brokerConnection/DualFederationTest.java | 6 +++---
.../smoke/brokerConnection/DualMirrorNoContainerTest.java | 6 +++---
.../smoke/brokerConnection/MirrorInfiniteRetryReplicaTest.java | 6 +++---
.../tests/smoke/brokerConnection/MirroredSubscriptionTest.java | 6 +++---
.../tests/smoke/brokerConnection/PagedMirrorSmokeTest.java | 6 +++---
.../activemq/artemis/tests/smoke/checkTest/CheckTest.java | 6 +++---
.../smoke/clusteredLargeMessage/ClusteredLargeMessageTest.java | 6 +++---
.../artemis/tests/smoke/console/ConsoleMutualSSLTest.java | 4 ++--
.../tests/smoke/crossprotocol/MultiThreadConvertTest.java | 4 ++--
.../activemq/artemis/tests/smoke/custometc/CustomETCTest.java | 4 ++--
.../activemq/artemis/tests/smoke/expire/TestSimpleExpire.java | 4 ++--
.../tests/smoke/infinite/InfiniteRedeliverySmokeTest.java | 4 ++--
.../artemis/tests/smoke/jdbccli/JDBCExportWrongUserTest.java | 4 ++--
.../activemq/artemis/tests/smoke/jmx/JmxConnectionTest.java | 4 ++--
.../artemis/tests/smoke/jmx2/JmxServerControlTest.java | 4 ++--
.../artemis/tests/smoke/jmxfailback/JmxFailbackTest.java | 6 +++---
.../jmxmultiplefailback/ReplicatedMultipleFailbackTest.java | 10 +++++-----
.../artemis/tests/smoke/jmxrbac/JmxRBACBrokerSecurityTest.java | 4 ++--
.../activemq/artemis/tests/smoke/jmxrbac/JmxRBACTest.java | 4 ++--
.../tests/smoke/lockmanager/LockManagerSinglePairTest.java | 4 ++--
.../artemis/tests/smoke/logging/AuditLoggerTestBase.java | 4 ++--
.../artemis/tests/smoke/maxConsumers/MaxConsumersTest.java | 4 ++--
.../apache/activemq/artemis/tests/smoke/mqtt/MQTTLeakTest.java | 4 ++--
.../artemis/tests/smoke/nettynative/NettyNativeTest.java | 4 ++--
.../tests/smoke/paging/FloodServerWithAsyncSendTest.java | 4 ++--
.../artemis/tests/smoke/paging/SmokeMaxMessagePagingTest.java | 6 +++---
.../activemq/artemis/tests/smoke/paging/SmokePagingTest.java | 4 ++--
.../artemis/tests/smoke/resourcetest/MaxQueueResourceTest.java | 4 ++--
.../activemq/artemis/tests/smoke/retention/ReplayTest.java | 4 ++--
.../artemis/tests/smoke/topologycheck/TopologyCheckTest.java | 4 ++--
.../activemq/artemis/tests/smoke/transfer/TransferTest.java | 6 +++---
.../brokerConnection/mirror/AccumulatedInPageSoakTest.java | 4 ++--
.../soak/brokerConnection/mirror/ClusteredMirrorSoakTest.java | 4 ++--
.../soak/brokerConnection/mirror/DivertSoakMirrorTest.java | 4 ++--
.../tests/soak/brokerConnection/mirror/IdempotentACKTest.java | 4 ++--
.../brokerConnection/mirror/InterruptedLargeMessageTest.java | 4 ++--
.../soak/brokerConnection/mirror/MultiMirrorSoakTest.java | 4 ++--
.../tests/soak/brokerConnection/mirror/PagedSNFSoakTest.java | 4 ++--
.../brokerConnection/mirror/ReplicatedBothNodesMirrorTest.java | 6 +++---
.../brokerConnection/mirror/ReplicatedMirrorTargetTest.java | 6 +++---
.../soak/brokerConnection/mirror/SingleMirrorSoakTest.java | 4 ++--
.../tests/soak/brokerConnection/sender/SenderSoakTest.java | 4 ++--
.../tests/soak/clientFailure/ClientFailureSoakTest.java | 4 ++--
.../ClusterNotificationsContinuityTest.java | 4 ++--
.../tests/soak/interrupt/JournalFlushInterruptTest.java | 4 ++--
.../soak/interruptlm/ClusteredLargeMessageInterruptTest.java | 6 +++---
.../tests/soak/interruptlm/LargeMessageInterruptTest.java | 4 ++--
.../apache/activemq/artemis/tests/soak/mqtt/MQTT5SoakTest.java | 4 ++--
.../apache/activemq/artemis/tests/soak/owleak/OWLeakTest.java | 4 ++--
.../artemis/tests/soak/paging/FlowControlPagingTest.java | 4 ++--
.../artemis/tests/soak/paging/HorizontalPagingTest.java | 4 ++--
.../artemis/tests/soak/paging/M_and_M_FactoryTest.java | 4 ++--
.../artemis/tests/soak/paging/SubscriptionPagingTest.java | 4 ++--
.../artemis/tests/soak/paging/ValidateExportSpeedTest.java | 4 ++--
.../artemis/tests/soak/replicaTxCheck/ReplicaTXCheckTest.java | 4 ++--
.../tests/soak/replicationflow/ReplicationFlowControlTest.java | 6 +++---
.../tests/soak/replicationflow/SoakReplicatedPagingTest.java | 6 +++---
.../tests/soak/retention/LargeMessageRetentionTest.java | 4 ++--
.../activemq/artemis/tests/soak/stomp/StompSoakTest.java | 4 ++--
67 files changed, 168 insertions(+), 161 deletions(-)
diff --git
a/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/utils/cli/helper/HelperBase.java
b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/helper/HelperBase.java
similarity index 92%
rename from
tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/utils/cli/helper/HelperBase.java
rename to
artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/helper/HelperBase.java
index 8444ff5456..0fe2b91f27 100644
---
a/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/utils/cli/helper/HelperBase.java
+++
b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/helper/HelperBase.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.activemq.artemis.utils.cli.helper;
+package org.apache.activemq.artemis.cli.commands.helper;
import java.io.File;
import java.lang.invoke.MethodHandles;
@@ -27,8 +27,6 @@ public class HelperBase {
private static final Logger logger =
LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
- public static final String ARTEMIS_HOME_PROPERTY =
"artemis.distribution.output";
-
File artemisHome;
File artemisInstance;
@@ -37,10 +35,12 @@ public class HelperBase {
logger.debug("using artemisHome as {}", artemisHome);
}
- public static File getHome() {
- return getHome(ARTEMIS_HOME_PROPERTY);
+ HelperBase(File artemisHome) {
+ setArtemisHome(artemisHome);
+ logger.debug("using artemisHome as {}", artemisHome);
}
+
public static File getHome(String homeProperty) {
String valueHome = System.getProperty(homeProperty);
if (valueHome == null) {
diff --git
a/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/utils/cli/helper/HelperCreate.java
b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/helper/HelperCreate.java
similarity index 98%
rename from
tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/utils/cli/helper/HelperCreate.java
rename to
artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/helper/HelperCreate.java
index 293138e186..23501f233f 100644
---
a/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/utils/cli/helper/HelperCreate.java
+++
b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/helper/HelperCreate.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.activemq.artemis.utils.cli.helper;
+package org.apache.activemq.artemis.cli.commands.helper;
import java.io.File;
import java.io.IOException;
@@ -36,14 +36,14 @@ import org.slf4j.LoggerFactory;
* You may use by creating a new instance, filling the properties, and
calling the method create */
public class HelperCreate extends HelperBase {
- public HelperCreate() {
- super(ARTEMIS_HOME_PROPERTY);
- }
-
public HelperCreate(String homeProperty) {
super(homeProperty);
}
+ public HelperCreate(File artemisHome) {
+ super(artemisHome);
+ }
+
private static final Logger logger =
LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
private File configuration;
diff --git
a/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/utils/RealServerTestBase.java
b/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/utils/RealServerTestBase.java
index b7d2f46373..e8aea1aa99 100644
---
a/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/utils/RealServerTestBase.java
+++
b/tests/artemis-test-support/src/main/java/org/apache/activemq/artemis/utils/RealServerTestBase.java
@@ -46,6 +46,7 @@ import
org.apache.activemq.artemis.api.core.management.ObjectNameBuilder;
import org.apache.activemq.artemis.api.core.management.QueueControl;
import org.apache.activemq.artemis.api.core.management.SimpleManagement;
import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
+import org.apache.activemq.artemis.cli.commands.helper.HelperCreate;
import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
import org.apache.activemq.artemis.tests.util.ActiveMQTestBase;
import org.apache.activemq.artemis.util.ServerUtil;
@@ -65,6 +66,12 @@ public class RealServerTestBase extends ActiveMQTestBase {
public static final String basedir = System.getProperty("basedir");
+ public static final String ARTEMIS_HOME_PROPERTY =
"artemis.distribution.output";
+
+ public static HelperCreate helperCreate() {
+ return new HelperCreate(ARTEMIS_HOME_PROPERTY);
+ }
+
@AfterEach
public void after() throws Exception {
// close ServerLocators before killing the server otherwise they'll hang
and delay test termination
diff --git
a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/distribution/RollingUpgradeTest.java
b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/distribution/RollingUpgradeTest.java
index 47928af181..cb5ff18e43 100644
---
a/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/distribution/RollingUpgradeTest.java
+++
b/tests/compatibility-tests/src/test/java/org/apache/activemq/artemis/tests/compatibility/distribution/RollingUpgradeTest.java
@@ -37,7 +37,7 @@ import org.apache.activemq.artemis.utils.RealServerTestBase;
import org.apache.activemq.artemis.utils.SpawnedVMSupport;
import org.apache.activemq.artemis.utils.TestParameters;
import org.apache.activemq.artemis.utils.Wait;
-import org.apache.activemq.artemis.utils.cli.helper.HelperBase;
+import org.apache.activemq.artemis.cli.commands.helper.HelperBase;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -184,12 +184,12 @@ public class RollingUpgradeTest extends
RealServerTestBase {
@Test
public void testRollUpgrade_2_30() throws Exception {
- testRollUpgrade(new File(TWO_THIRTY), HelperBase.getHome());
+ testRollUpgrade(new File(TWO_THIRTY),
HelperBase.getHome(ARTEMIS_HOME_PROPERTY));
}
@Test
public void testRollUpgrade_2_36() throws Exception {
- testRollUpgrade(new File(TWO_THIRTY_SIX), HelperBase.getHome());
+ testRollUpgrade(new File(TWO_THIRTY_SIX),
HelperBase.getHome(ARTEMIS_HOME_PROPERTY));
}
// Define a System Property TEST_ROLLED_DISTRIBUTION towards the Artemis
Home of your choice and this will
@@ -200,7 +200,7 @@ public class RollingUpgradeTest extends RealServerTestBase {
String distribution = TestParameters.testProperty("ROLLED",
"DISTRIBUTION", null);
assumeTrue(distribution != null);
- String distributionUpgrading = TestParameters.testProperty("ROLLED",
"DISTRIBUTION_UPGRADE", HelperBase.getHome().getAbsolutePath());
+ String distributionUpgrading = TestParameters.testProperty("ROLLED",
"DISTRIBUTION_UPGRADE",
HelperBase.getHome(ARTEMIS_HOME_PROPERTY).getAbsolutePath());
testRollUpgrade(new File(distribution), new
File(distributionUpgrading));
}
diff --git
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/bridgeTransfer/BridgeTransferingTest.java
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/bridgeTransfer/BridgeTransferingTest.java
index b75590c421..dfca8d5611 100644
---
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/bridgeTransfer/BridgeTransferingTest.java
+++
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/bridgeTransfer/BridgeTransferingTest.java
@@ -38,7 +38,7 @@ import
org.apache.activemq.artemis.tests.extensions.parameterized.Parameters;
import org.apache.activemq.artemis.tests.smoke.common.SmokeTestBase;
import org.apache.activemq.artemis.tests.util.CFUtil;
import org.apache.activemq.artemis.utils.Wait;
-import org.apache.activemq.artemis.utils.cli.helper.HelperCreate;
+import org.apache.activemq.artemis.cli.commands.helper.HelperCreate;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
@@ -61,13 +61,13 @@ public class BridgeTransferingTest extends SmokeTestBase {
deleteDirectory(server0Location);
if (!server0Location.exists()) {
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setRole("amq").setUser("artemis").setPassword("artemis").setNoWeb(true).setConfiguration("./src/main/resources/servers/bridgeTransfer/serverA").setArtemisInstance(server0Location);
cliCreateServer.createServer();
}
if (!server1Location.exists()) {
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setRole("amq").setUser("artemis").setPassword("artemis").setNoWeb(true).setConfiguration("./src/main/resources/servers/bridgeTransfer/serverB").setArtemisInstance(server1Location);
cliCreateServer.createServer();
}
diff --git
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/BrokerConnectionBridgeSecurityTest.java
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/BrokerConnectionBridgeSecurityTest.java
index d7554a0c97..4cebfa8af0 100644
---
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/BrokerConnectionBridgeSecurityTest.java
+++
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/BrokerConnectionBridgeSecurityTest.java
@@ -33,7 +33,7 @@ import java.io.File;
import org.apache.activemq.artemis.tests.smoke.common.SmokeTestBase;
import org.apache.activemq.artemis.util.ServerUtil;
-import org.apache.activemq.artemis.utils.cli.helper.HelperCreate;
+import org.apache.activemq.artemis.cli.commands.helper.HelperCreate;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -51,13 +51,13 @@ public class BrokerConnectionBridgeSecurityTest extends
SmokeTestBase {
{
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setAllowAnonymous(false).setUser("A").setPassword("A").setNoWeb(true).setConfiguration("./src/main/resources/servers/brokerConnect/bridgeSecurityA").setArtemisInstance(server0Location);
cliCreateServer.createServer();
}
{
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setAllowAnonymous(false).setUser("A").setPassword("A").setNoWeb(true).setConfiguration("./src/main/resources/servers/brokerConnect/bridgeSecurityB").setArtemisInstance(server1Location);
cliCreateServer.createServer();
}
diff --git
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/BrokerConnectionMirrorSecurityTest.java
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/BrokerConnectionMirrorSecurityTest.java
index 31e91adb78..63104ea52b 100644
---
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/BrokerConnectionMirrorSecurityTest.java
+++
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/BrokerConnectionMirrorSecurityTest.java
@@ -33,7 +33,7 @@ import java.io.File;
import org.apache.activemq.artemis.tests.smoke.common.SmokeTestBase;
import org.apache.activemq.artemis.tests.util.CFUtil;
import org.apache.activemq.artemis.util.ServerUtil;
-import org.apache.activemq.artemis.utils.cli.helper.HelperCreate;
+import org.apache.activemq.artemis.cli.commands.helper.HelperCreate;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -52,13 +52,13 @@ public class BrokerConnectionMirrorSecurityTest extends
SmokeTestBase {
deleteDirectory(server0Location);
{
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setAllowAnonymous(false).setUser("A").setPassword("A").setNoWeb(true).setConfiguration("./src/main/resources/servers/brokerConnect/mirrorSecurityA").setArtemisInstance(server0Location);
cliCreateServer.createServer();
}
{
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setAllowAnonymous(false).setUser("B").setPassword("B").setNoWeb(true).setPortOffset(1).setConfiguration("./src/main/resources/servers/brokerConnect/mirrorSecurityB").setArtemisInstance(server1Location);
cliCreateServer.createServer();
}
diff --git
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/DivertQueueMirrorTest.java
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/DivertQueueMirrorTest.java
index e966980aec..9cadc608aa 100644
---
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/DivertQueueMirrorTest.java
+++
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/DivertQueueMirrorTest.java
@@ -36,7 +36,7 @@ import
org.apache.activemq.artemis.tests.smoke.common.SmokeTestBase;
import org.apache.activemq.artemis.tests.util.CFUtil;
import org.apache.activemq.artemis.util.ServerUtil;
import org.apache.activemq.artemis.utils.Wait;
-import org.apache.activemq.artemis.utils.cli.helper.HelperCreate;
+import org.apache.activemq.artemis.cli.commands.helper.HelperCreate;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
@@ -79,7 +79,7 @@ public class DivertQueueMirrorTest extends SmokeTestBase {
File serverLocation = getFileServerLocation(serverName);
deleteDirectory(serverLocation);
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setAllowAnonymous(true).setNoWeb(true).setArtemisInstance(serverLocation);
cliCreateServer.setMessageLoadBalancing("ON_DEMAND");
cliCreateServer.setClustered(false);
diff --git
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/DualFederationTest.java
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/DualFederationTest.java
index 4cbb27f163..502efd03ff 100644
---
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/DualFederationTest.java
+++
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/DualFederationTest.java
@@ -33,7 +33,7 @@ import java.io.File;
import org.apache.activemq.artemis.tests.smoke.common.SmokeTestBase;
import org.apache.activemq.artemis.tests.util.CFUtil;
import org.apache.activemq.artemis.util.ServerUtil;
-import org.apache.activemq.artemis.utils.cli.helper.HelperCreate;
+import org.apache.activemq.artemis.cli.commands.helper.HelperCreate;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -52,13 +52,13 @@ public class DualFederationTest extends SmokeTestBase {
deleteDirectory(server0Location);
{
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setAllowAnonymous(true).setUser("A").setPassword("A").setRole("amq").setNoWeb(true).setConfiguration("./src/main/resources/servers/brokerConnect/federationA").setArtemisInstance(server0Location);
cliCreateServer.createServer();
}
{
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setAllowAnonymous(true).setUser("B").setPassword("B").setRole("amq").setNoWeb(true).setPortOffset(1).setConfiguration("./src/main/resources/servers/brokerConnect/federationB").setArtemisInstance(server1Location);
cliCreateServer.createServer();
}
diff --git
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/DualMirrorNoContainerTest.java
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/DualMirrorNoContainerTest.java
index e342119a1b..221f5c92aa 100644
---
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/DualMirrorNoContainerTest.java
+++
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/DualMirrorNoContainerTest.java
@@ -36,11 +36,11 @@ import java.io.File;
import java.io.FileOutputStream;
import java.io.PrintStream;
+import org.apache.activemq.artemis.cli.commands.helper.HelperCreate;
import org.apache.activemq.artemis.cli.commands.tools.PrintData;
import org.apache.activemq.artemis.tests.smoke.common.SmokeTestBase;
import org.apache.activemq.artemis.tests.util.CFUtil;
import org.apache.activemq.artemis.util.ServerUtil;
-import org.apache.activemq.artemis.utils.cli.helper.HelperCreate;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -65,13 +65,13 @@ public class DualMirrorNoContainerTest extends
SmokeTestBase {
deleteDirectory(server0Location);
{
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setAllowAnonymous(false).setUser("A").setPassword("A").setNoWeb(true).setConfiguration("./src/main/resources/servers/brokerConnect/mirrorSecurityA").setArtemisInstance(server0Location);
cliCreateServer.createServer();
}
{
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setAllowAnonymous(false).setUser("B").setPassword("B").setNoWeb(true).setPortOffset(1).setConfiguration("./src/main/resources/servers/brokerConnect/mirrorSecurityB").setArtemisInstance(server1Location);
cliCreateServer.createServer();
}
diff --git
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/MirrorInfiniteRetryReplicaTest.java
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/MirrorInfiniteRetryReplicaTest.java
index 6025fc679a..7a18f8685f 100644
---
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/MirrorInfiniteRetryReplicaTest.java
+++
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/MirrorInfiniteRetryReplicaTest.java
@@ -35,7 +35,7 @@ import org.apache.activemq.artemis.tests.util.CFUtil;
import org.apache.activemq.artemis.util.ServerUtil;
import org.apache.activemq.artemis.utils.FileUtil;
import org.apache.activemq.artemis.utils.Wait;
-import org.apache.activemq.artemis.utils.cli.helper.HelperCreate;
+import org.apache.activemq.artemis.cli.commands.helper.HelperCreate;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
@@ -110,7 +110,7 @@ public class MirrorInfiniteRetryReplicaTest extends
SmokeTestBase {
File serverLocation = getFileServerLocation(serverName);
deleteDirectory(serverLocation);
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setAllowAnonymous(true).setArtemisInstance(serverLocation);
cliCreateServer.setNoWeb(true);
cliCreateServer.setArgs("--no-stomp-acceptor", "--no-hornetq-acceptor",
"--no-mqtt-acceptor", "--no-amqp-acceptor", "--max-hops", "1", "--name",
DC1_NODE);
@@ -174,7 +174,7 @@ public class MirrorInfiniteRetryReplicaTest extends
SmokeTestBase {
File serverLocation = getFileServerLocation(serverName);
deleteDirectory(serverLocation);
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setAllowAnonymous(true).setArtemisInstance(serverLocation);
cliCreateServer.setMessageLoadBalancing("ON_DEMAND");
cliCreateServer.setArgs("--no-stomp-acceptor", "--no-hornetq-acceptor",
"--no-mqtt-acceptor", "--no-amqp-acceptor", "--max-hops", "1", "--name",
DC1_NODE);
diff --git
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/MirroredSubscriptionTest.java
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/MirroredSubscriptionTest.java
index f607ba8f7f..4186c9a96d 100644
---
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/MirroredSubscriptionTest.java
+++
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/MirroredSubscriptionTest.java
@@ -42,7 +42,7 @@ import
org.apache.activemq.artemis.tests.smoke.common.SmokeTestBase;
import org.apache.activemq.artemis.tests.util.CFUtil;
import org.apache.activemq.artemis.util.ServerUtil;
import org.apache.activemq.artemis.utils.Wait;
-import org.apache.activemq.artemis.utils.cli.helper.HelperCreate;
+import org.apache.activemq.artemis.cli.commands.helper.HelperCreate;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -64,13 +64,13 @@ public class MirroredSubscriptionTest extends SmokeTestBase
{
deleteDirectory(server0Location);
{
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setAllowAnonymous(true).setRole("amq").setUser("admin").setPassword("admin").setNoWeb(true).setConfiguration("./src/main/resources/servers/mirrored-subscriptions/broker1").setArtemisInstance(server0Location);
cliCreateServer.createServer();
}
{
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setAllowAnonymous(true).setRole("amq").setUser("admin").setPassword("admin").setNoWeb(true).setConfiguration("./src/main/resources/servers/mirrored-subscriptions/broker2").setArtemisInstance(server1Location);
cliCreateServer.createServer();
}
diff --git
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/PagedMirrorSmokeTest.java
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/PagedMirrorSmokeTest.java
index 15e7d55f4b..8fa67b4601 100644
---
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/PagedMirrorSmokeTest.java
+++
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/brokerConnection/PagedMirrorSmokeTest.java
@@ -35,7 +35,7 @@ import
org.apache.activemq.artemis.tests.smoke.common.SmokeTestBase;
import org.apache.activemq.artemis.tests.util.CFUtil;
import org.apache.activemq.artemis.utils.Wait;
import org.apache.activemq.artemis.util.ServerUtil;
-import org.apache.activemq.artemis.utils.cli.helper.HelperCreate;
+import org.apache.activemq.artemis.cli.commands.helper.HelperCreate;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -61,13 +61,13 @@ public class PagedMirrorSmokeTest extends SmokeTestBase {
deleteDirectory(server0Location);
if (!server0Location.exists()) {
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setAllowAnonymous(true).setRole("amq").setUser("artemis").setPassword("artemis").setNoWeb(true).setConfiguration("./src/main/resources/servers/brokerConnect/pagedA").setArtemisInstance(server0Location);
cliCreateServer.createServer();
}
if (!server1Location.exists()) {
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setAllowAnonymous(true).setRole("amq").setUser("artemis").setPassword("artemis").setNoWeb(true).setConfiguration("./src/main/resources/servers/brokerConnect/pagedB").setArtemisInstance(server1Location);
cliCreateServer.createServer();
}
diff --git
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/checkTest/CheckTest.java
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/checkTest/CheckTest.java
index 0d4f45bac5..00d3653592 100644
---
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/checkTest/CheckTest.java
+++
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/checkTest/CheckTest.java
@@ -46,7 +46,7 @@ import org.apache.activemq.artemis.tests.util.CFUtil;
import org.apache.activemq.artemis.util.ServerUtil;
import org.apache.activemq.artemis.utils.RandomUtil;
import org.apache.activemq.artemis.utils.Wait;
-import org.apache.activemq.artemis.utils.cli.helper.HelperCreate;
+import org.apache.activemq.artemis.cli.commands.helper.HelperCreate;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -72,13 +72,13 @@ public class CheckTest extends SmokeTestBase {
deleteDirectory(server0Location);
{
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setSharedStore(true).setBackup(false).setSharedStore(true).setDataFolder("./target/check-test/data").setFailoverOnShutdown(true).setStaticCluster("tcp://localhost:61716").setArtemisInstance(server0Location);
cliCreateServer.createServer();
}
{
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setSharedStore(true).setBackup(true).setSharedStore(true).setDataFolder("./target/check-test/data").setFailoverOnShutdown(true).setStaticCluster("tcp://localhost:61616").setPortOffset(100).setArtemisInstance(server1Location);
cliCreateServer.createServer();
}
diff --git
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/clusteredLargeMessage/ClusteredLargeMessageTest.java
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/clusteredLargeMessage/ClusteredLargeMessageTest.java
index 56e4f4a050..271f0daf5c 100644
---
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/clusteredLargeMessage/ClusteredLargeMessageTest.java
+++
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/clusteredLargeMessage/ClusteredLargeMessageTest.java
@@ -35,7 +35,7 @@ import
org.apache.activemq.artemis.tests.smoke.common.SmokeTestBase;
import org.apache.activemq.artemis.tests.util.CFUtil;
import org.apache.activemq.artemis.util.ServerUtil;
import org.apache.activemq.artemis.utils.Wait;
-import org.apache.activemq.artemis.utils.cli.helper.HelperCreate;
+import org.apache.activemq.artemis.cli.commands.helper.HelperCreate;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -51,14 +51,14 @@ public class ClusteredLargeMessageTest extends
SmokeTestBase {
deleteDirectory(server0Location);
{
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setRole("amq").setUser("artemis").setPassword("artemis").setAllowAnonymous(true).setNoWeb(true).
setArtemisInstance(server0Location).setClustered(true).
setStaticCluster("tcp://localhost:61716").setArgs("--name",
"cluster1", "--max-hops", "1", "--queues", "testQueue");
cliCreateServer.createServer();
}
{
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setRole("amq").setUser("artemis").setPassword("artemis").setAllowAnonymous(true).setNoWeb(true).setPortOffset(100).
setArtemisInstance(server1Location).setClustered(true).
setStaticCluster("tcp://localhost:61616").setArgs("--name",
"cluster2", "--max-hops", "1", "--queues", "testQueue");
diff --git
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/console/ConsoleMutualSSLTest.java
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/console/ConsoleMutualSSLTest.java
index c28662d550..bf140b0308 100644
---
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/console/ConsoleMutualSSLTest.java
+++
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/console/ConsoleMutualSSLTest.java
@@ -20,7 +20,7 @@ import
com.github.dockerjava.zerodep.shaded.org.apache.hc.core5.ssl.SSLContexts;
import org.apache.activemq.artemis.tests.smoke.common.SmokeTestBase;
import org.apache.activemq.artemis.util.ServerUtil;
import org.apache.activemq.artemis.utils.Wait;
-import org.apache.activemq.artemis.utils.cli.helper.HelperCreate;
+import org.apache.activemq.artemis.cli.commands.helper.HelperCreate;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.impl.client.CloseableHttpClient;
@@ -42,7 +42,7 @@ public class ConsoleMutualSSLTest extends SmokeTestBase {
public static void createServers() throws Exception {
File server0Location = getFileServerLocation(SERVER_NAME);
deleteDirectory(server0Location);
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setRole("amq").setUser("admin").setPassword("admin").setAllowAnonymous(false).setConfiguration("./src/main/resources/servers/console-mutual-ssl").
setNoWeb(false).setArtemisInstance(server0Location).setArgs(
"--http-host",
"localhost",
diff --git
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/crossprotocol/MultiThreadConvertTest.java
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/crossprotocol/MultiThreadConvertTest.java
index 01a8511423..aff03270f4 100644
---
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/crossprotocol/MultiThreadConvertTest.java
+++
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/crossprotocol/MultiThreadConvertTest.java
@@ -43,7 +43,7 @@ import
org.apache.activemq.artemis.core.remoting.impl.netty.TransportConstants;
import org.apache.activemq.artemis.core.server.ActiveMQServer;
import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
import org.apache.activemq.artemis.tests.smoke.common.SmokeTestBase;
-import org.apache.activemq.artemis.utils.cli.helper.HelperCreate;
+import org.apache.activemq.artemis.cli.commands.helper.HelperCreate;
import org.apache.qpid.jms.JmsConnectionFactory;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
@@ -67,7 +67,7 @@ public class MultiThreadConvertTest extends SmokeTestBase {
deleteDirectory(server0Location);
{
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setUser("admin").setPassword("admin").setAllowAnonymous(true).setNoWeb(true).
setArtemisInstance(server0Location);
cliCreateServer.createServer();
diff --git
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/custometc/CustomETCTest.java
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/custometc/CustomETCTest.java
index 8be191406e..5c8558a3b5 100644
---
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/custometc/CustomETCTest.java
+++
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/custometc/CustomETCTest.java
@@ -35,7 +35,7 @@ import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.activemq.artemis.tests.smoke.common.SmokeTestBase;
import org.apache.activemq.artemis.tests.util.CFUtil;
import org.apache.activemq.artemis.utils.RandomUtil;
-import org.apache.activemq.artemis.utils.cli.helper.HelperCreate;
+import org.apache.activemq.artemis.cli.commands.helper.HelperCreate;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -51,7 +51,7 @@ public class CustomETCTest extends SmokeTestBase {
deleteDirectory(server0Location);
{
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setUser("admin").setPassword("admin").setAllowAnonymous(true).setNoWeb(true).
setArgs("--etc", new
File("./target/customETC/theCustomETC").getAbsolutePath()).
setArtemisInstance(server0Location);
diff --git
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/expire/TestSimpleExpire.java
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/expire/TestSimpleExpire.java
index 00dd00541b..7365c60f62 100644
---
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/expire/TestSimpleExpire.java
+++
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/expire/TestSimpleExpire.java
@@ -32,7 +32,7 @@ import javax.jms.TextMessage;
import java.io.File;
import org.apache.activemq.artemis.tests.smoke.common.SmokeTestBase;
-import org.apache.activemq.artemis.utils.cli.helper.HelperCreate;
+import org.apache.activemq.artemis.cli.commands.helper.HelperCreate;
import org.apache.qpid.jms.JmsConnectionFactory;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
@@ -49,7 +49,7 @@ public class TestSimpleExpire extends SmokeTestBase {
deleteDirectory(server0Location);
{
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setUser("admin").setPassword("admin").setAllowAnonymous(true).setNoWeb(true).setArtemisInstance(server0Location).setArgs("--disable-persistence");
cliCreateServer.createServer();
}
diff --git
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/infinite/InfiniteRedeliverySmokeTest.java
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/infinite/InfiniteRedeliverySmokeTest.java
index 8bb9d2aa6c..b99bc14fb4 100644
---
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/infinite/InfiniteRedeliverySmokeTest.java
+++
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/infinite/InfiniteRedeliverySmokeTest.java
@@ -35,7 +35,7 @@ import
org.apache.activemq.artemis.core.io.nio.NIOSequentialFileFactory;
import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
import org.apache.activemq.artemis.tests.smoke.common.SmokeTestBase;
import org.apache.activemq.artemis.utils.Wait;
-import org.apache.activemq.artemis.utils.cli.helper.HelperCreate;
+import org.apache.activemq.artemis.cli.commands.helper.HelperCreate;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -56,7 +56,7 @@ public class InfiniteRedeliverySmokeTest extends
SmokeTestBase {
deleteDirectory(server0Location);
{
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setUser("admin").setPassword("admin").setAllowAnonymous(true).setNoWeb(true).setArtemisInstance(server0Location).setConfiguration("./src/main/resources/servers/infinite-redelivery");
cliCreateServer.createServer();
}
diff --git
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/jdbccli/JDBCExportWrongUserTest.java
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/jdbccli/JDBCExportWrongUserTest.java
index 1916b0c48a..2ec00498c9 100644
---
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/jdbccli/JDBCExportWrongUserTest.java
+++
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/jdbccli/JDBCExportWrongUserTest.java
@@ -28,7 +28,7 @@ import
org.apache.activemq.artemis.core.config.storage.DatabaseStorageConfigurat
import org.apache.activemq.artemis.tests.smoke.common.SmokeTestBase;
import org.apache.activemq.artemis.utils.FileUtil;
import org.apache.activemq.artemis.utils.RandomUtil;
-import org.apache.activemq.artemis.utils.cli.helper.HelperCreate;
+import org.apache.activemq.artemis.cli.commands.helper.HelperCreate;
import org.junit.jupiter.api.Test;
public class JDBCExportWrongUserTest extends SmokeTestBase {
@@ -43,7 +43,7 @@ public class JDBCExportWrongUserTest extends SmokeTestBase {
runAfter(() -> deleteDirectory(server0Location));
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setUser("admin").setPassword("admin").setAllowAnonymous(true).setNoWeb(true).setArtemisInstance(server0Location).addArgs("--jdbc",
"--jdbc-connection-url", "fakeOne");
cliCreateServer.createServer();
diff --git
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/jmx/JmxConnectionTest.java
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/jmx/JmxConnectionTest.java
index 1cbdea1404..eb9996bc3a 100644
---
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/jmx/JmxConnectionTest.java
+++
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/jmx/JmxConnectionTest.java
@@ -36,7 +36,7 @@ import java.rmi.server.RemoteRef;
import io.netty.util.internal.PlatformDependent;
import org.apache.activemq.artemis.tests.smoke.common.SmokeTestBase;
-import org.apache.activemq.artemis.utils.cli.helper.HelperCreate;
+import org.apache.activemq.artemis.cli.commands.helper.HelperCreate;
import org.jctools.util.UnsafeAccess;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
@@ -64,7 +64,7 @@ public class JmxConnectionTest extends SmokeTestBase {
deleteDirectory(server0Location);
{
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setUser("admin").setPassword("admin").setAllowAnonymous(true).setNoWeb(true).setArtemisInstance(server0Location).
setConfiguration("./src/main/resources/servers/jmx").setArgs("--java-options",
"-Djava.rmi.server.hostname=localhost");
cliCreateServer.createServer();
diff --git
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/jmx2/JmxServerControlTest.java
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/jmx2/JmxServerControlTest.java
index d70a6db6ca..31803317f6 100644
---
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/jmx2/JmxServerControlTest.java
+++
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/jmx2/JmxServerControlTest.java
@@ -42,7 +42,7 @@ import org.apache.activemq.artemis.api.jms.ActiveMQJMSClient;
import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
import org.apache.activemq.artemis.jms.client.ActiveMQQueue;
import org.apache.activemq.artemis.tests.smoke.common.SmokeTestBase;
-import org.apache.activemq.artemis.utils.cli.helper.HelperCreate;
+import org.apache.activemq.artemis.cli.commands.helper.HelperCreate;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -62,7 +62,7 @@ public class JmxServerControlTest extends SmokeTestBase {
deleteDirectory(server0Location);
{
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setUser("admin").setPassword("admin").setAllowAnonymous(true).setNoWeb(true).setArtemisInstance(server0Location).
setConfiguration("./src/main/resources/servers/jmx").setArgs("--java-options",
"-Djava.rmi.server.hostname=localhost -Dcom.sun.management.jmxremote=true " +
diff --git
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/jmxfailback/JmxFailbackTest.java
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/jmxfailback/JmxFailbackTest.java
index 9f0ecdef91..05aaf6e762 100644
---
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/jmxfailback/JmxFailbackTest.java
+++
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/jmxfailback/JmxFailbackTest.java
@@ -30,7 +30,7 @@ import
org.apache.activemq.artemis.api.core.management.ActiveMQServerControl;
import org.apache.activemq.artemis.api.core.management.ObjectNameBuilder;
import org.apache.activemq.artemis.tests.smoke.common.SmokeTestBase;
import org.apache.activemq.artemis.utils.Wait;
-import org.apache.activemq.artemis.utils.cli.helper.HelperCreate;
+import org.apache.activemq.artemis.cli.commands.helper.HelperCreate;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -54,14 +54,14 @@ public class JmxFailbackTest extends SmokeTestBase {
deleteDirectory(server1Location);
{
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setUser("admin").setPassword("admin").setAllowAnonymous(true).setNoWeb(true).setArtemisInstance(server0Location).
setConfiguration("./src/main/resources/servers/jmx-failback1").setArgs(
"--java-options", "-Djava.rmi.server.hostname=localhost");
cliCreateServer.createServer();
}
{
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setUser("admin").setPassword("admin").setAllowAnonymous(true).setNoWeb(true).setArtemisInstance(server1Location).
setConfiguration("./src/main/resources/servers/jmx-failback2").setArgs(
"--java-options", "-Djava.rmi.server.hostname=localhost");
cliCreateServer.createServer();
diff --git
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/jmxmultiplefailback/ReplicatedMultipleFailbackTest.java
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/jmxmultiplefailback/ReplicatedMultipleFailbackTest.java
index 259bb7ed8e..0876e97d2b 100644
---
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/jmxmultiplefailback/ReplicatedMultipleFailbackTest.java
+++
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/jmxmultiplefailback/ReplicatedMultipleFailbackTest.java
@@ -47,7 +47,7 @@ import
org.apache.activemq.artemis.api.core.management.ObjectNameBuilder;
import org.apache.activemq.artemis.tests.smoke.common.SmokeTestBase;
import org.apache.activemq.artemis.utils.JsonLoader;
import org.apache.activemq.artemis.utils.Wait;
-import org.apache.activemq.artemis.utils.cli.helper.HelperCreate;
+import org.apache.activemq.artemis.cli.commands.helper.HelperCreate;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -193,25 +193,25 @@ public class ReplicatedMultipleFailbackTest extends
SmokeTestBase {
deleteDirectory(server3Location);
{
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setUser("admin").setPassword("admin").setAllowAnonymous(true).setNoWeb(true).setArtemisInstance(server0Location).setConfiguration("./src/main/resources/servers/replicated-failback-primary1").setArgs("--java-options",
"-Djava.rmi.server.hostname=localhost");
cliCreateServer.createServer();
}
{
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setUser("admin").setPassword("admin").setAllowAnonymous(true).setNoWeb(true).setArtemisInstance(server1Location).setConfiguration("./src/main/resources/servers/replicated-failback-primary2").setArgs("--java-options",
"-Djava.rmi.server.hostname=localhost");
cliCreateServer.createServer();
}
{
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setUser("admin").setPassword("admin").setAllowAnonymous(true).setNoWeb(true).setArtemisInstance(server2Location).setConfiguration("./src/main/resources/servers/replicated-failback-primary3").setArgs("--java-options",
"-Djava.rmi.server.hostname=localhost");
cliCreateServer.createServer();
}
{
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setUser("admin").setPassword("admin").setAllowAnonymous(true).setNoWeb(true).setArtemisInstance(server3Location).setConfiguration("./src/main/resources/servers/replicated-failback-backup1").setArgs("--java-options",
"-Djava.rmi.server.hostname=localhost");
cliCreateServer.createServer();
}
diff --git
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/jmxrbac/JmxRBACBrokerSecurityTest.java
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/jmxrbac/JmxRBACBrokerSecurityTest.java
index 5198bd6106..69c441f06a 100644
---
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/jmxrbac/JmxRBACBrokerSecurityTest.java
+++
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/jmxrbac/JmxRBACBrokerSecurityTest.java
@@ -37,7 +37,7 @@ import
org.apache.activemq.artemis.api.core.management.AddressControl;
import org.apache.activemq.artemis.api.core.management.ObjectNameBuilder;
import org.apache.activemq.artemis.tests.smoke.common.SmokeTestBase;
import org.apache.activemq.artemis.util.ServerUtil;
-import org.apache.activemq.artemis.utils.cli.helper.HelperCreate;
+import org.apache.activemq.artemis.cli.commands.helper.HelperCreate;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -65,7 +65,7 @@ public class JmxRBACBrokerSecurityTest extends SmokeTestBase {
deleteDirectory(server0Location);
{
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setRole("amq").setUser("admin").setPassword("admin").setAllowAnonymous(false).setNoWeb(false).setArtemisInstance(server0Location).
setConfiguration("./src/main/resources/servers/jmx-rbac-broker-security").setArgs("--java-options",
"-Djava.rmi.server.hostname=localhost
-Djavax.management.builder.initial=org.apache.activemq.artemis.core.server.management.ArtemisRbacMBeanServerBuilder");
cliCreateServer.createServer();
diff --git
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/jmxrbac/JmxRBACTest.java
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/jmxrbac/JmxRBACTest.java
index 7e6d51da45..325ee06566 100644
---
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/jmxrbac/JmxRBACTest.java
+++
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/jmxrbac/JmxRBACTest.java
@@ -38,7 +38,7 @@ import
org.apache.activemq.artemis.api.core.management.AddressControl;
import org.apache.activemq.artemis.api.core.management.ObjectNameBuilder;
import org.apache.activemq.artemis.tests.smoke.common.SmokeTestBase;
import org.apache.activemq.artemis.util.ServerUtil;
-import org.apache.activemq.artemis.utils.cli.helper.HelperCreate;
+import org.apache.activemq.artemis.cli.commands.helper.HelperCreate;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -65,7 +65,7 @@ public class JmxRBACTest extends SmokeTestBase {
deleteDirectory(server0Location);
{
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setRole("amq").setUser("admin").setPassword("admin").setAllowAnonymous(false).setNoWeb(true).setArtemisInstance(server0Location).
setConfiguration("./src/main/resources/servers/jmx-rbac").setArgs("--java-options",
"-Djava.rmi.server.hostname=localhost");
cliCreateServer.createServer();
diff --git
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/lockmanager/LockManagerSinglePairTest.java
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/lockmanager/LockManagerSinglePairTest.java
index d95c3c50ed..97233ca96e 100644
---
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/lockmanager/LockManagerSinglePairTest.java
+++
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/lockmanager/LockManagerSinglePairTest.java
@@ -34,7 +34,7 @@ import
org.apache.activemq.artemis.tests.smoke.common.SmokeTestBase;
import org.apache.activemq.artemis.tests.util.Jmx;
import org.apache.activemq.artemis.util.ServerUtil;
import org.apache.activemq.artemis.utils.Wait;
-import org.apache.activemq.artemis.utils.cli.helper.HelperCreate;
+import org.apache.activemq.artemis.cli.commands.helper.HelperCreate;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
@@ -79,7 +79,7 @@ public abstract class LockManagerSinglePairTest extends
SmokeTestBase {
deleteDirectory(server0Location);
{
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setUser("admin").setPassword("admin").setAllowAnonymous(true).setNoWeb(true).setArtemisInstance(server0Location).
setConfiguration("./src/main/resources/servers/" + serverName);
cliCreateServer.setArgs("--java-options",
"-Djava.rmi.server.hostname=localhost");
diff --git
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/logging/AuditLoggerTestBase.java
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/logging/AuditLoggerTestBase.java
index 3a219fe6bc..82cd901915 100644
---
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/logging/AuditLoggerTestBase.java
+++
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/logging/AuditLoggerTestBase.java
@@ -21,7 +21,7 @@ import java.io.FileWriter;
import java.io.PrintWriter;
import org.apache.activemq.artemis.tests.smoke.common.SmokeTestBase;
-import org.apache.activemq.artemis.utils.cli.helper.HelperCreate;
+import org.apache.activemq.artemis.cli.commands.helper.HelperCreate;
import org.junit.jupiter.api.BeforeEach;
public abstract class AuditLoggerTestBase extends SmokeTestBase {
@@ -35,7 +35,7 @@ public abstract class AuditLoggerTestBase extends
SmokeTestBase {
deleteDirectory(server0Location);
{
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setUser("admin").setPassword("admin").setAllowAnonymous(true).setNoWeb(true).setArtemisInstance(server0Location).
setConfiguration("./src/main/resources/servers/" +
getServerName()).setArgs("--java-options",
"-Djava.rmi.server.hostname=localhost");
cliCreateServer.createServer();
diff --git
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/maxConsumers/MaxConsumersTest.java
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/maxConsumers/MaxConsumersTest.java
index 7eeb44f9f4..83e517264e 100644
---
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/maxConsumers/MaxConsumersTest.java
+++
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/maxConsumers/MaxConsumersTest.java
@@ -28,7 +28,7 @@ import javax.jms.Session;
import java.io.File;
import org.apache.activemq.artemis.tests.smoke.common.SmokeTestBase;
-import org.apache.activemq.artemis.utils.cli.helper.HelperCreate;
+import org.apache.activemq.artemis.cli.commands.helper.HelperCreate;
import org.apache.qpid.jms.JmsConnectionFactory;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
@@ -64,7 +64,7 @@ public class MaxConsumersTest extends SmokeTestBase {
deleteDirectory(server0Location);
{
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setUser("admin").setPassword("admin").setAllowAnonymous(true).setNoWeb(true).setArtemisInstance(server0Location).
setConfiguration("./src/main/resources/servers/maxConsumers");
cliCreateServer.createServer();
diff --git
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/mqtt/MQTTLeakTest.java
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/mqtt/MQTTLeakTest.java
index cb65a2d0f3..3510c707ce 100644
---
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/mqtt/MQTTLeakTest.java
+++
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/mqtt/MQTTLeakTest.java
@@ -23,7 +23,7 @@ import java.util.concurrent.Semaphore;
import org.apache.activemq.artemis.tests.smoke.common.SmokeTestBase;
import org.apache.activemq.artemis.util.ServerUtil;
-import org.apache.activemq.artemis.utils.cli.helper.HelperCreate;
+import org.apache.activemq.artemis.cli.commands.helper.HelperCreate;
import org.eclipse.paho.client.mqttv3.IMqttDeliveryToken;
import org.eclipse.paho.client.mqttv3.MqttAsyncClient;
import org.eclipse.paho.client.mqttv3.MqttCallback;
@@ -69,7 +69,7 @@ public class MQTTLeakTest extends SmokeTestBase {
deleteDirectory(server0Location);
{
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setUser("admin").setPassword("admin").setAllowAnonymous(true).setNoWeb(true).setArtemisInstance(server0Location);
//setConfiguration("./src/main/resources/servers/mqtt");
cliCreateServer.createServer();
diff --git
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/nettynative/NettyNativeTest.java
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/nettynative/NettyNativeTest.java
index da0e7086bd..849370b4a0 100644
---
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/nettynative/NettyNativeTest.java
+++
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/nettynative/NettyNativeTest.java
@@ -24,7 +24,7 @@ import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
import org.apache.activemq.artemis.tests.smoke.common.SmokeTestBase;
import org.apache.activemq.artemis.util.ServerUtil;
-import org.apache.activemq.artemis.utils.cli.helper.HelperCreate;
+import org.apache.activemq.artemis.cli.commands.helper.HelperCreate;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -52,7 +52,7 @@ public class NettyNativeTest extends SmokeTestBase {
deleteDirectory(server0Location);
{
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setRole("amq").setUser("admin").setPassword("admin").setAllowAnonymous(false).setNoWeb(true).setArtemisInstance(server0Location).
setConfiguration("./src/main/resources/servers/nettynative");
cliCreateServer.createServer();
diff --git
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/paging/FloodServerWithAsyncSendTest.java
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/paging/FloodServerWithAsyncSendTest.java
index c5f6aa9f67..704d4b699d 100644
---
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/paging/FloodServerWithAsyncSendTest.java
+++
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/paging/FloodServerWithAsyncSendTest.java
@@ -38,7 +38,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.apache.activemq.artemis.tests.smoke.common.SmokeTestBase;
import org.apache.activemq.artemis.tests.util.CFUtil;
import org.apache.activemq.artemis.utils.RandomUtil;
-import org.apache.activemq.artemis.utils.cli.helper.HelperCreate;
+import org.apache.activemq.artemis.cli.commands.helper.HelperCreate;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -59,7 +59,7 @@ public class FloodServerWithAsyncSendTest extends
SmokeTestBase {
deleteDirectory(server0Location);
{
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setUser("admin").setPassword("admin").setAllowAnonymous(true).setNoWeb(true).setArtemisInstance(server0Location).
setConfiguration("./src/main/resources/servers/paging");
cliCreateServer.createServer();
diff --git
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/paging/SmokeMaxMessagePagingTest.java
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/paging/SmokeMaxMessagePagingTest.java
index 17f2785b2a..c513ea7675 100644
---
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/paging/SmokeMaxMessagePagingTest.java
+++
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/paging/SmokeMaxMessagePagingTest.java
@@ -25,7 +25,7 @@ import java.io.File;
import org.apache.activemq.artemis.cli.commands.ActionContext;
import org.apache.activemq.artemis.cli.commands.messages.Producer;
import org.apache.activemq.artemis.tests.smoke.common.SmokeTestBase;
-import org.apache.activemq.artemis.utils.cli.helper.HelperCreate;
+import org.apache.activemq.artemis.cli.commands.helper.HelperCreate;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -45,14 +45,14 @@ public class SmokeMaxMessagePagingTest extends
SmokeTestBase {
deleteDirectory(server1Location);
{
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setUser("admin").setPassword("admin").setAllowAnonymous(true).setNoWeb(true).setArtemisInstance(server0Location);
cliCreateServer.setArgs("--java-options",
"-Djava.rmi.server.hostname=localhost", "--global-max-messages", "1000");
cliCreateServer.createServer();
}
{
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setUser("admin").setPassword("admin").setAllowAnonymous(true).setNoWeb(true).setArtemisInstance(server1Location).
setConfiguration("./src/main/resources/servers/" +
SERVER_NAME_ADDRESS);
cliCreateServer.createServer();
diff --git
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/paging/SmokePagingTest.java
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/paging/SmokePagingTest.java
index 4a33ed4ed7..18d04faec0 100644
---
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/paging/SmokePagingTest.java
+++
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/paging/SmokePagingTest.java
@@ -25,7 +25,7 @@ import org.apache.activemq.artemis.cli.commands.ActionContext;
import org.apache.activemq.artemis.cli.commands.messages.Consumer;
import org.apache.activemq.artemis.cli.commands.messages.Producer;
import org.apache.activemq.artemis.tests.smoke.common.SmokeTestBase;
-import org.apache.activemq.artemis.utils.cli.helper.HelperCreate;
+import org.apache.activemq.artemis.cli.commands.helper.HelperCreate;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -41,7 +41,7 @@ public class SmokePagingTest extends SmokeTestBase {
deleteDirectory(server0Location);
{
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setUser("admin").setPassword("admin").setAllowAnonymous(true).setNoWeb(true).setArtemisInstance(server0Location).
setConfiguration("./src/main/resources/servers/paging");
cliCreateServer.createServer();
diff --git
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/resourcetest/MaxQueueResourceTest.java
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/resourcetest/MaxQueueResourceTest.java
index 22ecf0b885..2acc90f952 100644
---
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/resourcetest/MaxQueueResourceTest.java
+++
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/resourcetest/MaxQueueResourceTest.java
@@ -33,7 +33,7 @@ import java.io.File;
import org.apache.activemq.artemis.tests.smoke.common.SmokeTestBase;
import org.apache.activemq.artemis.tests.util.CFUtil;
import org.apache.activemq.artemis.util.ServerUtil;
-import org.apache.activemq.artemis.utils.cli.helper.HelperCreate;
+import org.apache.activemq.artemis.cli.commands.helper.HelperCreate;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -49,7 +49,7 @@ public class MaxQueueResourceTest extends SmokeTestBase {
deleteDirectory(server0Location);
{
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setUser("A").setPassword("A").setAllowAnonymous(false).setNoWeb(true).setArtemisInstance(server0Location).setConfiguration("./src/main/resources/servers/MaxQueueResourceTest");
cliCreateServer.createServer();
}
diff --git
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/retention/ReplayTest.java
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/retention/ReplayTest.java
index c6f651d7c8..5c57cdb67e 100644
---
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/retention/ReplayTest.java
+++
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/retention/ReplayTest.java
@@ -38,7 +38,7 @@ import
org.apache.activemq.artemis.api.core.management.ObjectNameBuilder;
import org.apache.activemq.artemis.tests.smoke.common.SmokeTestBase;
import org.apache.activemq.artemis.tests.util.CFUtil;
import org.apache.activemq.artemis.utils.RandomUtil;
-import org.apache.activemq.artemis.utils.cli.helper.HelperCreate;
+import org.apache.activemq.artemis.cli.commands.helper.HelperCreate;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -58,7 +58,7 @@ public class ReplayTest extends SmokeTestBase {
deleteDirectory(server0Location);
{
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setRole("amq").setUser("admin").setPassword("admin").setAllowAnonymous(true).setNoWeb(true).setArtemisInstance(server0Location).
setConfiguration("./src/main/resources/servers/replay/replay");
cliCreateServer.setArgs("--java-options",
"-Djava.rmi.server.hostname=localhost", "--journal-retention", "1", "--queues",
"RetentionTest", "--name", "replay");
diff --git
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/topologycheck/TopologyCheckTest.java
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/topologycheck/TopologyCheckTest.java
index 10a2c49f78..8107f22991 100644
---
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/topologycheck/TopologyCheckTest.java
+++
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/topologycheck/TopologyCheckTest.java
@@ -33,7 +33,7 @@ import org.apache.activemq.artemis.json.JsonString;
import org.apache.activemq.artemis.tests.smoke.common.SmokeTestBase;
import org.apache.activemq.artemis.util.ServerUtil;
import org.apache.activemq.artemis.utils.Wait;
-import org.apache.activemq.artemis.utils.cli.helper.HelperCreate;
+import org.apache.activemq.artemis.cli.commands.helper.HelperCreate;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -140,7 +140,7 @@ public class TopologyCheckTest extends SmokeTestBase {
deleteDirectory(server0Location);
{
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setUser("admin").setPassword("admin").setAllowAnonymous(true).setNoWeb(true).setArtemisInstance(server0Location).
setConfiguration("./src/main/resources/servers/" +
serverConfigName);
cliCreateServer.createServer();
diff --git
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/transfer/TransferTest.java
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/transfer/TransferTest.java
index 074902522c..ddb33dc7ae 100644
---
a/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/transfer/TransferTest.java
+++
b/tests/smoke-tests/src/test/java/org/apache/activemq/artemis/tests/smoke/transfer/TransferTest.java
@@ -38,7 +38,7 @@ import
org.apache.activemq.artemis.tests.extensions.parameterized.Parameters;
import org.apache.activemq.artemis.tests.smoke.common.SmokeTestBase;
import org.apache.activemq.artemis.tests.util.CFUtil;
import org.apache.activemq.artemis.util.ServerUtil;
-import org.apache.activemq.artemis.utils.cli.helper.HelperCreate;
+import org.apache.activemq.artemis.cli.commands.helper.HelperCreate;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.TestTemplate;
@@ -102,13 +102,13 @@ public class TransferTest extends SmokeTestBase {
deleteDirectory(server1Location);
{
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setUser("admin").setPassword("admin").setAllowAnonymous(true).setNoWeb(true).setArtemisInstance(server0Location);
cliCreateServer.createServer();
}
{
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setUser("admin").setPassword("admin").setAllowAnonymous(true).setNoWeb(true).setArtemisInstance(server1Location).setPortOffset(100);
cliCreateServer.createServer();
}
diff --git
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/AccumulatedInPageSoakTest.java
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/AccumulatedInPageSoakTest.java
index 0f133ae98f..60c0d7e2b6 100644
---
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/AccumulatedInPageSoakTest.java
+++
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/AccumulatedInPageSoakTest.java
@@ -40,7 +40,7 @@ import org.apache.activemq.artemis.tests.util.CFUtil;
import org.apache.activemq.artemis.tests.util.RandomUtil;
import org.apache.activemq.artemis.util.ServerUtil;
import org.apache.activemq.artemis.utils.Wait;
-import org.apache.activemq.artemis.utils.cli.helper.HelperCreate;
+import org.apache.activemq.artemis.cli.commands.helper.HelperCreate;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -86,7 +86,7 @@ public class AccumulatedInPageSoakTest extends SoakTestBase {
File serverLocation = getFileServerLocation(serverName);
deleteDirectory(serverLocation);
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setAllowAnonymous(true).setNoWeb(true).setArtemisInstance(serverLocation);
cliCreateServer.setMessageLoadBalancing("ON_DEMAND");
cliCreateServer.setClustered(false);
diff --git
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/ClusteredMirrorSoakTest.java
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/ClusteredMirrorSoakTest.java
index 9f605a3f2d..8269d78872 100644
---
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/ClusteredMirrorSoakTest.java
+++
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/ClusteredMirrorSoakTest.java
@@ -58,7 +58,7 @@ import org.apache.activemq.artemis.tests.util.RandomUtil;
import org.apache.activemq.artemis.util.ServerUtil;
import org.apache.activemq.artemis.utils.FileUtil;
import org.apache.activemq.artemis.utils.Wait;
-import org.apache.activemq.artemis.utils.cli.helper.HelperCreate;
+import org.apache.activemq.artemis.cli.commands.helper.HelperCreate;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -97,7 +97,7 @@ public class ClusteredMirrorSoakTest extends SoakTestBase {
File serverLocation = getFileServerLocation(serverName);
deleteDirectory(serverLocation);
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setAllowAnonymous(true).setArtemisInstance(serverLocation);
cliCreateServer.setMessageLoadBalancing("ON_DEMAND");
cliCreateServer.setClustered(true);
diff --git
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/DivertSoakMirrorTest.java
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/DivertSoakMirrorTest.java
index e9a6f18569..08dbeab489 100644
---
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/DivertSoakMirrorTest.java
+++
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/DivertSoakMirrorTest.java
@@ -39,7 +39,7 @@ import org.apache.activemq.artemis.util.ServerUtil;
import org.apache.activemq.artemis.utils.FileUtil;
import org.apache.activemq.artemis.utils.TestParameters;
import org.apache.activemq.artemis.utils.Wait;
-import org.apache.activemq.artemis.utils.cli.helper.HelperCreate;
+import org.apache.activemq.artemis.cli.commands.helper.HelperCreate;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
@@ -122,7 +122,7 @@ public class DivertSoakMirrorTest extends SoakTestBase {
}
deleteDirectory(serverLocation);
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setAllowAnonymous(true).setArtemisInstance(serverLocation);
cliCreateServer.setArgs("--no-stomp-acceptor", "--no-hornetq-acceptor",
"--no-mqtt-acceptor", "--no-amqp-acceptor", "--max-hops", "1", "--name",
DC1_NODE);
cliCreateServer.addArgs("--queues", QUEUE_NAME_LIST);
diff --git
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/IdempotentACKTest.java
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/IdempotentACKTest.java
index b9e5200d8b..43d4ccdd7d 100644
---
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/IdempotentACKTest.java
+++
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/IdempotentACKTest.java
@@ -46,7 +46,7 @@ import org.apache.activemq.artemis.tests.soak.SoakTestBase;
import org.apache.activemq.artemis.tests.util.CFUtil;
import org.apache.activemq.artemis.util.ServerUtil;
import org.apache.activemq.artemis.utils.Wait;
-import org.apache.activemq.artemis.utils.cli.helper.HelperCreate;
+import org.apache.activemq.artemis.cli.commands.helper.HelperCreate;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -85,7 +85,7 @@ public class IdempotentACKTest extends SoakTestBase {
File serverLocation = getFileServerLocation(serverName);
deleteDirectory(serverLocation);
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setAllowAnonymous(true).setNoWeb(true).setArtemisInstance(serverLocation);
cliCreateServer.setMessageLoadBalancing("ON_DEMAND");
cliCreateServer.setClustered(false);
diff --git
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/InterruptedLargeMessageTest.java
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/InterruptedLargeMessageTest.java
index 69b078b5be..9b1b4d3806 100644
---
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/InterruptedLargeMessageTest.java
+++
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/InterruptedLargeMessageTest.java
@@ -47,7 +47,7 @@ import org.apache.activemq.artemis.tests.util.CFUtil;
import org.apache.activemq.artemis.util.ServerUtil;
import org.apache.activemq.artemis.utils.FileUtil;
import org.apache.activemq.artemis.utils.Wait;
-import org.apache.activemq.artemis.utils.cli.helper.HelperCreate;
+import org.apache.activemq.artemis.cli.commands.helper.HelperCreate;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -89,7 +89,7 @@ public class InterruptedLargeMessageTest extends SoakTestBase
{
File serverLocation = getFileServerLocation(serverName);
deleteDirectory(serverLocation);
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setAllowAnonymous(true).setNoWeb(true).setArtemisInstance(serverLocation);
cliCreateServer.setMessageLoadBalancing("ON_DEMAND");
cliCreateServer.setClustered(false);
diff --git
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/MultiMirrorSoakTest.java
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/MultiMirrorSoakTest.java
index 521cc92210..fc2ad18709 100644
---
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/MultiMirrorSoakTest.java
+++
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/MultiMirrorSoakTest.java
@@ -41,7 +41,7 @@ import org.apache.activemq.artemis.tests.util.CFUtil;
import org.apache.activemq.artemis.util.ServerUtil;
import org.apache.activemq.artemis.utils.FileUtil;
import org.apache.activemq.artemis.utils.Wait;
-import org.apache.activemq.artemis.utils.cli.helper.HelperCreate;
+import org.apache.activemq.artemis.cli.commands.helper.HelperCreate;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -80,7 +80,7 @@ public class MultiMirrorSoakTest extends SoakTestBase {
File serverLocation = getFileServerLocation(serverName);
deleteDirectory(serverLocation);
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setAllowAnonymous(true).setArtemisInstance(serverLocation);
cliCreateServer.setMessageLoadBalancing("ON_DEMAND");
cliCreateServer.setClustered(false);
diff --git
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/PagedSNFSoakTest.java
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/PagedSNFSoakTest.java
index cf6347edb8..1226a81d29 100644
---
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/PagedSNFSoakTest.java
+++
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/PagedSNFSoakTest.java
@@ -42,7 +42,7 @@ import org.apache.activemq.artemis.tests.soak.SoakTestBase;
import org.apache.activemq.artemis.tests.util.CFUtil;
import org.apache.activemq.artemis.util.ServerUtil;
import org.apache.activemq.artemis.utils.Wait;
-import org.apache.activemq.artemis.utils.cli.helper.HelperCreate;
+import org.apache.activemq.artemis.cli.commands.helper.HelperCreate;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -84,7 +84,7 @@ public class PagedSNFSoakTest extends SoakTestBase {
File serverLocation = getFileServerLocation(serverName);
deleteDirectory(serverLocation);
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setAllowAnonymous(true).setNoWeb(true).setArtemisInstance(serverLocation);
cliCreateServer.setMessageLoadBalancing("ON_DEMAND");
cliCreateServer.setClustered(false);
diff --git
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/ReplicatedBothNodesMirrorTest.java
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/ReplicatedBothNodesMirrorTest.java
index dd0ad73348..90e3aad007 100644
---
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/ReplicatedBothNodesMirrorTest.java
+++
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/ReplicatedBothNodesMirrorTest.java
@@ -49,7 +49,7 @@ import org.apache.activemq.artemis.util.ServerUtil;
import org.apache.activemq.artemis.utils.FileUtil;
import org.apache.activemq.artemis.utils.TestParameters;
import org.apache.activemq.artemis.utils.Wait;
-import org.apache.activemq.artemis.utils.cli.helper.HelperCreate;
+import org.apache.activemq.artemis.cli.commands.helper.HelperCreate;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Assumptions;
import org.junit.jupiter.api.Test;
@@ -168,7 +168,7 @@ public class ReplicatedBothNodesMirrorTest extends
SoakTestBase {
}
deleteDirectory(serverLocation);
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setAllowAnonymous(true).setArtemisInstance(serverLocation);
cliCreateServer.setArgs("--no-stomp-acceptor", "--no-hornetq-acceptor",
"--no-mqtt-acceptor", "--no-amqp-acceptor", "--max-hops", "1", "--name",
DC1_NODE);
cliCreateServer.addArgs("--queues", QUEUE_NAME);
@@ -235,7 +235,7 @@ public class ReplicatedBothNodesMirrorTest extends
SoakTestBase {
}
deleteDirectory(serverLocation);
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setAllowAnonymous(true).setArtemisInstance(serverLocation);
cliCreateServer.setMessageLoadBalancing("ON_DEMAND");
cliCreateServer.setArgs("--no-stomp-acceptor", "--no-hornetq-acceptor",
"--no-mqtt-acceptor", "--no-amqp-acceptor", "--max-hops", "1", "--name",
DC1_NODE);
diff --git
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/ReplicatedMirrorTargetTest.java
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/ReplicatedMirrorTargetTest.java
index 05a26d2aa9..65b8f59e4d 100644
---
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/ReplicatedMirrorTargetTest.java
+++
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/ReplicatedMirrorTargetTest.java
@@ -52,7 +52,7 @@ import org.apache.activemq.artemis.utils.FileUtil;
import org.apache.activemq.artemis.utils.TestParameters;
import org.apache.activemq.artemis.utils.Wait;
import org.apache.activemq.artemis.utils.actors.OrderedExecutor;
-import org.apache.activemq.artemis.utils.cli.helper.HelperCreate;
+import org.apache.activemq.artemis.cli.commands.helper.HelperCreate;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
@@ -140,7 +140,7 @@ public class ReplicatedMirrorTargetTest extends
SoakTestBase {
File serverLocation = getFileServerLocation(serverName);
deleteDirectory(serverLocation);
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setAllowAnonymous(true).setArtemisInstance(serverLocation);
cliCreateServer.setNoWeb(false);
cliCreateServer.setArgs("--no-stomp-acceptor", "--no-hornetq-acceptor",
"--no-mqtt-acceptor", "--no-amqp-acceptor", "--max-hops", "1", "--name",
DC1_NODE);
@@ -200,7 +200,7 @@ public class ReplicatedMirrorTargetTest extends
SoakTestBase {
File serverLocation = getFileServerLocation(serverName);
deleteDirectory(serverLocation);
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setAllowAnonymous(true).setArtemisInstance(serverLocation);
cliCreateServer.setMessageLoadBalancing("ON_DEMAND");
cliCreateServer.setNoWeb(false);
diff --git
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/SingleMirrorSoakTest.java
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/SingleMirrorSoakTest.java
index 654b368650..8585d9de04 100644
---
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/SingleMirrorSoakTest.java
+++
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/mirror/SingleMirrorSoakTest.java
@@ -53,7 +53,7 @@ import org.apache.activemq.artemis.utils.FileUtil;
import org.apache.activemq.artemis.utils.TestParameters;
import org.apache.activemq.artemis.utils.Wait;
import org.apache.activemq.artemis.utils.actors.OrderedExecutor;
-import org.apache.activemq.artemis.utils.cli.helper.HelperCreate;
+import org.apache.activemq.artemis.cli.commands.helper.HelperCreate;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
@@ -129,7 +129,7 @@ public class SingleMirrorSoakTest extends SoakTestBase {
File serverLocation = getFileServerLocation(serverName);
deleteDirectory(serverLocation);
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setAllowAnonymous(true).setArtemisInstance(serverLocation);
cliCreateServer.setMessageLoadBalancing("ON_DEMAND");
cliCreateServer.setClustered(false);
diff --git
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/sender/SenderSoakTest.java
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/sender/SenderSoakTest.java
index 805067d489..f56fcb7f9b 100644
---
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/sender/SenderSoakTest.java
+++
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/brokerConnection/sender/SenderSoakTest.java
@@ -35,7 +35,7 @@ import java.util.Properties;
import org.apache.activemq.artemis.tests.soak.SoakTestBase;
import org.apache.activemq.artemis.tests.util.CFUtil;
import org.apache.activemq.artemis.util.ServerUtil;
-import org.apache.activemq.artemis.utils.cli.helper.HelperCreate;
+import org.apache.activemq.artemis.cli.commands.helper.HelperCreate;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -68,7 +68,7 @@ public class SenderSoakTest extends SoakTestBase {
File serverLocation = getFileServerLocation(serverName);
deleteDirectory(serverLocation);
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setAllowAnonymous(true).setNoWeb(true).setArtemisInstance(serverLocation);
cliCreateServer.setMessageLoadBalancing("STRICT");
cliCreateServer.setClustered(false);
diff --git
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/clientFailure/ClientFailureSoakTest.java
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/clientFailure/ClientFailureSoakTest.java
index 3884608e90..c7c0656c56 100644
---
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/clientFailure/ClientFailureSoakTest.java
+++
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/clientFailure/ClientFailureSoakTest.java
@@ -48,13 +48,13 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.RedeliveryPolicy;
import org.apache.activemq.artemis.api.core.management.SimpleManagement;
+import org.apache.activemq.artemis.cli.commands.helper.HelperCreate;
import
org.apache.activemq.artemis.tests.extensions.parameterized.ParameterizedTestExtension;
import org.apache.activemq.artemis.tests.extensions.parameterized.Parameters;
import org.apache.activemq.artemis.tests.soak.SoakTestBase;
import org.apache.activemq.artemis.tests.util.CFUtil;
import org.apache.activemq.artemis.utils.SpawnedVMSupport;
import org.apache.activemq.artemis.utils.Wait;
-import org.apache.activemq.artemis.utils.cli.helper.HelperCreate;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.TestTemplate;
@@ -77,7 +77,7 @@ public class ClientFailureSoakTest extends SoakTestBase {
public static void createServers() throws Exception {
File serverLocation = getFileServerLocation(SERVER_NAME_0);
deleteDirectory(serverLocation);
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setAllowAnonymous(true).setArtemisInstance(serverLocation);
cliCreateServer.setArgs("--global-max-messages", "500000",
"--java-options", "-ea", "--java-options", "-Xmx512M", "--queues",
"CLIENT_TEST,OUT_QUEUE");
cliCreateServer.createServer();
diff --git
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/clusterNotificationsContinuity/ClusterNotificationsContinuityTest.java
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/clusterNotificationsContinuity/ClusterNotificationsContinuityTest.java
index 9f183dbecb..f73274faf5 100644
---
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/clusterNotificationsContinuity/ClusterNotificationsContinuityTest.java
+++
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/clusterNotificationsContinuity/ClusterNotificationsContinuityTest.java
@@ -36,13 +36,13 @@ import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import org.apache.activemq.artemis.api.core.management.SimpleManagement;
+import org.apache.activemq.artemis.cli.commands.helper.HelperCreate;
import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
import org.apache.activemq.artemis.jms.client.ActiveMQDestination;
import org.apache.activemq.artemis.tests.soak.SoakTestBase;
import org.apache.activemq.artemis.util.ServerUtil;
import org.apache.activemq.artemis.utils.SpawnedVMSupport;
import org.apache.activemq.artemis.utils.Wait;
-import org.apache.activemq.artemis.utils.cli.helper.HelperCreate;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
@@ -103,7 +103,7 @@ public class ClusterNotificationsContinuityTest extends
SoakTestBase {
File serverLocation = getFileServerLocation(serverName);
deleteDirectory(serverLocation);
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer
.setRole("amq")
.setUser("admin")
diff --git
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/interrupt/JournalFlushInterruptTest.java
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/interrupt/JournalFlushInterruptTest.java
index beb07ff5ca..11d8cb77c1 100644
---
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/interrupt/JournalFlushInterruptTest.java
+++
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/interrupt/JournalFlushInterruptTest.java
@@ -31,10 +31,10 @@ import
org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
import org.apache.activemq.artemis.api.core.RoutingType;
import org.apache.activemq.artemis.api.core.management.ObjectNameBuilder;
import org.apache.activemq.artemis.api.core.management.QueueControl;
+import org.apache.activemq.artemis.cli.commands.helper.HelperCreate;
import org.apache.activemq.artemis.tests.soak.SoakTestBase;
import org.apache.activemq.artemis.tests.util.CFUtil;
import org.apache.activemq.artemis.utils.Wait;
-import org.apache.activemq.artemis.utils.cli.helper.HelperCreate;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -51,7 +51,7 @@ public class JournalFlushInterruptTest extends SoakTestBase {
deleteDirectory(server0Location);
{
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setRole("amq").setUser("artemis").setPassword("artemis").setAllowAnonymous(true).setNoWeb(false).setArtemisInstance(server0Location).
setConfiguration("./src/main/resources/servers/interruptjf");
cliCreateServer.setArgs("--java-options",
"-Djava.rmi.server.hostname=localhost", "--queues",
"JournalFlushInterruptTest", "--name", "interruptjf");
diff --git
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/interruptlm/ClusteredLargeMessageInterruptTest.java
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/interruptlm/ClusteredLargeMessageInterruptTest.java
index f6ff2a70d1..2c4ed313c4 100644
---
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/interruptlm/ClusteredLargeMessageInterruptTest.java
+++
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/interruptlm/ClusteredLargeMessageInterruptTest.java
@@ -43,7 +43,7 @@ import
org.apache.activemq.artemis.api.core.management.QueueControl;
import org.apache.activemq.artemis.tests.soak.SoakTestBase;
import org.apache.activemq.artemis.tests.util.CFUtil;
import org.apache.activemq.artemis.utils.Wait;
-import org.apache.activemq.artemis.utils.cli.helper.HelperCreate;
+import org.apache.activemq.artemis.cli.commands.helper.HelperCreate;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -62,7 +62,7 @@ public class ClusteredLargeMessageInterruptTest extends
SoakTestBase {
File serverLocation = getFileServerLocation(SERVER_NAME_0);
deleteDirectory(serverLocation);
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setRole("amq").setUser("artemis").setPassword("artemis").setAllowAnonymous(true).setNoWeb(false).setArtemisInstance(serverLocation).
setConfiguration("./src/main/resources/servers/lmbroker1");
cliCreateServer.setArgs("--java-options",
"-Djava.rmi.server.hostname=localhost", "--clustered", "--static-cluster",
"tcp://localhost:61716", "--queues", "ClusteredLargeMessageInterruptTest",
"--name", "lmbroker1");
@@ -73,7 +73,7 @@ public class ClusteredLargeMessageInterruptTest extends
SoakTestBase {
File serverLocation = getFileServerLocation(SERVER_NAME_1);
deleteDirectory(serverLocation);
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setRole("amq").setUser("artemis").setPassword("artemis").setAllowAnonymous(true).setNoWeb(false).setArtemisInstance(serverLocation).
setConfiguration("./src/main/resources/servers/lmbroker2").setPortOffset(100);
cliCreateServer.setArgs("--java-options",
"-Djava.rmi.server.hostname=localhost", "--clustered", "--static-cluster",
"tcp://localhost:61616", "--queues", "ClusteredLargeMessageInterruptTest",
"--name", "lmbroker2");
diff --git
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/interruptlm/LargeMessageInterruptTest.java
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/interruptlm/LargeMessageInterruptTest.java
index 208696068e..788f4d15f1 100644
---
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/interruptlm/LargeMessageInterruptTest.java
+++
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/interruptlm/LargeMessageInterruptTest.java
@@ -43,7 +43,7 @@ import
org.apache.activemq.artemis.api.core.management.QueueControl;
import org.apache.activemq.artemis.tests.soak.SoakTestBase;
import org.apache.activemq.artemis.tests.util.CFUtil;
import org.apache.activemq.artemis.utils.Wait;
-import org.apache.activemq.artemis.utils.cli.helper.HelperCreate;
+import org.apache.activemq.artemis.cli.commands.helper.HelperCreate;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -62,7 +62,7 @@ public class LargeMessageInterruptTest extends SoakTestBase {
File serverLocation = getFileServerLocation(SERVER_NAME_0);
deleteDirectory(serverLocation);
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setRole("amq").setUser("artemis").setPassword("artemis").setAllowAnonymous(true).setNoWeb(false).setArtemisInstance(serverLocation).
setConfiguration("./src/main/resources/servers/interruptlm");
cliCreateServer.setArgs("--java-options",
"-Djava.rmi.server.hostname=localhost", "--clustered", "--static-cluster",
"tcp://localhost:61716", "--queues", "ClusteredLargeMessageInterruptTest",
"--name", "lmbroker1");
diff --git
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/mqtt/MQTT5SoakTest.java
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/mqtt/MQTT5SoakTest.java
index bd498d8e26..d26969f9a7 100644
---
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/mqtt/MQTT5SoakTest.java
+++
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/mqtt/MQTT5SoakTest.java
@@ -31,7 +31,7 @@ import
org.apache.activemq.artemis.api.core.management.SimpleManagement;
import org.apache.activemq.artemis.core.protocol.mqtt.MQTTUtil;
import org.apache.activemq.artemis.tests.soak.SoakTestBase;
import org.apache.activemq.artemis.utils.Wait;
-import org.apache.activemq.artemis.utils.cli.helper.HelperCreate;
+import org.apache.activemq.artemis.cli.commands.helper.HelperCreate;
import org.eclipse.paho.mqttv5.client.IMqttToken;
import org.eclipse.paho.mqttv5.client.MqttCallback;
import org.eclipse.paho.mqttv5.client.MqttClient;
@@ -60,7 +60,7 @@ public class MQTT5SoakTest extends SoakTestBase {
File serverLocation = getFileServerLocation(SERVER_NAME_0);
deleteDirectory(serverLocation);
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setRole("amq").setUser("artemis").setPassword("artemis").setAllowAnonymous(true).setNoWeb(false).setArtemisInstance(serverLocation);
cliCreateServer.setArgs("--addresses", "MQTT_SOAK");
cliCreateServer.createServer();
diff --git
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/owleak/OWLeakTest.java
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/owleak/OWLeakTest.java
index c632d30149..112b38f34f 100644
---
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/owleak/OWLeakTest.java
+++
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/owleak/OWLeakTest.java
@@ -41,13 +41,13 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.activemq.artemis.cli.commands.helper.HelperCreate;
import
org.apache.activemq.artemis.tests.extensions.parameterized.ParameterizedTestExtension;
import org.apache.activemq.artemis.tests.extensions.parameterized.Parameters;
import org.apache.activemq.artemis.tests.soak.SoakTestBase;
import org.apache.activemq.artemis.tests.util.CFUtil;
import org.apache.activemq.artemis.utils.SpawnedVMSupport;
import org.apache.activemq.artemis.utils.TestParameters;
-import org.apache.activemq.artemis.utils.cli.helper.HelperCreate;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.TestTemplate;
@@ -76,7 +76,7 @@ public class OWLeakTest extends SoakTestBase {
File serverLocation = getFileServerLocation(SERVER_NAME_0);
deleteDirectory(serverLocation);
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setRole("amq").setUser("admin").setPassword("admin").setAllowAnonymous(true).setNoWeb(false).setArtemisInstance(serverLocation);
cliCreateServer.createServer();
}
diff --git
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/paging/FlowControlPagingTest.java
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/paging/FlowControlPagingTest.java
index 3ecc1cd07f..d1f28da0d8 100644
---
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/paging/FlowControlPagingTest.java
+++
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/paging/FlowControlPagingTest.java
@@ -41,7 +41,7 @@ import
org.apache.activemq.artemis.tests.extensions.parameterized.Parameters;
import org.apache.activemq.artemis.tests.soak.SoakTestBase;
import org.apache.activemq.artemis.tests.util.CFUtil;
import org.apache.activemq.artemis.utils.TestParameters;
-import org.apache.activemq.artemis.utils.cli.helper.HelperCreate;
+import org.apache.activemq.artemis.cli.commands.helper.HelperCreate;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.TestTemplate;
@@ -87,7 +87,7 @@ public class FlowControlPagingTest extends SoakTestBase {
File serverLocation = getFileServerLocation(SERVER_NAME_0);
deleteDirectory(serverLocation);
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setRole("amq").setUser("admin").setPassword("admin").setAllowAnonymous(true).setNoWeb(false).setArtemisInstance(serverLocation);
// some limited memory to make it more likely to fail
cliCreateServer.setArgs("--java-memory", "512M");
diff --git
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/paging/HorizontalPagingTest.java
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/paging/HorizontalPagingTest.java
index 08f20812cf..64216b8432 100644
---
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/paging/HorizontalPagingTest.java
+++
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/paging/HorizontalPagingTest.java
@@ -43,7 +43,7 @@ import org.apache.activemq.artemis.tests.soak.SoakTestBase;
import org.apache.activemq.artemis.tests.util.CFUtil;
import org.apache.activemq.artemis.utils.ReusableLatch;
import org.apache.activemq.artemis.utils.TestParameters;
-import org.apache.activemq.artemis.utils.cli.helper.HelperCreate;
+import org.apache.activemq.artemis.cli.commands.helper.HelperCreate;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.TestTemplate;
@@ -89,7 +89,7 @@ public class HorizontalPagingTest extends SoakTestBase {
File serverLocation = getFileServerLocation(SERVER_NAME_0);
deleteDirectory(serverLocation);
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setRole("amq").setUser("admin").setPassword("admin").setAllowAnonymous(true).setNoWeb(false).setArtemisInstance(serverLocation);
// some limited memory to make it more likely to fail
cliCreateServer.setArgs("--java-memory", "2g");
diff --git
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/paging/M_and_M_FactoryTest.java
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/paging/M_and_M_FactoryTest.java
index 4610fc1a5c..f74b2639e3 100644
---
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/paging/M_and_M_FactoryTest.java
+++
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/paging/M_and_M_FactoryTest.java
@@ -46,7 +46,7 @@ import org.apache.activemq.artemis.tests.util.CFUtil;
import org.apache.activemq.artemis.utils.RandomUtil;
import org.apache.activemq.artemis.utils.SpawnedVMSupport;
import org.apache.activemq.artemis.utils.Wait;
-import org.apache.activemq.artemis.utils.cli.helper.HelperCreate;
+import org.apache.activemq.artemis.cli.commands.helper.HelperCreate;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -68,7 +68,7 @@ public class M_and_M_FactoryTest extends SoakTestBase {
File serverLocation = getFileServerLocation(SERVER_NAME_0);
deleteDirectory(serverLocation);
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setUser("admin").setPassword("admin").setAllowAnonymous(true).setNoWeb(false).setArtemisInstance(serverLocation);
cliCreateServer.setConfiguration("./src/main/resources/servers/mmfactory");
cliCreateServer.setArgs("--java-options",
"-Djava.rmi.server.hostname=localhost -Dcom.sun.management.jmxremote=true
-Dcom.sun.management.jmxremote.port=11099
-Dcom.sun.management.jmxremote.rmi.port=11098
-Dcom.sun.management.jmxremote.ssl=false
-Dcom.sun.management.jmxremote.authenticate=false");
diff --git
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/paging/SubscriptionPagingTest.java
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/paging/SubscriptionPagingTest.java
index 1247ffcc40..030d060a6d 100644
---
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/paging/SubscriptionPagingTest.java
+++
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/paging/SubscriptionPagingTest.java
@@ -40,12 +40,12 @@ import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.activemq.artemis.cli.commands.helper.HelperCreate;
import
org.apache.activemq.artemis.tests.extensions.parameterized.ParameterizedTestExtension;
import org.apache.activemq.artemis.tests.extensions.parameterized.Parameters;
import org.apache.activemq.artemis.tests.soak.SoakTestBase;
import org.apache.activemq.artemis.tests.util.CFUtil;
import org.apache.activemq.artemis.utils.TestParameters;
-import org.apache.activemq.artemis.utils.cli.helper.HelperCreate;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.TestTemplate;
@@ -91,7 +91,7 @@ public class SubscriptionPagingTest extends SoakTestBase {
File serverLocation = getFileServerLocation(SERVER_NAME_0);
deleteDirectory(serverLocation);
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setRole("amq").setUser("admin").setPassword("admin").setAllowAnonymous(true).setNoWeb(false).setArtemisInstance(serverLocation);
// some limited memory to make it more likely to fail
cliCreateServer.setArgs("--java-memory", "512M");
diff --git
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/paging/ValidateExportSpeedTest.java
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/paging/ValidateExportSpeedTest.java
index 2c858126e6..c42d40a49b 100644
---
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/paging/ValidateExportSpeedTest.java
+++
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/paging/ValidateExportSpeedTest.java
@@ -42,7 +42,7 @@ import
org.apache.activemq.artemis.cli.commands.tools.xml.XmlDataImporter;
import org.apache.activemq.artemis.tests.soak.SoakTestBase;
import org.apache.activemq.artemis.tests.util.CFUtil;
import org.apache.activemq.artemis.utils.Wait;
-import org.apache.activemq.artemis.utils.cli.helper.HelperCreate;
+import org.apache.activemq.artemis.cli.commands.helper.HelperCreate;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
@@ -61,7 +61,7 @@ public class ValidateExportSpeedTest extends SoakTestBase {
File serverLocation = getFileServerLocation(SERVER_NAME_0);
deleteDirectory(serverLocation);
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setRole("amq").setUser("admin").setPassword("admin").setAllowAnonymous(true).setNoWeb(false).setArtemisInstance(serverLocation);
cliCreateServer.setArgs("--global-max-messages", "10000",
"--java-options", "-ea", "--queues", "TEST");
cliCreateServer.createServer();
diff --git
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/replicaTxCheck/ReplicaTXCheckTest.java
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/replicaTxCheck/ReplicaTXCheckTest.java
index 1739342478..4fb7092391 100644
---
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/replicaTxCheck/ReplicaTXCheckTest.java
+++
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/replicaTxCheck/ReplicaTXCheckTest.java
@@ -34,7 +34,7 @@ import java.util.HashSet;
import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
import org.apache.activemq.artemis.tests.soak.SoakTestBase;
import org.apache.activemq.artemis.util.ServerUtil;
-import org.apache.activemq.artemis.utils.cli.helper.HelperCreate;
+import org.apache.activemq.artemis.cli.commands.helper.HelperCreate;
import org.apache.qpid.jms.JmsConnectionFactory;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
@@ -58,7 +58,7 @@ public class ReplicaTXCheckTest extends SoakTestBase {
File serverLocation = getFileServerLocation(name);
deleteDirectory(serverLocation);
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setAllowAnonymous(true).setNoWeb(true).setArtemisInstance(serverLocation);
cliCreateServer.setConfiguration("./src/main/resources/servers/" + name);
cliCreateServer.createServer();
diff --git
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/replicationflow/ReplicationFlowControlTest.java
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/replicationflow/ReplicationFlowControlTest.java
index a810be3a77..5bf9626f1a 100644
---
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/replicationflow/ReplicationFlowControlTest.java
+++
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/replicationflow/ReplicationFlowControlTest.java
@@ -32,11 +32,11 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.activemq.artemis.cli.commands.helper.HelperCreate;
import org.apache.activemq.artemis.jms.client.ActiveMQConnectionFactory;
import org.apache.activemq.artemis.tests.soak.SoakTestBase;
import org.apache.activemq.artemis.util.ServerUtil;
import org.apache.activemq.artemis.utils.ReusableLatch;
-import org.apache.activemq.artemis.utils.cli.helper.HelperCreate;
import org.apache.qpid.jms.JmsConnectionFactory;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeAll;
@@ -55,7 +55,7 @@ public class ReplicationFlowControlTest extends SoakTestBase {
File serverLocation = getFileServerLocation(SERVER_NAME_0);
deleteDirectory(serverLocation);
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setAllowAnonymous(true).setNoWeb(true).setArtemisInstance(serverLocation);
cliCreateServer.setConfiguration("./src/main/resources/servers/replicated-static0");
cliCreateServer.createServer();
@@ -64,7 +64,7 @@ public class ReplicationFlowControlTest extends SoakTestBase {
File serverLocation = getFileServerLocation(SERVER_NAME_1);
deleteDirectory(serverLocation);
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setAllowAnonymous(true).setNoWeb(true).setArtemisInstance(serverLocation);
cliCreateServer.setConfiguration("./src/main/resources/servers/replicated-static1");
cliCreateServer.createServer();
diff --git
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/replicationflow/SoakReplicatedPagingTest.java
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/replicationflow/SoakReplicatedPagingTest.java
index 4bc9390d3b..b0bb6daefa 100644
---
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/replicationflow/SoakReplicatedPagingTest.java
+++
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/replicationflow/SoakReplicatedPagingTest.java
@@ -55,13 +55,13 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.activemq.artemis.cli.commands.helper.HelperCreate;
import
org.apache.activemq.artemis.tests.extensions.parameterized.ParameterizedTestExtension;
import org.apache.activemq.artemis.tests.extensions.parameterized.Parameters;
import org.apache.activemq.artemis.tests.soak.SoakTestBase;
import org.apache.activemq.artemis.utils.ExecuteUtil;
import org.apache.activemq.artemis.utils.SpawnedVMSupport;
import org.apache.activemq.artemis.utils.Wait;
-import org.apache.activemq.artemis.utils.cli.helper.HelperCreate;
import org.apache.qpid.jms.JmsConnectionFactory;
import org.fusesource.mqtt.client.BlockingConnection;
import org.fusesource.mqtt.client.MQTT;
@@ -122,7 +122,7 @@ public class SoakReplicatedPagingTest extends SoakTestBase {
File serverLocation = getFileServerLocation(SERVER_NAME_0);
deleteDirectory(serverLocation);
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setAllowAnonymous(true).setNoWeb(true).setArtemisInstance(serverLocation);
cliCreateServer.setConfiguration("./src/main/resources/servers/replicated-static0");
cliCreateServer.createServer();
@@ -131,7 +131,7 @@ public class SoakReplicatedPagingTest extends SoakTestBase {
File serverLocation = getFileServerLocation(SERVER_NAME_1);
deleteDirectory(serverLocation);
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setAllowAnonymous(true).setNoWeb(true).setArtemisInstance(serverLocation);
cliCreateServer.setConfiguration("./src/main/resources/servers/replicated-static1");
cliCreateServer.createServer();
diff --git
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/retention/LargeMessageRetentionTest.java
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/retention/LargeMessageRetentionTest.java
index 1fbcbe71e2..62300762d6 100644
---
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/retention/LargeMessageRetentionTest.java
+++
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/retention/LargeMessageRetentionTest.java
@@ -45,11 +45,11 @@ import
org.apache.activemq.artemis.api.config.ActiveMQDefaultConfiguration;
import org.apache.activemq.artemis.api.core.management.ActiveMQServerControl;
import org.apache.activemq.artemis.api.core.management.ObjectNameBuilder;
import org.apache.activemq.artemis.api.core.management.SimpleManagement;
+import org.apache.activemq.artemis.cli.commands.helper.HelperCreate;
import org.apache.activemq.artemis.tests.soak.SoakTestBase;
import org.apache.activemq.artemis.tests.util.CFUtil;
import org.apache.activemq.artemis.utils.RandomUtil;
import org.apache.activemq.artemis.utils.Wait;
-import org.apache.activemq.artemis.utils.cli.helper.HelperCreate;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@@ -76,7 +76,7 @@ public class LargeMessageRetentionTest extends SoakTestBase {
File serverLocation = getFileServerLocation(SERVER_NAME_0);
deleteDirectory(serverLocation);
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setRole("amq").setUser("artemis").setPassword("artemis").setAllowAnonymous(true).setNoWeb(false);
cliCreateServer.setAllowAnonymous(true).setNoWeb(true).setArtemisInstance(serverLocation);
cliCreateServer.setConfiguration("./src/main/resources/servers/replay/large-message");
diff --git
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/stomp/StompSoakTest.java
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/stomp/StompSoakTest.java
index a392b020a0..cc9aed2920 100644
---
a/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/stomp/StompSoakTest.java
+++
b/tests/soak-tests/src/test/java/org/apache/activemq/artemis/tests/soak/stomp/StompSoakTest.java
@@ -43,7 +43,7 @@ import
org.apache.activemq.artemis.tests.integration.stomp.util.ClientStompFrame
import
org.apache.activemq.artemis.tests.integration.stomp.util.StompClientConnection;
import
org.apache.activemq.artemis.tests.integration.stomp.util.StompClientConnectionFactory;
import org.apache.activemq.artemis.tests.soak.SoakTestBase;
-import org.apache.activemq.artemis.utils.cli.helper.HelperCreate;
+import org.apache.activemq.artemis.cli.commands.helper.HelperCreate;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -69,7 +69,7 @@ public class StompSoakTest extends SoakTestBase {
File serverLocation = getFileServerLocation(SERVER_NAME_0);
deleteDirectory(serverLocation);
- HelperCreate cliCreateServer = new HelperCreate();
+ HelperCreate cliCreateServer = helperCreate();
cliCreateServer.setRole("amq").setUser("admin").setPassword("admin").setAllowAnonymous(true).setNoWeb(false)
.setArtemisInstance(serverLocation);
// some limited memory to make it more likely to fail
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information, visit: https://activemq.apache.org/contact
