This closes #214 config rename

This commit is contained in:
jbertram 2015-04-29 12:02:06 -05:00
commit 46254e72b9
546 changed files with 1148 additions and 1148 deletions

View File

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

View File

@ -28,14 +28,14 @@ import org.apache.activemq.artemis.cli.commands.Stop;
import java.io.InputStream;
import java.io.OutputStream;
public class ActiveMQ
public class Artemis
{
public static void main(String[] args) throws Exception
{
String instance = System.getProperty("activemq.instance");
Cli.CliBuilder<Action> builder = Cli.<Action>builder("activemq")
.withDescription("ActiveMQ Command Line")
String instance = System.getProperty("artemis.instance");
Cli.CliBuilder<Action> builder = Cli.<Action>builder("artemis")
.withDescription("ActiveMQ Artemis Command Line")
.withCommand(HelpAction.class)
.withDefaultCommand(HelpAction.class);
@ -67,14 +67,14 @@ public class ActiveMQ
{
System.err.println(configException.getMessage());
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
{
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

View File

@ -44,7 +44,7 @@ public class Create implements Action
@Option(name = "--force", description = "Overwrite configuration at destination directory")
boolean force;
@Option(name = "--home", description = "Directory where ActiveMQ is installed")
@Option(name = "--home", description = "Directory where ActiveMQ Artemis is installed")
File home;
@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)
{
host = directory.getName();
@ -128,8 +128,8 @@ public class Create implements Action
{
filters.put("${home}", path(home, false));
}
filters.put("${activemq.home}", path(System.getProperty("activemq.home"), false));
filters.put("${activemq.instance}", path(directory, false));
filters.put("${artemis.home}", path(System.getProperty("artemis.home"), false));
filters.put("${artemis.instance}", path(directory, false));
filters.put("${java.home}", path(System.getProperty("java.home"), false));
new File(directory, "bin").mkdirs();
@ -141,34 +141,34 @@ public class Create implements Action
if (IS_WINDOWS)
{
write("bin/activemq.cmd", null, false);
write("bin/activemq-service.exe");
write("bin/activemq-service.xml", filters, false);
write("etc/activemq.profile.cmd", filters, false);
write("bin/artemis.cmd", null, false);
write("bin/artemis-service.exe");
write("bin/artemis-service.xml", filters, false);
write("etc/artemis.profile.cmd", filters, false);
}
if (!IS_WINDOWS || IS_CYGWIN)
{
write("bin/activemq", null, true);
makeExec("bin/activemq");
write("bin/activemq-service", null, true);
makeExec("bin/activemq-service");
write("etc/activemq.profile", filters, true);
makeExec("etc/activemq.profile");
write("bin/artemis", null, true);
makeExec("bin/artemis");
write("bin/artemis-service", null, true);
makeExec("bin/artemis-service");
write("etc/artemis.profile", filters, true);
makeExec("etc/artemis.profile");
}
write("etc/logging.properties", null, false);
write("etc/bootstrap.xml", null, false);
write("etc/activemq-configuration.xml", filters, false);
write("etc/activemq-roles.properties", null, false);
write("etc/activemq-users.properties", null, false);
write("etc/broker.xml", filters, false);
write("etc/artemis-roles.properties", null, false);
write("etc/artemis-users.properties", null, false);
context.out.println("");
context.out.println("You can now start the broker by executing: ");
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("");
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("");
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("");
}

View File

@ -19,7 +19,7 @@ package org.apache.activemq.artemis.cli.commands;
import io.airlift.command.Arguments;
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.core.server.ActiveMQComponent;
import org.apache.activemq.artemis.dto.BrokerDTO;
@ -40,7 +40,7 @@ import java.util.TimerTask;
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;
private ArrayList<ActiveMQComponent> components = new ArrayList<>();
@ -60,13 +60,13 @@ public class Run implements Action
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
the ACTIVEMQ_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. */
String activemqInstance = System.getProperty("activemq.instance").replace("\\", "/");
System.setProperty("activemq.instance", activemqInstance);
/* We use File URI for locating files. The ARTEMIS_HOME variable is used to determine file paths. For Windows
the ARTEMIS_HOME variable will include back slashes (An invalid file URI character path separator). For this
reason we overwrite the ARTEMIS_HOME variable with backslashes replaced with forward slashes. */
String activemqInstance = System.getProperty("artemis.instance").replace("\\", "/");
System.setProperty("artemis.instance", activemqInstance);
if (configuration == null)
{
@ -120,7 +120,7 @@ public class Run implements Action
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()
{
@Override

View File

@ -27,17 +27,17 @@ import java.net.URI;
@Command(name = "stop", description = "stops the broker instance")
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;
@Override
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
the ACTIVEMQ_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. */
String activemqHome = System.getProperty("activemq.instance").replace("\\", "/");
System.setProperty("activemq.instance", activemqHome);
/* We use File URI for locating files. The ARTEMIS_HOME variable is used to determine file paths. For Windows
the ARTEMIS_HOME variable will include back slashes (An invalid file URI character path separator). For this
reason we overwrite the ARTEMIS_HOME variable with backslashes replaced with forward slashes. */
String activemqHome = System.getProperty("artemis.instance").replace("\\", "/");
System.setProperty("artemis.instance", activemqHome);
if (configuration == null)
{

View File

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

View File

@ -19,9 +19,9 @@
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
PRG="$0"
@ -41,19 +41,19 @@ if [ -z "$ACTIVEMQ_INSTANCE" ] ; then
fi
done
ACTIVEMQ_INSTANCE=`dirname "$PRG"`
ARTEMIS_INSTANCE=`dirname "$PRG"`
cd "$saveddir"
# make it fully qualified
ACTIVEMQ_INSTANCE=`cd "$ACTIVEMQ_INSTANCE/.." && pwd`
export ACTIVEMQ_INSTANCE
ARTEMIS_INSTANCE=`cd "$ARTEMIS_INSTANCE/.." && pwd`
export ARTEMIS_INSTANCE
fi
PID_FILE="${ACTIVEMQ_INSTANCE}/data/activemq.pid"
PID_FILE="${ARTEMIS_INSTANCE}/data/artemis.pid"
if [ ! -d "${ACTIVEMQ_INSTANCE}/data/" ]; then
mkdir "${ACTIVEMQ_INSTANCE}/data/"
if [ ! -d "${ARTEMIS_INSTANCE}/data/" ]; then
mkdir "${ARTEMIS_INSTANCE}/data/"
fi
status() {
@ -95,7 +95,7 @@ start() {
return 1
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}"

View File

@ -18,11 +18,11 @@
-->
<service>
<id>activemq-${host}</id>
<name>ActiveMQ: ${host}</name>
<id>armetis-${host}</id>
<name>ActiveMQ Artemis: ${host}</name>
<description>Apache ActiveMQ Artemis is a reliable messaging broker</description>
<logpath>${activemq.instance}\log</logpath>
<logpath>${artemis.instance}\log</logpath>
<logmode>roll</logmode>
<executable>"${java.home}\bin\java.exe"</executable>
@ -32,27 +32,27 @@
<argument>-Xms512M</argument>
<argument>-Xmx1024M</argument>
<!-- Cluster Properties: Used to pass arguments to ActiveMQ which can be referenced in activemq-configuration.xml
<argument>-Dactivemq.remoting.default.port=61617</argument>
<argument>-Dactivemq.remoting.amqp.port=5673</argument>
<argument>-Dactivemq.remoting.stomp.port=61614</argument>
<argument>-Dactivemq.remoting.hornetq.port=5446</argument>
<!-- Cluster Properties: Used to pass arguments to ActiveMQ which can be referenced in broker.xml
<argument>-Dartemis.remoting.default.port=61617</argument>
<argument>-Dartemis.remoting.amqp.port=5673</argument>
<argument>-Dartemis.remoting.stomp.port=61614</argument>
<argument>-Dartemis.remoting.hornetq.port=5446</argument>
-->
<argument>-classpath</argument>
<argument>"${activemq.home}\lib\artemis-boot.jar"</argument>
<argument>"-Dactivemq.home=${activemq.home}"</argument>
<argument>"-Dactivemq.instance=${activemq.instance}"</argument>
<argument>"-Ddata.dir=${activemq.instance}/data"</argument>
<argument>"${artemis.home}\lib\artemis-boot.jar"</argument>
<argument>"-artemis.home=${artemis.home}"</argument>
<argument>"-artemis.instance=${artemis.instance}"</argument>
<argument>"-Ddata.dir=${artemis.instance}/data"</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
<argument>-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005</argument>
-->
<argument>ActiveMQ</argument>
<argument>Armetis</argument>
<argument>run</argument>

View File

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

View File

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

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 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 activemq-configuration.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 Cluster Properties: Used to pass arguments to ActiveMQ which can be referenced in broker.xml
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 set JAVA_ARGS=-XX:+UseParallelGC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Xms512M -Xmx1024M

View File

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

View File

@ -20,7 +20,7 @@ under the License.
<configuration xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
xsi:schemaLocation="urn:activemq /schema/artemis-configuration.xsd">
<jms xmlns="urn:activemq:jms">
<queue name="DLQ"/>
<queue name="ExpiryQueue"/>

View File

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

View File

@ -30,7 +30,7 @@ public class FileBrokerTest
public void startWithJMS() throws Exception
{
ServerDTO serverDTO = new ServerDTO();
serverDTO.configuration = "activemq-configuration.xml";
serverDTO.configuration = "broker.xml";
FileBroker broker = null;
try
{

View File

@ -22,7 +22,7 @@ import org.apache.activemq.artemis.core.protocol.core.Packet;
* This is class is a simple way to intercepting calls on ActiveMQ client and servers.
* <p>
* To add an interceptor to ActiveMQ server, you have to modify the server configuration file
* {@literal activemq-configuration.xml}.<br>
* {@literal broker.xml}.<br>
* To add it to a client, use {@link org.apache.activemq.artemis.api.core.client.ServerLocator#addIncomingInterceptor(Interceptor)}
*/
public interface Interceptor extends BaseInterceptor<Packet>

View File

@ -677,7 +677,7 @@ public class ActiveMQSessionContext extends SessionContext
ClientSession.QueueQuery queueInfo = consumerInternal.getQueueInfo();
// We try and recreate any non durable queues, since they probably won't be there unless
// they are defined in activemq-configuration.xml
// they are defined in broker.xml
// This allows e.g. JMS non durable subs and temporary queues to continue to be used after failover
if (!queueInfo.isDurable())
{

View File

@ -38,7 +38,7 @@ import java.util.Map;
public class FileJMSConfiguration extends JMSConfigurationImpl implements Deployable
{
private static final String CONFIGURATION_SCHEMA_URL = "schema/activemq-jms.xsd";
private static final String CONFIGURATION_SCHEMA_URL = "schema/artemis-jms.xsd";
private static final String CONFIGURATION_SCHEMA_ROOT_ELEMENT = "jms";

View File

@ -96,14 +96,14 @@ public class ActiveMQBootstrap
{
//extendPluginClasspath(configurationDir);
configuration = new FileConfiguration();
File file = new File(new File(configurationDir), "activemq-configuration.xml");
File file = new File(new File(configurationDir), "broker.xml");
jmsFileConfiguration = new FileJMSConfiguration();
FileDeploymentManager deploymentManager = new FileDeploymentManager(file.toURI().toString());
deploymentManager.addDeployable((FileConfiguration)configuration);
deploymentManager.addDeployable((FileJMSConfiguration) jmsFileConfiguration);
securityConfiguration = new FileSecurityConfiguration(new File(configurationDir, "activemq-users.properties").toURI().toString(),
new File(configurationDir, "activemq-roles.properties").toURI().toString(),
securityConfiguration = new FileSecurityConfiguration(new File(configurationDir, "artemis-users.properties").toURI().toString(),
new File(configurationDir, "artemis-roles.properties").toURI().toString(),
"guest",
false,
null);

View File

@ -22,7 +22,7 @@ import org.apache.activemq.artemis.api.core.BaseInterceptor;
* This class is a simple way to intercepting client calls on ActiveMQ using STOMP protocol.
* <p>
* To add an interceptor to ActiveMQ server, you have to modify the server configuration file
* {@literal activemq-configuration.xml}.<br>
* {@literal broker.xml}.<br>
*/
public interface StompFrameInterceptor extends BaseInterceptor<StompFrame>
{

View File

@ -50,8 +50,8 @@ public class EmbeddedTest
{
server = new EmbeddedRestActiveMQJMS();
server.getManager().setConfigResourcePath("activemq-rest.xml");
FileSecurityConfiguration securityConfiguration = new FileSecurityConfiguration("activemq-users.properties",
"activemq-roles.properties",
FileSecurityConfiguration securityConfiguration = new FileSecurityConfiguration("artemis-users.properties",
"artemis-roles.properties",
"guest",
false,
null);

View File

@ -16,7 +16,7 @@
-->
<configuration xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
<jms xmlns="urn:activemq:jms">
<!--the queue used by the example-->
<queue name="exampleQueue"/>

View File

@ -37,7 +37,7 @@ import org.w3c.dom.NodeList;
*/
public class FileDeploymentManager
{
private static final String DEFAULT_CONFIGURATION_URL = "activemq-configuration.xml";
private static final String DEFAULT_CONFIGURATION_URL = "broker.xml";
private final String configurationUrl;

View File

@ -34,7 +34,7 @@ public final class FileConfiguration extends ConfigurationImpl implements Deploy
{
private static final long serialVersionUID = -4766689627675039596L;
private static final String CONFIGURATION_SCHEMA_URL = "schema/activemq-configuration.xsd";
private static final String CONFIGURATION_SCHEMA_URL = "schema/artemis-configuration.xsd";
private static final String CONFIGURATION_SCHEMA_ROOT_ELEMENT = "core";

View File

@ -24,7 +24,7 @@ import javax.management.MBeanServer;
import java.util.Map;
/**
* A Deployable is an object that can be configured via an xml configuration element in the main configuration file "activemq-configuration.xml"
* A Deployable is an object that can be configured via an xml configuration element in the main configuration file "broker.xml"
* It holds all the information needed by the FileDeploymentManager to parse the configuration and build the component
*/
public interface Deployable

View File

@ -73,7 +73,7 @@ import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
/**
* Parses an XML document according to the {@literal activemq-configuration.xsd} schema.
* Parses an XML document according to the {@literal artemis-configuration.xsd} schema.
*/
public final class FileConfigurationParser extends XMLConfigurationUtil
{

View File

@ -38,7 +38,7 @@ public class EmbeddedActiveMQ
protected MBeanServer mbeanServer;
/**
* Classpath resource for activemq server config. Defaults to 'activemq-configuration.xml'.
* Classpath resource for activemq server config. Defaults to 'broker.xml'.
*
* @param filename
*/
@ -94,7 +94,7 @@ public class EmbeddedActiveMQ
{
if (configuration == null)
{
if (configResourcePath == null) configResourcePath = "activemq-configuration.xml";
if (configResourcePath == null) configResourcePath = "broker.xml";
FileDeploymentManager deploymentManager = new FileDeploymentManager(configResourcePath);
FileConfiguration config = new FileConfiguration();
deploymentManager.addDeployable(config);

View File

@ -64,7 +64,7 @@ public class WrongRoleFileConfigurationParserTest extends UnitTestCase
private static final String configuration =
"<configuration xmlns=\"urn:activemq\"\n" +
"xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"\n" +
"xsi:schemaLocation=\"urn:activemq /schema/activemq-configuration.xsd\">\n" +
"xsi:schemaLocation=\"urn:activemq /schema/artemis-configuration.xsd\">\n" +
"<name>ActiveMQ.main.config</name>" + "\n" +
"<log-delegate-factory-class-name>org.apache.activemq.artemis.integration.logging.Log4jLogDelegateFactory</log-delegate-factory-class-name>" + "\n" +
"<bindings-directory>${jboss.server.data.dir}/activemq/bindings</bindings-directory>" + "\n" +

View File

@ -17,7 +17,7 @@
<configuration
xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:activemq ../../src/schemas/activemq-server.xsd ">
xsi:schemaLocation="urn:activemq ../../src/schemas/artemis-server.xsd ">
<!-- just use the defaults -->
<core xmlns="urn:activemq:core"/>
</configuration>

View File

@ -17,7 +17,7 @@
<configuration
xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-server.xsd">
xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/artemis-server.xsd">
<core xmlns="urn:activemq:core">
<name>SomeNameForUseOnTheApplicationServer</name>
<resolve-protocols>false</resolve-protocols>

View File

@ -17,7 +17,7 @@
<configuration
xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:activemq ../../src/config/common/schema/activemq-server.xsd">
xsi:schemaLocation="urn:activemq ../../src/config/common/schema/artemis-server.xsd">
<core xmlns="urn:activemq:core">
<name>SomeNameForUseOnTheApplicationServer</name>
<scheduled-thread-pool-max-size>12345</scheduled-thread-pool-max-size>

View File

@ -17,7 +17,7 @@
<configuration
xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:activemq ../../src/config/common/schema/activemq-server.xsd">
xsi:schemaLocation="urn:activemq ../../src/config/common/schema/artemis-server.xsd">
<core xmlns="urn:activemq:core">
<name>SomeNameForUseOnTheApplicationServer</name>
<scheduled-thread-pool-max-size>12345</scheduled-thread-pool-max-size>

View File

@ -17,7 +17,7 @@
<configuration
xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:activemq ../../src/config/common/schema/activemq-server.xsd">
xsi:schemaLocation="urn:activemq ../../src/config/common/schema/artemis-server.xsd">
<core xmlns="urn:activemq:core">
<name>SomeNameForUseOnTheApplicationServer</name>
<scheduled-thread-pool-max-size>12345</scheduled-thread-pool-max-size>

View File

@ -17,7 +17,7 @@
<configuration
xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:activemq ../../src/config/common/schema/activemq-server.xsd">
xsi:schemaLocation="urn:activemq ../../src/config/common/schema/artemis-server.xsd">
<core xmlns="urn:activemq:core">
<name>SomeNameForUseOnTheApplicationServer</name>
<scheduled-thread-pool-max-size>12345</scheduled-thread-pool-max-size>

View File

@ -17,7 +17,7 @@
<configuration
xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:activemq ../../src/config/common/schema/activemq-server.xsd">
xsi:schemaLocation="urn:activemq ../../src/config/common/schema/artemis-server.xsd">
<core xmlns="urn:activemq:core">
<name>SomeNameForUseOnTheApplicationServer</name>
<scheduled-thread-pool-max-size>12345</scheduled-thread-pool-max-size>

View File

@ -17,7 +17,7 @@
<configuration
xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:activemq ../../src/config/common/schema/activemq-server.xsd">
xsi:schemaLocation="urn:activemq ../../src/config/common/schema/artemis-server.xsd">
<core xmlns="urn:activemq:core">
<name>SomeNameForUseOnTheApplicationServer</name>
<scheduled-thread-pool-max-size>12345</scheduled-thread-pool-max-size>

View File

@ -17,7 +17,7 @@
<configuration
xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-server.xsd">
xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/artemis-server.xsd">
<core xmlns="urn:activemq:core">
<discovery-groups>
<discovery-group name="wahey"/>

View File

@ -17,7 +17,7 @@
<configuration
xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-server.xsd">
xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/artemis-server.xsd">
<core xmlns="urn:activemq:core">
<ha-policy>
<shared-store>

View File

@ -16,7 +16,7 @@
-->
<configuration xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
xsi:schemaLocation="urn:activemq /schema/artemis-configuration.xsd">
<core xmlns="urn:activemq:core">

View File

@ -17,7 +17,7 @@
<configuration
xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
<core xmlns="urn:activemq:core">
<discovery-groups>
<discovery-group name="wahey"/>

View File

@ -17,7 +17,7 @@
<configuration
xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
<core xmlns="urn:activemq:core">
<ha-policy>
<!--only one of the following-->

View File

@ -17,7 +17,7 @@
<configuration
xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
<core xmlns="urn:activemq:core">
<ha-policy>
<!--only one of the following-->

View File

@ -17,7 +17,7 @@
<configuration
xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
<core xmlns="urn:activemq:core">
<ha-policy/>
</core>

View File

@ -17,7 +17,7 @@
<configuration
xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
<core xmlns="urn:activemq:core"/>

View File

@ -17,7 +17,7 @@
<configuration
xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
<core xmlns="urn:activemq:core">
<discovery-groups>
<discovery-group name="wahey"/>

View File

@ -17,7 +17,7 @@
<configuration
xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
<core xmlns="urn:activemq:core">
<ha-policy>

View File

@ -17,7 +17,7 @@
<configuration
xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
<core xmlns="urn:activemq:core">
<ha-policy>

View File

@ -17,7 +17,7 @@
<configuration
xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
<core xmlns="urn:activemq:core">
<ha-policy>

View File

@ -17,7 +17,7 @@
<configuration
xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-server.xsd">
xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/artemis-server.xsd">
<core xmlns="urn:activemq:core">
<ha-policy>
<shared-store>

View File

@ -17,7 +17,7 @@
<configuration
xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-server.xsd">
xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/artemis-server.xsd">
<core xmlns="urn:activemq:core">
<discovery-groups>
<discovery-group name="wahey"/>

View File

@ -17,7 +17,7 @@
<configuration
xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-server.xsd">
xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/artemis-server.xsd">
<core xmlns="urn:activemq:core">
<ha-policy>
<shared-store>

View File

@ -17,7 +17,7 @@
<configuration
xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-server.xsd">
xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/artemis-server.xsd">
<core xmlns="urn:activemq:core">
<ha-policy>
<shared-store>

View File

@ -40,7 +40,7 @@ public class ActiveMQXAResourceWrapperImplTest
xaResourceWrapperProperties.put(ActiveMQXAResourceWrapper.ACTIVEMQ_JNDI_NAME, jndiName);
xaResourceWrapperProperties.put(ActiveMQXAResourceWrapper.ACTIVEMQ_NODE_ID, nodeId);
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);
String expectedJndiNodeId = jndiName + " NodeId:" + nodeId;

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
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
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>
<div></div>

View File

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

View File

@ -18,17 +18,17 @@ rem under the License.
setlocal
if NOT "%ACTIVEMQ_HOME%"=="" goto CHECK_ACTIVEMQ_HOME
if NOT "%ARTEMIS_HOME%"=="" goto CHECK_ARTEMIS_HOME
PUSHD .
CD %~dp0..
set ACTIVEMQ_HOME=%CD%
set ARTEMIS_HOME=%CD%
POPD
:CHECK_ACTIVEMQ_HOME
if exist "%ACTIVEMQ_HOME%\bin\activemq.cmd" goto CHECK_JAVA
:CHECK_ARTEMIS_HOME
if exist "%ARTEMIS_HOME%\bin\artemis.cmd" goto CHECK_JAVA
: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
:CHECK_JAVA
@ -52,12 +52,12 @@ set JAVA_ARGS=-XX:+UseParallelGC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods
rem "Create full JVM Args"
set JVM_ARGS=%JAVA_ARGS%
if not "%ACTIVEMQ_CLUSTER_PROPS%"=="" set JVM_ARGS=%JVM_ARGS% %ACTIVEMQ_CLUSTER_PROPS%
set JVM_ARGS=%JVM_ARGS% -classpath "%ACTIVEMQ_HOME%\lib\artemis-boot.jar"
set JVM_ARGS=%JVM_ARGS% -Dactivemq.home="%ACTIVEMQ_HOME%"
if not "%ARTEMIS_CLUSTER_PROPS%"=="" set JVM_ARGS=%JVM_ARGS% %ARTEMIS_CLUSTER_PROPS%
set JVM_ARGS=%JVM_ARGS% -classpath "%ARTEMIS_HOME%\lib\artemis-boot.jar"
set JVM_ARGS=%JVM_ARGS% -Dartemis.home="%ARTEMIS_HOME%"
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
endlocal

View File

@ -4,7 +4,7 @@ Creating a Broker Instance
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
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.
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:
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:

View File

@ -8,7 +8,7 @@ the cluster is an active Apache ActiveMQ Artemis server which manages its own me
and handles its own connections.
The cluster is formed by each node declaring *cluster connections* to
other nodes in the core configuration file `activemq-configuration.xml`.
other nodes in the core configuration file `broker.xml`.
When a node forms a cluster connection to another node, internally it
creates a *core bridge* (as described in [Core Bridges](core-bridges.md)) connection between it and
the other node, this is done transparently behind the scenes - you don't
@ -84,12 +84,12 @@ broadcasting technique you configure the cluster, it uses either UDP or
JGroups to broadcast connector pairs information.
Broadcast groups are defined in the server configuration file
`activemq-configuration.xml`. There can be many broadcast groups per
`broker.xml`. There can be many broadcast groups per
Apache ActiveMQ Artemis server. All broadcast groups must be defined in a
`broadcast-groups` element.
Let's take a look at an example broadcast group from
`activemq-configuration.xml` that defines a UDP broadcast group:
`broker.xml` that defines a UDP broadcast group:
<broadcast-groups>
<broadcast-group name="my-broadcast-group">
@ -272,7 +272,7 @@ normal Apache ActiveMQ Artemis connections.
#### Defining Discovery Groups on the Server
For cluster connections, discovery groups are defined in the server side
configuration file `activemq-configuration.xml`. All discovery groups
configuration file `broker.xml`. All discovery groups
must be defined inside a `discovery-groups` element. There can be many
discovery groups defined by Apache ActiveMQ Artemis server. Let's look at an example:
@ -362,7 +362,7 @@ take a look at an example:
connectionFactory.myConnectionFactory=udp://231.7.7.7:9876
The element `discovery-group-ref` specifies the name of a discovery
group defined in `activemq-configuration.xml`.
group defined in `broker.xml`.
When this connection factory is downloaded from JNDI by a client
application and JMS connections are created from it, those connections
@ -550,7 +550,7 @@ connections in general.
Cluster connections group servers into clusters so that messages can be
load balanced between the nodes of the cluster. Let's take a look at a
typical cluster connection. Cluster connections are always defined in
`activemq-configuration.xml` inside a `cluster-connection` element.
`broker.xml` inside a `cluster-connection` element.
There can be zero or more cluster connections defined per Apache ActiveMQ Artemis
server.
@ -775,7 +775,7 @@ connection has been made.
When creating connections between nodes of a cluster to form a cluster
connection, Apache ActiveMQ Artemis uses a cluster user and cluster password which is
defined in `activemq-configuration.xml`:
defined in `broker.xml`:
<cluster-user>ACTIVEMQ.CLUSTER.ADMIN.USER</cluster-user>
<cluster-password>CHANGE ME!!</cluster-password>
@ -925,7 +925,7 @@ Message redistribution can be configured on a per address basis, by
specifying the redistribution delay in the address settings, for more
information on configuring address settings, please see [Queue Attributes](queue-attributes.md).
Here's an address settings snippet from `activemq-configuration.xml`
Here's an address settings snippet from `broker.xml`
showing how message redistribution is enabled for a set of queues:
<address-settings>

View File

@ -7,7 +7,7 @@ element name to go to the specific chapter.
Server Configuration
====================
activemq-configuration.xml
broker.xml
--------------------------
This is the main core server configuration file which contains to elements
@ -385,7 +385,7 @@ Bridges. Example:
With this configuration, both passwords in ra.xml and all of its MDBs
will have to be in masked form.
### Masking passwords in activemq-users.properties
### Masking passwords in artemis-users.properties
Apache ActiveMQ Artemis's built-in security manager uses plain properties files
where the user passwords are specified in plaintext forms by default. To

View File

@ -7,7 +7,7 @@ Apache ActiveMQ Artemis transports and where and how they're configured.
One of the most important concepts in Apache ActiveMQ Artemis transports is the
*acceptor*. Let's dive straight in and take a look at an acceptor
defined in xml in the configuration file `activemq-configuration.xml`.
defined in xml in the configuration file `broker.xml`.
<acceptors>
<acceptor name="netty">tcp://localhost:61617</acceptor>
@ -45,7 +45,7 @@ Whereas acceptors are used on the server to define how we accept
connections, connectors are used by a client to define how it connects
to a server.
Let's look at a connector defined in our `activemq-configuration.xml`
Let's look at a connector defined in our `broker.xml`
file:
<connectors>

View File

@ -190,5 +190,5 @@ thread adds a little more latency. These packets are:
- `org.apache.activemq.artemis.core.protocol.core.impl.wireformat.SessionXARollbackMessage`
To disable asynchronous connection execution, set the parameter
`async-connection-execution-enabled` in `activemq-configuration.xml` to
`async-connection-execution-enabled` in `broker.xml` to
`false` (default value is `true`).

View File

@ -38,7 +38,7 @@ server. They do this by using duplicate detection (described in [Duplicate Detec
## Configuring Bridges
Bridges are configured in `activemq-configuration.xml`. Let's kick off
Bridges are configured in `broker.xml`. Let's kick off
with an example (this is actually from the bridge example):
<bridge name="my-bridge">
@ -84,7 +84,7 @@ Let's take a look at all the parameters in turn:
>
> If you're using JMS then normally the JMS configuration
> `activemq-jms.xml` is loaded after the core configuration file
> `activemq-configuration.xml` is loaded. If your bridge is
> `broker.xml` is loaded. If your bridge is
> consuming from a JMS queue then you'll need to make sure the JMS
> queue is also deployed as a core queue in the core configuration.
> Take a look at the bridge example for an example of how this is
@ -204,12 +204,12 @@ Let's take a look at all the parameters in turn:
- `user`. This optional parameter determines the user name to use when
creating the bridge connection to the remote server. If it is not
specified the default cluster user specified by `cluster-user` in
`activemq-configuration.xml` will be used.
`broker.xml` will be used.
- `password`. This optional parameter determines the password to use
when creating the bridge connection to the remote server. If it is
not specified the default cluster password specified by
`cluster-password` in `activemq-configuration.xml` will be used.
`cluster-password` in `broker.xml` will be used.
- `static-connectors` or `discovery-group-ref`. Pick either of these
options to connect the bridge to the target server.

View File

@ -34,7 +34,7 @@ for messages. Combining diverts with bridges allows you to create a
distributed network of reliable routing connections between multiple
geographically distributed servers, creating your global messaging mesh.
Diverts are defined as xml in the `activemq-configuration.xml` file.
Diverts are defined as xml in the `broker.xml` file.
There can be zero or more diverts in the file.
Please see the examples for a full working example showing you how to

View File

@ -109,12 +109,12 @@ size of `n` elements, then the `n + 1`th id stored will overwrite the
`0`th element in the cache.
The maximum size of the cache is configured by the parameter
`id-cache-size` in `activemq-configuration.xml`, the default value is
`id-cache-size` in `broker.xml`, the default value is
`2000` elements.
The caches can also be configured to persist to disk or not. This is
configured by the parameter `persist-id-cache`, also in
`activemq-configuration.xml`. If this is set to `true` then each id will
`broker.xml`. If this is set to `true` then each id will
be persisted to permanent storage as they are received. The default
value for this parameter is `true`.
@ -135,7 +135,7 @@ will be ignored.
To configure a core bridge to add the duplicate id header, simply set
the `use-duplicate-detection` to `true` when configuring a bridge in
`activemq-configuration.xml`.
`broker.xml`.
The default value for this parameter is `true`.
@ -151,7 +151,7 @@ using their internal bridges.
To configure a cluster connection to add the duplicate id header, simply
set the `use-duplicate-detection` to `true` when configuring a cluster
connection in `activemq-configuration.xml`.
connection in `broker.xml`.
The default value for this parameter is `true`.

View File

@ -27,7 +27,7 @@ using the Apache ActiveMQ Artemis Core API or JMS.
For instantiating a core Apache ActiveMQ Artemis Server only, the steps are pretty
simple. The example requires that you have defined a configuration file
`activemq-configuration.xml` in your classpath:
`broker.xml` in your classpath:
``` java
import org.apache.activemq.artemis.core.server.embedded.EmbeddedActiveMQ;
@ -72,7 +72,7 @@ properties. See the javadocs for this class for more details.
## JMS API
JMS embedding is simple as well. This example requires that you have
defined the config files `activemq-configuration.xml`,
defined the config files `broker.xml`,
`activemq-jms.xml`, and a `activemq-users.xml` if you have security
enabled. Let's also assume that a queue and connection factory has been
defined in the `activemq-jms.xml` config file.

View File

@ -11,7 +11,7 @@ please the JMS javadoc for
Filter expressions are used in several places in Apache ActiveMQ Artemis
- Predefined Queues. When pre-defining a queue, in
`activemq-configuration.xml` in either the core or jms configuration a filter
`broker.xml` in either the core or jms configuration a filter
expression can be defined for a queue. Only messages that match the
filter expression will enter the queue.

View File

@ -52,7 +52,7 @@ which we will cover in a later chapter.
> **Note**
>
> The `ha-policy` configurations replaces any current HA configuration
> in the root of the `activemq-configuration.xml` configuration. All old
> in the root of the `broker.xml` configuration. All old
> configuration is now deprecated altho best efforts will be made to
> honour it if configured this way.
@ -140,7 +140,7 @@ live server to replicate from, these are:
- `specifying a node group`. You can specify a group of live servers
that a backup server can connect to. This is done by configuring
`group-name` in either the `master` or the `slave` element of the
`activemq-configuration.xml`. A Backup server will only connect to a
`broker.xml`. A Backup server will only connect to a
live server that shares the same node group name
- `connecting to any live`. This will be the behaviour if `group-name`
@ -200,7 +200,7 @@ reconnecting with the live. This avoids a split brain situation.
#### Configuration
To configure the live and backup servers to be a replicating pair,
configure the live server in ' `activemq-configuration.xml` to have:
configure the live server in ' `broker.xml` to have:
<ha-policy>
<replication>
@ -351,7 +351,7 @@ on amount of data).
#### Configuration
To configure the live and backup servers to share their store, configure
id via the `ha-policy` configuration in `activemq-configuration.xml`:
id via the `ha-policy` configuration in `broker.xml`:
<ha-policy>
<shared-store>
@ -426,7 +426,7 @@ other server (which it assumes it is a back that has assumed its duties)
to shutdown for it to take over. This is necessary because otherwise the
live server has no means to know whether there was a fail-over or not,
and if there was if the server that took its duties is still running or
not. To configure this option at your `activemq-configuration.xml`
not. To configure this option at your `broker.xml`
configuration file as follows:
<ha-policy>
@ -464,7 +464,7 @@ you can do this by using the management API as explained at [Management](managem
You can also force the running live server to shutdown when the old live
server comes back up allowing the original live server to take over
automatically by setting the following property in the
`activemq-configuration.xml` configuration file as follows:
`broker.xml` configuration file as follows:
<ha-policy>
<shared-store>
@ -566,7 +566,7 @@ its Connectors and Acceptors which are discussed later on in this
chapter. A live server can also be configured to allow requests from
backups and also how many backups a live server can start. this way you
can evenly distribute backups around the cluster. This is configured via
the `ha-policy` element in the `activemq-configuration.xml` file like
the `ha-policy` element in the `broker.xml` file like
so:
<ha-policy>

View File

@ -42,7 +42,7 @@ The returned boolean value is important:
## Configuring The Interceptors
Both incoming and outgoing interceptors are configured in
`activemq-configuration.xml`:
`broker.xml`:
<remoting-incoming-interceptors>
<class-name>org.apache.activemq.jms.example.LoginInterceptor</class-name>

View File

@ -32,7 +32,7 @@ large messages are stored.
<configuration xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
...
<large-messages-directory>/data/large-messages</large-messages-directory>
...

View File

@ -504,7 +504,7 @@ proxies of the MBeans.
By default, JMX is enabled to manage Apache ActiveMQ Artemis. It can be disabled by
setting `jmx-management-enabled` to `false` in
`activemq-configuration.xml`:
`broker.xml`:
<!-- false to disable JMX management for Apache ActiveMQ Artemis -->
<jmx-management-enabled>false</jmx-management-enabled>
@ -522,7 +522,7 @@ If JMX is enabled, Apache ActiveMQ Artemis can be managed locally using `jconsol
By default, Apache ActiveMQ Artemis server uses the JMX domain "org.apache.activemq".
To manage several Apache ActiveMQ Artemis servers from the *same* MBeanServer, the JMX
domain can be configured for each individual Apache ActiveMQ Artemis server by setting
`jmx-domain` in `activemq-configuration.xml`:
`jmx-domain` in `broker.xml`:
<!-- use a specific JMX domain for ActiveMQ MBeans -->
<jmx-domain>my.org.apache.activemq</jmx-domain>
@ -623,7 +623,7 @@ straightforward (`core.queue.exampleQueue` for the Core Queue
### Configuring Core Management
The management address to send management messages is configured in
`activemq-configuration.xml`:
`broker.xml`:
<management-address>jms.queue.activemq.management</management-address>
@ -633,7 +633,7 @@ messages).
The management address requires a *special* user permission `manage` to
be able to receive and handle management messages. This is also
configured in activemq-configuration.xml:
configured in broker.xml:
<!-- users with the admin role will be allowed to manage -->
<!-- Apache ActiveMQ Artemis using management messages -->
@ -741,7 +741,7 @@ of all the notifications emitted by the server.
#### Configuring The Core Management Notification Address
The management notification address to receive management notifications
is configured in `activemq-configuration.xml`:
is configured in `broker.xml`:
<management-notification-address>activemq.notifications</management-notification-address>
@ -948,7 +948,7 @@ By default, message counters are disabled as it might have a small
negative effect on memory.
To enable message counters, you can set it to `true` in
`activemq-configuration.xml`:
`broker.xml`:
<message-counter-enabled>true</message-counter-enabled>
@ -956,7 +956,7 @@ Message counters keeps a history of the queue metrics (10 days by
default) and samples all the queues at regular interval (10 seconds by
default). If message counters are enabled, these values should be
configured to suit your messaging use case in
`activemq-configuration.xml`:
`broker.xml`:
<!-- keep history for a week -->
<message-counter-max-day-history>7</message-counter-max-day-history>

View File

@ -61,7 +61,7 @@ A reaper thread will periodically inspect the queues to check if
messages have expired.
The reaper thread can be configured with the following properties in
`activemq-configuration.xml`
`broker.xml`
- `message-expiry-scan-period`

View File

@ -104,7 +104,7 @@ choose 1 node to have a local grouping handler and all the other nodes
should have remote handlers- it's the local handler that actually makes
the decision as to what route should be used, all the other remote
handlers converse with this. Here is a sample config for both types of
handler, this should be configured in the *activemq-configuration.xml*
handler, this should be configured in the *broker.xml*
file.
<grouping-handler name="my-grouping-handler">

View File

@ -41,11 +41,11 @@ Consumers with selectors will also navigate through the page-files and it will i
You can configure the location of the paging folder
Global paging parameters are specified on the main configuration file
(`activemq-configuration.xml`).
(`broker.xml`).
<configuration xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
...
<paging-directory>/somewhere/paging-directory</paging-directory>
...
@ -72,7 +72,7 @@ that address alone goes into page mode.
## Configuration
Configuration is done at the address settings, done at the main
configuration file (`activemq-configuration.xml`).
configuration file (`broker.xml`).
<address-settings>
<address-setting match="jms.someaddress">

View File

@ -95,21 +95,21 @@ tuning:
- Disable security. You may get a small performance boost by disabling
security by setting the `security-enabled` parameter to `false` in
`activemq-configuration.xml`.
`broker.xml`.
- Disable persistence. If you don't need message persistence, turn it
off altogether by setting `persistence-enabled` to false in
`activemq-configuration.xml`.
`broker.xml`.
- Sync transactions lazily. Setting `journal-sync-transactional` to
`false` in `activemq-configuration.xml` can give you better
`false` in `broker.xml` can give you better
transactional persistent performance at the expense of some
possibility of loss of transactions on failure. See [Guarantees of sends and commits](send-guarantees.md)
for more information.
- Sync non transactional lazily. Setting
`journal-sync-non-transactional` to `false` in
`activemq-configuration.xml` can give you better non-transactional
`broker.xml` can give you better non-transactional
persistent performance at the expense of some possibility of loss of
durable messages on failure. See [Guarantees of sends and commits](send-guarantees.md)
for more information.
@ -176,7 +176,7 @@ tuning:
- Use `batch-delay` and set `direct-deliver` to false for the best
throughput for very small messages. Apache ActiveMQ Artemis comes with a
preconfigured connector/acceptor pair (`netty-throughput`) in
`activemq-configuration.xml` and JMS connection factory
`broker.xml` and JMS connection factory
(`ThroughputConnectionFactory`) in `activemq-jms.xml`which can be
used to give the very best throughput, especially for small
messages. See the [Configuring the Transport](configuring-transports.md)

View File

@ -129,7 +129,7 @@ the broker for Zero Persistence section.
## Configuring the bindings journal
The bindings journal is configured using the following attributes in
`activemq-configuration.xml`
`broker.xml`
- `bindings-directory`
@ -150,7 +150,7 @@ The jms config shares its configuration with the bindings journal.
## Configuring the message journal
The message journal is configured using the following attributes in
`activemq-configuration.xml`
`broker.xml`
- `journal-directory`
@ -349,7 +349,7 @@ Using aptitude, (e.g. on Ubuntu or Debian system):
In some situations, zero persistence is sometimes required for a
messaging system. Configuring Apache ActiveMQ Artemis to perform zero persistence is
straightforward. Simply set the parameter `persistence-enabled` in
`activemq-configuration.xml` to `false`.
`broker.xml` to `false`.
Please note that if you set this parameter to false, then *zero*
persistence will occur. That means no bindings data, message data, large

View File

@ -10,7 +10,7 @@ attribute has.
Queues can be predefined via configuration at a core level or at a JMS
level. Firstly let's look at a JMS level.
The following shows a queue predefined in the jms element of the `activemq-configuration.xml`
The following shows a queue predefined in the jms element of the `broker.xml`
configuration file.
<queue name="selectorQueue">
@ -36,7 +36,7 @@ The durable element specifies whether the queue will be persisted. This
again is optional and defaults to true if omitted.
Secondly a queue can be predefined at a core level in the
`activemq-configuration.xml` file. The following is an example.
`broker.xml` file. The following is an example.
<queues>
<queue name="jms.queue.selectorQueue">
@ -78,7 +78,7 @@ queues.
There are some attributes that are defined against an address wildcard
rather than a specific queue. Here an example of an `address-setting`
entry that would be found in the `activemq-configuration.xml` file.
entry that would be found in the `broker.xml` file.
<address-settings>
<address-setting match="jms.queue.exampleQueue">

View File

@ -190,7 +190,7 @@ The project structure should look this like:
`-- src
`-- main
`-- resources
`-- activemq-configuration.xml
`-- broker.xml
`-- webapp
`-- WEB-INF
`-- web.xml

View File

@ -2,7 +2,7 @@
This chapter describes how security works with Apache ActiveMQ Artemis and how you can
configure it. To disable security completely simply set the
`security-enabled` property to false in the `activemq-configuration.xml`
`security-enabled` property to false in the `broker.xml`
file.
For performance reasons security is cached and invalidated every so
@ -54,7 +54,7 @@ specified. If the user has any of those roles, he/she will be granted
that permission for that set of addresses.
Let's take a simple example, here's a security block from
`activemq-configuration.xml` file:
`broker.xml` file:
<security-setting match="globalqueues.europe.#">
<permission type="createDurableQueue" roles="admin"/>
@ -133,7 +133,7 @@ For more information on configuring the SSL transport, please see [Configuring t
Apache ActiveMQ Artemis ships with a security manager implementation that reads user
credentials, i.e. user names, passwords and role information from properties
files on the classpath called `activemq-users.properties` and `activemq-roles.properties`. This is the default security manager.
files on the classpath called `artemis-users.properties` and `artemis-roles.properties`. This is the default security manager.
If you wish to use this security manager, then users, passwords and
roles can easily be added into these files.
@ -142,8 +142,8 @@ To configure this manager then it needs to be added to the `bootstrap.xml` confi
Lets take a look at what this might look like:
<basic-security>
<users>file:${activemq.home}/config/non-clustered/activemq-users.properties</users>
<roles>file:${activemq.home}/config/non-clustered/activemq-roles.properties</roles>
<users>file:${activemq.home}/config/non-clustered/artemis-users.properties</users>
<roles>file:${activemq.home}/config/non-clustered/artemis-roles.properties</roles>
<default-user>guest</default-user>
</basic-security>
@ -153,9 +153,9 @@ The next thing to note is the element `defaultuser`. This defines what
user will be assumed when the client does not specify a
username/password when creating a session. In this case they will be the
user `guest`. Multiple roles can be specified for a default user in the
`activemq-roles.properties`.
`artemis-roles.properties`.
Lets now take alook at the `activemq-users.properties` file, this is basically
Lets now take alook at the `artemis-users.properties` file, this is basically
just a set of key value pairs that define the users and their password, like so:
bill=activemq
@ -163,7 +163,7 @@ just a set of key value pairs that define the users and their password, like so:
frank=activemq2
sam=activemq3
The `activemq-roles.properties` defines what groups these users belong too
The `artemis-roles.properties` defines what groups these users belong too
where the key is the user and the value is a comma seperated list of the groups
the user belongs to, like so:

View File

@ -22,7 +22,7 @@ storage by the time the call to commit or rollback returns.
Setting this parameter to `false` can improve performance at the expense
of some loss of transaction durability.
This parameter is set in `activemq-configuration.xml`
This parameter is set in `broker.xml`
## Guarantees of Non Transactional Message Sends

View File

@ -4,7 +4,7 @@ Apache ActiveMQ Artemis provides a simple bootstrap class,
`org.apache.activemq.integration.spring.SpringJmsBootstrap`, for
integration with Spring. To use it, you configure Apache ActiveMQ Artemis as you always
would, through its various configuration files like
`activemq-configuration.xml`, `activemq-jms.xml`, and
`broker.xml`, `activemq-jms.xml`, and
`activemq-users.xml`. The Spring helper class starts the Apache ActiveMQ Artemis server
and adds any factories or destinations configured within
`activemq-jms.xml` directly into the namespace of the Spring context.
@ -12,7 +12,7 @@ Let's take this `activemq-jms.xml` file for instance:
<configuration xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:activemq /schema/activemq-jms.xsd">
xsi:schemaLocation="urn:activemq /schema/artemis-jms.xsd">
<!--the queue used by the example-->
<queue name="exampleQueue"/>

View File

@ -52,7 +52,7 @@ internally to a `java.util.concurrent.ScheduledThreadPoolExecutor`
instance.
The maximum number of thread used by this pool is configure in
`activemq-configuration.xml` with the `scheduled-thread-pool-max-size`
`broker.xml` with the `scheduled-thread-pool-max-size`
parameter. The default value is `5` threads. A small number of threads
is usually sufficient for this pool.
@ -63,7 +63,7 @@ on the server side. It maps internally to a
`java.util.concurrent.ThreadPoolExecutor` instance.
The maximum number of thread used by this pool is configure in
`activemq-configuration.xml` with the `thread-pool-max-size` parameter.
`broker.xml` with the `thread-pool-max-size` parameter.
If a value of `-1` is used this signifies that the thread pool has no
upper bound and new threads will be created on demand if there are not

View File

@ -11,7 +11,7 @@ To cope with this Apache ActiveMQ Artemis can, if configured, scan for old trans
and rollback any it finds. The default for this is 3000000 milliseconds
(5 minutes), i.e. any transactions older than 5 minutes are removed.
This timeout can be changed by editing the `transaction-timeout`
property in `activemq-configuration.xml` (value must be in
property in `broker.xml` (value must be in
milliseconds). The property `transaction-timeout-scan-period` configures
how often, in milliseconds, to scan for old transactions.

View File

@ -165,6 +165,6 @@ delivery count before message delivery but this feature is disabled by default
due to performance implications.
To enable it, set `persist-delivery-count-before-delivery` to `true` in
`activemq-configuration.xml`:
`broker.xml`:
<persist-delivery-count-before-delivery>true</persist-delivery-count-before-delivery>

View File

@ -10,13 +10,13 @@ we mean the Apache ActiveMQ Artemis standalone server, in its default configurat
with a JMS Service enabled.
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
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
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.
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:
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:
@ -115,7 +115,7 @@ The configuration file used to bootstrap the server (e.g.
`bootstrap.xml` by default) references the specific broker configuration
files.
- `activemq-configuration.xml`. This is the main ActiveMQ
- `broker.xml`. This is the main ActiveMQ
configuration file. All the parameters in this file are
described [here](configuration-index.md)
@ -142,7 +142,7 @@ The bootstrap file is very simple. Let's take a look at an example:
<broker xmlns="http://activemq.org/schema">
<file:core configuration="${activemq.home}/config/stand-alone/non-clustered/activemq-configuration.xml"></core>
<file:core configuration="${activemq.home}/config/stand-alone/non-clustered/broker.xml"></core>
<basic-security/>
@ -156,7 +156,7 @@ The bootstrap file is very simple. Let's take a look at an example:
## The main configuration file.
The configuration for the Apache ActiveMQ Artemis core server is contained in
`activemq-configuration.xml`. This is what the FileConfiguration bean
`broker.xml`. This is what the FileConfiguration bean
uses to configure the messaging server.
There are many attributes which you can configure Apache ActiveMQ Artemis. In most

View File

@ -13,7 +13,7 @@ messages which are sent to a *hierarchy* of addresses.
> In JMS terminology this allows "topic hierarchies" to be created.
To enable this functionality set the property
`wild-card-routing-enabled` in the `activemq-configuration.xml` file to
`wild-card-routing-enabled` in the `broker.xml` file to
`true`. This is `true` by default.
For more information on the wild card syntax take a look at [wildcard syntax](wildcard-syntax.md) chapter,

View File

@ -20,7 +20,7 @@ under the License.
<configuration xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
<core xmlns="urn:activemq:core">
<bindings-directory>target/server0/data/messaging/bindings</bindings-directory>

View File

@ -20,7 +20,7 @@ under the License.
<configuration xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
<core xmlns="urn:activemq:core">
<bindings-directory>${build.directory}/server0/data/messaging/bindings</bindings-directory>

View File

@ -20,7 +20,7 @@ under the License.
<configuration xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="urn:activemq /schema/activemq-server.xsd">
xsi:schemaLocation="urn:activemq /schema/artemis-server.xsd">
<jms xmlns="urn:activemq:jms">
<!--the queue used by the example-->
<queue name="exampleQueue"/>

View File

@ -79,7 +79,7 @@ under the License.
</ol>
<p>And on your mobile app you should see a message from ActiveMQ</p>
<p>Now lets look a bit more closely at the configuration in activemq-configuration.xml</p>
<p>Now lets look a bit more closely at the configuration in broker.xml</p>
<ol>
<pre class="prettyprint">
<code>

Some files were not shown because too many files have changed in this diff Show More