Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

renamed startup scripts

This commit is contained in:
Andy Taylor 2015-04-29 14:28:11 +01:00
parent 24a4c63458
commit 34f8e5383d
19 changed files with 136 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
artemis-boot/src/main/java/org/apache/activemq/artemis/boot/ActiveMQ.java → artemis-boot/src/main/java/org/apache/activemq/artemis/boot/Artemis.java
View File

@ -32,19 +32,19 @@ import java.util.Comparator;
* execution off to the ActiveMQ cli main. * execution off to the ActiveMQ cli main.
* </p> * </p>
*/ */
public class ActiveMQ public class Artemis
{ {
public static void main(String[] args) throws Throwable public static void main(String[] args) throws Throwable
{ {
ArrayList<File> dirs = new ArrayList<File>(); ArrayList<File> dirs = new ArrayList<File>();
String instance = System.getProperty("activemq.instance"); String instance = System.getProperty("artemis.instance");
if (instance != null) if (instance != null)
{ {
dirs.add(new File(new File(instance), "lib")); dirs.add(new File(new File(instance), "lib"));
} }
String home = System.getProperty("activemq.home"); String home = System.getProperty("artemis.home");
if (home != null) if (home != null)
{ {
dirs.add(new File(new File(home), "lib")); dirs.add(new File(new File(home), "lib"));
@ -98,7 +98,7 @@ public class ActiveMQ
// Now setup our classloader.. // Now setup our classloader..
URLClassLoader loader = new URLClassLoader(urls.toArray(new URL[urls.size()])); URLClassLoader loader = new URLClassLoader(urls.toArray(new URL[urls.size()]));
Thread.currentThread().setContextClassLoader(loader); Thread.currentThread().setContextClassLoader(loader);
Class<?> clazz = loader.loadClass("org.apache.activemq.artemis.cli.ActiveMQ"); Class<?> clazz = loader.loadClass("org.apache.activemq.artemis.cli.Artemis");
Method method = clazz.getMethod("main", args.getClass()); Method method = clazz.getMethod("main", args.getClass());
try try
{ {

12
artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/ActiveMQ.java → artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/Artemis.java
View File

@ -28,14 +28,14 @@ import org.apache.activemq.artemis.cli.commands.Stop;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
public class ActiveMQ public class Artemis
{ {
public static void main(String[] args) throws Exception public static void main(String[] args) throws Exception
{ {
String instance = System.getProperty("activemq.instance"); String instance = System.getProperty("artemis.instance");
Cli.CliBuilder<Action> builder = Cli.<Action>builder("activemq") Cli.CliBuilder<Action> builder = Cli.<Action>builder("artemis")
.withDescription("ActiveMQ Command Line") .withDescription("ActiveMQ Artemis Command Line")
.withCommand(HelpAction.class) .withCommand(HelpAction.class)
.withDefaultCommand(HelpAction.class); .withDefaultCommand(HelpAction.class);
@ -67,14 +67,14 @@ public class ActiveMQ
{ {
System.err.println(configException.getMessage()); System.err.println(configException.getMessage());
System.out.println(); System.out.println();
System.out.println("Configuration should be specified as 'scheme:location'. Default configuration is 'xml:${ACTIVEMQ_INSTANCE}/etc/bootstrap.xml'"); System.out.println("Configuration should be specified as 'scheme:location'. Default configuration is 'xml:${ARTEMIS_INSTANCE}/etc/bootstrap.xml'");
} }
} }
public static void printBanner() throws Exception public static void printBanner() throws Exception
{ {
copy(ActiveMQ.class.getResourceAsStream("banner.txt"), System.out); copy(Artemis.class.getResourceAsStream("banner.txt"), System.out);
} }
private static long copy(InputStream in, OutputStream out) throws Exception private static long copy(InputStream in, OutputStream out) throws Exception

34
artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/Create.java
View File

@ -44,7 +44,7 @@ public class Create implements Action
@Option(name = "--force", description = "Overwrite configuration at destination directory") @Option(name = "--force", description = "Overwrite configuration at destination directory")
boolean force; boolean force;
@Option(name = "--home", description = "Directory where ActiveMQ is installed") @Option(name = "--home", description = "Directory where ActiveMQ Artemis is installed")
File home; File home;
@Option(name = "--with-ssl", description = "Generate an SSL enabled configuration") @Option(name = "--with-ssl", description = "Generate an SSL enabled configuration")
@ -91,7 +91,7 @@ public class Create implements Action
} }
context.out.println(String.format("Creating ActiveMQ instance at: %s", directory.getCanonicalPath())); context.out.println(String.format("Creating ActiveMQ Artemis instance at: %s", directory.getCanonicalPath()));
if (host == null) if (host == null)
{ {
host = directory.getName(); host = directory.getName();
@ -128,8 +128,8 @@ public class Create implements Action
{ {
filters.put("${home}", path(home, false)); filters.put("${home}", path(home, false));
} }
filters.put("${activemq.home}", path(System.getProperty("activemq.home"), false)); filters.put("${artemis.home}", path(System.getProperty("artemis.home"), false));
filters.put("${activemq.instance}", path(directory, false)); filters.put("${artemis.instance}", path(directory, false));
filters.put("${java.home}", path(System.getProperty("java.home"), false)); filters.put("${java.home}", path(System.getProperty("java.home"), false));
new File(directory, "bin").mkdirs(); new File(directory, "bin").mkdirs();
@ -141,20 +141,20 @@ public class Create implements Action
if (IS_WINDOWS) if (IS_WINDOWS)
{ {
write("bin/activemq.cmd", null, false); write("bin/artemis.cmd", null, false);
write("bin/activemq-service.exe"); write("bin/artemis-service.exe");
write("bin/activemq-service.xml", filters, false); write("bin/artemis-service.xml", filters, false);
write("etc/activemq.profile.cmd", filters, false); write("etc/artemis.profile.cmd", filters, false);
} }
if (!IS_WINDOWS || IS_CYGWIN) if (!IS_WINDOWS || IS_CYGWIN)
{ {
write("bin/activemq", null, true); write("bin/artemis", null, true);
makeExec("bin/activemq"); makeExec("bin/artemis");
write("bin/activemq-service", null, true); write("bin/artemis-service", null, true);
makeExec("bin/activemq-service"); makeExec("bin/artemis-service");
write("etc/activemq.profile", filters, true); write("etc/artemis.profile", filters, true);
makeExec("etc/activemq.profile"); makeExec("etc/artemis.profile");
} }
write("etc/logging.properties", null, false); write("etc/logging.properties", null, false);
@ -166,9 +166,9 @@ public class Create implements Action
context.out.println(""); context.out.println("");
context.out.println("You can now start the broker by executing: "); context.out.println("You can now start the broker by executing: ");
context.out.println(""); context.out.println("");
context.out.println(String.format(" \"%s\" run", path(new File(directory, "bin/activemq"), true))); context.out.println(String.format(" \"%s\" run", path(new File(directory, "bin/artemis"), true)));
File service = new File(directory, "bin/activemq-service"); File service = new File(directory, "bin/artemis-service");
context.out.println(""); context.out.println("");
if (!IS_WINDOWS || IS_CYGWIN) if (!IS_WINDOWS || IS_CYGWIN)
@ -180,7 +180,7 @@ public class Create implements Action
context.out.println("Or you can setup the broker as system service and run it in the background:"); context.out.println("Or you can setup the broker as system service and run it in the background:");
context.out.println(""); context.out.println("");
context.out.println(" sudo ln -s \"%s\" /etc/init.d/".format(service.getCanonicalPath())); context.out.println(" sudo ln -s \"%s\" /etc/init.d/".format(service.getCanonicalPath()));
context.out.println(" /etc/init.d/activemq-service start"); context.out.println(" /etc/init.d/artemis-service start");
context.out.println(""); context.out.println("");
} }

18
artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/Run.java
View File

@ -19,7 +19,7 @@ package org.apache.activemq.artemis.cli.commands;
import io.airlift.command.Arguments; import io.airlift.command.Arguments;
import io.airlift.command.Command; import io.airlift.command.Command;
import org.apache.activemq.artemis.cli.ActiveMQ; import org.apache.activemq.artemis.cli.Artemis;
import org.apache.activemq.artemis.components.ExternalComponent; import org.apache.activemq.artemis.components.ExternalComponent;
import org.apache.activemq.artemis.core.server.ActiveMQComponent; import org.apache.activemq.artemis.core.server.ActiveMQComponent;
import org.apache.activemq.artemis.dto.BrokerDTO; import org.apache.activemq.artemis.dto.BrokerDTO;
@ -40,7 +40,7 @@ import java.util.TimerTask;
public class Run implements Action public class Run implements Action
{ {
@Arguments(description = "Broker Configuration URI, default 'xml:${ACTIVEMQ_INSTANCE}/etc/bootstrap.xml'") @Arguments(description = "Broker Configuration URI, default 'xml:${ARTEMIS_INSTANCE}/etc/bootstrap.xml'")
String configuration; String configuration;
private ArrayList<ActiveMQComponent> components = new ArrayList<>(); private ArrayList<ActiveMQComponent> components = new ArrayList<>();
@ -60,13 +60,13 @@ public class Run implements Action
public Object execute(ActionContext context) throws Exception public Object execute(ActionContext context) throws Exception
{ {
ActiveMQ.printBanner(); Artemis.printBanner();
/* We use File URI for locating files. The ACTIVEMQ_HOME variable is used to determine file paths. For Windows /* We use File URI for locating files. The ARTEMIS_HOME variable is used to determine file paths. For Windows
the ACTIVEMQ_HOME variable will include back slashes (An invalid file URI character path separator). For this the ARTEMIS_HOME variable will include back slashes (An invalid file URI character path separator). For this
reason we overwrite the ACTIVEMQ_HOME variable with backslashes replaced with forward slashes. */ reason we overwrite the ARTEMIS_HOME variable with backslashes replaced with forward slashes. */
String activemqInstance = System.getProperty("activemq.instance").replace("\\", "/"); String activemqInstance = System.getProperty("artemis.instance").replace("\\", "/");
System.setProperty("activemq.instance", activemqInstance); System.setProperty("artemis.instance", activemqInstance);
if (configuration == null) if (configuration == null)
{ {
@ -120,7 +120,7 @@ public class Run implements Action
ActiveMQBootstrapLogger.LOGGER.errorDeletingFile(file.getAbsolutePath()); ActiveMQBootstrapLogger.LOGGER.errorDeletingFile(file.getAbsolutePath());
} }
} }
final Timer timer = new Timer("ActiveMQ Server Shutdown Timer", true); final Timer timer = new Timer("ActiveMQ Artemis Server Shutdown Timer", true);
timer.scheduleAtFixedRate(new TimerTask() timer.scheduleAtFixedRate(new TimerTask()
{ {
@Override @Override

12
artemis-bootstrap/src/main/java/org/apache/activemq/artemis/cli/commands/Stop.java
View File

@ -27,17 +27,17 @@ import java.net.URI;
@Command(name = "stop", description = "stops the broker instance") @Command(name = "stop", description = "stops the broker instance")
public class Stop implements Action public class Stop implements Action
{ {
@Arguments(description = "Broker Configuration URI, default 'xml:${ACTIVEMQ_INSTANCE}/etc/bootstrap.xml'") @Arguments(description = "Broker Configuration URI, default 'xml:${ARTEMIS_INSTANCE}/etc/bootstrap.xml'")
String configuration; String configuration;
@Override @Override
public Object execute(ActionContext context) throws Exception public Object execute(ActionContext context) throws Exception
{ {
/* We use File URI for locating files. The ACTIVEMQ_HOME variable is used to determine file paths. For Windows /* We use File URI for locating files. The ARTEMIS_HOME variable is used to determine file paths. For Windows
the ACTIVEMQ_HOME variable will include back slashes (An invalid file URI character path separator). For this the ARTEMIS_HOME variable will include back slashes (An invalid file URI character path separator). For this
reason we overwrite the ACTIVEMQ_HOME variable with backslashes replaced with forward slashes. */ reason we overwrite the ARTEMIS_HOME variable with backslashes replaced with forward slashes. */
String activemqHome = System.getProperty("activemq.instance").replace("\\", "/"); String activemqHome = System.getProperty("artemis.instance").replace("\\", "/");
System.setProperty("activemq.instance", activemqHome); System.setProperty("artemis.instance", activemqHome);
if (configuration == null) if (configuration == null)
{ {

40
artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/activemq → artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis
View File

@ -16,7 +16,7 @@
# specific language governing permissions and limitations # specific language governing permissions and limitations
# under the License. # under the License.
if [ -z "$ACTIVEMQ_INSTANCE" ] ; then if [ -z "$ARTEMIS_INSTANCE" ] ; then
## resolve links - $0 may be a link to ActiveMQ's home ## resolve links - $0 may be a link to ActiveMQ's home
PRG="$0" PRG="$0"
@ -37,23 +37,23 @@ if [ -z "$ACTIVEMQ_INSTANCE" ] ; then
fi fi
done done
ACTIVEMQ_INSTANCE=`dirname "$PRG"` ARTEMIS_INSTANCE=`dirname "$PRG"`
cd "$saveddir" cd "$saveddir"
# make it fully qualified # make it fully qualified
ACTIVEMQ_INSTANCE=`cd "$ACTIVEMQ_INSTANCE/.." && pwd` ARTEMIS_INSTANCE=`cd "$ARTEMIS_INSTANCE/.." && pwd`
fi fi
# Set Defaults Properties # Set Defaults Properties
ACTIVEMQ_LOGGING_CONF="file:$ACTIVEMQ_INSTANCE/etc/logging.properties" ARTEMIS_LOGGING_CONF="file:$ARTEMIS_INSTANCE/etc/logging.properties"
ACTIVEMQ_DATA_DIR="$ACTIVEMQ_INSTANCE/data" ARTEMIS_DATA_DIR="$ARTEMIS_INSTANCE/data"
ACTIVEMQ_LOG_MANAGER=org.jboss.logmanager.LogManager ARTEMIS_LOG_MANAGER=org.jboss.logmanager.LogManager
JAVA_ARGS="-XX:+UseParallelGC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Xms512M -Xmx1024M" JAVA_ARGS="-XX:+UseParallelGC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Xms512M -Xmx1024M"
# Load Profile Data # Load Profile Data
. "$ACTIVEMQ_INSTANCE/etc/activemq.profile" . "$ARTEMIS_INSTANCE/etc/artemis.profile"
CLASSPATH="$ACTIVEMQ_HOME/lib/artemis-boot.jar" CLASSPATH="$ARTEMIS_HOME/lib/artemis-boot.jar"
# OS specific support. # OS specific support.
cygwin=false; cygwin=false;
@ -72,8 +72,8 @@ esac
# For Cygwin, ensure paths are in UNIX format before anything is touched # For Cygwin, ensure paths are in UNIX format before anything is touched
if $cygwin ; then if $cygwin ; then
[ -n "$ACTIVEMQ_INSTANCE" ] && [ -n "$ARTEMIS_INSTANCE" ] &&
ACTIVEMQ_INSTANCE=`cygpath --unix "$ACTIVEMQ_INSTANCE"` ARTEMIS_INSTANCE=`cygpath --unix "$ARTEMIS_INSTANCE"`
[ -n "$JAVA_HOME" ] && [ -n "$JAVA_HOME" ] &&
JAVA_HOME=`cygpath --unix "$JAVA_HOME"` JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
fi fi
@ -102,18 +102,18 @@ fi
if $cygwin ; then if $cygwin ; then
JAVA_HOME=`cygpath --windows "$JAVA_HOME"` JAVA_HOME=`cygpath --windows "$JAVA_HOME"`
ACTIVEMQ_HOME=`cygpath --windows "$ACTIVEMQ_HOME"` ARTEMIS_HOME=`cygpath --windows "$ARTEMIS_HOME"`
CLASSPATH=`cygpath --windows "$CLASSPATH"` CLASSPATH=`cygpath --windows "$CLASSPATH"`
fi fi
exec "$JAVACMD" $JAVA_ARGS $ACTIVEMQ_CLUSTER_PROPS \ exec "$JAVACMD" $JAVA_ARGS $ARTEMIS_CLUSTER_PROPS \
-classpath "$CLASSPATH" \ -classpath "$CLASSPATH" \
-Dactivemq.home="$ACTIVEMQ_HOME" \ -Dartemis.home="$ARTEMIS_HOME" \
-Dactivemq.instance="$ACTIVEMQ_INSTANCE" \ -Dartemis.instance="$ARTEMIS_INSTANCE" \
-Djava.library.path="$ACTIVEMQ_HOME/bin/lib/linux-i686:$ACTIVEMQ_INSTANCE/bin/lib/linux-x86_64" \ -Djava.library.path="$ARTEMIS_HOME/bin/lib/linux-i686:$ARTEMIS_INSTANCE/bin/lib/linux-x86_64" \
-Djava.io.tmpdir="$ACTIVEMQ_INSTANCE/tmp" \ -Djava.io.tmpdir="$ARTEMIS_INSTANCE/tmp" \
-Ddata.dir="$ACTIVEMQ_DATA_DIR" \ -Ddata.dir="$ARTEMIS_DATA_DIR" \
-Djava.util.logging.manager="$ACTIVEMQ_LOG_MANAGER" \ -Djava.util.logging.manager="$ARTEMIS_LOG_MANAGER" \
-Dlogging.configuration="$ACTIVEMQ_LOGGING_CONF" \ -Dlogging.configuration="$ARTEMIS_LOGGING_CONF" \
$DEBUG_ARGS \ $DEBUG_ARGS \
org.apache.activemq.artemis.boot.ActiveMQ $@ org.apache.activemq.artemis.boot.Artemis $@

18
artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/activemq-service → artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service
View File

@ -19,9 +19,9 @@
service=`basename "$0"` service=`basename "$0"`
# #
# Discover the ACTIVEMQ_INSTANCE from the location of this script. # Discover the ARTEMIS_INSTANCE from the location of this script.
# #
if [ -z "$ACTIVEMQ_INSTANCE" ] ; then if [ -z "$ARTEMIS_INSTANCE" ] ; then
## resolve links - $0 may be a link to ActiveMQ's home ## resolve links - $0 may be a link to ActiveMQ's home
PRG="$0" PRG="$0"
@ -41,19 +41,19 @@ if [ -z "$ACTIVEMQ_INSTANCE" ] ; then
fi fi
done done
ACTIVEMQ_INSTANCE=`dirname "$PRG"` ARTEMIS_INSTANCE=`dirname "$PRG"`
cd "$saveddir" cd "$saveddir"
# make it fully qualified # make it fully qualified
ACTIVEMQ_INSTANCE=`cd "$ACTIVEMQ_INSTANCE/.." && pwd` ARTEMIS_INSTANCE=`cd "$ARTEMIS_INSTANCE/.." && pwd`
export ACTIVEMQ_INSTANCE export ARTEMIS_INSTANCE
fi fi
PID_FILE="${ACTIVEMQ_INSTANCE}/data/activemq.pid" PID_FILE="${ARTEMIS_INSTANCE}/data/artemis.pid"
if [ ! -d "${ACTIVEMQ_INSTANCE}/data/" ]; then if [ ! -d "${ARTEMIS_INSTANCE}/data/" ]; then
mkdir "${ACTIVEMQ_INSTANCE}/data/" mkdir "${ARTEMIS_INSTANCE}/data/"
fi fi
status() { status() {
@ -95,7 +95,7 @@ start() {
return 1 return 1
fi fi
nohup ${ACTIVEMQ_INSTANCE}/bin/activemq run > /dev/null 2> /dev/null & nohup ${ARTEMIS_INSTANCE}/bin/artemis run > /dev/null 2> /dev/null &
echo $! > "${PID_FILE}" echo $! > "${PID_FILE}"

26
artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/activemq-service.xml → artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis-service.xml
View File

@ -18,11 +18,11 @@
--> -->
<service> <service>
<id>activemq-${host}</id> <id>armetis-${host}</id>
<name>ActiveMQ: ${host}</name> <name>ActiveMQ Artemis: ${host}</name>
<description>Apache ActiveMQ Artemis is a reliable messaging broker</description> <description>Apache ActiveMQ Artemis is a reliable messaging broker</description>
<logpath>${activemq.instance}\log</logpath> <logpath>${artemis.instance}\log</logpath>
<logmode>roll</logmode> <logmode>roll</logmode>
<executable>"${java.home}\bin\java.exe"</executable> <executable>"${java.home}\bin\java.exe"</executable>
@ -33,26 +33,26 @@
<argument>-Xmx1024M</argument> <argument>-Xmx1024M</argument>
<!-- Cluster Properties: Used to pass arguments to ActiveMQ which can be referenced in broker.xml <!-- Cluster Properties: Used to pass arguments to ActiveMQ which can be referenced in broker.xml
<argument>-Dactivemq.remoting.default.port=61617</argument> <argument>-Dartemis.remoting.default.port=61617</argument>
<argument>-Dactivemq.remoting.amqp.port=5673</argument> <argument>-Dartemis.remoting.amqp.port=5673</argument>
<argument>-Dactivemq.remoting.stomp.port=61614</argument> <argument>-Dartemis.remoting.stomp.port=61614</argument>
<argument>-Dactivemq.remoting.hornetq.port=5446</argument> <argument>-Dartemis.remoting.hornetq.port=5446</argument>
--> -->
<argument>-classpath</argument> <argument>-classpath</argument>
<argument>"${activemq.home}\lib\artemis-boot.jar"</argument> <argument>"${artemis.home}\lib\artemis-boot.jar"</argument>
<argument>"-Dactivemq.home=${activemq.home}"</argument> <argument>"-artemis.home=${artemis.home}"</argument>
<argument>"-Dactivemq.instance=${activemq.instance}"</argument> <argument>"-artemis.instance=${artemis.instance}"</argument>
<argument>"-Ddata.dir=${activemq.instance}/data"</argument> <argument>"-Ddata.dir=${artemis.instance}/data"</argument>
<argument>-Djava.util.logging.manager=org.jboss.logmanager.LogManager</argument> <argument>-Djava.util.logging.manager=org.jboss.logmanager.LogManager</argument>
<argument>"-Dlogging.configuration=file:${activemq.instance}\etc\logging.properties"</argument> <argument>"-Dlogging.configuration=file:${artemis.instance}\etc\logging.properties"</argument>
<!-- Debug args: Uncomment to enable debug <!-- Debug args: Uncomment to enable debug
<argument>-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005</argument> <argument>-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005</argument>
--> -->
<argument>ActiveMQ</argument> <argument>Armetis</argument>
<argument>run</argument> <argument>run</argument>

34
artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/activemq.cmd → artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/bin/artemis.cmd
View File

@ -18,17 +18,17 @@ rem under the License.
setlocal setlocal
if NOT "%ACTIVEMQ_INSTANCE%"=="" goto CHECK_ACTIVEMQ_INSTANCE if NOT "%ARTEMIS_INSTANCE%"=="" goto CHECK_ARTEMIS_INSTANCE
PUSHD . PUSHD .
CD %~dp0.. CD %~dp0..
set ACTIVEMQ_INSTANCE=%CD% set ARTEMIS_INSTANCE=%CD%
POPD POPD
:CHECK_ACTIVEMQ_INSTANCE :CHECK_ARTEMIS_INSTANCE
if exist "%ACTIVEMQ_INSTANCE%\bin\activemq.cmd" goto CHECK_JAVA if exist "%ARTEMIS_INSTANCE%\bin\activemq.cmd" goto CHECK_JAVA
:NO_HOME :NO_HOME
echo ACTIVEMQ_INSTANCE environment variable is set incorrectly. Please set ACTIVEMQ_INSTANCE. echo ARTEMIS_INSTANCE environment variable is set incorrectly. Please set ARTEMIS_INSTANCE.
goto END goto END
:CHECK_JAVA :CHECK_JAVA
@ -49,25 +49,25 @@ echo.
rem "Set Defaults." rem "Set Defaults."
set JAVA_ARGS=-XX:+UseParallelGC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Xms512M -Xmx1024M set JAVA_ARGS=-XX:+UseParallelGC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Xms512M -Xmx1024M
set ACTIVEMQ_LOGGING_CONF=file:%ACTIVEMQ_INSTANCE%\etc\logging.properties set ARTEMIS_LOGGING_CONF=file:%ARTEMIS_INSTANCE%\etc\logging.properties
set ACTIVEMQ_DATA_DIR=%ACTIVEMQ_INSTANCE%\data set ARTEMIS_DATA_DIR=%ARTEMIS_INSTANCE%\data
set ACTIVEMQ_LOG_MANAGER=org.jboss.logmanager.LogManager set ARTEMIS_LOG_MANAGER=org.jboss.logmanager.LogManager
rem "Load Profile Config" rem "Load Profile Config"
call "%ACTIVEMQ_INSTANCE%\etc\activemq.profile.cmd" %* call "%ARTEMIS_INSTANCE%\etc\artemis.profile.cmd" %*
rem "Create full JVM Args" rem "Create full JVM Args"
set JVM_ARGS=%JAVA_ARGS% set JVM_ARGS=%JAVA_ARGS%
if not "%ACTIVEMQ_CLUSTER_PROPS%"=="" set JVM_ARGS=%JVM_ARGS% %ACTIVEMQ_CLUSTER_PROPS% if not "%ARTEMIS_CLUSTER_PROPS%"=="" set JVM_ARGS=%JVM_ARGS% %ARTEMIS_CLUSTER_PROPS%
set JVM_ARGS=%JVM_ARGS% -classpath "%ACTIVEMQ_HOME%\lib\artemis-boot.jar" set JVM_ARGS=%JVM_ARGS% -classpath "%ARTEMIS_HOME%\lib\artemis-boot.jar"
set JVM_ARGS=%JVM_ARGS% -Dactivemq.home="%ACTIVEMQ_HOME%" set JVM_ARGS=%JVM_ARGS% -Dartemis.home="%ARTEMIS_HOME%"
set JVM_ARGS=%JVM_ARGS% -Dactivemq.instance="%ACTIVEMQ_INSTANCE%" set JVM_ARGS=%JVM_ARGS% -Dartemis.instance="%ARTEMIS_INSTANCE%"
set JVM_ARGS=%JVM_ARGS% -Ddata.dir="%ACTIVEMQ_DATA_DIR%" set JVM_ARGS=%JVM_ARGS% -Ddata.dir="%ARTEMIS_DATA_DIR%"
set JVM_ARGS=%JVM_ARGS% -Djava.util.logging.manager="%ACTIVEMQ_LOG_MANAGER%" set JVM_ARGS=%JVM_ARGS% -Djava.util.logging.manager="%ARTEMIS_LOG_MANAGER%"
set JVM_ARGS=%JVM_ARGS% -Dlogging.configuration="%ACTIVEMQ_LOGGING_CONF%" set JVM_ARGS=%JVM_ARGS% -Dlogging.configuration="%ARTEMIS_LOGGING_CONF%"
if not "%DEBUG_ARGS%"=="" set JVM_ARGS=%JVM_ARGS% %DEBUG_ARGS% if not "%DEBUG_ARGS%"=="" set JVM_ARGS=%JVM_ARGS% %DEBUG_ARGS%
"%_JAVACMD%" %JVM_ARGS% org.apache.activemq.artemis.boot.ActiveMQ %* "%_JAVACMD%" %JVM_ARGS% org.apache.activemq.artemis.boot.Artemis %*
:END :END
endlocal endlocal

4
artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/activemq.profile → artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile
View File

@ -15,10 +15,10 @@
# specific language governing permissions and limitations # specific language governing permissions and limitations
# under the License. # under the License.
ACTIVEMQ_HOME='${activemq.home}' ARTEMIS_HOME='${artemis.home}'
# Cluster Properties: Used to pass arguments to ActiveMQ which can be referenced in broker.xml # Cluster Properties: Used to pass arguments to ActiveMQ which can be referenced in broker.xml
#ACTIVEMQ_CLUSTER_PROPS="-Dactivemq.remoting.default.port=61617 -Dactivemq.remoting.amqp.port=5673 -Dactivemq.remoting.stomp.port=61614 -Dactivemq.remoting.hornetq.port=5446" #ARTEMIS_CLUSTER_PROPS="-Dactivemq.remoting.default.port=61617 -Dactivemq.remoting.amqp.port=5673 -Dactivemq.remoting.stomp.port=61614 -Dactivemq.remoting.hornetq.port=5446"
# Java Opts # Java Opts
#JAVA_ARGS="-XX:+UseParallelGC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Xms512M -Xmx1024M" #JAVA_ARGS="-XX:+UseParallelGC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Xms512M -Xmx1024M"

4
artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/activemq.profile.cmd → artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/artemis.profile.cmd
View File

@ -15,10 +15,10 @@ rem KIND, either express or implied. See the License for the
rem specific language governing permissions and limitations rem specific language governing permissions and limitations
rem under the License. rem under the License.
set ACTIVEMQ_HOME=${activemq.home} set ARTEMIS_HOME=${artemis.home}
rem Cluster Properties: Used to pass arguments to ActiveMQ which can be referenced in broker.xml rem Cluster Properties: Used to pass arguments to ActiveMQ which can be referenced in broker.xml
rem set ACTIVEMQ_CLUSTER_PROPS=-Dactivemq.remoting.default.port=61617 -Dactivemq.remoting.amqp.port=5673 -Dactivemq.remoting.stomp.port=61614 -Dactivemq.remoting.hornetq.port=5446 rem set ARTEMIS_CLUSTER_PROPS=-Dactivemq.remoting.default.port=61617 -Dactivemq.remoting.amqp.port=5673 -Dactivemq.remoting.stomp.port=61614 -Dactivemq.remoting.hornetq.port=5446
rem Java Opts rem Java Opts
rem set JAVA_ARGS=-XX:+UseParallelGC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Xms512M -Xmx1024M rem set JAVA_ARGS=-XX:+UseParallelGC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Xms512M -Xmx1024M

6
artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/bootstrap.xml
View File

@ -19,12 +19,12 @@
<broker xmlns="http://activemq.org/schema"> <broker xmlns="http://activemq.org/schema">
<basic-security <basic-security
users="file:${activemq.instance}/etc/activemq-users.properties" users="file:${artemis.instance}/etc/activemq-users.properties"
roles="file:${activemq.instance}/etc/activemq-roles.properties" roles="file:${artemis.instance}/etc/activemq-roles.properties"
default-user="guest" default-user="guest"
/> />
<server configuration="file:${activemq.instance}/etc/broker.xml"/> <server configuration="file:${artemis.instance}/etc/broker.xml"/>
<web bind="http://localhost:8161" path="web"> <web bind="http://localhost:8161" path="web">
<app url="jolokia" war="jolokia-war-1.2.3.war"/> <app url="jolokia" war="jolokia-war-1.2.3.war"/>

2
artemis-bootstrap/src/main/resources/org/apache/activemq/artemis/cli/commands/etc/logging.properties
View File

@ -42,7 +42,7 @@ handler.FILE=org.jboss.logmanager.handlers.FileHandler
handler.FILE.level=DEBUG handler.FILE.level=DEBUG
handler.FILE.properties=autoFlush,fileName handler.FILE.properties=autoFlush,fileName
handler.FILE.autoFlush=true handler.FILE.autoFlush=true
handler.FILE.fileName=${activemq.instance}/log/activemq.log handler.FILE.fileName=${artemis.instance}/log/activemq.log
handler.FILE.formatter=PATTERN handler.FILE.formatter=PATTERN
# Formatter pattern configuration # Formatter pattern configuration

2
artemis-service-extensions/src/test/java/org/apache/activemq/artemis/service/extensions/tests/xa/ActiveMQXAResourceWrapperImplTest.java
View File

@ -40,7 +40,7 @@ public class ActiveMQXAResourceWrapperImplTest
xaResourceWrapperProperties.put(ActiveMQXAResourceWrapper.ACTIVEMQ_JNDI_NAME, jndiName); xaResourceWrapperProperties.put(ActiveMQXAResourceWrapper.ACTIVEMQ_JNDI_NAME, jndiName);
xaResourceWrapperProperties.put(ActiveMQXAResourceWrapper.ACTIVEMQ_NODE_ID, nodeId); xaResourceWrapperProperties.put(ActiveMQXAResourceWrapper.ACTIVEMQ_NODE_ID, nodeId);
xaResourceWrapperProperties.put(ActiveMQXAResourceWrapper.ACTIVEMQ_PRODUCT_VERSION, "6"); xaResourceWrapperProperties.put(ActiveMQXAResourceWrapper.ACTIVEMQ_PRODUCT_VERSION, "6");
xaResourceWrapperProperties.put(ActiveMQXAResourceWrapper.ACTIVEMQ_PRODUCT_NAME, "ActiveMQ"); xaResourceWrapperProperties.put(ActiveMQXAResourceWrapper.ACTIVEMQ_PRODUCT_NAME, "ActiveMQ Artemis");
ActiveMQXAResourceWrapperImpl xaResourceWrapper = new ActiveMQXAResourceWrapperImpl(xaResource, xaResourceWrapperProperties); ActiveMQXAResourceWrapperImpl xaResourceWrapper = new ActiveMQXAResourceWrapperImpl(xaResource, xaResourceWrapperProperties);
String expectedJndiNodeId = jndiName + " NodeId:" + nodeId; String expectedJndiNodeId = jndiName + " NodeId:" + nodeId;

2
artemis-website/src/main/resources/examples/index.html
View File

@ -60,7 +60,7 @@
to run a different example simply edit the <code>config/examples/bootstrap.xml</code> aand change the paths to point to run a different example simply edit the <code>config/examples/bootstrap.xml</code> aand change the paths to point
the correct configuration (this will be found in the directory of the example you wish to run). By default the broker the correct configuration (this will be found in the directory of the example you wish to run). By default the broker
will use the <code>data/server0</code> directory for the journal, to avoid problems it is best to delete this will use the <code>data/server0</code> directory for the journal, to avoid problems it is best to delete this
directory between running different examples or set the <code>ACTIVEMQ_DATA_DIR</code> environment property in directory between running different examples or set the <code>ARTEMIS_DATA_DIR</code> environment property in
<code>activemq.conf</code>to use a different location</p> <code>activemq.conf</code>to use a different location</p>
<div></div> <div></div>

22
distribution/artemis/src/main/resources/bin/activemq → distribution/artemis/src/main/resources/bin/artemis
View File

@ -16,7 +16,7 @@
# specific language governing permissions and limitations # specific language governing permissions and limitations
# under the License. # under the License.
if [ -z "$ACTIVEMQ_HOME" ] ; then if [ -z "$ARTEMIS_HOME" ] ; then
## resolve links - $0 may be a link to ActiveMQ's home ## resolve links - $0 may be a link to ActiveMQ's home
PRG="$0" PRG="$0"
@ -37,16 +37,16 @@ if [ -z "$ACTIVEMQ_HOME" ] ; then
fi fi
done done
ACTIVEMQ_HOME=`dirname "$PRG"` ARTEMIS_HOME=`dirname "$PRG"`
cd "$saveddir" cd "$saveddir"
# make it fully qualified # make it fully qualified
ACTIVEMQ_HOME=`cd "$ACTIVEMQ_HOME/.." && pwd` ARTEMIS_HOME=`cd "$ARTEMIS_HOME/.." && pwd`
fi fi
# Set Defaults Properties # Set Defaults Properties
JAVA_ARGS="-XX:+UseParallelGC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Xms512M -Xmx1024M" JAVA_ARGS="-XX:+UseParallelGC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Xms512M -Xmx1024M"
CLASSPATH="$ACTIVEMQ_HOME/lib/artemis-boot.jar" CLASSPATH="$ARTEMIS_HOME/lib/artemis-boot.jar"
# OS specific support. # OS specific support.
cygwin=false; cygwin=false;
@ -65,8 +65,8 @@ esac
# For Cygwin, ensure paths are in UNIX format before anything is touched # For Cygwin, ensure paths are in UNIX format before anything is touched
if $cygwin ; then if $cygwin ; then
[ -n "$ACTIVEMQ_HOME" ] && [ -n "$ARTEMIS_HOME" ] &&
ACTIVEMQ_HOME=`cygpath --unix "$ACTIVEMQ_HOME"` ARTEMIS_HOME=`cygpath --unix "$ARTEMIS_HOME"`
[ -n "$JAVA_HOME" ] && [ -n "$JAVA_HOME" ] &&
JAVA_HOME=`cygpath --unix "$JAVA_HOME"` JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
fi fi
@ -96,13 +96,13 @@ fi
if $cygwin ; then if $cygwin ; then
JAVA_HOME=`cygpath --windows "$JAVA_HOME"` JAVA_HOME=`cygpath --windows "$JAVA_HOME"`
ACTIVEMQ_HOME=`cygpath --windows "$ACTIVEMQ_HOME"` ARTEMIS_HOME=`cygpath --windows "$ARTEMIS_HOME"`
CLASSPATH=`cygpath --windows "$CLASSPATH"` CLASSPATH=`cygpath --windows "$CLASSPATH"`
fi fi
exec "$JAVACMD" $JAVA_ARGS $ACTIVEMQ_CLUSTER_PROPS \ exec "$JAVACMD" $JAVA_ARGS $ARTEMIS_CLUSTER_PROPS \
-classpath "$CLASSPATH" \ -classpath "$CLASSPATH" \
-Dactivemq.home="$ACTIVEMQ_HOME" \ -Dartemis.home="$ARTEMIS_HOME" \
-Djava.library.path="$ACTIVEMQ_HOME/bin/lib/linux-i686:$ACTIVEMQ_INSTANCE/bin/lib/linux-x86_64" \ -Djava.library.path="$ARTEMIS_HOME/bin/lib/linux-i686:$ARTEMIS_INSTANCE/bin/lib/linux-x86_64" \
$DEBUG_ARGS \ $DEBUG_ARGS \
org.apache.activemq.artemis.boot.ActiveMQ $@ org.apache.activemq.artemis.boot.Artemis $@

18
distribution/artemis/src/main/resources/bin/activemq.cmd → distribution/artemis/src/main/resources/bin/artemis.cmd
View File

@ -18,17 +18,17 @@ rem under the License.
setlocal setlocal
if NOT "%ACTIVEMQ_HOME%"=="" goto CHECK_ACTIVEMQ_HOME if NOT "%ARTEMIS_HOME%"=="" goto CHECK_ARTEMIS_HOME
PUSHD . PUSHD .
CD %~dp0.. CD %~dp0..
set ACTIVEMQ_HOME=%CD% set ARTEMIS_HOME=%CD%
POPD POPD
:CHECK_ACTIVEMQ_HOME :CHECK_ARTEMIS_HOME
if exist "%ACTIVEMQ_HOME%\bin\activemq.cmd" goto CHECK_JAVA if exist "%ARTEMIS_HOME%\bin\artemis.cmd" goto CHECK_JAVA
:NO_HOME :NO_HOME
echo ACTIVEMQ_HOME environment variable is set incorrectly. Please set ACTIVEMQ_HOME. echo ARTEMIS_HOME environment variable is set incorrectly. Please set ARTEMIS_HOME.
goto END goto END
:CHECK_JAVA :CHECK_JAVA
@ -52,12 +52,12 @@ set JAVA_ARGS=-XX:+UseParallelGC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods
rem "Create full JVM Args" rem "Create full JVM Args"
set JVM_ARGS=%JAVA_ARGS% set JVM_ARGS=%JAVA_ARGS%
if not "%ACTIVEMQ_CLUSTER_PROPS%"=="" set JVM_ARGS=%JVM_ARGS% %ACTIVEMQ_CLUSTER_PROPS% if not "%ARTEMIS_CLUSTER_PROPS%"=="" set JVM_ARGS=%JVM_ARGS% %ARTEMIS_CLUSTER_PROPS%
set JVM_ARGS=%JVM_ARGS% -classpath "%ACTIVEMQ_HOME%\lib\artemis-boot.jar" set JVM_ARGS=%JVM_ARGS% -classpath "%ARTEMIS_HOME%\lib\artemis-boot.jar"
set JVM_ARGS=%JVM_ARGS% -Dactivemq.home="%ACTIVEMQ_HOME%" set JVM_ARGS=%JVM_ARGS% -Dartemis.home="%ARTEMIS_HOME%"
if not "%DEBUG_ARGS%"=="" set JVM_ARGS=%JVM_ARGS% %DEBUG_ARGS% if not "%DEBUG_ARGS%"=="" set JVM_ARGS=%JVM_ARGS% %DEBUG_ARGS%
"%_JAVACMD%" %JVM_ARGS% org.apache.activemq.artemis.boot.ActiveMQ %* "%_JAVACMD%" %JVM_ARGS% org.apache.activemq.artemis.boot.Artemis %*
:END :END
endlocal endlocal

4
docs/quickstart-guide/en/running.md
View File

@ -4,7 +4,7 @@ Creating a Broker Instance
A broker instance is the directory containing all the configuration and runtime A broker instance is the directory containing all the configuration and runtime
data, such as logs and data files, associated with a broker process. It is recommended that data, such as logs and data files, associated with a broker process. It is recommended that
you do *not* create the instance directory under `${ACTIVEMQ_HOME}`. This separation is you do *not* create the instance directory under `${ARTEMIS_HOME}`. This separation is
encouraged so that you can more easily upgrade when the next version of ActiveMQ is released. encouraged so that you can more easily upgrade when the next version of ActiveMQ is released.
On Unix systems, it is a common convention to store this kind of runtime data under On Unix systems, it is a common convention to store this kind of runtime data under
@ -12,7 +12,7 @@ the `/var/lib` directory. For example, to create an instance at '/var/lib/mybro
the following commands in your command line shell: the following commands in your command line shell:
cd /var/lib cd /var/lib
${ACTIVEMQ_HOME}/bin/activemq create mybroker ${ARTEMIS_HOME}/bin/activemq create mybroker
A broker instance directory will contain the following sub directories: A broker instance directory will contain the following sub directories:

6
docs/user-manual/en/using-server.md
View File

@ -10,13 +10,13 @@ we mean the Apache ActiveMQ Artemis standalone server, in its default configurat
with a JMS Service enabled. with a JMS Service enabled.
This document will refer to the full path of the directory where the ActiveMQ This document will refer to the full path of the directory where the ActiveMQ
distribution has been extracted to as `${ACTIVEMQ_HOME}` directory. distribution has been extracted to as `${ARTEMIS_HOME}` directory.
## Creating a Broker Instance ## Creating a Broker Instance
A broker instance is the directory containing all the configuration and runtime A broker instance is the directory containing all the configuration and runtime
data, such as logs and data files, associated with a broker process. It is recommended that data, such as logs and data files, associated with a broker process. It is recommended that
you do *not* create the instance directory under `${ACTIVEMQ_HOME}`. This separation is you do *not* create the instance directory under `${ARTEMIS_HOME}`. This separation is
encouraged so that you can more easily upgrade when the next version of ActiveMQ is released. encouraged so that you can more easily upgrade when the next version of ActiveMQ is released.
On Unix systems, it is a common convention to store this kind of runtime data under On Unix systems, it is a common convention to store this kind of runtime data under
@ -24,7 +24,7 @@ the `/var/lib` directory. For example, to create an instance at '/var/lib/mybro
the following commands in your command line shell: the following commands in your command line shell:
cd /var/lib cd /var/lib
${ACTIVEMQ_HOME}/bin/activemq create mybroker ${ARTEMIS_HOME}/bin/activemq create mybroker
A broker instance directory will contain the following sub directories: A broker instance directory will contain the following sub directories: