diff --git a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java index 0a950412dd..e0b274c56a 100644 --- a/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java +++ b/artemis-cli/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java @@ -585,9 +585,9 @@ public class Create extends InputAbstract { } if (!IS_WINDOWS || IS_CYGWIN) { - write(BIN_ARTEMIS, null, true); + write(BIN_ARTEMIS, filters, true); makeExec(BIN_ARTEMIS); - write(BIN_ARTEMIS_SERVICE, null, true); + write(BIN_ARTEMIS_SERVICE, filters, true); makeExec(BIN_ARTEMIS_SERVICE); write(ETC_ARTEMIS_PROFILE, filters, true); } diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis index a81cf1944c..ec9b95e935 100755 --- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis +++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis @@ -105,7 +105,10 @@ if $cygwin ; then CLASSPATH=`cygpath --windows "$CLASSPATH"` fi -exec "$JAVACMD" $JAVA_ARGS $ARTEMIS_CLUSTER_PROPS \ +exec "$JAVACMD" $JAVA_ARGS \ + -Xbootclasspath/a:"$ARTEMIS_HOME/lib/${logmanager}" \ + -Djava.security.auth.login.config="$ARTEMIS_INSTANCE/etc/login.config" \ + $ARTEMIS_CLUSTER_PROPS \ -classpath "$CLASSPATH" \ -Dartemis.home="$ARTEMIS_HOME" \ -Dartemis.instance="$ARTEMIS_INSTANCE" \ diff --git a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile index d071c9f22f..049fea01a0 100644 --- a/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile +++ b/artemis-cli/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile @@ -23,7 +23,7 @@ ARTEMIS_INSTANCE='${artemis.instance}' # Java Opts -JAVA_ARGS="-XX:+UseParallelGC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Xms512M -Xmx1024M -Xbootclasspath/a:$ARTEMIS_HOME/lib/${logmanager} -Djava.security.auth.login.config=$ARTEMIS_INSTANCE/etc/login.config ${java-opts} -Dartemis.instance=$ARTEMIS_INSTANCE" +JAVA_ARGS="-XX:+UseParallelGC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Xms512M -Xmx1024M" # # There might be options that you only want to enable on specifc commands, like setting a JMX port