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

ACTIVEMQ6-4 - more refactoring 

https://issues.apache.org/jira/browse/ACTIVEMQ6-4

renamed all the scripts and run commands and variables to be ActiveMQ
This commit is contained in:
Andy Taylor 2014-11-17 09:49:55 +00:00
parent b5039ab8d5
commit f9bdb25aef
31 changed files with 62 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
activemq-bootstrap/src/main/java/org/apache/activemq/cli/HornetQ.java → activemq-bootstrap/src/main/java/org/apache/activemq/cli/ActiveMQ.java
View File

@ -23,17 +23,17 @@ import org.apache.activemq.cli.commands.Stop;
import java.io.InputStream; import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
public class HornetQ public class ActiveMQ
{ {
public static void main(String[] args) throws Exception public static void main(String[] args) throws Exception
{ {
Cli.CliBuilder<Action> builder = Cli.<Action>builder("hornetq") Cli.CliBuilder<Action> builder = Cli.<Action>builder("activemq")
.withDefaultCommand(HelpAction.class) .withDefaultCommand(HelpAction.class)
.withCommand(Run.class) .withCommand(Run.class)
.withCommand(Stop.class) .withCommand(Stop.class)
.withCommand(HelpAction.class) .withCommand(HelpAction.class)
.withDescription("HornetQ Command Line"); .withDescription("ActiveMQ Command Line");
Cli<Action> parser = builder.build(); Cli<Action> parser = builder.build();
@ -51,14 +51,14 @@ public class HornetQ
{ {
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:${HORNETQ_HOME}/config/non-clustered/bootstrap.xml'"); System.out.println("Configuration should be specified as 'scheme:location'. Default configuration is 'xml:${ACTIVEMQ_HOME}/config/non-clustered/bootstrap.xml'");
} }
} }
public static void printBanner() throws Exception public static void printBanner() throws Exception
{ {
copy(HornetQ.class.getResourceAsStream("banner.txt"), System.out); copy(ActiveMQ.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

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

@ -15,7 +15,7 @@ package org.apache.activemq.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.cli.HornetQ; import org.apache.activemq.cli.ActiveMQ;
import org.apache.activemq.core.config.Configuration; import org.apache.activemq.core.config.Configuration;
import org.apache.activemq.core.server.impl.HornetQServerImpl; import org.apache.activemq.core.server.impl.HornetQServerImpl;
import org.apache.activemq.dto.BrokerDTO; import org.apache.activemq.dto.BrokerDTO;
@ -41,7 +41,7 @@ import java.util.TimerTask;
public class Run implements Action public class Run implements Action
{ {
@Arguments(description = "Broker Configuration URI, default 'xml:${HORNETQ_HOME}/config/non-clustered/bootstrap.xml'") @Arguments(description = "Broker Configuration URI, default 'xml:${ACTIVEMQ_HOME}/config/non-clustered/bootstrap.xml'")
String configuration; String configuration;
private StandaloneNamingServer namingServer; private StandaloneNamingServer namingServer;
private JMSServerManager jmsServerManager; private JMSServerManager jmsServerManager;
@ -50,11 +50,11 @@ public class Run implements Action
public Object execute(ActionContext context) throws Exception public Object execute(ActionContext context) throws Exception
{ {
HornetQ.printBanner(); ActiveMQ.printBanner();
if (configuration == null) if (configuration == null)
{ {
configuration = "xml:" + System.getProperty("hornetq.home").replace("\\", "/") + "/config/non-clustered/bootstrap.xml"; configuration = "xml:" + System.getProperty("activemq.home").replace("\\", "/") + "/config/non-clustered/bootstrap.xml";
} }
System.out.println("Loading configuration file: " + configuration); System.out.println("Loading configuration file: " + configuration);
@ -117,7 +117,7 @@ public class Run implements Action
HornetQBootstrapLogger.LOGGER.errorDeletingFile(file.getAbsolutePath()); HornetQBootstrapLogger.LOGGER.errorDeletingFile(file.getAbsolutePath());
} }
} }
final Timer timer = new Timer("HornetQ Server Shutdown Timer", true); final Timer timer = new Timer("ActiveMQ Server Shutdown Timer", true);
timer.scheduleAtFixedRate(new TimerTask() timer.scheduleAtFixedRate(new TimerTask()
{ {
@Override @Override

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

@ -22,7 +22,7 @@ import java.io.File;
@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:${HORNETQ_HOME}/config/non-clustered/bootstrap.xml'") @Arguments(description = "Broker Configuration URI, default 'xml:${ACTIVEMQ_HOME}/config/non-clustered/bootstrap.xml'")
String configuration; String configuration;
@Override @Override
@ -30,7 +30,7 @@ public class Stop implements Action
{ {
if (configuration == null) if (configuration == null)
{ {
configuration = "xml:" + System.getProperty("hornetq.home").replace("\\", "/") + "/config/non-clustered/bootstrap.xml"; configuration = "xml:" + System.getProperty("activemq.home").replace("\\", "/") + "/config/non-clustered/bootstrap.xml";
} }
BrokerDTO broker = BrokerFactory.createBroker(configuration); BrokerDTO broker = BrokerFactory.createBroker(configuration);

2
activemq-bootstrap/src/main/java/org/apache/activemq/factory/BrokerFactory.java
View File

@ -32,7 +32,7 @@ public class BrokerFactory
BrokerFactoryHandler factory = null; BrokerFactoryHandler factory = null;
try try
{ {
FactoryFinder finder = new FactoryFinder("META-INF/services/org.apache.activemq/broker/"); FactoryFinder finder = new FactoryFinder("META-INF/services/org/apache/activemq/broker/");
factory = (BrokerFactoryHandler)finder.newInstance(configURI.getScheme()); factory = (BrokerFactoryHandler)finder.newInstance(configURI.getScheme());
} }
catch (IOException ioe ) catch (IOException ioe )

2
activemq-bootstrap/src/main/java/org/apache/activemq/factory/CoreFactory.java
View File

@ -31,7 +31,7 @@ public class CoreFactory
URI configURI = new URI(core.configuration.replace("\\", "/")); URI configURI = new URI(core.configuration.replace("\\", "/"));
try try
{ {
FactoryFinder finder = new FactoryFinder("META-INF/services/org.apache.activemq/broker/core/"); FactoryFinder finder = new FactoryFinder("META-INF/services/org/apache/activemq/broker/core/");
factory = (CoreFactoryHandler)finder.newInstance(configURI.getScheme()); factory = (CoreFactoryHandler)finder.newInstance(configURI.getScheme());
} }
catch (IOException ioe ) catch (IOException ioe )

2
activemq-bootstrap/src/main/java/org/apache/activemq/factory/JmsFactory.java
View File

@ -30,7 +30,7 @@ public class JmsFactory
URI configURI = new URI(jms.configuration.replace("\\", "/")); URI configURI = new URI(jms.configuration.replace("\\", "/"));
try try
{ {
FactoryFinder finder = new FactoryFinder("META-INF/services/org.apache.activemq/broker/jms/"); FactoryFinder finder = new FactoryFinder("META-INF/services/org/apache/activemq/broker/jms/");
factory = (JmsFactoryHandler)finder.newInstance(configURI.getScheme()); factory = (JmsFactoryHandler)finder.newInstance(configURI.getScheme());
} }
catch (IOException ioe ) catch (IOException ioe )

2
activemq-bootstrap/src/main/java/org/apache/activemq/factory/SecurityManagerFactory.java
View File

@ -25,7 +25,7 @@ public class SecurityManagerFactory
{ {
if (config != null) if (config != null)
{ {
FactoryFinder finder = new FactoryFinder("META-INF/services/org.apache.activemq/security/"); FactoryFinder finder = new FactoryFinder("META-INF/services/org/apache/activemq/security/");
HornetQSecurityManager manager = (HornetQSecurityManager)finder.newInstance(config.getClass().getAnnotation(XmlRootElement.class).name()); HornetQSecurityManager manager = (HornetQSecurityManager)finder.newInstance(config.getClass().getAnnotation(XmlRootElement.class).name());
return manager; return manager;
} }

4
activemq-bootstrap/src/main/java/org/apache/activemq/integration/bootstrap/HornetQBootstrapLogger.java
View File

@ -46,11 +46,11 @@ public interface HornetQBootstrapLogger extends BasicLogger
HornetQBootstrapLogger LOGGER = Logger.getMessageLogger(HornetQBootstrapLogger.class, HornetQBootstrapLogger.class.getPackage().getName()); HornetQBootstrapLogger LOGGER = Logger.getMessageLogger(HornetQBootstrapLogger.class, HornetQBootstrapLogger.class.getPackage().getName());
@LogMessage(level = Logger.Level.INFO) @LogMessage(level = Logger.Level.INFO)
@Message(id = 101000, value = "Starting HornetQ Server", format = Message.Format.MESSAGE_FORMAT) @Message(id = 101000, value = "Starting ActiveMQ Server", format = Message.Format.MESSAGE_FORMAT)
void serverStarting(); void serverStarting();
@LogMessage(level = Logger.Level.INFO) @LogMessage(level = Logger.Level.INFO)
@Message(id = 101001, value = "Stopping HornetQ Server", format = Message.Format.MESSAGE_FORMAT) @Message(id = 101001, value = "Stopping ActiveMQ Server", format = Message.Format.MESSAGE_FORMAT)
void serverStopping(); void serverStopping();
@LogMessage(level = Logger.Level.INFO) @LogMessage(level = Logger.Level.INFO)

18
distribution/activemq/src/main/resources/bin/hornetq → distribution/activemq/src/main/resources/bin/activemq
View File

@ -1,9 +1,9 @@
#!/bin/sh #!/bin/sh
if [ -z "$HORNETQ_HOME" ] ; then if [ -z "$ACTIVEMQ_HOME" ] ; then
## resolve links - $0 may be a link to hornetq's home ## resolve links - $0 may be a link to ActiveMQ's home
PRG="$0" PRG="$0"
progname=`basename "$0"` progname=`basename "$0"`
saveddir=`pwd` saveddir=`pwd`
@ -22,11 +22,11 @@ if [ -z "$HORNETQ_HOME" ] ; then
fi fi
done done
HORNETQ_HOME=`dirname "$PRG"` ACTIVEMQ_HOME=`dirname "$PRG"`
cd "$saveddir" cd "$saveddir"
# make it fully qualified # make it fully qualified
HORNETQ_HOME=`cd "$HORNETQ_HOME/.." && pwd` ACTIVEMQ_HOME=`cd "$ACTIVEMQ_HOME/.." && pwd`
fi fi
# OS specific support. # OS specific support.
@ -46,8 +46,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 "$HORNETQ_HOME" ] && [ -n "$ACTIVEMQ_HOME" ] &&
HORNETQ_HOME=`cygpath --unix "$HORNETQ_HOME"` ACTIVEMQ_HOME=`cygpath --unix "$ACTIVEMQ_HOME"`
[ -n "$JAVA_HOME" ] && [ -n "$JAVA_HOME" ] &&
JAVA_HOME=`cygpath --unix "$JAVA_HOME"` JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
[ -n "$CLASSPATH" ] && [ -n "$CLASSPATH" ] &&
@ -76,12 +76,12 @@ if [ ! -x "$JAVACMD" ] ; then
exit 1 exit 1
fi fi
for i in `ls $HORNETQ_HOME/lib/*.jar`; do for i in `ls $ACTIVEMQ_HOME/lib/*.jar`; do
CLASSPATH=$i:$CLASSPATH CLASSPATH=$i:$CLASSPATH
done done
JAVA_ARGS="-XX:+UseParallelGC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Xms512M -Xmx1024M -Djava.naming.factory.initial=org.jnp.interfaces.NamingContextFactory -Djava.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces -Dhornetq.home=$HORNETQ_HOME -Ddata.dir=$HORNETQ_HOME/data -Djava.util.logging.manager=org.jboss.logmanager.LogManager -Dlogging.configuration=file:$HORNETQ_HOME/config/logging.properties -Djava.library.path=$HORNETQ_HOME/bin/lib/linux-i686:$HORNETQ_HOME/bin/lib/linux-x86_64" JAVA_ARGS="-XX:+UseParallelGC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Xms512M -Xmx1024M -Djava.naming.factory.initial=org.jnp.interfaces.NamingContextFactory -Djava.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces -Dactivemq.home=$ACTIVEMQ_HOME -Ddata.dir=$ACTIVEMQ_HOME/data -Djava.util.logging.manager=org.jboss.logmanager.LogManager -Dlogging.configuration=file:$ACTIVEMQ_HOME/config/logging.properties -Djava.library.path=$ACTIVEMQ_HOME/bin/lib/linux-i686:$ACTIVEMQ_HOME/bin/lib/linux-x86_64"
#JAVA_ARGS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005 -Djava.naming.factory.initial=org.jnp.interfaces.NamingContextFactory -Djava.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces" #JAVA_ARGS="-agentlib:jdwp=transport=dt_socket,server=y,suspend=y,address=5005 -Djava.naming.factory.initial=org.jnp.interfaces.NamingContextFactory -Djava.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces"
exec "$JAVACMD" $JAVA_ARGS -classpath $CLASSPATH org.apache.activemq.cli.HornetQ $@ exec "$JAVACMD" $JAVA_ARGS -classpath $CLASSPATH org.apache.activemq.cli.ActiveMQ $@

20
distribution/activemq/src/main/resources/bin/hornetq-service → distribution/activemq/src/main/resources/bin/activemq-service
View File

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

26
distribution/activemq/src/main/resources/bin/hornetq.cmd → distribution/activemq/src/main/resources/bin/activemq.cmd
View File

@ -2,17 +2,17 @@
setlocal setlocal
if NOT "%HORNETQ_HOME%"=="" goto CHECK_HORNETQ_HOME if NOT "%ACTIVEMQ_HOME%"=="" goto CHECK_ACTIVEMQ_HOME
PUSHD . PUSHD .
CD %~dp0.. CD %~dp0..
set HORNETQ_HOME=%CD% set ACTIVEMQ_HOME=%CD%
POPD POPD
:CHECK_HORNETQ_HOME :CHECK_ACTIVEMQ_HOME
if exist "%HORNETQ_HOME%\bin\hornetq.cmd" goto CHECK_JAVA if exist "%ACTIVEMQ_HOME%\bin\activemq.cmd" goto CHECK_JAVA
:NO_HOME :NO_HOME
echo HORNETQ_HOME environment variable is set incorrectly. Please set HORNETQ_HOME. echo ACTIVEMQ_HOME environment variable is set incorrectly. Please set ACTIVEMQ_HOME.
goto END goto END
:CHECK_JAVA :CHECK_JAVA
@ -31,25 +31,25 @@ echo.
:RUN_JAVA :RUN_JAVA
if "%JVM_FLAGS%" == "" set JVM_FLAGS=-XX:+UseParallelGC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Xms512M -Xmx1024M -Djava.naming.factory.initial=org.jnp.interfaces.NamingContextFactory -Djava.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces -Dhornetq.home=$HORNETQ_HOME -Ddata.dir=$HORNETQ_HOME/data -Djava.util.logging.manager=org.jboss.logmanager.LogManager -Dlogging.configuration="file:%HORNETQ_HOME%\config\logging.properties" -Djava.library.path="%HORNETQ_HOME%/bin/lib/linux-i686:%HORNETQ_HOME%/bin/lib/linux-x86_64" if "%JVM_FLAGS%" == "" set JVM_FLAGS=-XX:+UseParallelGC -XX:+AggressiveOpts -XX:+UseFastAccessorMethods -Xms512M -Xmx1024M -Djava.naming.factory.initial=org.jnp.interfaces.NamingContextFactory -Djava.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces -Dactivemq.home=$ACTIVEMQ_HOME -Ddata.dir=$ACTIVEMQ_HOME/data -Djava.util.logging.manager=org.jboss.logmanager.LogManager -Dlogging.configuration="file:%ACTIVEMQ_HOME%\config\logging.properties" -Djava.library.path="%ACTIVEMQ_HOME%/bin/lib/linux-i686:%ACTIVEMQ_HOME%/bin/lib/linux-x86_64"
if "x%HORNETQ_OPTS%" == "x" goto noHORNETQ_OPTS if "x%ACTIVEMQ_OPTS%" == "x" goto noACTIVEMQ_OPTS
set JVM_FLAGS=%JVM_FLAGS% %HORNETQ_OPTS% set JVM_FLAGS=%JVM_FLAGS% %ACTIVEMQ_OPTS%
:noHORNETQ_OPTS :noACTIVEMQ_OPTS
if "x%HORNETQ_DEBUG%" == "x" goto noDEBUG if "x%ACTIVEMQ_DEBUG%" == "x" goto noDEBUG
set JVM_FLAGS=%JVM_FLAGS% -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005 set JVM_FLAGS=%JVM_FLAGS% -Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005
:noDEBUG :noDEBUG
if "x%HORNETQ_PROFILE%" == "x" goto noPROFILE if "x%ACTIVEMQ_PROFILE%" == "x" goto noPROFILE
set JVM_FLAGS=-agentlib:yjpagent %JVM_FLAGS% set JVM_FLAGS=-agentlib:yjpagent %JVM_FLAGS%
:noPROFILE :noPROFILE
rem set JMX_OPTS=-Dcom.sun.management.jmxremote.port=1099 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false rem set JMX_OPTS=-Dcom.sun.management.jmxremote.port=1099 -Dcom.sun.management.jmxremote.authenticate=false -Dcom.sun.management.jmxremote.ssl=false
set JVM_FLAGS=%JVM_FLAGS% %JMX_OPTS% -Dhornetq.home="%HORNETQ_HOME%" -classpath "%HORNETQ_HOME%\lib\*" set JVM_FLAGS=%JVM_FLAGS% %JMX_OPTS% -Dactivemq.home="%ACTIVEMQ_HOME%" -classpath "%ACTIVEMQ_HOME%\lib\*"
"%_JAVACMD%" %JVM_FLAGS% org.apache.activemq.cli.HornetQ %* "%_JAVACMD%" %JVM_FLAGS% org.apache.activemq.cli.ActiveMQ %*
:END :END
endlocal endlocal

2
distribution/activemq/src/main/resources/bin/run.bat
View File

@ -1 +1 @@
hornetq.cmd run %* activemq.cmd run %*

2
distribution/activemq/src/main/resources/bin/run.sh
View File

@ -1,3 +1,3 @@
#!/bin/sh #!/bin/sh
./hornetq run $@ ./activemq run $@

2
distribution/activemq/src/main/resources/bin/stop.bat
View File

@ -1 +1 @@
hornetq.cmd stop %* activemq.cmd stop %*

2
distribution/activemq/src/main/resources/bin/stop.sh
View File

@ -1,3 +1,3 @@
#!/bin/sh #!/bin/sh
./hornetq stop $@ ./activemq stop $@

0
distribution/activemq/src/main/resources/config/clustered/hornetq-configuration.xml → distribution/activemq/src/main/resources/config/clustered/activemq-configuration.xml
View File

0
distribution/activemq/src/main/resources/config/clustered/hornetq-jms.xml → distribution/activemq/src/main/resources/config/clustered/activemq-jms.xml
View File

0
distribution/activemq/src/main/resources/config/clustered/hornetq-users.xml → distribution/activemq/src/main/resources/config/clustered/activemq-users.xml
View File

4
distribution/activemq/src/main/resources/config/clustered/bootstrap.xml
View File

@ -14,8 +14,8 @@
<broker xmlns="http://hornetq.org/schema"> <broker xmlns="http://hornetq.org/schema">
<core configuration="file:${hornetq.home}/config/clustered/hornetq-configuration.xml"></core> <core configuration="file:${activemq.home}/config/clustered/activemq-configuration.xml"></core>
<jms configuration="file:${hornetq.home}/config/clustered/hornetq-jms.xml"></jms> <jms configuration="file:${activemq.home}/config/clustered/activemq-jms.xml"></jms>
<basic-security/> <basic-security/>

0
distribution/activemq/src/main/resources/config/non-clustered/hornetq-configuration.xml → distribution/activemq/src/main/resources/config/non-clustered/activemq-configuration.xml
View File

0
distribution/activemq/src/main/resources/config/non-clustered/hornetq-jms.xml → distribution/activemq/src/main/resources/config/non-clustered/activemq-jms.xml
View File

0
distribution/activemq/src/main/resources/config/non-clustered/hornetq-users.xml → distribution/activemq/src/main/resources/config/non-clustered/activemq-users.xml
View File

4
distribution/activemq/src/main/resources/config/non-clustered/bootstrap.xml
View File

@ -14,8 +14,8 @@
<broker xmlns="http://hornetq.org/schema"> <broker xmlns="http://hornetq.org/schema">
<core configuration="file:${hornetq.home}/config/non-clustered/hornetq-configuration.xml"></core> <core configuration="file:${activemq.home}/config/non-clustered/activemq-configuration.xml"></core>
<jms configuration="file:${hornetq.home}/config/non-clustered/hornetq-jms.xml"></jms> <jms configuration="file:${activemq.home}/config/non-clustered/activemq-jms.xml"></jms>
<basic-security/> <basic-security/>

0
distribution/activemq/src/main/resources/config/replicated/hornetq-configuration.xml → distribution/activemq/src/main/resources/config/replicated/activemq-configuration.xml
View File

0
distribution/activemq/src/main/resources/config/replicated/hornetq-jms.xml → distribution/activemq/src/main/resources/config/replicated/activemq-jms.xml
View File

0
distribution/activemq/src/main/resources/config/replicated/hornetq-users.xml → distribution/activemq/src/main/resources/config/replicated/activemq-users.xml
View File

4
distribution/activemq/src/main/resources/config/replicated/bootstrap.xml
View File

@ -14,8 +14,8 @@
<broker xmlns="http://hornetq.org/schema"> <broker xmlns="http://hornetq.org/schema">
<core configuration="file:${hornetq.home}/config/replicated/hornetq-configuration.xml"></core> <core configuration="file:${activemq.home}/config/replicated/activemq-configuration.xml"></core>
<jms configuration="file:${hornetq.home}/config/replicated/hornetq-jms.xml"></jms> <jms configuration="file:${activemq.home}/config/replicated/activemq-jms.xml"></jms>
<basic-security/> <basic-security/>

0
distribution/activemq/src/main/resources/config/shared-store/hornetq-configuration.xml → distribution/activemq/src/main/resources/config/shared-store/activemq-configuration.xml
View File

0
distribution/activemq/src/main/resources/config/shared-store/hornetq-jms.xml → distribution/activemq/src/main/resources/config/shared-store/activemq-jms.xml
View File

0
distribution/activemq/src/main/resources/config/shared-store/hornetq-users.xml → distribution/activemq/src/main/resources/config/shared-store/activemq-users.xml
View File

4
distribution/activemq/src/main/resources/config/shared-store/bootstrap.xml
View File

@ -14,8 +14,8 @@
<broker xmlns="http://hornetq.org/schema"> <broker xmlns="http://hornetq.org/schema">
<core configuration="file:${hornetq.home}/config/shared-store/hornetq-configuration.xml"></core> <core configuration="file:${activemq.home}/config/shared-store/activemq-configuration.xml"></core>
<jms configuration="file:${hornetq.home}/config/shared-store/hornetq-jms.xml"></jms> <jms configuration="file:${activemq.home}/config/shared-store/activemq-jms.xml"></jms>
<basic-security/> <basic-security/>