diff --git a/.gitignore b/.gitignore index fd63cefc44..7af8f9fc2d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ #idea files -hornetq-pom.ipr -hornetq-pom.iws +activemq-pom.ipr +activemq-pom.iws .idea *.iml */*.iml @@ -33,7 +33,7 @@ org.maven.ide.eclipse.prefs .classpath tests/*-tests/hs_err_pid*.log tests/**/server.lock -hornetq-core/*.log +activemq-core/*.log .checkstyle # / @@ -48,15 +48,15 @@ hornetq-core/*.log /target /.metadata -integration/hornetq-*-integration/.project +integration/activemq-*-integration/.project # /distribution/ /distribution/target /distribution/.project /distribution/jboss-mc/.project -# /distribution/hornetq/ -/distribution/hornetq/.project +# /distribution/activemq/ +/distribution/activemq/.project # /distribution/jnp-client/ /distribution/jnp-client/target @@ -711,26 +711,26 @@ examples/pom-template.xml # /examples/soak/tx-restarts/ /examples/soak/tx-restarts/build -# /hornetq-protocols/ -/hornetq-protocols/hornetq-amqp-protocol/.project -/hornetq-protocols/hornetq-stomp-protocol/.project +# /activemq-protocols/ +/activemq-protocols/activemq-amqp-protocol/.project +/activemq-protocols/activemq-stomp-protocol/.project -# /hornetq-ra/hornetq-ra-jar/ -/hornetq-ra/hornetq-ra-jar/target -/hornetq-ra/hornetq-ra-jar/.project +# /activemq-ra/activemq-ra-jar/ +/activemq-ra/activemq-ra-jar/target +/activemq-ra/activemq-ra-jar/.project -# /hornetq-ra/hornetq-ra-rar/ -/hornetq-ra/hornetq-ra-rar/target -/hornetq-ra/hornetq-ra-rar/.project +# /activemq-ra/activemq-ra-rar/ +/activemq-ra/activemq-ra-rar/target +/activemq-ra/activemq-ra-rar/.project -# /hornetq-rest/hornetq-rest/ -/hornetq-rest/target -/hornetq-rest/.project -/hornetq-rest/data/ +# /activemq-rest/activemq-rest/ +/activemq-rest/target +/activemq-rest/.project +/activemq-rest/data/ -# /hornetq-rest/ -/hornetq-*/.project -/hornetq-*/target +# /activemq-rest/ +/activemq-*/.project +/activemq-*/target /tests/.project /tests/*-tests/.project @@ -748,7 +748,7 @@ native/src/.deps */*/*.iml */*/*/*.iml -hornetq.log -*/hornetq.log -*/*/hornetq.log -*/*/*/hornetq.log +activemq.log +*/activemq.log +*/*/activemq.log +*/*/*/activemq.log diff --git a/.project b/.project index d928224b6f..fe8261c37b 100644 --- a/.project +++ b/.project @@ -1,6 +1,6 @@ - hornetq + activemq diff --git a/RELEASING.md b/RELEASING.md index bf5a5ef804..e7e29e9550 100644 --- a/RELEASING.md +++ b/RELEASING.md @@ -20,7 +20,7 @@ Assuming current version is ``X.Y.Z-SNAPSHOT`` 1. Prepare a single commit changing all version tags in all pom's. 2. tag this commit locally by 'git tag -a ActiveMQ_X_Y_Z_Final -m "release for x.y.z.Final' or what ever the version is 3. remember to update the version in the main pom, think of a cool name if you can -4. update the hornetq-maven-plugin plugin in the main pom to one that is released, if needed release a new version of the plugin. +4. update the activemq-maven-plugin plugin in the main pom to one that is released, if needed release a new version of the plugin. 5. Either use ``git revert`` to create a new commit reverting the commit with the version changes. Or change again all versions to ``R.S.T-SNAPSHOT``. 6. push both commits with version changes together, including them in the same _pull-request_. 7. push the committed tag upstream 'git push upstream ActiveMQ_X_Y_Z_Final' @@ -40,7 +40,7 @@ testing the standalone release (this should be done on windows as well as linux testing the release for AS7 -1. update the hornetq version in you local AS7 clone (there may be integration work you may have to include that is in the hornetq AS7 clone) +1. update the activemq version in you local AS7 clone (there may be integration work you may have to include that is in the activemq AS7 clone) 2. commit this and push to your repo 3. go to http://lightning.mw.lab.eng.bos.redhat.com/jenkins/job/as7-param-all-tests/ and run against your repo (using the staged repo). 4. go to http://lightning.mw.lab.eng.bos.redhat.com/jenkins/job/tck6-as7-jms/ and run against your repo (using the staged repo). (note this takes 5 hours) diff --git a/activemq-bootstrap/pom.xml b/activemq-bootstrap/pom.xml index f883de3a46..51b15c7a5d 100644 --- a/activemq-bootstrap/pom.xml +++ b/activemq-bootstrap/pom.xml @@ -13,7 +13,7 @@ ActiveMQ6 Bootstrap - ${project.basedir}/.. + ${project.basedir}/.. diff --git a/activemq-commons/pom.xml b/activemq-commons/pom.xml index 656b0f6745..cae0651004 100644 --- a/activemq-commons/pom.xml +++ b/activemq-commons/pom.xml @@ -13,7 +13,7 @@ ActiveMQ6 Commons - ${project.basedir}/.. + ${project.basedir}/.. diff --git a/activemq-core-client/pom.xml b/activemq-core-client/pom.xml index c362506d9c..9da2c18aa0 100644 --- a/activemq-core-client/pom.xml +++ b/activemq-core-client/pom.xml @@ -13,7 +13,7 @@ ActiveMQ6 Core Client - ${project.basedir}/.. + ${project.basedir}/.. diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientConsumerImpl.java b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientConsumerImpl.java index 6295a741c5..c17907fe3e 100644 --- a/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientConsumerImpl.java +++ b/activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientConsumerImpl.java @@ -59,7 +59,10 @@ public final class ClientConsumerImpl implements ClientConsumerInternal private static final int NUM_PRIORITIES = 10; - public static final SimpleString FORCED_DELIVERY_MESSAGE = new SimpleString("_hornetq.forced.delivery.seq"); + + // TODO: We need to set this to _hornetq | activemq based on the version of the protocol + // I have added a comment about this at https://issues.apache.org/jira/browse/ACTIVEMQ6-42 + public static final SimpleString FORCED_DELIVERY_MESSAGE = new SimpleString("_activemq.forced.delivery.seq"); // Attributes // ----------------------------------------------------------------------------------- diff --git a/activemq-dto/pom.xml b/activemq-dto/pom.xml index 419f8e2139..98d9bb7ab0 100644 --- a/activemq-dto/pom.xml +++ b/activemq-dto/pom.xml @@ -13,7 +13,7 @@ ActiveMQ6 DTO - ${project.basedir}/.. + ${project.basedir}/.. @@ -55,7 +55,7 @@ - + diff --git a/activemq-jms-client/pom.xml b/activemq-jms-client/pom.xml index 04f075b128..d6eb8100f0 100644 --- a/activemq-jms-client/pom.xml +++ b/activemq-jms-client/pom.xml @@ -13,7 +13,7 @@ ActiveMQ6 JMS Client - ${project.basedir}/.. + ${project.basedir}/.. diff --git a/activemq-jms-server/pom.xml b/activemq-jms-server/pom.xml index 26ac847b7e..476914bb0b 100644 --- a/activemq-jms-server/pom.xml +++ b/activemq-jms-server/pom.xml @@ -13,7 +13,7 @@ ActiveMQ6 JMS Server - ${project.basedir}/.. + ${project.basedir}/.. diff --git a/activemq-jms-server/src/main/resources/schema/activemq-jms.xsd b/activemq-jms-server/src/main/resources/schema/activemq-jms.xsd index a7864ebe82..7367b15b8c 100644 --- a/activemq-jms-server/src/main/resources/schema/activemq-jms.xsd +++ b/activemq-jms-server/src/main/resources/schema/activemq-jms.xsd @@ -8,7 +8,7 @@ attributeFormDefault="unqualified" version="1.0"> - + ActiveMQ6 Journal - ${project.basedir}/.. + ${project.basedir}/.. diff --git a/activemq-native/pom.xml b/activemq-native/pom.xml index 827385c79b..22a9515206 100644 --- a/activemq-native/pom.xml +++ b/activemq-native/pom.xml @@ -120,7 +120,7 @@ jar - ${project.basedir}/.. + ${project.basedir}/.. diff --git a/activemq-protocols/activemq-amqp-protocol/pom.xml b/activemq-protocols/activemq-amqp-protocol/pom.xml index 5090820392..ebd5ebe88f 100644 --- a/activemq-protocols/activemq-amqp-protocol/pom.xml +++ b/activemq-protocols/activemq-amqp-protocol/pom.xml @@ -10,7 +10,7 @@ activemq-amqp-protocol - ${project.basedir}/../.. + ${project.basedir}/../.. diff --git a/activemq-protocols/activemq-openwire-protocol/pom.xml b/activemq-protocols/activemq-openwire-protocol/pom.xml index 2e5fa30442..003f6008f0 100644 --- a/activemq-protocols/activemq-openwire-protocol/pom.xml +++ b/activemq-protocols/activemq-openwire-protocol/pom.xml @@ -10,7 +10,7 @@ activemq-openwire-protocol - ${project.parent.parent.basedir} + ${project.parent.parent.basedir} diff --git a/activemq-protocols/activemq-proton-plug/pom.xml b/activemq-protocols/activemq-proton-plug/pom.xml index f60bc40e56..84c56d8eb3 100644 --- a/activemq-protocols/activemq-proton-plug/pom.xml +++ b/activemq-protocols/activemq-proton-plug/pom.xml @@ -10,7 +10,7 @@ activemq-proton-plug - ${project.basedir}/../.. + ${project.basedir}/../.. diff --git a/activemq-protocols/activemq-stomp-protocol/pom.xml b/activemq-protocols/activemq-stomp-protocol/pom.xml index d52bbb0424..78727fb2e5 100644 --- a/activemq-protocols/activemq-stomp-protocol/pom.xml +++ b/activemq-protocols/activemq-stomp-protocol/pom.xml @@ -10,7 +10,7 @@ activemq-stomp-protocol - ${project.basedir}/../.. + ${project.basedir}/../.. diff --git a/activemq-protocols/pom.xml b/activemq-protocols/pom.xml index d4696dfbc5..20235e4ec8 100644 --- a/activemq-protocols/pom.xml +++ b/activemq-protocols/pom.xml @@ -13,7 +13,7 @@ pom - ${project.basedir}/.. + ${project.basedir}/.. diff --git a/activemq-ra/pom.xml b/activemq-ra/pom.xml index a31d51c660..b9954b9f9e 100644 --- a/activemq-ra/pom.xml +++ b/activemq-ra/pom.xml @@ -13,7 +13,7 @@ jar - ${project.basedir}/.. + ${project.basedir}/.. diff --git a/activemq-rest/pom.xml b/activemq-rest/pom.xml index f54aebd646..5ffab7f067 100644 --- a/activemq-rest/pom.xml +++ b/activemq-rest/pom.xml @@ -15,7 +15,7 @@ ${project.version} - ${project.basedir}/.. + ${project.basedir}/.. @@ -96,7 +96,7 @@ maven-surefire-plugin - -Djava.util.logging.config.file=${project.build.directory}/../../../distribution/hornetq/src/main/resources/config/stand-alone/non-clustered/logging.properties + -Djava.util.logging.config.file=${project.build.directory}/../../../distribution/activemq/src/main/resources/config/stand-alone/non-clustered/logging.properties ${skipRestTests} diff --git a/activemq-server/src/test/resources/live-only-hapolicy-config3.xml b/activemq-server/src/test/resources/live-only-hapolicy-config3.xml index fafce391fd..c77f8e4183 100644 --- a/activemq-server/src/test/resources/live-only-hapolicy-config3.xml +++ b/activemq-server/src/test/resources/live-only-hapolicy-config3.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd"> diff --git a/activemq-server/src/test/resources/live-only-hapolicy-config4.xml b/activemq-server/src/test/resources/live-only-hapolicy-config4.xml index e41bf095a9..0e7f45a2ec 100644 --- a/activemq-server/src/test/resources/live-only-hapolicy-config4.xml +++ b/activemq-server/src/test/resources/live-only-hapolicy-config4.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd"> diff --git a/activemq-server/src/test/resources/live-only-hapolicy-config5.xml b/activemq-server/src/test/resources/live-only-hapolicy-config5.xml index 91dd0dee50..83c6c33de8 100644 --- a/activemq-server/src/test/resources/live-only-hapolicy-config5.xml +++ b/activemq-server/src/test/resources/live-only-hapolicy-config5.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd"> diff --git a/activemq-server/src/test/resources/logging.properties b/activemq-server/src/test/resources/logging.properties index fe033b13b3..67b5e02028 100644 --- a/activemq-server/src/test/resources/logging.properties +++ b/activemq-server/src/test/resources/logging.properties @@ -45,7 +45,7 @@ handler.FILE=org.jboss.logmanager.handlers.FileHandler handler.FILE.level=FINE handler.FILE.properties=autoFlush,fileName handler.FILE.autoFlush=true -handler.FILE.fileName=target/hornetq.log +handler.FILE.fileName=target/activemq.log handler.FILE.formatter=PATTERN diff --git a/activemq-server/src/test/resources/replica-hapolicy-config.xml b/activemq-server/src/test/resources/replica-hapolicy-config.xml index 28a1f1107f..6874afb63c 100644 --- a/activemq-server/src/test/resources/replica-hapolicy-config.xml +++ b/activemq-server/src/test/resources/replica-hapolicy-config.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd"> diff --git a/activemq-server/src/test/resources/replica-hapolicy-config2.xml b/activemq-server/src/test/resources/replica-hapolicy-config2.xml index 973623705d..dba47b09b3 100644 --- a/activemq-server/src/test/resources/replica-hapolicy-config2.xml +++ b/activemq-server/src/test/resources/replica-hapolicy-config2.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd"> diff --git a/activemq-server/src/test/resources/replica-hapolicy-config3.xml b/activemq-server/src/test/resources/replica-hapolicy-config3.xml index 8269ce324a..6dea68dd4f 100644 --- a/activemq-server/src/test/resources/replica-hapolicy-config3.xml +++ b/activemq-server/src/test/resources/replica-hapolicy-config3.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd"> diff --git a/activemq-server/src/test/resources/replicated-hapolicy-config.xml b/activemq-server/src/test/resources/replicated-hapolicy-config.xml index 75c5bee6a6..3cb67e1c3d 100644 --- a/activemq-server/src/test/resources/replicated-hapolicy-config.xml +++ b/activemq-server/src/test/resources/replicated-hapolicy-config.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd"> diff --git a/activemq-server/src/test/resources/shared-store-master-hapolicy-config.xml b/activemq-server/src/test/resources/shared-store-master-hapolicy-config.xml index fb2b303b21..0e29addad8 100644 --- a/activemq-server/src/test/resources/shared-store-master-hapolicy-config.xml +++ b/activemq-server/src/test/resources/shared-store-master-hapolicy-config.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd"> diff --git a/activemq-server/src/test/resources/shared-store-slave-hapolicy-config.xml b/activemq-server/src/test/resources/shared-store-slave-hapolicy-config.xml index d9cd77e4da..02ce6de4c4 100644 --- a/activemq-server/src/test/resources/shared-store-slave-hapolicy-config.xml +++ b/activemq-server/src/test/resources/shared-store-slave-hapolicy-config.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd"> diff --git a/activemq-server/src/test/resources/shared-store-slave-hapolicy-config2.xml b/activemq-server/src/test/resources/shared-store-slave-hapolicy-config2.xml index 31a681f042..1fd060e73f 100644 --- a/activemq-server/src/test/resources/shared-store-slave-hapolicy-config2.xml +++ b/activemq-server/src/test/resources/shared-store-slave-hapolicy-config2.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd"> diff --git a/activemq-server/src/test/resources/shared-store-slave-hapolicy-config3.xml b/activemq-server/src/test/resources/shared-store-slave-hapolicy-config3.xml index a1eb14e77f..093804e1b5 100644 --- a/activemq-server/src/test/resources/shared-store-slave-hapolicy-config3.xml +++ b/activemq-server/src/test/resources/shared-store-slave-hapolicy-config3.xml @@ -1,7 +1,7 @@ + xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd"> diff --git a/activemq-tools/pom.xml b/activemq-tools/pom.xml index 2453cedb3d..d3a653c6b2 100644 --- a/activemq-tools/pom.xml +++ b/activemq-tools/pom.xml @@ -34,7 +34,7 @@ - ${project.basedir}/.. + ${project.basedir}/.. diff --git a/distribution/activemq/src/main/resources/config/clustered/activemq-configuration.xml b/distribution/activemq/src/main/resources/config/clustered/activemq-configuration.xml index a09ffe08f3..5d292fb829 100644 --- a/distribution/activemq/src/main/resources/config/clustered/activemq-configuration.xml +++ b/distribution/activemq/src/main/resources/config/clustered/activemq-configuration.xml @@ -15,14 +15,14 @@ org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + + @@ -30,14 +30,14 @@ org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + + diff --git a/distribution/activemq/src/main/resources/config/clustered/bootstrap.xml b/distribution/activemq/src/main/resources/config/clustered/bootstrap.xml index 28b9dce589..d7f2d5b774 100644 --- a/distribution/activemq/src/main/resources/config/clustered/bootstrap.xml +++ b/distribution/activemq/src/main/resources/config/clustered/bootstrap.xml @@ -12,7 +12,7 @@ permissions and limitations under the License. --> - + diff --git a/distribution/activemq/src/main/resources/config/logging.properties b/distribution/activemq/src/main/resources/config/logging.properties index e905257959..f38bffe825 100644 --- a/distribution/activemq/src/main/resources/config/logging.properties +++ b/distribution/activemq/src/main/resources/config/logging.properties @@ -47,7 +47,7 @@ handler.FILE=org.jboss.logmanager.handlers.FileHandler handler.FILE.level=DEBUG handler.FILE.properties=autoFlush,fileName handler.FILE.autoFlush=true -handler.FILE.fileName=${hornetq.home}/logs/hornetq.log +handler.FILE.fileName=${actviemq.home}/logs/activemq.log handler.FILE.formatter=PATTERN # Formatter pattern configuration diff --git a/distribution/activemq/src/main/resources/config/non-clustered/activemq-configuration.xml b/distribution/activemq/src/main/resources/config/non-clustered/activemq-configuration.xml index 71752110ca..1941b92f34 100644 --- a/distribution/activemq/src/main/resources/config/non-clustered/activemq-configuration.xml +++ b/distribution/activemq/src/main/resources/config/non-clustered/activemq-configuration.xml @@ -15,14 +15,14 @@ org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + + @@ -30,14 +30,14 @@ org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + + diff --git a/distribution/activemq/src/main/resources/config/non-clustered/bootstrap.xml b/distribution/activemq/src/main/resources/config/non-clustered/bootstrap.xml index de3147e4f0..2e93aa4b0b 100644 --- a/distribution/activemq/src/main/resources/config/non-clustered/bootstrap.xml +++ b/distribution/activemq/src/main/resources/config/non-clustered/bootstrap.xml @@ -12,7 +12,7 @@ permissions and limitations under the License. --> - + diff --git a/distribution/activemq/src/main/resources/config/replicated/activemq-configuration.xml b/distribution/activemq/src/main/resources/config/replicated/activemq-configuration.xml index 54bb6f0e21..06f014a44d 100644 --- a/distribution/activemq/src/main/resources/config/replicated/activemq-configuration.xml +++ b/distribution/activemq/src/main/resources/config/replicated/activemq-configuration.xml @@ -19,14 +19,14 @@ org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + + @@ -34,14 +34,14 @@ org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + + diff --git a/distribution/activemq/src/main/resources/config/replicated/bootstrap.xml b/distribution/activemq/src/main/resources/config/replicated/bootstrap.xml index 977dea4078..9293b29c57 100644 --- a/distribution/activemq/src/main/resources/config/replicated/bootstrap.xml +++ b/distribution/activemq/src/main/resources/config/replicated/bootstrap.xml @@ -12,7 +12,7 @@ permissions and limitations under the License. --> - + diff --git a/distribution/activemq/src/main/resources/config/shared-store/activemq-configuration.xml b/distribution/activemq/src/main/resources/config/shared-store/activemq-configuration.xml index 11c0476856..0f60895812 100644 --- a/distribution/activemq/src/main/resources/config/shared-store/activemq-configuration.xml +++ b/distribution/activemq/src/main/resources/config/shared-store/activemq-configuration.xml @@ -19,14 +19,14 @@ org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + + org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory - - + + @@ -34,14 +34,14 @@ org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + + org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory - - + + diff --git a/distribution/activemq/src/main/resources/config/shared-store/bootstrap.xml b/distribution/activemq/src/main/resources/config/shared-store/bootstrap.xml index 192cdb9adc..03a1ba9716 100644 --- a/distribution/activemq/src/main/resources/config/shared-store/bootstrap.xml +++ b/distribution/activemq/src/main/resources/config/shared-store/bootstrap.xml @@ -12,7 +12,7 @@ permissions and limitations under the License. --> - + diff --git a/docs/eap-manual/en/clusters.xml b/docs/eap-manual/en/clusters.xml index 54c8b6b061..19bf1d5aba 100644 --- a/docs/eap-manual/en/clusters.xml +++ b/docs/eap-manual/en/clusters.xml @@ -133,7 +133,7 @@ We also need to configure the connection factories used by the client to be HA. This is done by adding - certain attributes to the connection factories inhornetq-jms.xml. Let's look at an + certain attributes to the connection factories inactivemq-jms.xml. Let's look at an example: @@ -201,15 +201,15 @@ for a live server running on a different eap instance. - The first thing to mention is that the backup only needs a hornetq-jboss-beans.xml + The first thing to mention is that the backup only needs a activemq-jboss-beans.xml and a activemq-configuration.xml configuration file. This is because any JMS components are created from the Journal when the backup server becomes live. Firstly we need to define a new ActiveMQ Server that EAP will deploy. We do this by creating a new - hornetq-jboss-beans.xml + activemq-jboss-beans.xml configuration. We will place this under a new directory - hornetq-backup1 + activemq-backup1 which will need creating in the deploy @@ -223,7 +223,7 @@ <!-- The core configuration --> <bean name="BackupConfiguration" class="org.apache.activemq.core.config.impl.FileConfiguration"> <property - name="configurationUrl">${jboss.server.home.url}/deploy/hornetq-backup1/activemq-configuration.xml</property> + name="configurationUrl">${jboss.server.home.url}/deploy/activemq-backup1/activemq-configuration.xml</property> </bean> @@ -280,7 +280,7 @@ Now let's add the server configuration in activemq-configuration.xml and add it to the same directory - deploy/hornetq-backup1 + deploy/activemq-backup1 and configure it like so: @@ -298,26 +298,26 @@ <allow-failback>true</allow-failback> - <bindings-directory>/media/shared/data/hornetq-backup/bindings</bindings-directory> + <bindings-directory>/media/shared/data/activemq-backup/bindings</bindings-directory> - <journal-directory>/media/shared/data/hornetq-backup/journal</journal-directory> + <journal-directory>/media/shared/data/activemq-backup/journal</journal-directory> <journal-min-files>10</journal-min-files> - <large-messages-directory>/media/shared/data/hornetq-backup/largemessages</large-messages-directory> + <large-messages-directory>/media/shared/data/activemq-backup/largemessages</large-messages-directory> - <paging-directory>/media/shared/data/hornetq-backup/paging</paging-directory> + <paging-directory>/media/shared/data/activemq-backup/paging</paging-directory> <connectors> <connector name="netty-connector"> <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <param key="host" value="${jboss.bind.address:localhost}"/> - <param key="port" value="${hornetq.remoting.backup.netty.port:5446}"/> + <param key="port" value="${activemq.remoting.backup.netty.port:5446}"/> </connector> <connector name="in-vm"> <factory-class>org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory</factory-class> - <param key="server-id" value="${hornetq.server-id:0}"/> + <param key="server-id" value="${activemq.server-id:0}"/> </connector> </connectors> @@ -326,7 +326,7 @@ <acceptor name="netty"> <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <param key="host" value="${jboss.bind.address:localhost}"/> - <param key="port" value="${hornetq.remoting.backup.netty.port:5446}"/> + <param key="port" value="${activemq.remoting.backup.netty.port:5446}"/> </acceptor> </acceptors> @@ -452,7 +452,7 @@ - Make sure that you give all the beans in the hornetq-jboss-beans.xml configuration + Make sure that you give all the beans in the activemq-jboss-beans.xml configuration file a unique name, i.e. @@ -461,7 +461,7 @@
Running the shipped example - EAP ships with an example configuration for this topology. Look under extras/hornetq/resources/examples/symmetric-cluster-with-backups-colocated + EAP ships with an example configuration for this topology. Look under extras/activemq/resources/examples/symmetric-cluster-with-backups-colocated and follow the read me
@@ -491,9 +491,9 @@ - Because there is no live hornetq server running by default in the eap instance running the backup server it + Because there is no live activemq server running by default in the eap instance running the backup server it makes no sense to host any applications in it. However you can host applications on the server running the live - hornetq server. If failure occurs to an live hornetq server then remote jms clients will failover as previously + activemq server. If failure occurs to an live activemq server then remote jms clients will failover as previously explained however what happens to any messages meant for or sent from JEE components. Well when the backup comes live, messages will be distributed to and from the backup server over ActiveMQ cluster connections and handled appropriately. @@ -516,16 +516,16 @@ For the backup server the activemq-configuration.xml is unchanged, however since there is - no live server we need to make sure that the hornetq-jboss-beans.xml instantiates all + no live server we need to make sure that the activemq-jboss-beans.xml instantiates all the beans needed. For this simply use the same configuration as in the live server changing only the location of the activemq-configuration.xml parameter for the Configuration bean. - As before there will be no hornetq-jms.xml or jms-ds.xml configuration. + As before there will be no activemq-jms.xml or jms-ds.xml configuration. - If you want both hornetq servers to be in there own dedicated server where they are remote to applications, + If you want both activemq servers to be in there own dedicated server where they are remote to applications, as in the last diagram. Then simply edit the jms-ds.xml and change the following lines to @@ -560,7 +560,7 @@ Running the shipped example EAP ships with an example configuration for this topology. Look under - extras/hornetq/resources/examples/cluster-with-dedicated-backup + extras/activemq/resources/examples/cluster-with-dedicated-backup and follow the read me diff --git a/docs/quickstart-guide/en/download.xml b/docs/quickstart-guide/en/download.xml index 7eeecb8dea..f47d5a6d03 100644 --- a/docs/quickstart-guide/en/download.xml +++ b/docs/quickstart-guide/en/download.xml @@ -23,13 +23,13 @@ ]> Download - The official ActiveMQ project page is http://hornetq.org/. + The official ActiveMQ project page is http://activemq.org/.
Software Download The software can be download from the Download page:http://hornetq.org/downloads.html + url="http://activemq.org/downloads.html" + >http://activemq.org/downloads.html
Project Information @@ -41,7 +41,7 @@ If you have any user questions please use our user + url="https://community.jboss.org/en/activemq">user forum @@ -50,24 +50,24 @@ >developer forum - Pop in and chat to us in our Pop in and chat to us in our IRC channel - Our project blog + Our project blog - Follow us on twitter + Follow us on twitter ActiveMQ Git repository is https://github.com/hornetq/hornetq + url="https://github.com/activemq/activemq" + >https://github.com/activemq/activemq All release tags are available from https://github.com/hornetq/hornetq/tags + url="https://github.com/activemq/activemq/tags" + >https://github.com/activemq/activemq/tags diff --git a/docs/quickstart-guide/en/examples.xml b/docs/quickstart-guide/en/examples.xml index 7574664dbd..ccacb14d99 100644 --- a/docs/quickstart-guide/en/examples.xml +++ b/docs/quickstart-guide/en/examples.xml @@ -48,7 +48,7 @@ This contains the source code for the example - resources/hornetq/server0 configuration directory + resources/activemq/server0 configuration directory This contains the configuration files needed to run the server for the example. There may be multiple configuration directories server0, server1 etc for clustered examples etc. @@ -69,45 +69,45 @@ [INFO] Building ActiveMQ JMS Queue Example 2.3.0.BETA-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] -[INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ hornetq-jms-queue-example --- +[INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ activemq-jms-queue-example --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 3 resources [INFO] -[INFO] --- maven-compiler-plugin:3.0:compile (default-compile) @ hornetq-jms-queue-example --- +[INFO] --- maven-compiler-plugin:3.0:compile (default-compile) @ activemq-jms-queue-example --- [INFO] Nothing to compile - all classes are up to date [INFO] -[INFO] --- maven-resources-plugin:2.6:testResources (default-testResources) @ hornetq-jms-queue-example --- +[INFO] --- maven-resources-plugin:2.6:testResources (default-testResources) @ activemq-jms-queue-example --- [INFO] Using 'UTF-8' encoding to copy filtered resources. -[INFO] skip non existing resourceDirectory /home/andy/projects/hornetq-master/examples/jms/queue/src/test/resources +[INFO] skip non existing resourceDirectory /home/andy/projects/activemq-master/examples/jms/queue/src/test/resources [INFO] -[INFO] --- maven-compiler-plugin:3.0:testCompile (default-testCompile) @ hornetq-jms-queue-example --- +[INFO] --- maven-compiler-plugin:3.0:testCompile (default-testCompile) @ activemq-jms-queue-example --- [INFO] No sources to compile [INFO] -[INFO] --- maven-surefire-plugin:2.13:test (default-test) @ hornetq-jms-queue-example --- +[INFO] --- maven-surefire-plugin:2.13:test (default-test) @ activemq-jms-queue-example --- [INFO] -[INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ hornetq-jms-queue-example --- -[INFO] Building jar: /home/andy/projects/hornetq-master/examples/jms/queue/target/hornetq-jms-queue-example-2.3.0.BETA-SNAPSHOT.jar +[INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ activemq-jms-queue-example --- +[INFO] Building jar: /home/andy/projects/activemq-master/examples/jms/queue/target/activemq-jms-queue-example-2.3.0.BETA-SNAPSHOT.jar [INFO] -[INFO] >>> maven-source-plugin:2.2.1:jar (attach-sources) @ hornetq-jms-queue-example >>> +[INFO] >>> maven-source-plugin:2.2.1:jar (attach-sources) @ activemq-jms-queue-example >>> [INFO] -[INFO] <<< maven-source-plugin:2.2.1:jar (attach-sources) @ hornetq-jms-queue-example <<< +[INFO] <<< maven-source-plugin:2.2.1:jar (attach-sources) @ activemq-jms-queue-example <<< [INFO] -[INFO] --- maven-source-plugin:2.2.1:jar (attach-sources) @ hornetq-jms-queue-example --- -[INFO] Building jar: /home/andy/projects/hornetq-master/examples/jms/queue/target/hornetq-jms-queue-example-2.3.0.BETA-SNAPSHOT-sources.jar +[INFO] --- maven-source-plugin:2.2.1:jar (attach-sources) @ activemq-jms-queue-example --- +[INFO] Building jar: /home/andy/projects/activemq-master/examples/jms/queue/target/activemq-jms-queue-example-2.3.0.BETA-SNAPSHOT-sources.jar [INFO] -[INFO] >>> maven-source-plugin:2.2.1:jar (default) @ hornetq-jms-queue-example >>> +[INFO] >>> maven-source-plugin:2.2.1:jar (default) @ activemq-jms-queue-example >>> [INFO] -[INFO] <<< maven-source-plugin:2.2.1:jar (default) @ hornetq-jms-queue-example <<< +[INFO] <<< maven-source-plugin:2.2.1:jar (default) @ activemq-jms-queue-example <<< [INFO] -[INFO] --- maven-source-plugin:2.2.1:jar (default) @ hornetq-jms-queue-example --- -[WARNING] Artifact org.apache.activemq.examples.jms:hornetq-jms-queue-example:java-source:sources:2.3.0.BETA-SNAPSHOT already attached to project, ignoring duplicate +[INFO] --- maven-source-plugin:2.2.1:jar (default) @ activemq-jms-queue-example --- +[WARNING] Artifact org.apache.activemq.examples.jms:activemq-jms-queue-example:java-source:sources:2.3.0.BETA-SNAPSHOT already attached to project, ignoring duplicate [INFO] -[INFO] --- hornetq-maven-plugin:1.1.1-SNAPSHOT:start (start) @ hornetq-jms-queue-example --- -[file:/home/andy/projects/hornetq-master/examples/jms/queue/target/classes/hornetq/server0/] +[INFO] --- activemq-maven-plugin:1.1.1-SNAPSHOT:start (start) @ activemq-jms-queue-example --- +[file:/home/andy/projects/activemq-master/examples/jms/queue/target/classes/activemq/server0/] Apr 17, 2013 10:51:01 AM org.apache.activemq.core.deployers.impl.FileConfigurationParser parseMainConfig WARN: HQ222018: AIO was not located on this platform, it will fall back to using pure Java NIO. If your platform is Linux, install LibAIO to enable the AIO journal Apr 17, 2013 10:51:01 AM org.apache.activemq.core.server.impl.ActiveMQServerImpl start -INFO: HQ221000: live server is starting with configuration ActiveMQ Configuration (clustered=false,backup=false,sharedStore=true,journalDirectory=/home/andy/projects/hornetq-master/examples/jms/queue/target//server0/data/messaging/journal,bindingsDirectory=/home/andy/projects/hornetq-master/examples/jms/queue/target//server0/data/messaging/bindings,largeMessagesDirectory=/home/andy/projects/hornetq-master/examples/jms/queue/target//server0/data/messaging/largemessages,pagingDirectory=/home/andy/projects/hornetq-master/examples/jms/queue/target//server0/data/messaging/paging) +INFO: HQ221000: live server is starting with configuration ActiveMQ Configuration (clustered=false,backup=false,sharedStore=true,journalDirectory=/home/andy/projects/activemq-master/examples/jms/queue/target//server0/data/messaging/journal,bindingsDirectory=/home/andy/projects/activemq-master/examples/jms/queue/target//server0/data/messaging/bindings,largeMessagesDirectory=/home/andy/projects/activemq-master/examples/jms/queue/target//server0/data/messaging/largemessages,pagingDirectory=/home/andy/projects/activemq-master/examples/jms/queue/target//server0/data/messaging/paging) Apr 17, 2013 10:51:01 AM org.apache.activemq.core.server.impl.ActiveMQServerImpl$SharedStoreLiveActivation run INFO: HQ221006: Waiting to obtain live lock Apr 17, 2013 10:51:01 AM org.apache.activemq.core.persistence.impl.journal.JournalStorageManager <init> @@ -127,7 +127,7 @@ INFO: HQ221007: Server is now live Apr 17, 2013 10:51:02 AM org.apache.activemq.core.server.impl.ActiveMQServerImpl start INFO: HQ221001: ActiveMQ Server version 2.3.0.SNAPSHOT (black'n'yellow, 123) [a57893ff-7783-11e2-9787-07ca142fc9f7] [INFO] -[INFO] --- hornetq-maven-plugin:1.1.1-SNAPSHOT:runClient (runClient) @ hornetq-jms-queue-example --- +[INFO] --- activemq-maven-plugin:1.1.1-SNAPSHOT:runClient (runClient) @ activemq-jms-queue-example --- Apr 17, 2013 10:51:02 AM org.apache.activemq.common.example.ActiveMQExample getContext INFO: using jnp://localhost:1099 for jndi Sent message: This is a text message @@ -138,7 +138,7 @@ example complete ### SUCCESS! ### ##################### [INFO] -[INFO] --- hornetq-maven-plugin:1.1.1-SNAPSHOT:stop (stop) @ hornetq-jms-queue-example --- +[INFO] --- activemq-maven-plugin:1.1.1-SNAPSHOT:stop (stop) @ activemq-jms-queue-example --- Apr 17, 2013 10:51:03 AM org.apache.activemq.core.server.management.impl.ManagementServiceImpl stop WARN: HQ222113: On ManagementService stop, there are 1 unexpected registered MBeans: [core.acceptor.netty-acceptor] Apr 17, 2013 10:51:03 AM org.apache.activemq.core.server.impl.ActiveMQServerImpl stop @@ -175,28 +175,28 @@ INFO: HQ221002: ActiveMQ Server version 2.3.0.SNAPSHOT (black'n'yellow, 123) [a5 [INFO] Building ActiveMQ JEE MDB Example 2.3.0.BETA-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] -[INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ hornetq-jee-mdb-bmt-example --- +[INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ activemq-jee-mdb-bmt-example --- [INFO] Using 'UTF-8' encoding to copy filtered resources. -[INFO] skip non existing resourceDirectory /home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/src/main/resources +[INFO] skip non existing resourceDirectory /home/andy/projects/activemq-master/examples/javaee/mdb-bmt/src/main/resources [INFO] -[INFO] --- maven-compiler-plugin:3.0:compile (default-compile) @ hornetq-jee-mdb-bmt-example --- +[INFO] --- maven-compiler-plugin:3.0:compile (default-compile) @ activemq-jee-mdb-bmt-example --- [INFO] Nothing to compile - all classes are up to date [INFO] -[INFO] --- maven-resources-plugin:2.6:copy-resources (as-node-0) @ hornetq-jee-mdb-bmt-example --- +[INFO] --- maven-resources-plugin:2.6:copy-resources (as-node-0) @ activemq-jee-mdb-bmt-example --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 1112 resources [INFO] Copying 5 resources [INFO] -[INFO] --- maven-resources-plugin:2.6:testResources (default-testResources) @ hornetq-jee-mdb-bmt-example --- +[INFO] --- maven-resources-plugin:2.6:testResources (default-testResources) @ activemq-jee-mdb-bmt-example --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 1 resource [INFO] -[INFO] --- maven-compiler-plugin:3.0:testCompile (default-testCompile) @ hornetq-jee-mdb-bmt-example --- +[INFO] --- maven-compiler-plugin:3.0:testCompile (default-testCompile) @ activemq-jee-mdb-bmt-example --- [INFO] Changes detected - recompiling the module! -[INFO] Compiling 1 source file to /home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/test-classes +[INFO] Compiling 1 source file to /home/andy/projects/activemq-master/examples/javaee/mdb-bmt/target/test-classes [INFO] -[INFO] --- maven-surefire-plugin:2.12:test (default-test) @ hornetq-jee-mdb-bmt-example --- -[INFO] Surefire report directory: /home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/surefire-reports +[INFO] --- maven-surefire-plugin:2.12:test (default-test) @ activemq-jee-mdb-bmt-example --- +[INFO] Surefire report directory: /home/andy/projects/activemq-master/examples/javaee/mdb-bmt/target/surefire-reports ------------------------------------------------------- T E S T S @@ -210,7 +210,7 @@ WARNING: Configuration contain properties not supported by the backing object or Unused property entries: {waitForPortsTimeoutInSeconds=8, waitForPorts=8787 9999} Supported property names: [jbossHome, outputToConsole, enableAssertions, password, managementPort, javaHome, javaVmArguments, username, serverConfig, allowConnectingToRunningServer, managementAddress, startupTimeoutInSeconds, modulePath] Apr 17, 2013 10:58:04 AM org.jboss.as.arquillian.container.managed.ManagedDeployableContainer startInternal -INFO: Starting container with: [/home/andy/devtools/jdk1.6.0_25//bin/java, -Djboss.inst=/home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/jbossas-node0, -ea, -Djboss.home.dir=/home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/jbossas-node0, -Dorg.jboss.boot.log.file=/home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/log/boot.log, -Dlogging.configuration=file:/home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/configuration/logging.properties, -Djboss.modules.dir=/home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/jbossas-node0/modules, -Djboss.bundles.dir=/home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/jbossas-node0/bundles, -jar, /home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/jbossas-node0/jboss-modules.jar, -mp, /home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/jbossas-node0/modules, -jaxpmodule, javax.xml.jaxp-provider, org.jboss.as.standalone, -server-config, standalone-example.xml] +INFO: Starting container with: [/home/andy/devtools/jdk1.6.0_25//bin/java, -Djboss.inst=/home/andy/projects/activemq-master/examples/javaee/mdb-bmt/target/jbossas-node0, -ea, -Djboss.home.dir=/home/andy/projects/activemq-master/examples/javaee/mdb-bmt/target/jbossas-node0, -Dorg.jboss.boot.log.file=/home/andy/projects/activemq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/log/boot.log, -Dlogging.configuration=file:/home/andy/projects/activemq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/configuration/logging.properties, -Djboss.modules.dir=/home/andy/projects/activemq-master/examples/javaee/mdb-bmt/target/jbossas-node0/modules, -Djboss.bundles.dir=/home/andy/projects/activemq-master/examples/javaee/mdb-bmt/target/jbossas-node0/bundles, -jar, /home/andy/projects/activemq-master/examples/javaee/mdb-bmt/target/jbossas-node0/jboss-modules.jar, -mp, /home/andy/projects/activemq-master/examples/javaee/mdb-bmt/target/jbossas-node0/modules, -jaxpmodule, javax.xml.jaxp-provider, org.jboss.as.standalone, -server-config, standalone-example.xml] 10:58:04,525 INFO [org.jboss.modules] JBoss Modules version 1.1.1.GA 10:58:04,664 INFO [org.jboss.msc] JBoss MSC version 1.0.2.GA 10:58:04,703 INFO [org.jboss.as] JBAS015899: JBoss AS 7.1.1.Final "Brontes" starting @@ -235,7 +235,7 @@ INFO: Starting container with: [/home/andy/devtools/jdk1.6.0_25//bin/java, -Djbo 10:58:05,831 INFO [org.jboss.ws.common.management.AbstractServerConfig] (MSC service thread 1-4) JBoss Web Services - Stack CXF Server 4.0.2.GA 10:58:05,943 INFO [org.apache.coyote.http11.Http11Protocol] (MSC service thread 1-6) Starting Coyote HTTP/1.1 on http-localhost.localdomain-127.0.0.1-8080 10:58:05,966 INFO [org.jboss.as.jacorb] (MSC service thread 1-2) JBAS016330: CORBA ORB Service started -10:58:05,988 INFO [org.apache.activemq.core.server.impl.ActiveMQServerImpl] (MSC service thread 1-11) live server is starting with configuration ActiveMQ Configuration (clustered=false,backup=false,sharedStore=true,journalDirectory=/home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/messagingjournal,bindingsDirectory=/home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/messagingbindings,largeMessagesDirectory=/home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/messaginglargemessages,pagingDirectory=/home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/messagingpaging) +10:58:05,988 INFO [org.apache.activemq.core.server.impl.ActiveMQServerImpl] (MSC service thread 1-11) live server is starting with configuration ActiveMQ Configuration (clustered=false,backup=false,sharedStore=true,journalDirectory=/home/andy/projects/activemq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/messagingjournal,bindingsDirectory=/home/andy/projects/activemq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/messagingbindings,largeMessagesDirectory=/home/andy/projects/activemq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/messaginglargemessages,pagingDirectory=/home/andy/projects/activemq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/messagingpaging) 10:58:05,996 INFO [org.apache.activemq.core.server.impl.ActiveMQServerImpl] (MSC service thread 1-11) Waiting to obtain live lock 10:58:06,037 INFO [org.apache.activemq.core.persistence.impl.journal.JournalStorageManager] (MSC service thread 1-11) Using AIO Journal 10:58:06,122 INFO [org.jboss.as.jacorb] (MSC service thread 1-14) JBAS016328: CORBA Naming Service started @@ -244,7 +244,7 @@ INFO: Starting container with: [/home/andy/devtools/jdk1.6.0_25//bin/java, -Djbo 10:58:06,205 INFO [org.apache.activemq.core.server.impl.AIOFileLockNodeManager] (MSC service thread 1-11) Live Server Obtained live lock 10:58:06,434 INFO [org.jboss.as.remoting] (MSC service thread 1-2) JBAS017100: Listening on localhost.localdomain/127.0.0.1:4447 10:58:06,434 INFO [org.jboss.as.remoting] (MSC service thread 1-15) JBAS017100: Listening on /127.0.0.1:9999 -10:58:06,436 INFO [org.jboss.as.server.deployment.scanner] (MSC service thread 1-16) JBAS015012: Started FileSystemDeploymentService for directory /home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/deployments +10:58:06,436 INFO [org.jboss.as.server.deployment.scanner] (MSC service thread 1-16) JBAS015012: Started FileSystemDeploymentService for directory /home/andy/projects/activemq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/deployments 10:58:08,790 INFO [org.apache.activemq.core.remoting.impl.netty.NettyAcceptor] (MSC service thread 1-11) Started Netty Acceptor version 3.2.5.Final-a96d88c localhost.localdomain:5445 for CORE protocol 10:58:08,793 INFO [org.apache.activemq.core.remoting.impl.netty.NettyAcceptor] (MSC service thread 1-11) Started Netty Acceptor version 3.2.5.Final-a96d88c localhost.localdomain:5455 for CORE protocol 10:58:08,795 INFO [org.apache.activemq.core.server.impl.ActiveMQServerImpl] (MSC service thread 1-11) Server is now live @@ -273,7 +273,7 @@ INFO: Starting container with: [/home/andy/devtools/jdk1.6.0_25//bin/java, -Djbo 10:58:09,517 INFO [org.jboss.wsf.stack.cxf.transport.AddressRewritingEndpointInfo] (MSC service thread 1-1) Setting new service endpoint address in wsdl: http://ONT001-HPM.rhcloud.com:80/BasicWService 10:58:09,656 INFO [org.jboss.wsf.stack.cxf.transport.AddressRewritingEndpointInfo] (MSC service thread 1-1) Setting new service endpoint address in wsdl: http://localhost:8080/hpm/BasicWService 10:58:09,688 INFO [org.apache.cxf.endpoint.ServerImpl] (MSC service thread 1-1) Setting the server's publish address to be http://localhost:8080/hpm/BasicWService -10:58:09,729 INFO [org.jboss.wsf.stack.cxf.deployment.WSDLFilePublisher] (MSC service thread 1-1) WSDL published to: file:/home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/wsdl/ONT001-1.0.war/BasicWService.wsdl +10:58:09,729 INFO [org.jboss.wsf.stack.cxf.deployment.WSDLFilePublisher] (MSC service thread 1-1) WSDL published to: file:/home/andy/projects/activemq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/wsdl/ONT001-1.0.war/BasicWService.wsdl 10:58:09,735 INFO [org.jboss.as.webservices] (MSC service thread 1-11) JBAS015539: Starting service jboss.ws.port-component-link 10:58:09,748 INFO [org.jboss.as.webservices] (MSC service thread 1-10) JBAS015539: Starting service jboss.ws.endpoint."ONT001-1.0.war"."com.hpm.webservices.BasicWSImpl" 10:58:09,753 INFO [org.jboss.ws.common.management.DefaultEndpointRegistry] (MSC service thread 1-10) register: jboss.ws:context=hpm,endpoint=com.hpm.webservices.BasicWSImpl @@ -288,7 +288,7 @@ mdb.jar: /org.apache.activemq/javaee/example/ /org.apache.activemq/javaee/example/server/ /org.apache.activemq/javaee/example/server/MDB_BMTExample.class -10:58:11,612 INFO [org.jboss.as.repository] (management-handler-thread - 2) JBAS014900: Content added at location /home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/content/f0/e2d589ab9490193e109c8bc833f725c87defae/content +10:58:11,612 INFO [org.jboss.as.repository] (management-handler-thread - 2) JBAS014900: Content added at location /home/andy/projects/activemq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/content/f0/e2d589ab9490193e109c8bc833f725c87defae/content 10:58:11,620 INFO [org.jboss.as.server.deployment] (MSC service thread 1-8) JBAS015876: Starting deployment of "arquillian-service" 10:58:11,811 WARN [org.jboss.as.dependency.private] (MSC service thread 1-1) JBAS018567: Deployment "deployment.arquillian-service" is using a private module ("org.jboss.as.jmx:main") which may be changed or removed in future versions without notice. 10:58:11,812 WARN [org.jboss.as.dependency.private] (MSC service thread 1-1) JBAS018567: Deployment "deployment.arquillian-service" is using a private module ("org.jboss.as.server:main") which may be changed or removed in future versions without notice. @@ -296,21 +296,21 @@ mdb.jar: 10:58:11,815 WARN [org.jboss.as.dependency.private] (MSC service thread 1-1) JBAS018567: Deployment "deployment.arquillian-service" is using a private module ("org.jboss.jandex:main") which may be changed or removed in future versions without notice. 10:58:11,817 WARN [org.jboss.as.dependency.private] (MSC service thread 1-1) JBAS018567: Deployment "deployment.arquillian-service" is using a private module ("org.jboss.osgi.framework:main") which may be changed or removed in future versions without notice. 10:58:11,953 INFO [org.jboss.as.server] (management-handler-thread - 2) JBAS018559: Deployed "arquillian-service" -10:58:12,328 INFO [org.jboss.as.repository] (management-handler-thread - 3) JBAS014900: Content added at location /home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/content/59/7dcdb0f420ed57aea638b2599f7a86eecf6c85/content +10:58:12,328 INFO [org.jboss.as.repository] (management-handler-thread - 3) JBAS014900: Content added at location /home/andy/projects/activemq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/content/59/7dcdb0f420ed57aea638b2599f7a86eecf6c85/content 10:58:12,333 INFO [org.jboss.as.server.deployment] (MSC service thread 1-7) JBAS015876: Starting deployment of "mdb.jar" 10:58:12,401 INFO [org.jboss.as.arquillian] (MSC service thread 1-14) Arquillian deployment detected: ArquillianConfig[service=jboss.arquillian.config."mdb.jar",unit=mdb.jar,tests=[org.apache.activemq.javaee.example.server.ExampleRunnerTest]] -10:58:12,418 INFO [org.jboss.as.ejb3] (MSC service thread 1-15) JBAS014142: Started message driven bean 'MDB_BMTExample' with 'hornetq-ra' resource adapter +10:58:12,418 INFO [org.jboss.as.ejb3] (MSC service thread 1-15) JBAS014142: Started message driven bean 'MDB_BMTExample' with 'activemq-ra' resource adapter 10:58:12,562 INFO [org.jboss.as.server] (management-handler-thread - 3) JBAS018559: Deployed "mdb.jar" Sent message: This is a text message 10:58:13,229 INFO [org.jboss.as.naming] (Remoting "localhost" task-3) JBAS011806: Channel end notification received, closing channel Channel ID 57be4578 (inbound) of Remoting connection 3ac552d5 to /127.0.0.1:58571 10:58:13,255 INFO [stdout] (Thread-0 (ActiveMQ-client-global-threads-1402019528)) message This is a text message received 10:58:13,257 INFO [stdout] (Thread-0 (ActiveMQ-client-global-threads-1402019528)) we're in the middle of a transaction: org.jboss.tm.usertx.client.ServerVMClientUserTransaction@6b04d3c8 10:58:14,292 INFO [org.jboss.as.server.deployment] (MSC service thread 1-5) JBAS015877: Stopped deployment mdb.jar in 33ms -10:58:14,413 INFO [org.jboss.as.repository] (management-handler-thread - 1) JBAS014901: Content removed from location /home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/content/59/7dcdb0f420ed57aea638b2599f7a86eecf6c85/content +10:58:14,413 INFO [org.jboss.as.repository] (management-handler-thread - 1) JBAS014901: Content removed from location /home/andy/projects/activemq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/content/59/7dcdb0f420ed57aea638b2599f7a86eecf6c85/content 10:58:14,415 INFO [org.jboss.as.server] (management-handler-thread - 1) JBAS018558: Undeployed "mdb.jar" Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 10.609 sec 10:58:14,436 INFO [org.jboss.as.server.deployment] (MSC service thread 1-5) JBAS015877: Stopped deployment arquillian-service in 6ms -10:58:14,530 INFO [org.jboss.as.repository] (management-handler-thread - 2) JBAS014901: Content removed from location /home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/content/f0/e2d589ab9490193e109c8bc833f725c87defae/content +10:58:14,530 INFO [org.jboss.as.repository] (management-handler-thread - 2) JBAS014901: Content removed from location /home/andy/projects/activemq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/content/f0/e2d589ab9490193e109c8bc833f725c87defae/content 10:58:14,532 INFO [org.jboss.as.server] (management-handler-thread - 2) JBAS018558: Undeployed "arquillian-service" Results : diff --git a/docs/quickstart-guide/en/running.xml b/docs/quickstart-guide/en/running.xml index 826c514fe2..6514659ee8 100644 --- a/docs/quickstart-guide/en/running.xml +++ b/docs/quickstart-guide/en/running.xml @@ -26,10 +26,10 @@
Standalone ActiveMQ To run a stand-alone server, open up a shell or command prompt and navigate into the - bin directory. Then execute ./hornetq run (or ./hornetq.cmd run on Windows) and you should see the following output + bin directory. Then execute ./activemq run (or ./activemq.cmd run on Windows) and you should see the following output - bin$ ./hornetq run + bin$ ./activemq run 11:05:06,589 INFO [org.apache.activemq.integration.bootstrap] HQ101000: Starting ActiveMQ Server ... @@ -38,9 +38,9 @@ ActiveMQ is now running. Both the run and the stop scripts use the config under config/non-clustered by default. The configuration can be changed - by running ./hornetq run xml:../config/non-clustered/bootstrap.xml or another config of + by running ./activemq run xml:../config/non-clustered/bootstrap.xml or another config of your choosing. - The server can be stopped by running ./hornetq stop + The server can be stopped by running ./activemq stop
ActiveMQ In Wildfly @@ -102,7 +102,7 @@ 14:47:43,777 INFO [org.jboss.as.connector.subsystems.datasources] (MSC service thread 1-8) JBAS010400: Bound data source [java:jboss/datasources/ExampleDS] 14:47:43,781 INFO [org.jboss.as.jacorb] (MSC service thread 1-1) JBAS016330: CORBA ORB Service started 14:47:44,115 INFO [org.jboss.as.jacorb] (MSC service thread 1-13) JBAS016328: CORBA Naming Service started - 14:47:44,345 INFO [org.wildfly.extension.undertow] (MSC service thread 1-3) JBAS018210: Register web context: /hornetq-server + 14:47:44,345 INFO [org.wildfly.extension.undertow] (MSC service thread 1-3) JBAS018210: Register web context: /activemq-server 14:47:44,361 INFO [org.apache.activemq.core.server] (ServerService Thread Pool -- 58) HQ221020: Started Netty Acceptor version 3.6.6.Final-90e1eb2 127.0.0.1:5455 for CORE protocol 14:47:44,362 INFO [org.apache.activemq.core.server] (ServerService Thread Pool -- 58) HQ221020: Started Netty Acceptor version 3.6.6.Final-90e1eb2 127.0.0.1:5445 for CORE protocol 14:47:44,364 INFO [org.apache.activemq.core.server] (ServerService Thread Pool -- 58) HQ221020: Started Netty Acceptor version 3.6.6.Final-90e1eb2 org.apache.activemq.default.servlet:5445 for CORE protocol diff --git a/docs/quickstart-guide/zh/download.xml b/docs/quickstart-guide/zh/download.xml index c1575e5d3a..34ee2f337d 100644 --- a/docs/quickstart-guide/zh/download.xml +++ b/docs/quickstart-guide/zh/download.xml @@ -18,13 +18,13 @@ 下载 - ActiveMQ项目的官方地址是 http://hornetq.org/。 + ActiveMQ项目的官方地址是 http://activemq.org/。
软件下载 ActiveMQ的下载地址是http://hornetq.org/downloads.html + url="http://activemq.org/downloads.html/" + >http://activemq.org/downloads.html
项目信息 @@ -45,24 +45,24 @@ >开发论坛 - 请加入我们的请加入我们的IRC频道与我们的核心开发工程师交流。 - 我们项目有自己的 博客 + 我们项目有自己的 博客 - 还可以跟踪我们的twitter + 还可以跟踪我们的twitter ActiveMQ的Git代码库地址 https://github.com/hornetq/hornetq + url="https://github.com/activemq/activemq" + >https://github.com/activemq/activemq 每次发布的版本标签都在https://github.com/hornetq/hornetq/tags下能找到。 + url="https://github.com/activemq/activemq/tags" + >https://github.com/activemq/activemq/tags下能找到。 diff --git a/docs/quickstart-guide/zh/examples.xml b/docs/quickstart-guide/zh/examples.xml index 8f7cba86b3..44be24ef11 100644 --- a/docs/quickstart-guide/zh/examples.xml +++ b/docs/quickstart-guide/zh/examples.xml @@ -58,17 +58,17 @@ run: init: compile: - [echo] src.example.dir=/home/andy/projects/hornetq/trunk/examples/jms/queue/src - [javac] Compiling 5 source files to /home/andy/projects/hornetq/trunk/examples/jms/queue + [echo] src.example.dir=/home/andy/projects/activemq/trunk/examples/jms/queue/src + [javac] Compiling 5 source files to /home/andy/projects/activemq/trunk/examples/jms/queue /build/classes runExample: - [java] 10:41:04,149 INFO @main [JMSExample] hornetq.example.runServer is true + [java] 10:41:04,149 INFO @main [JMSExample] activemq.example.runServer is true [java] 10:41:04,149 INFO @main [JMSExample] starting server with config 'server0' logServerOutput true [java] 10:41:04,149 INFO @main [JMSExample] and vm args: -Xms512M,-Xmx512M,-XX:+U seParallelGC,-XX:+AggressiveOpts,-XX:+UseFastAccessorMethods,-Djava.util.logging.config. -file=/home/andy/projects/hornetq/trunk/examples/jms/common/../../../src/config/stand-alone/no +file=/home/andy/projects/activemq/trunk/examples/jms/common/../../../src/config/stand-alone/no n-clustered/logging.properties [java] org.apache.activemq.jms.example.SpawnedJMSServer out:10:41:08,437 INFO @main [Journal StorageManager] AIO journal selected @@ -129,20 +129,20 @@ deploy: deploy-resources: [copy] Copying 1 file to /home/andy/projects/jbossas5.1/build/output/jboss-5.1.0.GA - /server/default-with-hornetq/deploy/hornetq.sar + /server/default-with-activemq/deploy/activemq.sar [copy] Copying 1 file to /home/andy/projects/jbossas5.1/build/output/jboss-5.1.0.GA - /server/default-with-hornetq/deploy/hornetq.sar + /server/default-with-activemq/deploy/activemq.sar init: compile: jar: - [jar] Building jar: /home/andy/projects/hornetq/trunk/examples/javaee/mdb/build/mdb-exa + [jar] Building jar: /home/andy/projects/activemq/trunk/examples/javaee/mdb/build/mdb-exa mple.jar ear: - [jar] Building jar: /home/andy/projects/hornetq/trunk/examples/javaee/mdb/build/mdb-exa + [jar] Building jar: /home/andy/projects/activemq/trunk/examples/javaee/mdb/build/mdb-exa mple.ear deploy-ear: @@ -198,11 +198,11 @@ undeploy: undeploy-misc: [delete] Deleting: /home/andy/projects/jbossas5.1/build/output/jboss-5.1.0.GA - /server/default-with-hornetq/deploy/mdb-example.ear + /server/default-with-activemq/deploy/mdb-example.ear [delete] Deleting: /home/andy/projects/jbossas5.1/build/output/jboss-5.1.0.GA - /server/default-with-hornetq/deploy/hornetq.sar/activemq-queues.xml + /server/default-with-activemq/deploy/activemq.sar/activemq-queues.xml [delete] Deleting: /home/andy/projects/jbossas5.1/build/output/jboss-5.1.0.GA - /server/default-with-hornetq/deploy/hornetq.sar/hornetq-jms.xml + /server/default-with-activemq/deploy/activemq.sar/activemq-jms.xml BUILD SUCCESSFUL Total time: 1 second diff --git a/docs/quickstart-guide/zh/installation.xml b/docs/quickstart-guide/zh/installation.xml index f29fdaa9f1..7f696206c7 100644 --- a/docs/quickstart-guide/zh/installation.xml +++ b/docs/quickstart-guide/zh/installation.xml @@ -110,18 +110,18 @@ 这将会在$JBOSS_HOME/server创建两个服务器配置： - default-with-hornetq -- 这个相当于AS 5的default-with-activemq -- 这个相当于AS 5的default配置但其JMS提供者替换成为ActiveMQ。在这个配置中的ActiveMQ 是非集群的。 - all-with-hornetq -- 这个相当于AS 5的all-with-activemq -- 这个相当于AS 5的all配置但其JMS提供者替换成为ActiveMQ。这个配置中的ActiveMQ 是集群的。 这时，你就可以启动上面其中任何一个配置的JBoss AS 5服务器了，例如： - $JBOSS_HOME/bin/run.sh -c default-with-hornetq + $JBOSS_HOME/bin/run.sh -c default-with-activemq
ActiveMQ运行于JBoss应用服务器4.x @@ -142,17 +142,17 @@ 这将会在$JBOSS_HOME/server创建两个服务器配置： - default-with-hornetq -- 这个相当于AS 4的default-with-activemq -- 这个相当于AS 4的default配置但其JMS提供者替换成为ActiveMQ。在这个配置中的ActiveMQ 是非集群的。 - all-with-hornetq -- 这个相当于AS 4的all-with-activemq -- 这个相当于AS 4的all配置但其JMS提供者替换成为ActiveMQ。这个配置中的ActiveMQ 是集群的。 这时，你就可以启动上面其中任何一个配置的JBoss AS 4服务器了，例如： - $JBOSS_HOME/bin/run.sh -c default-with-hornetq + $JBOSS_HOME/bin/run.sh -c default-with-activemq
diff --git a/docs/quickstart-guide/zh/running.xml b/docs/quickstart-guide/zh/running.xml index 9a571b55c4..867ab807d4 100644 --- a/docs/quickstart-guide/zh/running.xml +++ b/docs/quickstart-guide/zh/running.xml @@ -43,7 +43,7 @@ 例如，要运行一个带有非集群的ActiveMQ服务的AS 5，进入$JBOSS_HOME/bin目录，然后键入： - bin$ ./run.sh -c default-with-hornetq + bin$ ./run.sh -c default-with-activemq 15:18:35,460 INFO [ServerImpl] Starting JBoss (Microcontainer)... 15:18:35,462 INFO [ServerImpl] Release ID: JBoss (Microcontainer) [5.1.0.GA (build: SVNTag= diff --git a/docs/user-manual/user-manual.xpr b/docs/user-manual/user-manual.xpr index fc5025ab2b..615a6b9f88 100644 --- a/docs/user-manual/user-manual.xpr +++ b/docs/user-manual/user-manual.xpr @@ -25,7 +25,7 @@ - + diff --git a/docs/user-manual/zh/appserver-integration.xml b/docs/user-manual/zh/appserver-integration.xml index 82e9b00a30..2c7beea0d5 100644 --- a/docs/user-manual/zh/appserver-integration.xml +++ b/docs/user-manual/zh/appserver-integration.xml @@ -35,7 +35,7 @@ @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue"), @ActivationConfigProperty(propertyName = "destination", propertyValue = "queue/testQueue") }) -@ResourceAdapter("hornetq-ra.rar") +@ResourceAdapter("activemq-ra.rar") public class MDBExample implements MessageListener { public void onMessage(Message message)... @@ -50,7 +50,7 @@ public class MDBExample implements MessageListener >jboss.xml中加入类似以下的内容： <message-driven> <ejb-name>ExampleMDB</ejb-name> - <resource-adapter-name>hornetq-ra.rar</resource-adapter-name> + <resource-adapter-name>activemq-ra.rar</resource-adapter-name> </message-driven> 你还可以将hornetq-ra.rar改名为jms-ra.rar而不需要任何annotation或额外的部署描述信息。但是你需要 编辑jms-ds.xml文件，将其中的rar-name项改成相应的值。 @@ -72,7 +72,7 @@ public class MDBExample implements MessageListener }) @TransactionManagement(value= TransactionManagementType.CONTAINER) @TransactionAttribute(value= TransactionAttributeType.REQUIRED) -@ResourceAdapter("hornetq-ra.rar") +@ResourceAdapter("activemq-ra.rar") public class MDB_CMP_TxRequiredExample implements MessageListener { public void onMessage(Message message)... @@ -108,7 +108,7 @@ public class MDB_CMP_TxRequiredExample implements MessageListener }) @TransactionManagement(value = TransactionManagementType.CONTAINER) @TransactionAttribute(value = TransactionAttributeType.NOT_SUPPORTED) -@ResourceAdapter("hornetq-ra.rar") +@ResourceAdapter("activemq-ra.rar") public class MDB_CMP_TxLocalExample implements MessageListener { public void onMessage(Message message)... @@ -126,7 +126,7 @@ public class MDB_CMP_TxLocalExample implements MessageListener @ActivationConfigProperty(propertyName = "acknowledgeMode", propertyValue = "Dups-ok-acknowledge") }) @TransactionManagement(value= TransactionManagementType.BEAN) -@ResourceAdapter("hornetq-ra.rar") +@ResourceAdapter("activemq-ra.rar") public class MDB_BMPExample implements MessageListener { public void onMessage(Message message) @@ -175,7 +175,7 @@ public class MDB_BMPExample implements MessageListener }) @TransactionManagement(value= TransactionManagementType.CONTAINER) @TransactionAttribute(value= TransactionAttributeType.REQUIRED) -@ResourceAdapter("hornetq-ra.rar") +@ResourceAdapter("activemq-ra.rar") public class MDBMessageSelectorExample implements MessageListener { public void onMessage(Message message).... @@ -195,7 +195,7 @@ public class MDBMessageSelectorExample implements MessageListener }) @TransactionManagement(value= TransactionManagementType.CONTAINER) @TransactionAttribute(value= TransactionAttributeType.REQUIRED) -@ResourceAdapter("hornetq-ra.rar") +@ResourceAdapter("activemq-ra.rar") public class MDBMessageSendTxExample implements MessageListener { @Resource(mappedName = "java:/JmsXA") @@ -263,7 +263,7 @@ public class MDBMessageSendTxExample implements MessageListener }) @TransactionManagement(value= TransactionManagementType.CONTAINER) @TransactionAttribute(value= TransactionAttributeType.REQUIRED) -@ResourceAdapter("hornetq-ra.rar") +@ResourceAdapter("activemq-ra.rar") public class MyMDB implements MessageListener { ....} @@ -646,7 +646,7 @@ public class MyMDB implements MessageListener 适配器外部（outbound）配置 外部配置参数应该保持不变。这是因为它所定义的连接工厂要被Java EE的模块所使用。这些连接工厂 可以定义在名字样式为*-ds.xml的配置文件中。在JBoss的部署目录 - hornetq.sar下有一个默认的配置文件jms-ds.xml。 + activemq.sar下有一个默认的配置文件jms-ds.xml。 在这个文件中的连接工厂的配置从主要的配置文件ra.xml中继承， 但是可以在这里重新定义。下面的例子中给出了重新定义的方法。 @@ -784,7 +784,7 @@ private ConnectionFactory connectionFactory;
配置内部适配器 首先在deploy目录下创建一个以.rar为结尾的文件夹。 - 在这里我们将其命名为hornetq-ra.rar。主注意这一点很重要，因为MDB和外部配置都需要引用 + 在这里我们将其命名为activemq-ra.rar。主注意这一点很重要，因为MDB和外部配置都需要引用 该文件夹的名字。 @@ -793,7 +793,7 @@ private ConnectionFactory connectionFactory; 在文件夹 - hornetq-ra.rar + activemq-ra.rar 下创建名为 META-INF 的文件夹，然后在些文件夹内创建一个 @@ -825,8 +825,8 @@ private ConnectionFactory connectionFactory;
配置外部适配器 - 你还需要创建一个hornetq-ds.xml文件来配置外部连接。该文件需要放置在deploy - 下的任意一个文件夹中。在一相标准的安装中这个文件夹是horneq 或者 hornetq.sar。 + 你还需要创建一个activemq-ds.xml文件来配置外部连接。该文件需要放置在deploy + 下的任意一个文件夹中。在一相标准的安装中这个文件夹是horneq 或者 activemq.sar。 当然你可以选择其它文件夹。该文件的名字只要是以-ds.xml即可。在ActiveMQ的发布包中包含有一个模板文件， 它的名字是jms-ds.xml，位置就在config文件夹下。 @@ -835,7 +835,7 @@ private ConnectionFactory connectionFactory; <tx-connection-factory> <jndi-name>RemoteJmsXA</jndi-name> <xa-transaction/> - <rar-name>hornetq-ra.rar</rar-name> + <rar-name>activemq-ra.rar</rar-name> <connection-definition>org.apache.activemq.ra.ActiveMQRAConnectionFactory</connection-definition> <config-property name="SessionDefaultType" type="java.lang.String">javax.jms.Topic</config-property> <config-property name="ConnectorClassName" type="java.lang.String">org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</config-property> @@ -864,17 +864,17 @@ private ConnectionFactory connectionFactory; - hornetq-ra.jar + activemq-ra.jar ActiveMQ资源适配器文件 - deploy/hornetq-ra.rar或相应的位置 + deploy/activemq-ra.rar或相应的位置 - hornetq-core-client.jar + activemq-core-client.jar ActiveMQ核心客户类库 在JBoss的default/lib下或者是$JBOSS_HOME/common/lib下。 - hornetq-jms-client.jar + activemq-jms-client.jar ActiveMQ的JMS类 同上 diff --git a/docs/user-manual/zh/architecture.xml b/docs/user-manual/zh/architecture.xml index b50f7f3824..6cb0f1af25 100644 --- a/docs/user-manual/zh/architecture.xml +++ b/docs/user-manual/zh/architecture.xml @@ -53,7 +53,7 @@
将ActiveMQ嵌入到你的应用程序中 如果你的应用程序内部需要消息服务，但同时你又不想将消息服务暴露为单独的ActiveMQ服务器，你可以在应用中直接将ActiveMQ实例化。 - 有关嵌入式ActiveMQ的详细信息请参阅 有关嵌入式ActiveMQ的详细信息请参阅 。
@@ -78,7 +78,7 @@ ActiveMQ作为独立的服务（standalone） ActiveMQ可以部署成为独立的服务器。它可运行于任何JEE应用服务器之外，作为一个独立的服务运行。 作为独立服务器运行时，ActiveMQ消息服务器包括一个核心服务器，一个JMS服务以及一个JNDI服务。 - JMS服务用来部署服务器端hornetq-jms.xml配置文件中的JMS Queue，Topic和ConnectionFactory实例。 + JMS服务用来部署服务器端activemq-jms.xml配置文件中的JMS Queue，Topic和ConnectionFactory实例。 此外它还提供一组简单的管理接口，通过这些接口可以创建、消毁（destroy）Queue，Topic和ConnectionFactory实例。 用于可以通过JMX或连接使用这些接口。JMS服务是单独的服务，它不是ActiveMQ核心服务。ActiveMQ的核心不包含JMS相关的服务。 如果你不需要通过服务器端的xml配置文件部署任何JMS对象，也不需要JMS的管理接口，你可以选择不启动该服务。 diff --git a/docs/user-manual/zh/client-classpath.xml b/docs/user-manual/zh/client-classpath.xml index e9fb049380..ee853303c3 100644 --- a/docs/user-manual/zh/client-classpath.xml +++ b/docs/user-manual/zh/client-classpath.xml @@ -27,13 +27,13 @@
使用ActiveMQ内核的客户端 如果客户端只使用ActiveMQ内核（非JMS客户端），需要将 hornetq-core-client.jar和 + >activemq-core-client.jar和 netty.jar 放到classpath中。
JMS客户端 如果客户端使用JMS，需要在classpath上增加两个jar文件： hornetq-jms-client.jar 和 jboss-jms-api.jar。 + >activemq-jms-client.jar 和 jboss-jms-api.jar。 jboss-jms-api.jar中包含的只是 javax.jms.* 包中的接口类。 如果这些类已经在你的classpath中，则你就不需要这个jar文件。 diff --git a/docs/user-manual/zh/client-reconnection.xml b/docs/user-manual/zh/client-reconnection.xml index c5aec70215..ae50e97430 100644 --- a/docs/user-manual/zh/client-reconnection.xml +++ b/docs/user-manual/zh/client-reconnection.xml @@ -34,7 +34,7 @@ ConfirmationWindowSize字节的命令时，会向客户端发送一个命令确认，以使客户端 及时清除缓存。 如果使用JMS服务，并且JMS的连接工厂是注册到JNDI的话，相应的参数是hornetq-jms.xml文件中的activemq-jms.xml文件中的confirmation-window-size项。如果你并不将JMS连接工厂注册到JNDI，则你需要在 ActiveMQConnectionFactory上使用相应的方法直接设置该参数。 如果使用核心服务，你可以直接在ClientSessionFactory实例上直接设置该参数。 @@ -82,7 +82,7 @@ 并退出。-1表示进行无限次重试。默认值是0。 - 如果使用JMS并且将JMS的连接工厂绑定到JNDI服务中，则需要在hornetq-jms.xml + 如果使用JMS并且将JMS的连接工厂绑定到JNDI服务中，则需要在activemq-jms.xml 文件中对这些参数进行配置，如下例所示： <connection-factory name="ConnectionFactory"> diff --git a/docs/user-manual/zh/clusters.xml b/docs/user-manual/zh/clusters.xml index 011e2626a6..107addfe54 100644 --- a/docs/user-manual/zh/clusters.xml +++ b/docs/user-manual/zh/clusters.xml @@ -169,7 +169,7 @@
使用JMS时客户端发现的配置方法 如果使用JMS，并且在服务器端的JMS连接工厂是注册到JNDI的情况下，你可以在服务器端的配置文件 - hornetq-jms.xml中指定连接工厂所用的发现组。如下面所示： + activemq-jms.xml中指定连接工厂所用的发现组。如下面所示： <connection-factory name="ConnectionFactory"> <discovery-group-ref discovery-group-name="my-discovery-group"/> <entries> @@ -342,7 +342,7 @@ Connection jmsConnection2 = jmsConnectionFactory.createConnection();org.apache.activemq.api.core.client.loadbalance.ConnectionLoadBalancingPolicy即可。 根据你使用的是JMS还是核心接口，指定负载均衡的方法是有所不同的。如果你不指定策略，默认的策略是org.apache.activemq.api.core.client.loadbalance.RoundRobinConnectionLoadBalancingPolicy. - 如果使用的是JMS，并且JMS连接工厂注册到JNDI，则你需要在hornetq-jms.xml文件中定义策略，如： + 如果使用的是JMS，并且JMS连接工厂注册到JNDI，则你需要在activemq-jms.xml文件中定义策略，如： <connection-factory name="ConnectionFactory"> <discovery-group-ref discovery-group-name="my-discovery-group"/> @@ -385,7 +385,7 @@ factory.setLoadBalancingPolicyClassName("com.acme.MyLoadBalancingPolicy");
使用JMS时指定服务器列表 如果使用JMS，并且JMS连接工厂是注册到JNDI的话，你需要在服务器端的配置文件 - hornetq-jms.xml中来指定，如下面的例子： + activemq-jms.xml中来指定，如下面的例子： <connection-factory name="ConnectionFactory"> <connectors> <connector-ref connector-name="my-connector1" diff --git a/docs/user-manual/zh/configuration-index.xml b/docs/user-manual/zh/configuration-index.xml index 079703b6ee..8f8efd5ada 100644 --- a/docs/user-manual/zh/configuration-index.xml +++ b/docs/user-manual/zh/configuration-index.xml @@ -209,7 +209,7 @@ >management-address String 管理消息发送的地址 - jms.queue.hornetq.management + jms.queue.activemq.management management-notification-address String 用于接收管理通知的地址 - hornetq.notifications + activemq.notifications
- hornetq-jms.xml + activemq-jms.xml 该文件是服务器端JMS服务所使用的，用来装载JMS队列，话题和连接工厂。 JMS服务器配置 diff --git a/docs/user-manual/zh/configuring-transports.xml b/docs/user-manual/zh/configuring-transports.xml index 1d28de80f9..333879f1ff 100644 --- a/docs/user-manual/zh/configuring-transports.xml +++ b/docs/user-manual/zh/configuring-transports.xml @@ -75,7 +75,7 @@ org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory ActiveMQConnectionFactory时需要连接器的必要信息，以便这个连接工厂 能知道它如何与ActiveMQ服务器相连接。这一信息被定义在配置文件hornetq-jms.xml中的connector-ref单元下。下面这段配置 + >activemq-jms.xml中的connector-ref单元下。下面这段配置 就是从该配置文件中提取的相关部分，它展示了JMS的连接工厂是如何引用定义在配置文件activemq-configuration.xml中的连接器的： @@ -118,7 +118,7 @@ ClientSession session = sessionFactory.createSession(...); etc 如果在客户端直接使用JMS的连接工厂的话，也可以用类似的方法而不需要在服务器端定义连接器或在 - hornetq-jms.xml配置文件中创建连接工厂： + activemq-jms.xml配置文件中创建连接工厂： Map<String, Object> connectionParams = new HashMap<String, Object>(); diff --git a/docs/user-manual/zh/connection-ttl.xml b/docs/user-manual/zh/connection-ttl.xml index c2a3066736..d51d7bf49e 100644 --- a/docs/user-manual/zh/connection-ttl.xml +++ b/docs/user-manual/zh/connection-ttl.xml @@ -120,7 +120,7 @@ at org.acme.yourproject.YourClass (YourClass.java:666) 收到任何数据，客户端就认为这们连接发生了故障。根据不同的配置，客户端在这种情况下要么进行failover，要么 调用FailureListener的接口（或者是JMS的ExceptionListener）。 如果使用JMS，这个参数是ActiveMQConnectionFactory的ClientFailureCheckPeriod。 - 如果你向JNDI部署JMS连接工厂，那么相应的参数在hornetq-jms.xml配置文件中，参数名 + 如果你向JNDI部署JMS连接工厂，那么相应的参数在activemq-jms.xml配置文件中，参数名 为client-failure-check-period。 这个参数的默认值是30000毫秒，即半分钟。-1表示客户端不检查 连接的有效性。即不论是否有数据来自服务器，连接都一直有效。这一参数通常要比服务器端的连接TTL小许多，以使 diff --git a/docs/user-manual/zh/core-bridges.xml b/docs/user-manual/zh/core-bridges.xml index 2b25269de2..fcb226d473 100644 --- a/docs/user-manual/zh/core-bridges.xml +++ b/docs/user-manual/zh/core-bridges.xml @@ -70,7 +70,7 @@ 这个队列在桥的启动之前必须已经存在。 如果使用JMS，JMS的配置文件hornetq-jms.xml在核心配置文件 + >activemq-jms.xml在核心配置文件 activemq-configuration.xml之后装载。所以如果你的桥要从JMS 队列接收消息，就需要保证JMS队列同时要作为核心队列部署。具体方法可以参见 bridge例子。 diff --git a/docs/user-manual/zh/embedding-hornetq.xml b/docs/user-manual/zh/embedding-hornetq.xml index 9fe437fccc..2909b615b2 100644 --- a/docs/user-manual/zh/embedding-hornetq.xml +++ b/docs/user-manual/zh/embedding-hornetq.xml @@ -16,7 +16,7 @@ - + 嵌入式ActiveMQ ActiveMQ是由简单传统Java对象（POJO）实现，因此它可以在任何依赖注入的框架中运行，比如JBoss Microcontainer，Sprint或Google Guice。另外如果你的应用程序内部需要消息功能，你可以在程序中 @@ -76,7 +76,7 @@ server.start();你还可以使用一个依赖注入框架来启动ActiveMQ，比如JBoss Microcontainer或Spring框架。ActiveMQ独立服务器使用的是JBoss Microcontainer作为其框架。在ActiveMQ的发布中包括的ActiveMQBootstrapServer和hornetq-beans.xml文件共同实现了 + >ActiveMQBootstrapServer和activemq-beans.xml文件共同实现了 在JBoss Microcontainer中对ActiveMQ服务器的引导。要使用JBoss Microcontainer，需要在xml文件中声明ActiveMQServer 和Configuration对象。另外还可以注入一个安全管理器和一个MBean服务器。但是这些 @@ -103,7 +103,7 @@ server.start(); </deployment> ActiveMQBootstrapServer实现了JBoss Microcontainer的简单封装。 ActiveMQBootstrapServer bootStrap = - new ActiveMQBootstrapServer(new String[] {"hornetq-beans.xml"}); + new ActiveMQBootstrapServer(new String[] {"activemq-beans.xml"}); bootStrap.run();
diff --git a/docs/user-manual/zh/filter-expressions.xml b/docs/user-manual/zh/filter-expressions.xml index 1b5db78c11..6316b63ffe 100644 --- a/docs/user-manual/zh/filter-expressions.xml +++ b/docs/user-manual/zh/filter-expressions.xml @@ -29,7 +29,7 @@ 预定义的队列。当在activemq-configuration.xml 或 hornetq-jms.xml定义 + >activemq-configuration.xml 或 activemq-jms.xml定义 队列时，可以使用过滤器。只有与过滤器表达式相匹配的消息才能达到该队列中。 diff --git a/docs/user-manual/zh/flow-control.xml b/docs/user-manual/zh/flow-control.xml index db69d9311e..4039451ac6 100644 --- a/docs/user-manual/zh/flow-control.xml +++ b/docs/user-manual/zh/flow-control.xml @@ -83,7 +83,7 @@
使用JMS的流控制 - 若使用JNDI来获得连接工厂，则需要通过配置hornetq-jms.xml文件来设定窗口大小： + 若使用JNDI来获得连接工厂，则需要通过配置activemq-jms.xml文件来设定窗口大小： <connection-factory name="ConnectionFactory"> <connectors> @@ -118,7 +118,7 @@
使用JMS - 如果从JNDI中获取连接工厂，需要通过配置hornetq-jms.xml来进行速率流控制： + 如果从JNDI中获取连接工厂，需要通过配置activemq-jms.xml来进行速率流控制： <connection-factory name="ConnectionFactory"> <connectors> <connector-ref connector-name="netty-connector"/> @@ -161,7 +161,7 @@
使用JMS - 如果使用JNDI来获得连接工厂，则需要配置hornetq-jms.xml文件以设定窗口大小： + 如果使用JNDI来获得连接工厂，则需要配置activemq-jms.xml文件以设定窗口大小： <connection-factory name="ConnectionFactory"> <connectors> @@ -222,7 +222,7 @@
使用 JMS - 如果使用JNDI，需要配置hornetq-jms.xml文件： + 如果使用JNDI，需要配置activemq-jms.xml文件： <connection-factory name="ConnectionFactory"> <connectors> <connector-ref connector-name="netty-connector"/> diff --git a/docs/user-manual/zh/ha.xml b/docs/user-manual/zh/ha.xml index 298bcd930b..11cbb6e993 100644 --- a/docs/user-manual/zh/ha.xml +++ b/docs/user-manual/zh/ha.xml @@ -125,7 +125,7 @@ 另外，需要将主服务器和备份服务器的日志文件位置指向同一个共享位置。 （参见） 如果客户端使用JMS自动失效备援，主服务器除了要配置一个连接器以连接到备份服务器外，还要在 - 配置文件hornetq-jms.xml中指向这个连接器，如 + 配置文件activemq-jms.xml中指向这个连接器，如 中所解释的那样。
@@ -170,7 +170,7 @@ 有时你需要在主服务器正常关机的情况下仍然进行失效备援。如果使用JMS，你需要将ActiveMQConnectionFactory的FailoverOnServerShutdown属性设为true，或者是在hornetq-jms.xml（参数为failover-on-server-shutdown）文件中进行相应的配置。如果使用的是核心接口，可以在创建 + >activemq-jms.xml（参数为failover-on-server-shutdown）文件中进行相应的配置。如果使用的是核心接口，可以在创建 ClientSessionFactoryImpl实例时将上述同名属性设置为true。 这个属性的默认值是false。这表示如果主服务器是正常关机，客户端将不会进行失效备援。 diff --git a/docs/user-manual/zh/large-messages.xml b/docs/user-manual/zh/large-messages.xml index 2fcbb8f823..71a303962b 100644 --- a/docs/user-manual/zh/large-messages.xml +++ b/docs/user-manual/zh/large-messages.xml @@ -64,7 +64,7 @@ factory.setMinLargeMessageSize(25 * 1024);
使用JMS - 如果连接工厂是通过JNDI方式获得的，则需要在hornetq-jms.xml文件中定义： + 如果连接工厂是通过JNDI方式获得的，则需要在activemq-jms.xml文件中定义： ... <connection-factory name="ConnectionFactory"> <connectors> diff --git a/docs/user-manual/zh/management.xml b/docs/user-manual/zh/management.xml index 0b153fbbb5..f1111a01a7 100644 --- a/docs/user-manual/zh/management.xml +++ b/docs/user-manual/zh/management.xml @@ -520,7 +520,7 @@ 例如，要得到核心队列exampleQueue中消息的数量： ClientSession session = ... - ClientRequestor requestor = new ClientRequestor(session, "jms.queue.hornetq.management"); + ClientRequestor requestor = new ClientRequestor(session, "jms.queue.activemq.management"); ClientMessage message = session.createMessage(false); ManagementHelper.putAttribute(message, "core.queue.exampleQueue", "messageCount"); ClientMessage reply = requestor.request(m); @@ -537,16 +537,16 @@ 管理地址的配置在文件activemq-configuration.xml中： - <management-address>jms.queue.hornetq.management</management-address> + <management-address>jms.queue.activemq.management</management-address> - 它的默认地址是jms.queue.hornetq.management （地址前缀加上 + 它的默认地址是jms.queue.activemq.management （地址前缀加上 “jms.queue”是为了方便JMS客户端也可以向它发送管理消息。 管理地址需要一个特殊的用户权限 manage来接收并处理管理消息。这个权限也在hornetq-configuration.xml文件中配置： <!-- users with the admin role will be allowed to manage --> <!-- ActiveMQ using management messages --> - <security-setting match="jms.queue.hornetq.management"> + <security-setting match="jms.queue.activemq.management"> <permission type="manage" roles="admin" /> </security-setting> @@ -558,7 +558,7 @@ 其中一个重要的不同是JMS需要一个JMS队列来发送消息（而核心接口使用的是一个地址）。 管理队列是一个特殊的队列，它需要客户端直接实例化： - Queue managementQueue = ActiveMQJMSClient.createQueue("hornetq.management"); + Queue managementQueue = ActiveMQJMSClient.createQueue("activemq.management"); 其余步骤完全和使用核心接口一样，只是相应的对象不同： @@ -580,7 +580,7 @@ 例如，要得到一个JMS队列exampleQueue中有多少消息： - Queue managementQueue = ActiveMQJMSClient.createQueue("hornetq.management"); + Queue managementQueue = ActiveMQJMSClient.createQueue("activemq.management"); QueueSession session = ... QueueRequestor requestor = new QueueRequestor(session, managementQueue); @@ -643,9 +643,9 @@ 配置核心管理通知地址 用来发送管理通知的地址在文件中activemq-configuration.xml配置： - <management-notification-address>hornetq.notifications</management-notification-address> + <management-notification-address>activemq.notifications</management-notification-address> - 默认的地址是hornetq.notifications。 + 默认的地址是activemq.notifications。
diff --git a/docs/user-manual/zh/master.xml b/docs/user-manual/zh/master.xml index f7cc51fd0a..546813464f 100644 --- a/docs/user-manual/zh/master.xml +++ b/docs/user-manual/zh/master.xml @@ -31,7 +31,7 @@ - + @@ -118,7 +118,7 @@ &libaio; &thread-pooling; &logging; - &embedding-hornetq; + &embedding-activemq; &intercepting-operations; &interoperability; &perf-tuning; diff --git a/docs/user-manual/zh/message-grouping.xml b/docs/user-manual/zh/message-grouping.xml index 8f5cc4d033..dd4c6b9fa0 100644 --- a/docs/user-manual/zh/message-grouping.xml +++ b/docs/user-manual/zh/message-grouping.xml @@ -54,7 +54,7 @@ producer.send(message); 另一个方法是将ActiveMQConnectonFactory的autogroup - 属性设为true，或者在hornetq-jms.xml文件中进行配置： + 属性设为true，或者在activemq-jms.xml文件中进行配置： <connection-factory name="ConnectionFactory"> <connectors> <connector-ref connector-name="netty-connector"/> @@ -65,7 +65,7 @@ <autogroup>true</autogroup> </connection-factory> 还可以通过连接工厂来设置组id。来自这个连接工厂的所有的发送者（producer）发送的消息的JMSXGroupID将具有指定的值。这种方法需要在hornetq-jms.xml + >JMSXGroupID将具有指定的值。这种方法需要在activemq-jms.xml 文件中作如下配置： <connection-factory name="ConnectionFactory"> diff --git a/docs/user-manual/zh/perf-tuning.xml b/docs/user-manual/zh/perf-tuning.xml index 3e7573b116..15ba760572 100644 --- a/docs/user-manual/zh/perf-tuning.xml +++ b/docs/user-manual/zh/perf-tuning.xml @@ -121,7 +121,7 @@ 。 - 采用非阻塞方式发送消息。将文件hornetq-jms.xml中的参数 + 采用非阻塞方式发送消息。将文件activemq-jms.xml中的参数 block-on-non-durable-send设为false （使用JMS和JNDI时）或者直接在上进行相应的设置，可以使 消息发送时不阻塞等待服务器的响应。参见 。 @@ -171,7 +171,7 @@ serveruser hard nofile 20000 利用参数batch-delay并将参数direct-deliver 设为false来提高小消息的处理效率。ActiveMQ在其activemq-configuration.xml 中预先配置了一个连接器／接受器对（netty-throughput），并且在 - hornetq-jms.xml中配置了一个JMS连接工厂（ + activemq-jms.xml中配置了一个JMS连接工厂（ ThroughputConnectionFactory）。它们可以用在小消息的处理应用中以提 供最佳呑吐量。参见。 diff --git a/docs/user-manual/zh/persistence.xml b/docs/user-manual/zh/persistence.xml index 4a790b6f3b..22b5cb8bb2 100644 --- a/docs/user-manual/zh/persistence.xml +++ b/docs/user-manual/zh/persistence.xml @@ -61,7 +61,7 @@ 绑定日志 这个日志用来保存与绑定有关的数据。其中包括在ActiveMQ上部署的队列及其属性，还有ID序列计数器。 绑定日志是一个NIO型日志。与消息日志相比它的呑吐量是比较低的。 - 这种日志文件的名字采用hornetq-bindings作为前缀。每个文件都有 + 这种日志文件的名字采用activemq-bindings作为前缀。每个文件都有 bindings这样的扩展。文件大小是1048576，它的位置在bindings文件夹下。 @@ -70,7 +70,7 @@ 这个日志保存所有JMS相关的数据，包括JMS队列，话题及连接工厂，以及它们的JNDI绑定信息。 通过管理接口创建的JMS资源将被保存在这个日志中。但是通过配置文件配置的资源则不保存。只有使用JMS时JMS的日志 才被创建。 - 这种日志文件的名字采用hornetq-jms作为前缀。每个文件都有 + 这种日志文件的名字采用activemq-jms作为前缀。每个文件都有 jms这样的扩展。文件大小是1048576，它的位置在bindings文件夹下。 @@ -79,7 +79,7 @@ 这个日志用来存贮所有消息相关的数据，包括消息本身和重复ID缓存。 默认情况下ActiveMQ总是优先使用AIO型日志。如果AIO型日志不可用（比如在非Linux平台上运行，或系统内核版本不同） 它将自动使用NIO型日志。 - 这种日志文件的名字采用hornetq-data。作为前缀。每个文件都有 + 这种日志文件的名字采用activemq-data。作为前缀。每个文件都有 　hq作为扩展名。默认的文件大小是 10485760 (可配置)。文件保存在journal文件夹下。 @@ -110,7 +110,7 @@
配置消息日志 消息日志的配置在hornetq-configuration.xml文件中。 + >activemq-configuration.xml文件中。 journal-directory @@ -233,16 +233,16 @@ 导入入/导出日志数据 有时你需要使用导入／导出工具来查看日志文件的记录。这个导入／导出工具类在hornetq-core.jar文件中。 　　　 使用以下命令可以将日志文件导出为文本文件： - java -cp hornetq-core.jar org.apache.activemq.core.journal.impl.ExportJournal + java -cp activemq-core.jar org.apache.activemq.core.journal.impl.ExportJournal <JournalDirectory> <JournalPrefix> <FileExtension> <FileSize> <FileOutput> 要将日志文件导入，使用下面的命令（注意你需要netty.jar）： - java -cp hornetq-core.jar:netty.jar org.apache.activemq.core.journal.impl.ImportJournal + java -cp activemq-core.jar:netty.jar org.apache.activemq.core.journal.impl.ImportJournal <JournalDirectory> <JournalPrefix> <FileExtension> <FileSize> <FileInput> - JournalDirectory：文件的位置，如./hornetq/data/journal + JournalDirectory：文件的位置，如./activemq/data/journal JournalPrefix： 日志文件的前缀。这里有关于前缀的详细描述。 diff --git a/docs/user-manual/zh/pre-acknowledge.xml b/docs/user-manual/zh/pre-acknowledge.xml index 8029b1b112..7ebf6279f0 100644 --- a/docs/user-manual/zh/pre-acknowledge.xml +++ b/docs/user-manual/zh/pre-acknowledge.xml @@ -44,7 +44,7 @@
使用PRE_ACKNOWLEDGE - 这个模式在hornetq-jms.xml文件中 + 这个模式在activemq-jms.xml文件中 的connection factory下配置： <connection-factory name="ConnectionFactory"> <connectors> diff --git a/docs/user-manual/zh/project-info.xml b/docs/user-manual/zh/project-info.xml index cdfba0772d..1735fae824 100644 --- a/docs/user-manual/zh/project-info.xml +++ b/docs/user-manual/zh/project-info.xml @@ -18,12 +18,12 @@ 项目信息 - ActiveMQ的官方网址是 http://hornetq.org/. + ActiveMQ的官方网址是 http://activemq.org/.
软件下载 ActiveMQ的下载地址为：http://hornetq.org/downloads.html + url="http://activemq.org/downloads.html">http://activemq.org/downloads.html
其它相关信息 @@ -44,24 +44,24 @@ >开发论坛 - 请加入我们的请加入我们的IRC频道与我们的核心开发工程师交流。 - 我们项目有自己的 博客 + 我们项目有自己的 博客 - 还可以跟踪我们的twitter + 还可以跟踪我们的twitter ActiveMQ的Git代码库地址 https://github.com/hornetq/hornetq + url="https://github.com/activemq/activemq" + >https://github.com/activemq/activemq 每次发布的版本标签都在https://github.com/hornetq/hornetq/tags下能找到。 + url="https://github.com/activemq/activemq/tags" + >https://github.com/activemq/activemq/tags下能找到。 diff --git a/docs/user-manual/zh/queue-attributes.xml b/docs/user-manual/zh/queue-attributes.xml index 8aac0f4810..dc9a966ccd 100644 --- a/docs/user-manual/zh/queue-attributes.xml +++ b/docs/user-manual/zh/queue-attributes.xml @@ -23,7 +23,7 @@
预定义的队列 通过配置可以定义队列。队列的定义可以在核心层定义，也可以在JMS层来定义。首先我们看一下JMS层。 - 下面就是一个在hornetq-jms.xml中定义的一个队列的例子： + 下面就是一个在activemq-jms.xml中定义的一个队列的例子： <queue name="selectorQueue"> <entry name="/queue/selectorQueue"/> <selector string="color='red'"/> diff --git a/docs/user-manual/zh/security.xml b/docs/user-manual/zh/security.xml index b4db8fbb6c..8015d9e7d9 100644 --- a/docs/user-manual/zh/security.xml +++ b/docs/user-manual/zh/security.xml @@ -146,9 +146,9 @@
更换安全管理器 - 如果你不想用默认的安全管理器，可以通过修改配置文件hornetq-beans.xml + 如果你不想用默认的安全管理器，可以通过修改配置文件activemq-beans.xml （或者在运行JBoss应用服务器情况下hornetq-jboss-beans.xml文件）来更换。同时要更换 + >activemq-jboss-beans.xml文件）来更换。同时要更换 ActiveMQSecurityManager bean 的类。 让我们看一段默认bean文件的内容： @@ -163,8 +163,8 @@ ActiveMQ自带有另外两个安全管理器可供使用。一个是JAAS安全管理器，另一个是用来与JBoss应用服务 器集成的安全管理器。此外，你还可以编写实现你自己的安全管理器。首先要实现 org.apache.activemq.core.security.SecurityManager接口，再将你的实现 - 类定义到hornetq-beans.xml文件中即可（或者在JBoss应用服务器中 - 使用hornetq-jboss-beans.xml文件）。 + 类定义到activemq-beans.xml文件中即可（或者在JBoss应用服务器中 + 使用activemq-jboss-beans.xml文件）。 以下分别介绍这两咱安全管理器
@@ -212,7 +212,7 @@ 此安全管理器的类是 org.apache.activemq.integration.jboss.security.JBossASSecurityManager。 要了解如何配置JBoss安全管理器，可以看一眼ActiveMQ发布包中相关例子中的 - hornetq-jboss-beans.xml文件。 + activemq-jboss-beans.xml文件。
配置客户端登录 JBoss可以配置使用客户登录。JEE的模块如servlet或EJB可以将安全认证信息设置到安全上下文（security context）中， diff --git a/docs/user-manual/zh/send-guarantees.xml b/docs/user-manual/zh/send-guarantees.xml index b16180ef58..7916326fb0 100644 --- a/docs/user-manual/zh/send-guarantees.xml +++ b/docs/user-manual/zh/send-guarantees.xml @@ -53,7 +53,7 @@ 异步发送通知功能。这一功能在 进行了描述。 使用JMS时，如果JMS的连接工厂是在服务器端被注册到JNDI服务，你需要配置 - hornetq-jms.xml文件中的block-on-durable-send + activemq-jms.xml文件中的block-on-durable-send 和block-on-non-durable-send。如果不使用JNDI，可以调用 ActiveMQConnectionFactory相应的设置方法进行配置。 如果你使用的是内核服务，你可以直接在 >ConnectionFactory的实例。如： ConnectionFactory myConnectionFactory = ActiveMQJMSClient.createConnectionFactory(myFactory); 如果你使用JNDI来创建ActiveMQConnectionFactory - 实例，你还可以在hornetq-jms.xml文件中进行配置。如： + 实例，你还可以在activemq-jms.xml文件中进行配置。如： <connection-factory name="ConnectionFactory"> <connectors> <connector-ref connector-name="netty"/> diff --git a/docs/user-manual/zh/using-jms.xml b/docs/user-manual/zh/using-jms.xml index bbd4f9745e..ad5f598af8 100644 --- a/docs/user-manual/zh/using-jms.xml +++ b/docs/user-manual/zh/using-jms.xml @@ -37,7 +37,7 @@
JMS服务的配置 - hornetq-jms.xml文件包含了需要创建与部署的JMS Queue，Topic和ConnectionFactory + activemq-jms.xml文件包含了需要创建与部署的JMS Queue，Topic和ConnectionFactory 的实例。该文件必须要指定在classpath中。从这个文件中部署好的对象都可以用JNDI来找到。 JMS客户端可以利用JMS ConnectionFactory对象来创建与服务器的连接。ConnectionFactory中有关于服务器地址的 信息以及各种参数。通常使用这些参数的默认值即可。 @@ -158,7 +158,7 @@ java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces 其中的 myhost 是 JNDI server的主机名或IP地址。 1099是端口号，根据不同的配置， 端口号也可能不同。 - 在默认的单独方式（standalone）配置中，JNDI服务端口等参数定义在hornetq-beans.xml + 在默认的单独方式（standalone）配置中，JNDI服务端口等参数定义在activemq-beans.xml 文件中的 JNDIServer bean下，如： <bean name="JNDIServer" class="org.jnp.server.Main"> diff --git a/docs/user-manual/zh/using-server.xml b/docs/user-manual/zh/using-server.xml index 01835f6b8f..2cf70df75f 100644 --- a/docs/user-manual/zh/using-server.xml +++ b/docs/user-manual/zh/using-server.xml @@ -80,8 +80,8 @@ 配置文件的路径定义在 run.sh 和 run.bat 脚本中的classpath里。该路径下可以包含以下文件： - hornetq-beans.xml （如果是运行在JBoss应用服务器内，则为 hornetq-jboss-beans.xml）。这是JBoss Microcontainer的bean配置文件。其中定义了ActiveMQ的 + activemq-beans.xml （如果是运行在JBoss应用服务器内，则为 activemq-jboss-beans.xml）。这是JBoss Microcontainer的bean配置文件。其中定义了ActiveMQ的 各种bean，以及它们之间的依赖关系。ActiveMQ的bean都是一些POJO。是JBoss Microcontainer保证了这些bean的正确装载和运行。 @@ -101,7 +101,7 @@ 想了解更多关于安全的信息，参见 。 - hornetq-jms.xml。这个文件包含有JMS对象。ActiveMQ的默认配置中包含有JMS服务， + activemq-jms.xml。这个文件包含有JMS对象。ActiveMQ的默认配置中包含有JMS服务， 它从这个文件中读取JMS Queue，Topic和ConnectionFactory并将它们部署到JNDI服务中。如果你不使用JMS， 或者你不需要部署这些JMS对象，那么你就不需要这个文件。有关JMS的使用详见。 @@ -122,12 +122,12 @@ <connector name="netty"> <factory-class>org.apache.activemq.integration.transports.netty.NettyConnectorFactory </factory-class> - <param key="host" value="${hornetq.remoting.netty.host:localhost}" type="String"/> - <param key="port" value="${hornetq.remoting.netty.port:5445}" type="Integer"/> + <param key="host" value="${activemq.remoting.netty.host:localhost}" type="String"/> + <param key="port" value="${activemq.remoting.netty.port:5445}" type="Integer"/> </connector> 在上面的配置中我们定义了两个系统变量 hornetq.remoting.netty.host 和 hornetq.remoting.netty.port。它们的值会被相应的系统变量的值（如果定义了的话）所替代。 + >activemq.remoting.netty.host 和 activemq.remoting.netty.port。它们的值会被相应的系统变量的值（如果定义了的话）所替代。 如果没有定义这些系统变量，它们的默认值将分别为 localhost 及 5445。也可以不给出默认值，但如果这样就 必须要定义相应的系统变量。
@@ -232,7 +232,7 @@ JMSServerManager - 这个对象将hornetq-jms.xml文件中定义的JMS的对象进行部署，比如JMS Queues, Topics + 这个对象将activemq-jms.xml文件中定义的JMS的对象进行部署，比如JMS Queues, Topics 以及ConnectionFactory。它还提供一套简单的管理接口以方便地对这些JMS对象进行管理。通常它只是将工作代理给 核心服务器。如果你不需要在服务器端进行JMS对象的部署与管理，可以将它从配置中去掉。 diff --git a/etc/checkstyle.xml b/etc/checkstyle.xml index 3f8da102de..9301fd4b71 100644 --- a/etc/checkstyle.xml +++ b/etc/checkstyle.xml @@ -76,6 +76,7 @@ + diff --git a/etc/findbugs-exclude.xml b/etc/findbugs-exclude.xml index fb559ef1cf..0541fcd712 100644 --- a/etc/findbugs-exclude.xml +++ b/etc/findbugs-exclude.xml @@ -109,18 +109,18 @@ - + - + - + diff --git a/examples/core/embedded/readme.html b/examples/core/embedded/readme.html index d003ffbcfe..bf8c12cea0 100644 --- a/examples/core/embedded/readme.html +++ b/examples/core/embedded/readme.html @@ -12,7 +12,7 @@

ActiveMQ was designed to use POJOs (Plain Old Java Objects), what makes embedding ActiveMQ as simple as instantiating a few objects.

In this example, we are using two jars:

    -
  • hornetq-server.jar
    • +
  • activemq-server.jar
  • netty.jar
diff --git a/examples/core/perf/src/main/resources/server0/hornetq-configuration-messaging-lab.xml b/examples/core/perf/src/main/resources/server0/hornetq-configuration-messaging-lab.xml index 42eb7ebbb5..f742c351d8 100644 --- a/examples/core/perf/src/main/resources/server0/hornetq-configuration-messaging-lab.xml +++ b/examples/core/perf/src/main/resources/server0/hornetq-configuration-messaging-lab.xml @@ -26,10 +26,10 @@ true - /hornetq-data/large-messages - /hornetq-data/bindings - /hornetq-data/journal - /hornetq-data/paging + /activemq-data/large-messages + /activemq-data/bindings + /activemq-data/journal + /activemq-data/paging diff --git a/examples/javaee/ejb-jms-transaction/server/standalone/configuration/standalone-example.xml b/examples/javaee/ejb-jms-transaction/server/standalone/configuration/standalone-example.xml index e2d45af14b..2bab47dac7 100644 --- a/examples/javaee/ejb-jms-transaction/server/standalone/configuration/standalone-example.xml +++ b/examples/javaee/ejb-jms-transaction/server/standalone/configuration/standalone-example.xml @@ -195,7 +195,7 @@ - + @@ -309,7 +309,7 @@ - + true 102400 2 @@ -368,7 +368,7 @@ - + @@ -386,7 +386,7 @@ - + diff --git a/examples/javaee/jca-config/readme.html b/examples/javaee/jca-config/readme.html index 23be575850..f303af3f5d 100644 --- a/examples/javaee/jca-config/readme.html +++ b/examples/javaee/jca-config/readme.html @@ -99,7 +99,7 @@ public class MDBQueueA implements MessageListener @ActivationConfigProperty(propertyName = "destination", propertyValue = "B"), @ActivationConfigProperty(propertyName = "useJNDI", propertyValue = "false") }) -@ResourceAdapter("hornetq-ra-remote.rar") +@ResourceAdapter("activemq-ra-remote.rar") public class MDBQueueB implements MessageListener { public void onMessage(Message message)... diff --git a/examples/javaee/jca-config/server/standalone/configuration/standalone-example.xml b/examples/javaee/jca-config/server/standalone/configuration/standalone-example.xml index fc153645ad..314ae8dfc9 100644 --- a/examples/javaee/jca-config/server/standalone/configuration/standalone-example.xml +++ b/examples/javaee/jca-config/server/standalone/configuration/standalone-example.xml @@ -182,7 +182,7 @@ - + @@ -296,7 +296,7 @@ - + true 102400 2 @@ -355,7 +355,7 @@ - + @@ -377,7 +377,7 @@ - + diff --git a/examples/javaee/jca-config/server/standalone/configuration/standalone-example2.xml b/examples/javaee/jca-config/server/standalone/configuration/standalone-example2.xml index faf3f3f000..109e61a8fe 100644 --- a/examples/javaee/jca-config/server/standalone/configuration/standalone-example2.xml +++ b/examples/javaee/jca-config/server/standalone/configuration/standalone-example2.xml @@ -182,7 +182,7 @@ - + @@ -296,7 +296,7 @@ - + true 102400 2 @@ -356,7 +356,7 @@ - + @@ -367,7 +367,7 @@ - + guest password @@ -379,7 +379,7 @@ - + diff --git a/examples/javaee/jca-remote/readme.html b/examples/javaee/jca-remote/readme.html index 54f7e0efa5..ddc2939378 100644 --- a/examples/javaee/jca-remote/readme.html +++ b/examples/javaee/jca-remote/readme.html @@ -23,10 +23,10 @@
  • via a pooled-connection-factory in the "messaging" subsystem
  • via the activation configuration properties on the MDB set either via annotations or ejb-jar.xml
    • -

    In this example the MDB is annotated with @ResourceAdapter("hornetq-ra-remote.rar") which refers to +

    In this example the MDB is annotated with @ResourceAdapter("activemq-ra-remote.rar") which refers to this pooled-connection-factory:

    -                    <pooled-connection-factory name="hornetq-ra-remote">
+                    <pooled-connection-factory name="activemq-ra-remote">
                         <transaction mode="xa"/>
                         <user>guest</user>
                         <password>password</password>
@@ -44,7 +44,7 @@
 
      
    The same pooled-connection-factory used for JCA inflow also configures an outgoing JCA connection factory which Java EE components can use to send messages to the same remote ActiveMQ Server.
    
      
    -                    <pooled-connection-factory name="hornetq-ra-remote">
+                    <pooled-connection-factory name="activemq-ra-remote">
                         <transaction mode="xa"/>
                         <user>guest</user>
                         <password>password</password>
diff --git a/examples/javaee/jca-remote/server/standalone/configuration/standalone-example.xml b/examples/javaee/jca-remote/server/standalone/configuration/standalone-example.xml
index f6038107b9..8ed7aee7ed 100644
--- a/examples/javaee/jca-remote/server/standalone/configuration/standalone-example.xml
+++ b/examples/javaee/jca-remote/server/standalone/configuration/standalone-example.xml
@@ -182,7 +182,7 @@
                 
             
             
-                
+                
                 
             
             
@@ -296,7 +296,7 @@
             
         
         
-            
+            
                 true
                 102400
                 2
@@ -356,7 +356,7 @@
                             
                         
                     
-                    
+                    
                         
                         
                             
@@ -367,7 +367,7 @@
                             
                         
                     
-                    
+                    
                         
                         guest
                         password
@@ -379,7 +379,7 @@
                         
                     
                 
-            
+            
         
         
             
diff --git a/examples/javaee/jca-remote/server/standalone/configuration/standalone-example2.xml b/examples/javaee/jca-remote/server/standalone/configuration/standalone-example2.xml
index 2885355f1e..e53a16bf8d 100644
--- a/examples/javaee/jca-remote/server/standalone/configuration/standalone-example2.xml
+++ b/examples/javaee/jca-remote/server/standalone/configuration/standalone-example2.xml
@@ -182,7 +182,7 @@
                 
             
             
-                
+                
                 
             
             
@@ -296,7 +296,7 @@
             
         
         
-            
+            
                 true
                 102400
                 2
@@ -355,7 +355,7 @@
                             
                         
                     
-                    
+                    
                         
                         
                             
@@ -377,7 +377,7 @@
                         
                     
                 
-            
+            
         
         
             
diff --git a/examples/javaee/jms-bridge/readme.html b/examples/javaee/jms-bridge/readme.html
index a5c0b7b072..5da08f1eac 100644
--- a/examples/javaee/jms-bridge/readme.html
+++ b/examples/javaee/jms-bridge/readme.html
@@ -25,7 +25,7 @@
      
    JMS Bridge configuration
    
 
      
    The JMS Bridge is configured in the "messaging" subsystem.
    
-     
    The Bridge is deployed in the application server when you simply type ./build.sh deploy (or build.bat deploy on windows) (it is copied to ${JBOSS_HOME}/server/default-with-hornetq/deploy/).
    
+     
    The Bridge is deployed in the application server when you simply type ./build.sh deploy (or build.bat deploy on windows) (it is copied to ${JBOSS_HOME}/server/default-with-activemq/deploy/).
    
 
      
    Example step-by-step
    
 
diff --git a/examples/javaee/jms-bridge/server/standalone/configuration/standalone-example.xml b/examples/javaee/jms-bridge/server/standalone/configuration/standalone-example.xml
index 2850f8cf8a..9d8432d6d2 100644
--- a/examples/javaee/jms-bridge/server/standalone/configuration/standalone-example.xml
+++ b/examples/javaee/jms-bridge/server/standalone/configuration/standalone-example.xml
@@ -182,7 +182,7 @@
                 
             
             
-                
+                
                 
             
             
@@ -296,7 +296,7 @@
             
             
         
-            
+            
                 true
                 102400
                 2
@@ -355,7 +355,7 @@
                             
                         
                     
-                    
+                    
                         
                         
                             
@@ -377,7 +377,7 @@
                         
                     
                 
-            
+            
             
                 
                     
diff --git a/examples/javaee/jms-context-injection/server/standalone/configuration/standalone-example.xml b/examples/javaee/jms-context-injection/server/standalone/configuration/standalone-example.xml
index c64af5a547..437418ee38 100644
--- a/examples/javaee/jms-context-injection/server/standalone/configuration/standalone-example.xml
+++ b/examples/javaee/jms-context-injection/server/standalone/configuration/standalone-example.xml
@@ -182,7 +182,7 @@
                 
             
             
-                
+                
                 
             
             
@@ -296,7 +296,7 @@
             
         
         
-            
+            
                 true
                 102400
                 2
@@ -355,7 +355,7 @@
                             
                         
                     
-                    
+                    
                         
                         
                             
@@ -377,7 +377,7 @@
                         
                     
                 
-            
+            
         
         
             
diff --git a/examples/javaee/mdb-bmt/server/standalone/configuration/standalone-example.xml b/examples/javaee/mdb-bmt/server/standalone/configuration/standalone-example.xml
index 740cfb6472..be39676492 100644
--- a/examples/javaee/mdb-bmt/server/standalone/configuration/standalone-example.xml
+++ b/examples/javaee/mdb-bmt/server/standalone/configuration/standalone-example.xml
@@ -182,7 +182,7 @@
                 
             
             
-                
+                
                 
             
             
@@ -296,7 +296,7 @@
             
         
         
-            
+            
                 true
                 102400
                 2
@@ -355,7 +355,7 @@
                             
                         
                     
-                    
+                    
                         
                         
                             
@@ -373,7 +373,7 @@
                         
                     
                 
-            
+            
         
         
             
diff --git a/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/server/standalone/configuration/standalone-example.xml b/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/server/standalone/configuration/standalone-example.xml
index b1aa46e545..02c2daee0b 100644
--- a/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/server/standalone/configuration/standalone-example.xml
+++ b/examples/javaee/mdb-cmt-setrollbackonly-with-dlq/server/standalone/configuration/standalone-example.xml
@@ -182,7 +182,7 @@
                 
             
             
-                
+                
                 
             
             
@@ -296,7 +296,7 @@
             
         
         
-            
+            
                 true
                 102400
                 2
@@ -356,7 +356,7 @@
                             
                         
                     
-                    
+                    
                         
                         
                             
@@ -378,7 +378,7 @@
                         
                     
                 
-            
+            
         
         
             
diff --git a/examples/javaee/mdb-cmt-setrollbackonly/server/standalone/configuration/standalone-example.xml b/examples/javaee/mdb-cmt-setrollbackonly/server/standalone/configuration/standalone-example.xml
index 740cfb6472..be39676492 100644
--- a/examples/javaee/mdb-cmt-setrollbackonly/server/standalone/configuration/standalone-example.xml
+++ b/examples/javaee/mdb-cmt-setrollbackonly/server/standalone/configuration/standalone-example.xml
@@ -182,7 +182,7 @@
                 
             
             
-                
+                
                 
             
             
@@ -296,7 +296,7 @@
             
         
         
-            
+            
                 true
                 102400
                 2
@@ -355,7 +355,7 @@
                             
                         
                     
-                    
+                    
                         
                         
                             
@@ -373,7 +373,7 @@
                         
                     
                 
-            
+            
         
         
             
diff --git a/examples/javaee/mdb-cmt-tx-local/server/standalone/configuration/standalone-example.xml b/examples/javaee/mdb-cmt-tx-local/server/standalone/configuration/standalone-example.xml
index 740cfb6472..be39676492 100644
--- a/examples/javaee/mdb-cmt-tx-local/server/standalone/configuration/standalone-example.xml
+++ b/examples/javaee/mdb-cmt-tx-local/server/standalone/configuration/standalone-example.xml
@@ -182,7 +182,7 @@
                 
             
             
-                
+                
                 
             
             
@@ -296,7 +296,7 @@
             
         
         
-            
+            
                 true
                 102400
                 2
@@ -355,7 +355,7 @@
                             
                         
                     
-                    
+                    
                         
                         
                             
@@ -373,7 +373,7 @@
                         
                     
                 
-            
+            
         
         
             
diff --git a/examples/javaee/mdb-cmt-tx-not-supported/server/standalone/configuration/standalone-example.xml b/examples/javaee/mdb-cmt-tx-not-supported/server/standalone/configuration/standalone-example.xml
index 740cfb6472..be39676492 100644
--- a/examples/javaee/mdb-cmt-tx-not-supported/server/standalone/configuration/standalone-example.xml
+++ b/examples/javaee/mdb-cmt-tx-not-supported/server/standalone/configuration/standalone-example.xml
@@ -182,7 +182,7 @@
                 
             
             
-                
+                
                 
             
             
@@ -296,7 +296,7 @@
             
         
         
-            
+            
                 true
                 102400
                 2
@@ -355,7 +355,7 @@
                             
                         
                     
-                    
+                    
                         
                         
                             
@@ -373,7 +373,7 @@
                         
                     
                 
-            
+            
         
         
             
diff --git a/examples/javaee/mdb-cmt-tx-required/server/standalone/configuration/standalone-example.xml b/examples/javaee/mdb-cmt-tx-required/server/standalone/configuration/standalone-example.xml
index c3203b9ea6..58f07a7fce 100644
--- a/examples/javaee/mdb-cmt-tx-required/server/standalone/configuration/standalone-example.xml
+++ b/examples/javaee/mdb-cmt-tx-required/server/standalone/configuration/standalone-example.xml
@@ -182,7 +182,7 @@
                 
             
             
-                
+                
                 
             
             
@@ -296,7 +296,7 @@
             
         
         
-            
+            
                 true
                 102400
                 2
@@ -355,7 +355,7 @@
                             
                         
                     
-                    
+                    
                         
                         
                             
@@ -373,7 +373,7 @@
                         
                     
                 
-            
+            
         
         
             
diff --git a/examples/javaee/mdb-message-selector/server/standalone/configuration/standalone-example.xml b/examples/javaee/mdb-message-selector/server/standalone/configuration/standalone-example.xml
index c3203b9ea6..58f07a7fce 100644
--- a/examples/javaee/mdb-message-selector/server/standalone/configuration/standalone-example.xml
+++ b/examples/javaee/mdb-message-selector/server/standalone/configuration/standalone-example.xml
@@ -182,7 +182,7 @@
                 
             
             
-                
+                
                 
             
             
@@ -296,7 +296,7 @@
             
         
         
-            
+            
                 true
                 102400
                 2
@@ -355,7 +355,7 @@
                             
                         
                     
-                    
+                    
                         
                         
                             
@@ -373,7 +373,7 @@
                         
                     
                 
-            
+            
         
         
             
diff --git a/examples/javaee/mdb-remote-failover-static/server/standalone/configuration/standalone-backup.xml b/examples/javaee/mdb-remote-failover-static/server/standalone/configuration/standalone-backup.xml
index 2045cee270..feee7dae84 100644
--- a/examples/javaee/mdb-remote-failover-static/server/standalone/configuration/standalone-backup.xml
+++ b/examples/javaee/mdb-remote-failover-static/server/standalone/configuration/standalone-backup.xml
@@ -182,7 +182,7 @@
                 
             
             
-                
+                
                 
             
             
@@ -296,7 +296,7 @@
             
         
         
-            
+            
                 true
                 true
                 true
@@ -373,7 +373,7 @@
                             
                         
                     
-                    
+                    
                         
                         
                             
@@ -395,7 +395,7 @@
                         
                     
                 
-            
+            
         
         
             
diff --git a/examples/javaee/mdb-remote-failover-static/server/standalone/configuration/standalone-example.xml b/examples/javaee/mdb-remote-failover-static/server/standalone/configuration/standalone-example.xml
index 49aa8f5247..5a27ce6533 100644
--- a/examples/javaee/mdb-remote-failover-static/server/standalone/configuration/standalone-example.xml
+++ b/examples/javaee/mdb-remote-failover-static/server/standalone/configuration/standalone-example.xml
@@ -182,7 +182,7 @@
                 
             
             
-                
+                
                 
             
             
@@ -296,7 +296,7 @@
             
         
         
-            
+            
                 true
                 102400
                 2
@@ -365,7 +365,7 @@
                             
                         
                     
-                    
+                    
                         
                         
                             
@@ -376,7 +376,7 @@
                             
                         
                     
-                    
+                    
                         
                         guest
                         password
@@ -391,7 +391,7 @@
                         
                     
                 
-            
+            
         
         
             
diff --git a/examples/javaee/mdb-remote-failover-static/server/standalone/configuration/standalone-live.xml b/examples/javaee/mdb-remote-failover-static/server/standalone/configuration/standalone-live.xml
index bd258131cd..9d068f8523 100644
--- a/examples/javaee/mdb-remote-failover-static/server/standalone/configuration/standalone-live.xml
+++ b/examples/javaee/mdb-remote-failover-static/server/standalone/configuration/standalone-live.xml
@@ -182,7 +182,7 @@
                 
             
             
-                
+                
                 
             
             
@@ -296,7 +296,7 @@
             
         
         
-            
+            
                 true
                 true
                 true
@@ -375,7 +375,7 @@
                         true
                         -1
                     
-                    
+                    
                         
                         
                             
@@ -397,7 +397,7 @@
                         
                     
                 
-            
+            
         
         
             
diff --git a/examples/javaee/mdb-remote-failover/server/standalone/configuration/standalone-backup.xml b/examples/javaee/mdb-remote-failover/server/standalone/configuration/standalone-backup.xml
index 15aa305e45..4e784d180e 100644
--- a/examples/javaee/mdb-remote-failover/server/standalone/configuration/standalone-backup.xml
+++ b/examples/javaee/mdb-remote-failover/server/standalone/configuration/standalone-backup.xml
@@ -182,7 +182,7 @@
                 
             
             
-                
+                
                 
             
             
@@ -296,7 +296,7 @@
             
         
         
-            
+            
                 true
                 true
                 true
@@ -381,7 +381,7 @@
                             
                         
                     
-                    
+                    
                         
                         
                             
@@ -403,7 +403,7 @@
                         
                     
                 
-            
+            
         
         
             
diff --git a/examples/javaee/mdb-remote-failover/server/standalone/configuration/standalone-example.xml b/examples/javaee/mdb-remote-failover/server/standalone/configuration/standalone-example.xml
index e9242484b2..c08945d96a 100644
--- a/examples/javaee/mdb-remote-failover/server/standalone/configuration/standalone-example.xml
+++ b/examples/javaee/mdb-remote-failover/server/standalone/configuration/standalone-example.xml
@@ -182,7 +182,7 @@
                 
             
             
-                
+                
                 
             
             
@@ -296,7 +296,7 @@
             
         
         
-            
+            
                 true
                 102400
                 2
@@ -365,7 +365,7 @@
                             
                         
                     
-                    
+                    
                         
                         
                             
@@ -376,7 +376,7 @@
                             
                         
                     
-                    
+                    
                         
                         guest
                         password
@@ -388,7 +388,7 @@
                         
                     
                 
-            
+            
         
         
             
diff --git a/examples/javaee/mdb-remote-failover/server/standalone/configuration/standalone-live.xml b/examples/javaee/mdb-remote-failover/server/standalone/configuration/standalone-live.xml
index a5e67a3c94..987f8cb124 100644
--- a/examples/javaee/mdb-remote-failover/server/standalone/configuration/standalone-live.xml
+++ b/examples/javaee/mdb-remote-failover/server/standalone/configuration/standalone-live.xml
@@ -182,7 +182,7 @@
                 
             
             
-                
+                
                 
             
             
@@ -296,7 +296,7 @@
             
         
         
-            
+            
                 true
                 true
                 true
@@ -383,7 +383,7 @@
                         true
                         -1
                     
-                    
+                    
                         
                         
                             
@@ -405,7 +405,7 @@
                         
                     
                 
-            
+            
         
         
             
diff --git a/examples/javaee/mdb-tx-send/server/standalone/configuration/standalone-example.xml b/examples/javaee/mdb-tx-send/server/standalone/configuration/standalone-example.xml
index ca446061db..64bffceec9 100644
--- a/examples/javaee/mdb-tx-send/server/standalone/configuration/standalone-example.xml
+++ b/examples/javaee/mdb-tx-send/server/standalone/configuration/standalone-example.xml
@@ -182,7 +182,7 @@
                 
             
             
-                
+                
                 
             
             
@@ -296,7 +296,7 @@
             
         
         
-            
+            
                 true
                 102400
                 2
@@ -355,7 +355,7 @@
                             
                         
                     
-                    
+                    
                         
                         
                             
@@ -377,7 +377,7 @@
                         
                     
                 
-            
+            
         
         
             
diff --git a/examples/javaee/pom.xml b/examples/javaee/pom.xml
index 5f724f9a45..36acf34b6e 100644
--- a/examples/javaee/pom.xml
+++ b/examples/javaee/pom.xml
@@ -24,7 +24,7 @@
       ${env.JBOSS_HOME}
 
       
-      6.0.0-SNAPSHOT
+      6.0.0-SNAPSHOT
 
    
 
@@ -94,17 +94,17 @@
       
          org.apache.activemq
          activemq-core-client
-         ${hornetq.client.version}
+         ${activemq.client.version}
       
       
          org.apache.activemq
          activemq-jms-client
-         ${hornetq.client.version}
+         ${activemq.client.version}
       
       
          org.apache.activemq
          activemq-ra
-         ${hornetq.client.version}
+         ${activemq.client.version}
       
       
          io.netty
diff --git a/examples/javaee/xarecovery/server/standalone/configuration/standalone-example.xml b/examples/javaee/xarecovery/server/standalone/configuration/standalone-example.xml
index dbfde22493..7b3e84ce94 100644
--- a/examples/javaee/xarecovery/server/standalone/configuration/standalone-example.xml
+++ b/examples/javaee/xarecovery/server/standalone/configuration/standalone-example.xml
@@ -182,7 +182,7 @@
                 
             
             
-                
+                
                 
             
             
@@ -296,7 +296,7 @@
             
         
         
-            
+            
                 true
                 102400
                 2
@@ -355,7 +355,7 @@
                             
                         
                     
-                    
+                    
                         
                         
                             
@@ -373,7 +373,7 @@
                         
                     
                 
-            
+            
         
         
             
diff --git a/examples/jms/README.md b/examples/jms/README.md
index 9c9e0fb147..c2f9c941b2 100644
--- a/examples/jms/README.md
+++ b/examples/jms/README.md
@@ -8,7 +8,7 @@ mvn verify
 ```
 
 If you are running against an un released version, i.e. from master branch, you will have to run `mvn install` on the root
-pom.xml and the example/hornetq-jms-examples-common/pom.xml first.
+pom.xml and the example/activemq-jms-examples-common/pom.xml first.
 
 If you want to run all the examples (except those that need to be run standalone) you can run `mvn verify` in the examples
 directory but before you do you will need to up the memory used by running:
diff --git a/examples/jms/activemq-jms-examples-common/config/logging.properties b/examples/jms/activemq-jms-examples-common/config/logging.properties
index 754d13869d..32f5fc9b0a 100644
--- a/examples/jms/activemq-jms-examples-common/config/logging.properties
+++ b/examples/jms/activemq-jms-examples-common/config/logging.properties
@@ -20,7 +20,7 @@ handlers=java.util.logging.ConsoleHandler
 java.util.logging.ConsoleHandler.formatter=org.apache.activemq6.integration.logging.ActiveMQLoggerFormatter
 java.util.logging.FileHandler.level=INFO
 java.util.logging.FileHandler.formatter=org.apache.activemq6.integration.logging.ActiveMQLoggerFormatter
-java.util.logging.FileHandler.pattern=logs/hornetq.log
+java.util.logging.FileHandler.pattern=logs/activemq.log
 # Default global logging level.
 # This specifies which kinds of events are logged across
 # all loggers.  For any given facility this global level
diff --git a/examples/jms/aerogear/pom.xml b/examples/jms/aerogear/pom.xml
index 71c1d83563..4ae12ea117 100644
--- a/examples/jms/aerogear/pom.xml
+++ b/examples/jms/aerogear/pom.xml
@@ -130,7 +130,7 @@
             
             
                false
-               ${basedir}/target/classes/hornetq/server0
+               ${basedir}/target/classes/activemq/server0
             
          
       
diff --git a/examples/jms/aerogear/readme.html b/examples/jms/aerogear/readme.html
index d29075dbe0..cd3c15bba6 100644
--- a/examples/jms/aerogear/readme.html
+++ b/examples/jms/aerogear/readme.html
@@ -60,7 +60,7 @@
      
    
    And on your mobile app you should see a message from ActiveMQ
    
 
-  
    Now lets look a bit more closely at the configuration in hornetq-configuration.xml
    
+  
    Now lets look a bit more closely at the configuration in activemq-configuration.xml
    
      
      
         
                  
diff --git a/examples/jms/applet/applet.html b/examples/jms/applet/applet.html
index cb24c3de69..0ac3f482a4 100644
--- a/examples/jms/applet/applet.html
+++ b/examples/jms/applet/applet.html
@@ -11,7 +11,7 @@
      
      
   
 
\ No newline at end of file
diff --git a/examples/jms/applet/pom.xml b/examples/jms/applet/pom.xml
index 859103eb65..c99b2c7e4a 100644
--- a/examples/jms/applet/pom.xml
+++ b/examples/jms/applet/pom.xml
@@ -40,7 +40,7 @@
                      start
                   
                   
-                     ${basedir}/target/classes/hornetq/server0
+                     ${basedir}/target/classes/activemq/server0
                   
                
                
@@ -56,7 +56,7 @@
                      
                         
                            exampleConfigDir
-                           ${basedir}/target/classes/hornetq
+                           ${basedir}/target/classes/activemq
                         
                      
                   
@@ -67,7 +67,7 @@
                      stop
                   
                   
-                     ${basedir}/target/classes/hornetq/server0
+                     ${basedir}/target/classes/activemq/server0
                   
                
             
diff --git a/examples/jms/application-layer-failover/pom.xml b/examples/jms/application-layer-failover/pom.xml
index 5f9eaf1f34..0cfa2f7cf3 100644
--- a/examples/jms/application-layer-failover/pom.xml
+++ b/examples/jms/application-layer-failover/pom.xml
@@ -36,7 +36,7 @@
                      start
                   
                   
-                     ${basedir}/target/classes/hornetq/server0
+                     ${basedir}/target/classes/activemq/server0
                   
                
                
@@ -47,7 +47,7 @@
                   
                      1199
                      1198
-                     ${basedir}/target/classes/hornetq/server1
+                     ${basedir}/target/classes/activemq/server1
                      INFO: HQ221034
                      true
                   
@@ -66,7 +66,7 @@
                      
                         
                            exampleConfigDir
-                           ${basedir}/target/classes/hornetq
+                           ${basedir}/target/classes/activemq
                         
                      
                   
@@ -77,7 +77,7 @@
                      stop
                   
                   
-                     ${basedir}/target/classes/hornetq/server0
+                     ${basedir}/target/classes/activemq/server0
                   
                
                
@@ -86,7 +86,7 @@
                      stop
                   
                   
-                     ${basedir}/target/classes/hornetq/server1
+                     ${basedir}/target/classes/activemq/server1
                   
                
             
@@ -134,7 +134,7 @@
             
             
                false
-               ${basedir}/target/classes/hornetq/server0
+               ${basedir}/target/classes/activemq/server0
             
          
       
diff --git a/examples/jms/bridge/pom.xml b/examples/jms/bridge/pom.xml
index ee5dbc726d..f57adeff19 100644
--- a/examples/jms/bridge/pom.xml
+++ b/examples/jms/bridge/pom.xml
@@ -41,7 +41,7 @@
                      start
                   
                   
-                     ${basedir}/target/classes/hornetq/server0
+                     ${basedir}/target/classes/activemq/server0
                   
                
                
@@ -52,7 +52,7 @@
                   
                      1199
                      1198
-                     ${basedir}/target/classes/hornetq/server1
+                     ${basedir}/target/classes/activemq/server1
                      true
                   
                
@@ -70,7 +70,7 @@
                      
                         
                            exampleConfigDir
-                           ${basedir}/target/classes/hornetq
+                           ${basedir}/target/classes/activemq
                         
                      
                   
@@ -81,7 +81,7 @@
                      stop
                   
                   
-                     ${basedir}/target/classes/hornetq/server0
+                     ${basedir}/target/classes/activemq/server0
                   
                
                
@@ -90,7 +90,7 @@
                      stop
                   
                   
-                     ${basedir}/target/classes/hornetq/server1
+                     ${basedir}/target/classes/activemq/server1
                   
                
             
diff --git a/examples/jms/bridge/readme.html b/examples/jms/bridge/readme.html
index 7b3acdd26a..db6ecfd7ce 100644
--- a/examples/jms/bridge/readme.html
+++ b/examples/jms/bridge/readme.html
@@ -35,7 +35,7 @@
      want to reject those.
      
      
      Moreover it is known that Aardvarks normally wear blue hats, and it's important that we only make sausages using
      Aardvarks with green hats, so on the way we are going transform the property "hat" from "green" to "blue".
        
-     
      Here's a snippet from hornetq-configuration.xml showing the bridge configuration
      
+     
      Here's a snippet from activemq-configuration.xml showing the bridge configuration
      
      
            
      <bridge name="my-bridge">
diff --git a/examples/jms/browser/pom.xml b/examples/jms/browser/pom.xml
index 9d23336ca1..19d4284831 100644
--- a/examples/jms/browser/pom.xml
+++ b/examples/jms/browser/pom.xml
@@ -99,7 +99,7 @@
             
             
                false
-               ${basedir}/target/classes/hornetq/server0
+               ${basedir}/target/classes/activemq/server0
                
                   
                      build.directory
diff --git a/examples/jms/client-kickoff/pom.xml b/examples/jms/client-kickoff/pom.xml
index 7cc84d8825..c254db955b 100644
--- a/examples/jms/client-kickoff/pom.xml
+++ b/examples/jms/client-kickoff/pom.xml
@@ -130,7 +130,7 @@
             
             
                false
-               ${basedir}/target/classes/hornetq/server0
+               ${basedir}/target/classes/activemq/server0
             
          
       
diff --git a/examples/jms/client-kickoff/readme.html b/examples/jms/client-kickoff/readme.html
index 4522c23142..d34d5dc3d7 100644
--- a/examples/jms/client-kickoff/readme.html
+++ b/examples/jms/client-kickoff/readme.html
@@ -33,7 +33,7 @@
      
      Example step-by-step
      
      
      To run the example, simply type mvn verify from this directory
      
      
        
-        
      1. First we need to get an initial context so we can look-up the JMS connection factory and destination objects from JNDI. This initial context will get its properties from client-jndi.properties
        2. 
+        
      2. First we need to get an initial context so we can look-up the JMS connection factory and destination objects from JNDI. This initial context will get its properties from client-jndi.properties
        3. 
         
                     InitialContext initialContext = getContext(0);
         
        
diff --git a/examples/jms/client-side-failoverlistener/pom.xml b/examples/jms/client-side-failoverlistener/pom.xml
index 1264e48b13..37ffe90f9d 100644
--- a/examples/jms/client-side-failoverlistener/pom.xml
+++ b/examples/jms/client-side-failoverlistener/pom.xml
@@ -36,7 +36,7 @@
                      start
                   
                   
-                     ${basedir}/target/classes/hornetq/server0
+                     ${basedir}/target/classes/activemq/server0
                      
                         
                            build.directory
@@ -57,7 +57,7 @@
                   
                      1199
                      1198
-                     ${basedir}/target/classes/hornetq/server1
+                     ${basedir}/target/classes/activemq/server1
                      true
                      
                         
@@ -86,7 +86,7 @@
                      
                         
                            exampleConfigDir
-                           ${basedir}/target/classes/hornetq
+                           ${basedir}/target/classes/activemq
                         
                      
                   
@@ -97,7 +97,7 @@
                      stop
                   
                   
-                     ${basedir}/target/classes/hornetq/server0
+                     ${basedir}/target/classes/activemq/server0
                   
                
                
@@ -106,7 +106,7 @@
                      stop
                   
                   
-                     ${basedir}/target/classes/hornetq/server1
+                     ${basedir}/target/classes/activemq/server1
                   
                
             
diff --git a/examples/jms/client-side-failoverlistener/readme.html b/examples/jms/client-side-failoverlistener/readme.html
index c24b50ef4e..6f8f0737a6 100644
--- a/examples/jms/client-side-failoverlistener/readme.html
+++ b/examples/jms/client-side-failoverlistener/readme.html
@@ -16,7 +16,7 @@
      
        Example step-by-step
        
      
        To run the example, simply type mvn verify from this directory
        
      
          
-        
        1. First we need to get an initial context so we can look-up the JMS connection factory and destination objects from JNDI. This initial context will get its properties from client-jndi.properties
          2. 
+        
        2. First we need to get an initial context so we can look-up the JMS connection factory and destination objects from JNDI. This initial context will get its properties from client-jndi.properties
          3. 
         
                       InitialContext initialContext = getContext(0);
         
          
diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server0/activemq-configuration.xml
index 3a086ee96b..5cbdcfc213 100644
--- a/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ b/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server0/activemq-configuration.xml
@@ -1,6 +1,6 @@
 
+         xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
 
    ${build.directory}/server0/data/messaging/bindings
 
diff --git a/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server1/activemq-configuration.xml b/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server1/activemq-configuration.xml
index 8feacddd4c..2010768430 100644
--- a/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server1/activemq-configuration.xml
+++ b/examples/jms/client-side-failoverlistener/src/main/resources/hornetq/server1/activemq-configuration.xml
@@ -1,6 +1,6 @@
 
+         xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
 
    ${build.directory}/server0/data/messaging/bindings
 
diff --git a/examples/jms/client-side-load-balancing/pom.xml b/examples/jms/client-side-load-balancing/pom.xml
index bc09a2bc40..2e4f24a637 100644
--- a/examples/jms/client-side-load-balancing/pom.xml
+++ b/examples/jms/client-side-load-balancing/pom.xml
@@ -36,7 +36,7 @@
                      start
                   
                   
-                     ${basedir}/target/classes/hornetq/server0
+                     ${basedir}/target/classes/activemq/server0
                      
                         
                            build.directory
@@ -57,7 +57,7 @@
                   
                      1199
                      1198
-                     ${basedir}/target/classes/hornetq/server1
+                     ${basedir}/target/classes/activemq/server1
                      true
                      
                         
@@ -79,7 +79,7 @@
                   
                      1299
                      1298
-                     ${basedir}/target/classes/hornetq/server2
+                     ${basedir}/target/classes/activemq/server2
                      true
                      
                         
@@ -107,7 +107,7 @@
                      
                         
                            exampleConfigDir
-                           ${basedir}/target/classes/hornetq
+                           ${basedir}/target/classes/activemq
                         
                      
                   
@@ -118,7 +118,7 @@
                      stop
                   
                   
-                     ${basedir}/target/classes/hornetq/server0
+                     ${basedir}/target/classes/activemq/server0
                   
                
                
@@ -127,7 +127,7 @@
                      stop
                   
                   
-                     ${basedir}/target/classes/hornetq/server1
+                     ${basedir}/target/classes/activemq/server1
                   
                
                
@@ -136,7 +136,7 @@
                      stop
                   
                   
-                     ${basedir}/target/classes/hornetq/server2
+                     ${basedir}/target/classes/activemq/server2
                   
                
             
diff --git a/examples/jms/client-side-load-balancing/readme.html b/examples/jms/client-side-load-balancing/readme.html
index cc304baa70..93390e2f5a 100644
--- a/examples/jms/client-side-load-balancing/readme.html
+++ b/examples/jms/client-side-load-balancing/readme.html
@@ -19,7 +19,7 @@
      to use UDP discovery to discover the list of servers over which to round-robin. This example will use UDP
      discovery to obtain the list.
          
      
          This example starts three servers which all broadcast their location using UDP discovery. The UDP broadcast configuration
-     can be seen in the hornetq-configuration.xml file.
          
+     can be seen in the activemq-configuration.xml file.
          
      
          A JMS ConnectionFactory is deployed on each server specifying the discovery group that will be used by that
      connection factory.
                
      
          For more information on ActiveMQ load balancing, and clustering in general, please see the clustering
diff --git a/examples/jms/clustered-durable-subscription/pom.xml b/examples/jms/clustered-durable-subscription/pom.xml
index 963bc8d02b..5ff2e28d4c 100644
--- a/examples/jms/clustered-durable-subscription/pom.xml
+++ b/examples/jms/clustered-durable-subscription/pom.xml
@@ -36,7 +36,7 @@
                      start
                   
                   
-                     ${basedir}/target/classes/hornetq/server0
+                     ${basedir}/target/classes/activemq/server0
                      
                         
                            build.directory
@@ -57,7 +57,7 @@
                   
                      1199
                      1198
-                     ${basedir}/target/classes/hornetq/server1
+                     ${basedir}/target/classes/activemq/server1
                      true
                      
                         
@@ -85,7 +85,7 @@
                      
                         
                            exampleConfigDir
-                           ${basedir}/target/classes/hornetq
+                           ${basedir}/target/classes/activemq
                         
                      
                   
@@ -96,7 +96,7 @@
                      stop
                   
                   
-                     ${basedir}/target/classes/hornetq/server0
+                     ${basedir}/target/classes/activemq/server0
                   
                
                
@@ -105,7 +105,7 @@
                      stop
                   
                   
-                     ${basedir}/target/classes/hornetq/server1
+                     ${basedir}/target/classes/activemq/server1
                   
                
             
diff --git a/examples/jms/clustered-grouping/pom.xml b/examples/jms/clustered-grouping/pom.xml
index bcb96121ef..0e55226665 100644
--- a/examples/jms/clustered-grouping/pom.xml
+++ b/examples/jms/clustered-grouping/pom.xml
@@ -36,7 +36,7 @@
                      start
                   
                   
-                     ${basedir}/target/classes/hornetq/server0
+                     ${basedir}/target/classes/activemq/server0
                      
                         
                            build.directory
@@ -57,7 +57,7 @@
                   
                      1199
                      1198
-                     ${basedir}/target/classes/hornetq/server1
+                     ${basedir}/target/classes/activemq/server1
                      true
                      
                         
@@ -79,7 +79,7 @@
                   
                      1299
                      1298
-                     ${basedir}/target/classes/hornetq/server2
+                     ${basedir}/target/classes/activemq/server2
                      true
                      
                         
@@ -108,7 +108,7 @@
                      
                         
                            exampleConfigDir
-                           ${basedir}/target/classes/hornetq
+                           ${basedir}/target/classes/activemq
                         
                      
                   
@@ -119,7 +119,7 @@
                      stop
                   
                   
-                     ${basedir}/target/classes/hornetq/server0
+                     ${basedir}/target/classes/activemq/server0
                   
                
                
@@ -128,7 +128,7 @@
                      stop
                   
                   
-                     ${basedir}/target/classes/hornetq/server1
+                     ${basedir}/target/classes/activemq/server1
                   
                
                
@@ -137,7 +137,7 @@
                      stop
                   
                   
-                     ${basedir}/target/classes/hornetq/server2
+                     ${basedir}/target/classes/activemq/server2
                   
                
             
diff --git a/examples/jms/clustered-jgroups/pom.xml b/examples/jms/clustered-jgroups/pom.xml
index 252ba9d021..1cdaf59a13 100644
--- a/examples/jms/clustered-jgroups/pom.xml
+++ b/examples/jms/clustered-jgroups/pom.xml
@@ -36,7 +36,7 @@
                      start
                   
                   
-                     ${basedir}/target/classes/hornetq/server0
+                     ${basedir}/target/classes/activemq/server0
                      
                         
@@ -55,7 +55,7 @@
                   
                      1199
                      1198
-                     ${basedir}/target/classes/hornetq/server1
+                     ${basedir}/target/classes/activemq/server1
                      true
                      
                         
diff --git a/examples/jms/jms-completion-listener/pom.xml b/examples/jms/jms-completion-listener/pom.xml
index 3298470ec6..302d535708 100644
--- a/examples/jms/jms-completion-listener/pom.xml
+++ b/examples/jms/jms-completion-listener/pom.xml
@@ -107,7 +107,7 @@
             
             
                false
-               ${basedir}/target/classes/hornetq/server0
+               ${basedir}/target/classes/activemq/server0
             
          
       
diff --git a/examples/jms/jms-context/pom.xml b/examples/jms/jms-context/pom.xml
index 41dd390f4a..e2737e5ac5 100644
--- a/examples/jms/jms-context/pom.xml
+++ b/examples/jms/jms-context/pom.xml
@@ -107,7 +107,7 @@
             
             
                false
-               ${basedir}/target/classes/hornetq/server0
+               ${basedir}/target/classes/activemq/server0
             
          
       
diff --git a/examples/jms/jms-shared-consumer/pom.xml b/examples/jms/jms-shared-consumer/pom.xml
index 39d9779ffa..7c2bd384f7 100644
--- a/examples/jms/jms-shared-consumer/pom.xml
+++ b/examples/jms/jms-shared-consumer/pom.xml
@@ -107,7 +107,7 @@
             
             
                false
-               ${basedir}/target/classes/hornetq/server0
+               ${basedir}/target/classes/activemq/server0
             
          
       
diff --git a/examples/jms/jmx/pom.xml b/examples/jms/jmx/pom.xml
index 74354e417d..ede344e71d 100644
--- a/examples/jms/jmx/pom.xml
+++ b/examples/jms/jmx/pom.xml
@@ -135,7 +135,7 @@
             
             
                false
-               ${basedir}/target/classes/hornetq/server0
+               ${basedir}/target/classes/activemq/server0
             
          
       
diff --git a/examples/jms/large-message/pom.xml b/examples/jms/large-message/pom.xml
index 4c2eefa5f8..b1db82f291 100644
--- a/examples/jms/large-message/pom.xml
+++ b/examples/jms/large-message/pom.xml
@@ -57,7 +57,7 @@
                      
                         
                            exampleConfigDir
-                           ${basedir}/target/classes/hornetq
+                           ${basedir}/target/classes/activemq
                         
                      
                   
@@ -113,7 +113,7 @@
             
             
                false
-               ${basedir}/target/classes/hornetq/server0
+               ${basedir}/target/classes/activemq/server0
             
          
       
diff --git a/examples/jms/large-message/readme.html b/examples/jms/large-message/readme.html
index 6029e76571..7b5b8c2da4 100644
--- a/examples/jms/large-message/readme.html
+++ b/examples/jms/large-message/readme.html
@@ -38,7 +38,7 @@
            Queue queue = (Queue)initialContext.lookup("/queue/exampleQueue");
         
      
 
-        
    1. Perform a lookup on the Connection Factory. This ConnectionFactory has a special attribute set on it. hornetq-jms.xml)
+        
    2. Perform a lookup on the Connection Factory. This ConnectionFactory has a special attribute set on it. activemq-jms.xml)
             Messages with more than 10K are considered large.
      3. 
         
                  ConnectionFactory cf = (ConnectionFactory)initialContext.lookup("/ConnectionFactory");
diff --git a/examples/jms/last-value-queue/pom.xml b/examples/jms/last-value-queue/pom.xml
index 6a6297b879..b138e82afa 100644
--- a/examples/jms/last-value-queue/pom.xml
+++ b/examples/jms/last-value-queue/pom.xml
@@ -107,7 +107,7 @@
             
             
                false
-               ${basedir}/target/classes/hornetq/server0
+               ${basedir}/target/classes/activemq/server0
             
          
       
diff --git a/examples/jms/last-value-queue/readme.html b/examples/jms/last-value-queue/readme.html
index d22640082a..6c91bd5ae2 100644
--- a/examples/jms/last-value-queue/readme.html
+++ b/examples/jms/last-value-queue/readme.html
@@ -18,7 +18,7 @@
         We will then consume from the queue the last message.
      
         
      
      Example setup
      
-     
      Last-Value queues are defined in the configuration file hornetq-configuration.xml:
      
+     
      Last-Value queues are defined in the configuration file activemq-configuration.xml:
      
      
                <address-setting match="jms.queue.lastValueQueue">
                 <last-value-queue>true</last-value-queue>
diff --git a/examples/jms/management-notifications/pom.xml b/examples/jms/management-notifications/pom.xml
index 5630586d48..605b4ebde8 100644
--- a/examples/jms/management-notifications/pom.xml
+++ b/examples/jms/management-notifications/pom.xml
@@ -107,7 +107,7 @@
             
             
                false
-               ${basedir}/target/classes/hornetq/server0
+               ${basedir}/target/classes/activemq/server0
             
          
       
diff --git a/examples/jms/management-notifications/readme.html b/examples/jms/management-notifications/readme.html
index 13114f8405..bd268708da 100644
--- a/examples/jms/management-notifications/readme.html
+++ b/examples/jms/management-notifications/readme.html
@@ -18,20 +18,20 @@
      
      Example configuration
      
 
      
      ActiveMQ can configured to send JMS messages when management notifications are emitted on the server.
      
-     
      By default, the management name is called hornetq.notifications but this can be configured in hornetq-configuration.xml.
+     
      By default, the management name is called activemq.notifications but this can be configured in activemq-configuration.xml.
         For this example, we will set it to jms.topic.notificationsTopic to be able to receive notifications from a JMS Topic.
      
       
                <management-notification-address>jms.topic.notificationsTopic</management-notification-address>
      
      
      
-     
      Since we want to lookup the notifications topic using JNDI, we also declare it in  hornetq-jms.xml
+     
      Since we want to lookup the notifications topic using JNDI, we also declare it in  activemq-jms.xml
      
                <topic name="notificationsTopic">
             <entry name="/topic/notificationsTopic"/>
          </topic>
      
      
      
      The notification queue requires permission to create/delete temporary queues and consume messages.
-         This is also configured in hornetq-configuration.xml
      
+         This is also configured in activemq-configuration.xml
      
      
                
          <security-setting match="jms.topic.notificationsTopic">
diff --git a/examples/jms/management-notifications/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/management-notifications/src/main/resources/hornetq/server0/activemq-users.xml
index 7950ec3a5e..f7f5375caf 100644
--- a/examples/jms/management-notifications/src/main/resources/hornetq/server0/activemq-users.xml
+++ b/examples/jms/management-notifications/src/main/resources/hornetq/server0/activemq-users.xml
@@ -1,5 +1,5 @@
 
+            xsi:schemaLocation="urn:activemq ../schema/activemq-security.xsd">
    
    
       
diff --git a/examples/jms/management/pom.xml b/examples/jms/management/pom.xml
index d125672474..41192c6dca 100644
--- a/examples/jms/management/pom.xml
+++ b/examples/jms/management/pom.xml
@@ -107,7 +107,7 @@
             
             
                false
-               ${basedir}/target/classes/hornetq/server0
+               ${basedir}/target/classes/activemq/server0
             
          
       
diff --git a/examples/jms/management/readme.html b/examples/jms/management/readme.html
index cd1b861c8a..bde5551f23 100644
--- a/examples/jms/management/readme.html
+++ b/examples/jms/management/readme.html
@@ -13,15 +13,15 @@
      
      Example configuration
      
 
      
      ActiveMQ can be managed by sending JMS messages with specific properties to its management queue.
      
-     
      By default, the management name is called hornetq.management but this can be configured in hornetq-configuration.xml
+     
      By default, the management name is called activemq.management but this can be configured in activemq-configuration.xml
      
      -         <management-address>hornetq.management</management-address>
+         <management-address>activemq.management</management-address>
      
      
      
      
      The management queue requires a "special" user permission manage to be able to receive management messages.
-         This is also configured in hornetq-configuration.xml
      
+         This is also configured in activemq-configuration.xml
      
      
      -         <security-setting match="hornetq.management">
+         <security-setting match="activemq.management">
             <permission type="manage" roles="guest" />
          </security-setting>
      
      
@@ -74,7 +74,7 @@
             
         
    3. We create the JMS management queue. This is a special queue which is not looked up from JNDI but instantiated directly
      4. 
         
      -            Queue managementQueue = new ActiveMQQueue("hornetq.management", "hornetq.management");
+            Queue managementQueue = new ActiveMQQueue("activemq.management", "activemq.management");
         
      
 
         
    4. We create a QueueRequestor to send messages to the management queue and receive replies (see queue-requestor example)
      5. 
@@ -96,7 +96,7 @@
             We use a helper class JMSManagementHelper to fill these properties:
             
        
                 
      • The name of the resource to manage jms.queue.exampleQueue 
-                    (i.e. jms.queue followed by the name of the queue as defined in hornetq-jms.xml)
        • 
+                    (i.e. jms.queue followed by the name of the queue as defined in activemq-jms.xml)
                 
      • In our case, the name of the attribute to retrieve MessageCount
        • 
             
      
         
diff --git a/examples/jms/management/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/management/src/main/resources/hornetq/server0/activemq-configuration.xml
index ee472b289a..93d76784e1 100644
--- a/examples/jms/management/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ b/examples/jms/management/src/main/resources/hornetq/server0/activemq-configuration.xml
@@ -11,7 +11,7 @@
    ${build.directory}/server0/data/messaging/paging
 
 
-   jms.queue.hornetq.management
+   jms.queue.activemq.management
 
    
       
@@ -39,7 +39,7 @@
       
 
       
-      
+      
          
       
 
diff --git a/examples/jms/message-counters/pom.xml b/examples/jms/message-counters/pom.xml
index 8a1cf93cff..84de40b27f 100644
--- a/examples/jms/message-counters/pom.xml
+++ b/examples/jms/message-counters/pom.xml
@@ -130,7 +130,7 @@
             
             
                false
-               ${basedir}/target/classes/hornetq/server0
+               ${basedir}/target/classes/activemq/server0
             
          
       
diff --git a/examples/jms/message-counters/readme.html b/examples/jms/message-counters/readme.html
index d2431f914d..26687568dd 100644
--- a/examples/jms/message-counters/readme.html
+++ b/examples/jms/message-counters/readme.html
@@ -14,7 +14,7 @@
          at different times to display the metrics on the queue.
      
      
      
      Example setup
      
-     
      Message counter is configured in the server configuration file hornetq-configuration.xml:
      
+     
      Message counter is configured in the server configuration file activemq-configuration.xml:
      
      
                <message-counter-enabled>true</message-counter-enabled>
          <message-counter-sample-period>2000</message-counter-sample-period>
diff --git a/examples/jms/message-group/pom.xml b/examples/jms/message-group/pom.xml
index 325675fca5..2cfaa1516a 100644
--- a/examples/jms/message-group/pom.xml
+++ b/examples/jms/message-group/pom.xml
@@ -107,7 +107,7 @@
             
             
                false
-               ${basedir}/target/classes/hornetq/server0
+               ${basedir}/target/classes/activemq/server0
             
          
       
diff --git a/examples/jms/message-group/readme.html b/examples/jms/message-group/readme.html
index 41e8c3ec3e..b2e38ed21a 100644
--- a/examples/jms/message-group/readme.html
+++ b/examples/jms/message-group/readme.html
@@ -21,7 +21,7 @@
      the first consumer. The second consumer will receive none. 
      
 
      
      Alternatively, ActiveMQ's connection factories can be configured to auto group messages. By setting autogroup to true on the ActiveMQConnectionFactory
-        (or setting <autogroup>true</autogroup> in hornetq-jms.xml's connection factory settings), a random unique id
+        (or setting <autogroup>true</autogroup> in activemq-jms.xml's connection factory settings), a random unique id
         will be picked to create a message group. Every messages sent by a producer created from this connection factory will automatically
         be part of this message group.
      
 
diff --git a/examples/jms/message-group2/pom.xml b/examples/jms/message-group2/pom.xml
index 5bad1afec5..2e0f9838b1 100644
--- a/examples/jms/message-group2/pom.xml
+++ b/examples/jms/message-group2/pom.xml
@@ -107,7 +107,7 @@
             
             
                false
-               ${basedir}/target/classes/hornetq/server0
+               ${basedir}/target/classes/activemq/server0
             
          
       
diff --git a/examples/jms/message-group2/readme.html b/examples/jms/message-group2/readme.html
index ef25ea833e..70e5a2e49d 100644
--- a/examples/jms/message-group2/readme.html
+++ b/examples/jms/message-group2/readme.html
@@ -19,7 +19,7 @@
      In this example we set the group id 'Group-0'on a connection factory and send messages via 2 different producers and check that only 1 consumer receives them. 
      
 
      
      Alternatively, ActiveMQ's connection factories can be configured to auto group messages. By setting autogroup to true on the ActiveMQConnectionFactory
-        (or setting <autogroup>true</autogroup> in hornetq-jms.xml's connection factory settings), a random unique id
+        (or setting <autogroup>true</autogroup> in activemq-jms.xml's connection factory settings), a random unique id
         will be picked to create a message group. Every messages sent by a producer created from this connection factory will automatically
         be part of this message group.
      
 
diff --git a/examples/jms/message-priority/pom.xml b/examples/jms/message-priority/pom.xml
index e13979c5a4..db6c2913b8 100644
--- a/examples/jms/message-priority/pom.xml
+++ b/examples/jms/message-priority/pom.xml
@@ -107,7 +107,7 @@
             
             
                false
-               ${basedir}/target/classes/hornetq/server0
+               ${basedir}/target/classes/activemq/server0
             
          
       
diff --git a/examples/jms/multiple-failover-failback/pom.xml b/examples/jms/multiple-failover-failback/pom.xml
index 9d62bc67df..b9827f6035 100644
--- a/examples/jms/multiple-failover-failback/pom.xml
+++ b/examples/jms/multiple-failover-failback/pom.xml
@@ -36,7 +36,7 @@
                      start
                   
                   
-                     ${basedir}/target/classes/hornetq/server0
+                     ${basedir}/target/classes/activemq/server0
                      
                         
                            build.directory
@@ -57,7 +57,7 @@
                   
                      1199
                      1198
-                     ${basedir}/target/classes/hornetq/server1
+                     ${basedir}/target/classes/activemq/server1
                      true
                      
                         
@@ -79,7 +79,7 @@
                   
                      1299
                      1298
-                     ${basedir}/target/classes/hornetq/server2
+                     ${basedir}/target/classes/activemq/server2
                      true
                      
                         
@@ -108,7 +108,7 @@
                      
                         
                            exampleConfigDir
-                           ${basedir}/target/classes/hornetq
+                           ${basedir}/target/classes/activemq
                         
                      
                   
@@ -119,7 +119,7 @@
                      stop
                   
                   
-                     ${basedir}/target/classes/hornetq/server0
+                     ${basedir}/target/classes/activemq/server0
                   
                
                
@@ -128,7 +128,7 @@
                      stop
                   
                   
-                     ${basedir}/target/classes/hornetq/server1
+                     ${basedir}/target/classes/activemq/server1
                   
                
                
@@ -137,7 +137,7 @@
                      stop
                   
                   
-                     ${basedir}/target/classes/hornetq/server2
+                     ${basedir}/target/classes/activemq/server2
                   
                
             
diff --git a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/activemq-configuration.xml
index 3a086ee96b..5cbdcfc213 100644
--- a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server0/activemq-configuration.xml
@@ -1,6 +1,6 @@
 
+         xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
 
    ${build.directory}/server0/data/messaging/bindings
 
diff --git a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/activemq-configuration.xml b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/activemq-configuration.xml
index 55f0ffcb4a..b4dd7a1040 100644
--- a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/activemq-configuration.xml
+++ b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server1/activemq-configuration.xml
@@ -1,6 +1,6 @@
 
+         xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
 
    ${build.directory}/server0/data/messaging/bindings
 
diff --git a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/activemq-configuration.xml b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/activemq-configuration.xml
index 328ade9c4c..ee881cd67c 100644
--- a/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/activemq-configuration.xml
+++ b/examples/jms/multiple-failover-failback/src/main/resources/hornetq/server2/activemq-configuration.xml
@@ -1,6 +1,6 @@
 
+         xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
 
    ${build.directory}/server0/data/messaging/bindings
 
diff --git a/examples/jms/multiple-failover/pom.xml b/examples/jms/multiple-failover/pom.xml
index 29854dd710..e8c0744e98 100644
--- a/examples/jms/multiple-failover/pom.xml
+++ b/examples/jms/multiple-failover/pom.xml
@@ -36,7 +36,7 @@
                      start
                   
                   
-                     ${basedir}/target/classes/hornetq/server0
+                     ${basedir}/target/classes/activemq/server0
                      
                         
                            build.directory
@@ -57,7 +57,7 @@
                   
                      1199
                      1198
-                     ${basedir}/target/classes/hornetq/server1
+                     ${basedir}/target/classes/activemq/server1
                      true
                      
                         
@@ -79,7 +79,7 @@
                   
                      1299
                      1298
-                     ${basedir}/target/classes/hornetq/server2
+                     ${basedir}/target/classes/activemq/server2
                      true
                      
                         
@@ -108,7 +108,7 @@
                      
                         
                            exampleConfigDir
-                           ${basedir}/target/classes/hornetq
+                           ${basedir}/target/classes/activemq
                         
                      
                   
@@ -119,7 +119,7 @@
                      stop
                   
                   
-                     ${basedir}/target/classes/hornetq/server0
+                     ${basedir}/target/classes/activemq/server0
                   
                
                
@@ -128,7 +128,7 @@
                      stop
                   
                   
-                     ${basedir}/target/classes/hornetq/server1
+                     ${basedir}/target/classes/activemq/server1
                   
                
                
@@ -137,7 +137,7 @@
                      stop
                   
                   
-                     ${basedir}/target/classes/hornetq/server2
+                     ${basedir}/target/classes/activemq/server2
                   
                
             
diff --git a/examples/jms/multiple-failover/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/multiple-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
index f4004c494c..a506972eed 100644
--- a/examples/jms/multiple-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ b/examples/jms/multiple-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
@@ -1,6 +1,6 @@
 
+         xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
 
    ${build.directory}/server0/data/messaging/bindings
 
diff --git a/examples/jms/multiple-failover/src/main/resources/hornetq/server1/activemq-configuration.xml b/examples/jms/multiple-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
index 8c6b49fa94..4e2efba7ef 100644
--- a/examples/jms/multiple-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
+++ b/examples/jms/multiple-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
@@ -1,6 +1,6 @@
 
+         xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
 
    ${build.directory}/server0/data/messaging/bindings
 
diff --git a/examples/jms/multiple-failover/src/main/resources/hornetq/server2/activemq-configuration.xml b/examples/jms/multiple-failover/src/main/resources/hornetq/server2/activemq-configuration.xml
index 99413b12d0..00a8aa0283 100644
--- a/examples/jms/multiple-failover/src/main/resources/hornetq/server2/activemq-configuration.xml
+++ b/examples/jms/multiple-failover/src/main/resources/hornetq/server2/activemq-configuration.xml
@@ -1,6 +1,6 @@
 
+         xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
 
    ${build.directory}/server0/data/messaging/bindings
 
diff --git a/examples/jms/no-consumer-buffering/pom.xml b/examples/jms/no-consumer-buffering/pom.xml
index 022e291110..0415b4bd4b 100644
--- a/examples/jms/no-consumer-buffering/pom.xml
+++ b/examples/jms/no-consumer-buffering/pom.xml
@@ -107,7 +107,7 @@
             
             
                false
-               ${basedir}/target/classes/hornetq/server0
+               ${basedir}/target/classes/activemq/server0
             
          
       
diff --git a/examples/jms/no-consumer-buffering/readme.html b/examples/jms/no-consumer-buffering/readme.html
index 8201c1c694..79942e5844 100644
--- a/examples/jms/no-consumer-buffering/readme.html
+++ b/examples/jms/no-consumer-buffering/readme.html
@@ -24,9 +24,9 @@
      
      To turn off client side buffering of messages, set consumer-window-size to zero.
      
      
      
      With ActiveMQ you can specify a maximum consume rate at which a JMS MessageConsumer will consume messages.
-     This can be specified when creating or deploying the connection factory. See hornetq-jms.xml
           
+     This can be specified when creating or deploying the connection factory. See activemq-jms.xml
      
      
      Example step-by-step
      
-     
      In this example we specify a consumer-window-size of 0 bytes in the hornetq-jms.xml
+     
      In this example we specify a consumer-window-size of 0 bytes in the activemq-jms.xml
      file when deploying the connection factory:
      
      
            
diff --git a/examples/jms/non-transaction-failover/pom.xml b/examples/jms/non-transaction-failover/pom.xml
index ccfc326b32..54afb76bf7 100644
--- a/examples/jms/non-transaction-failover/pom.xml
+++ b/examples/jms/non-transaction-failover/pom.xml
@@ -42,7 +42,7 @@
                            ${basedir}/target/
                         
                      
-                     ${basedir}/target/classes/hornetq/server0
+                     ${basedir}/target/classes/activemq/server0
                      
                         
                            build.directory
@@ -63,7 +63,7 @@
                   
                      1199
                      1198
-                     ${basedir}/target/classes/hornetq/server1
+                     ${basedir}/target/classes/activemq/server1
                      true
                      
                         
@@ -91,7 +91,7 @@
                      
                         
                            exampleConfigDir
-                           ${basedir}/target/classes/hornetq
+                           ${basedir}/target/classes/activemq
                         
                      
                   
@@ -102,7 +102,7 @@
                      stop
                   
                   
-                     ${basedir}/target/classes/hornetq/server0
+                     ${basedir}/target/classes/activemq/server0
                   
                
                
@@ -111,7 +111,7 @@
                      stop
                   
                   
-                     ${basedir}/target/classes/hornetq/server1
+                     ${basedir}/target/classes/activemq/server1
                   
                
             
diff --git a/examples/jms/openwire/pom.xml b/examples/jms/openwire/pom.xml
index be59ad3144..b2ba57520f 100644
--- a/examples/jms/openwire/pom.xml
+++ b/examples/jms/openwire/pom.xml
@@ -116,7 +116,7 @@
             
             
                false
-               ${basedir}/target/classes/hornetq/server0
+               ${basedir}/target/classes/activemq/server0
             
          
       
diff --git a/examples/jms/paging/pom.xml b/examples/jms/paging/pom.xml
index beab47cef1..d635df56dd 100644
--- a/examples/jms/paging/pom.xml
+++ b/examples/jms/paging/pom.xml
@@ -107,7 +107,7 @@
             
             
                false
-               ${basedir}/target/classes/hornetq/server0
+               ${basedir}/target/classes/activemq/server0
             
          
       
diff --git a/examples/jms/paging/readme.html b/examples/jms/paging/readme.html
index 65c6c52fb9..ef9c838c6c 100644
--- a/examples/jms/paging/readme.html
+++ b/examples/jms/paging/readme.html
@@ -9,7 +9,7 @@
      
      Paging Example
      
 
      
      This example shows how ActiveMQ would avoid running out of memory resources by paging messages.
      
-     
      A maxSize can be specified per Destination via the destinations settings configuration file (hornetq-configuration.xml).
      
+     
      A maxSize can be specified per Destination via the destinations settings configuration file (activemq-configuration.xml).
      
      
      When messages routed to an address exceed the specified maxSize the server will begin to write messages to the file
      system, this is called paging. This will continue to occur until messages have been delivered to consumers and subsequently
      acknowledged freeing up memory. Messages will then be read from the file system , i.e. depaged, and routed as normal. 
      
@@ -69,7 +69,7 @@
          
      
          
 
-         
    5. Send only 20 messages to the Queue. This will be already enough for pagingQueue. Look at ./paging/config/hornetq-queues.xml for the config.
      6. 
+         
    6. Send only 20 messages to the Queue. This will be already enough for pagingQueue. Look at ./paging/config/activemq-queues.xml for the config.
      7. 
          
      
          for (int i = 0; i < 20; i++)
          {
diff --git a/examples/jms/perf/pom.xml b/examples/jms/perf/pom.xml
index 6fcd9fb52b..3416cf6216 100644
--- a/examples/jms/perf/pom.xml
+++ b/examples/jms/perf/pom.xml
@@ -68,7 +68,7 @@
                         
                         
                            true
-                           ${basedir}/target/classes/hornetq/server0
+                           ${basedir}/target/classes/activemq/server0
                            
                               
                                  build.directory
@@ -80,7 +80,7 @@
                   
                   
                      false
-                     ${basedir}/target/classes/hornetq/server0
+                     ${basedir}/target/classes/activemq/server0
                   
                   
                      
diff --git a/examples/jms/perf/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/perf/src/main/resources/hornetq/server0/activemq-configuration.xml
index 4eb3215736..ee93080305 100644
--- a/examples/jms/perf/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ b/examples/jms/perf/src/main/resources/hornetq/server0/activemq-configuration.xml
@@ -1,6 +1,6 @@
 
+            xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
 
    
       
diff --git a/examples/jms/perf/src/main/resources/hornetq/server0/hornetq-configuration-messaging-lab.xml b/examples/jms/perf/src/main/resources/hornetq/server0/hornetq-configuration-messaging-lab.xml
index 9b77211d3a..d00ad0af13 100644
--- a/examples/jms/perf/src/main/resources/hornetq/server0/hornetq-configuration-messaging-lab.xml
+++ b/examples/jms/perf/src/main/resources/hornetq/server0/hornetq-configuration-messaging-lab.xml
@@ -18,10 +18,10 @@
    
    true
 
-   /hornetq-data/large-messages
-   /hornetq-data/bindings
-   /hornetq-data/journal
-   /hornetq-data/paging 
+   /activemq-data/large-messages
+   /activemq-data/bindings
+   /activemq-data/journal
+   /activemq-data/paging
    
    
 	   
diff --git a/examples/jms/pre-acknowledge/pom.xml b/examples/jms/pre-acknowledge/pom.xml
index 2b3212e547..35112bd144 100644
--- a/examples/jms/pre-acknowledge/pom.xml
+++ b/examples/jms/pre-acknowledge/pom.xml
@@ -107,7 +107,7 @@
             
             
                false
-               ${basedir}/target/classes/hornetq/server0
+               ${basedir}/target/classes/activemq/server0
             
          
       
diff --git a/examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/activemq-configuration.xml
index 23fb7eacfe..d661c7cb16 100644
--- a/examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ b/examples/jms/pre-acknowledge/src/main/resources/hornetq/server0/activemq-configuration.xml
@@ -38,7 +38,7 @@
          
       
 
-      
+      
          
       
    
diff --git a/examples/jms/producer-rate-limit/pom.xml b/examples/jms/producer-rate-limit/pom.xml
index e45d34c470..35dcd665ca 100644
--- a/examples/jms/producer-rate-limit/pom.xml
+++ b/examples/jms/producer-rate-limit/pom.xml
@@ -107,7 +107,7 @@
             
             
                false
-               ${basedir}/target/classes/hornetq/server0
+               ${basedir}/target/classes/activemq/server0
             
          
       
diff --git a/examples/jms/producer-rate-limit/readme.html b/examples/jms/producer-rate-limit/readme.html
index 5871a2e889..e1f914dc99 100644
--- a/examples/jms/producer-rate-limit/readme.html
+++ b/examples/jms/producer-rate-limit/readme.html
@@ -9,11 +9,11 @@
      
      JMS Message Producer Rate Limiting
      
 
      
      With ActiveMQ you can specify a maximum send rate at which a JMS MessageProducer will send messages.
-     This can be specified when creating or deploying the connection factory. See hornetq-jms.xml
      
+     This can be specified when creating or deploying the connection factory. See activemq-jms.xml
      
      
      If this value is specified then ActiveMQ will ensure that messages are never produced at a rate higher than
      specified. This is a form of producer throttling.
           
      
      Example step-by-step
      
-     
      In this example we specify a producer-max-rate of 50 messages per second in the hornetq-jms.xml
+     
      In this example we specify a producer-max-rate of 50 messages per second in the activemq-jms.xml
      file when deploying the connection factory:
      
      
            
diff --git a/examples/jms/proton-cpp/pom.xml b/examples/jms/proton-cpp/pom.xml
index e6826630cf..801d97de67 100644
--- a/examples/jms/proton-cpp/pom.xml
+++ b/examples/jms/proton-cpp/pom.xml
@@ -69,7 +69,7 @@
                         
                         
                            true
-                           ${basedir}/target/classes/hornetq/server0
+                           ${basedir}/target/classes/activemq/server0
                            
                               
                                  build.directory
@@ -81,7 +81,7 @@
                   
                   
                      false
-                     ${basedir}/target/classes/hornetq/server0
+                     ${basedir}/target/classes/activemq/server0
                   
                   
                      
diff --git a/examples/jms/proton-cpp/readme.html b/examples/jms/proton-cpp/readme.html
index caff310a50..fc92461c0b 100644
--- a/examples/jms/proton-cpp/readme.html
+++ b/examples/jms/proton-cpp/readme.html
@@ -9,7 +9,7 @@
 
      AMQP CPP example
      
 
 
      ActiveMQ is a multi protocol broker. It will inspect the initial handshake of clients to determine what protocol to use.
      
-
      All you need to do is to connect a client into hornetq's configured port and you should be able connect.
      
+
      All you need to do is to connect a client into activemq's configured port and you should be able connect.
      
 
      To run this example simply run the command mvn verify, execute the compile.sh script and start the executable called ./hello
      
 
           # first make sure you have the dependencies you need to compile and run the client
diff --git a/examples/jms/proton-j/pom.xml b/examples/jms/proton-j/pom.xml
index 8c6749cd7b..7f2fad59ec 100644
--- a/examples/jms/proton-j/pom.xml
+++ b/examples/jms/proton-j/pom.xml
@@ -113,7 +113,7 @@
             
             
                false
-               ${basedir}/target/classes/hornetq/server0
+               ${basedir}/target/classes/activemq/server0
             
          
       
diff --git a/examples/jms/proton-j/readme.html b/examples/jms/proton-j/readme.html
index aabd71e870..5713f485ba 100644
--- a/examples/jms/proton-j/readme.html
+++ b/examples/jms/proton-j/readme.html
@@ -9,7 +9,7 @@
 
      Proton qpid java example
      
 
 <
      ActiveMQ is a multi protocol broker. It will inspect the initial handshake of clients to determine what protocol to use.
      
-
      All you need to do is to connect a client into hornetq's configured port and you should be able connect.
      
+
      All you need to do is to connect a client into activemq's configured port and you should be able connect.
      
 
      To run this example simply run the command mvn verify, execute the compile.sh script and start the executable called ./hello
      
 
 
      You don't need to do anything special to configure the ActiveMQ server to accept AMQP clients. 
      
diff --git a/examples/jms/proton-ruby/pom.xml b/examples/jms/proton-ruby/pom.xml
index 52d5d3e963..d3a2e7a88f 100644
--- a/examples/jms/proton-ruby/pom.xml
+++ b/examples/jms/proton-ruby/pom.xml
@@ -91,7 +91,7 @@
             
             
                false
-               ${basedir}/target/classes/hornetq/server0
+               ${basedir}/target/classes/activemq/server0
             
          
       
diff --git a/examples/jms/queue-message-redistribution/pom.xml b/examples/jms/queue-message-redistribution/pom.xml
index 9aeabc9182..a8868e8fc8 100644
--- a/examples/jms/queue-message-redistribution/pom.xml
+++ b/examples/jms/queue-message-redistribution/pom.xml
@@ -36,7 +36,7 @@
                      start
                   
                   
-                     ${basedir}/target/classes/hornetq/server0
+                     ${basedir}/target/classes/activemq/server0
                      
                         
                            build.directory
@@ -57,7 +57,7 @@
                   
                      1199
                      1198
-                     ${basedir}/target/classes/hornetq/server1
+                     ${basedir}/target/classes/activemq/server1
                      true
                      
                         
@@ -85,7 +85,7 @@
                      
                         
                            exampleConfigDir
-                           ${basedir}/target/classes/hornetq
+                           ${basedir}/target/classes/activemq
                         
                      
                   
@@ -96,7 +96,7 @@
                      stop
                   
                   
-                     ${basedir}/target/classes/hornetq/server0
+                     ${basedir}/target/classes/activemq/server0
                   
                
                
@@ -105,7 +105,7 @@
                      stop
                   
                   
-                     ${basedir}/target/classes/hornetq/server1
+                     ${basedir}/target/classes/activemq/server1
                   
                
             
diff --git a/examples/jms/queue-message-redistribution/readme.html b/examples/jms/queue-message-redistribution/readme.html
index c5c91569c1..c93395da5d 100644
--- a/examples/jms/queue-message-redistribution/readme.html
+++ b/examples/jms/queue-message-redistribution/readme.html
@@ -18,12 +18,12 @@
      with no consumers, to nodes where there are consumers. If the consumers have JMS selectors set on them, then they
      will only be redistributed to nodes with consumers whose selectors match.
      
      
      By default, message redistribution is disabled, but can be enabled by specifying some AddressSettings configuration
-     in either hornetq-queues.xml or hornetq-configuration.xml
      
+     in either activemq-queues.xml or activemq-configuration.xml
      
      
      Setting redistribution-delay to 0 will cause redistribution to occur immediately
      once there are no more matching consumers on a particular queue instance. Setting it to a positive value > 0 specifies
      a delay in milliseconds before attempting to redistribute. The delay is useful in the case that another consumer is
      likely to be created on the queue, to avoid unnecessary redistribution.
           
-     
      Here's the relevant snippet from the hornetq-queues.xml configuration, which tells the server
+     
      Here's the relevant snippet from the activemq-queues.xml configuration, which tells the server
      to use a redistribution delay of 0 on any jms queues, i.e. any queues whose name starts with
      jms.
      
      
      diff --git a/examples/jms/queue-requestor/pom.xml b/examples/jms/queue-requestor/pom.xml
index effabbda18..f9e6eac5f8 100644
--- a/examples/jms/queue-requestor/pom.xml
+++ b/examples/jms/queue-requestor/pom.xml
@@ -107,7 +107,7 @@
             
             
                false
-               ${basedir}/target/classes/hornetq/server0
+               ${basedir}/target/classes/activemq/server0
             
          
       
diff --git a/examples/jms/queue-selector/pom.xml b/examples/jms/queue-selector/pom.xml
index f19478a842..0cc242095a 100644
--- a/examples/jms/queue-selector/pom.xml
+++ b/examples/jms/queue-selector/pom.xml
@@ -107,7 +107,7 @@
             
             
                false
-               ${basedir}/target/classes/hornetq/server0
+               ${basedir}/target/classes/activemq/server0
             
          
       
diff --git a/examples/jms/queue/pom.xml b/examples/jms/queue/pom.xml
index 24caa0a9c4..97797a0a5f 100644
--- a/examples/jms/queue/pom.xml
+++ b/examples/jms/queue/pom.xml
@@ -107,7 +107,7 @@
             
             
                false
-               ${basedir}/target/classes/hornetq/server0
+               ${basedir}/target/classes/activemq/server0
             
          
       
diff --git a/examples/jms/reattach-node/pom.xml b/examples/jms/reattach-node/pom.xml
index c7dbb522c4..f7d955ebc2 100644
--- a/examples/jms/reattach-node/pom.xml
+++ b/examples/jms/reattach-node/pom.xml
@@ -36,7 +36,7 @@
                      start
                   
                   
-                     ${basedir}/target/classes/hornetq/server0
+                     ${basedir}/target/classes/activemq/server0
                   
                
                
@@ -52,7 +52,7 @@
                      
                         
                            exampleConfigDir
-                           ${basedir}/target/classes/hornetq
+                           ${basedir}/target/classes/activemq
                         
                      
                   
@@ -63,7 +63,7 @@
                      stop
                   
                   
-                     ${basedir}/target/classes/hornetq/server0
+                     ${basedir}/target/classes/activemq/server0
                   
                
             
diff --git a/examples/jms/reattach-node/readme.html b/examples/jms/reattach-node/readme.html
index f3407b09de..02797f3c98 100644
--- a/examples/jms/reattach-node/readme.html
+++ b/examples/jms/reattach-node/readme.html
@@ -25,7 +25,7 @@
      
      We then wait a few seconds, then restart the acceptor. The client reattaches and the session resumes
      as if nothing happened.
      
      
      The JMS Connection Factory is configured to reattach automatically by specifying the various reconnect
-     related attributes in the hornetq-jms.xml file.
      
+     related attributes in the activemq-jms.xml file.
      
 
      
      For more details on how to configure this and for clustering in general
      please consult the ActiveMQ user manual.
      
diff --git a/examples/jms/reattach-node/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/reattach-node/src/main/resources/hornetq/server0/activemq-configuration.xml
index 0dad5583c7..a09074878c 100644
--- a/examples/jms/reattach-node/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ b/examples/jms/reattach-node/src/main/resources/hornetq/server0/activemq-configuration.xml
@@ -55,7 +55,7 @@
          
       
 
-      
+      
          
          
          
diff --git a/examples/jms/replicated-failback-static/pom.xml b/examples/jms/replicated-failback-static/pom.xml
index 92c9f70e17..6617de197d 100644
--- a/examples/jms/replicated-failback-static/pom.xml
+++ b/examples/jms/replicated-failback-static/pom.xml
@@ -36,7 +36,7 @@
                      start
                   
                   
-                     ${basedir}/target/classes/hornetq/server0
+                     ${basedir}/target/classes/activemq/server0
                      
                         
                            build.directory
@@ -57,7 +57,7 @@
                   
                      1199
                      1198
-                     ${basedir}/target/classes/hornetq/server1
+                     ${basedir}/target/classes/activemq/server1
                      true
                      
                         
@@ -85,7 +85,7 @@
                      
                         
                            exampleConfigDir
-                           ${basedir}/target/classes/hornetq
+                           ${basedir}/target/classes/activemq
                         
                      
                   
@@ -96,7 +96,7 @@
                      stop
                   
                   
-                     ${basedir}/target/classes/hornetq/server0
+                     ${basedir}/target/classes/activemq/server0
                   
                
                
@@ -105,7 +105,7 @@
                      stop
                   
                   
-                     ${basedir}/target/classes/hornetq/server1
+                     ${basedir}/target/classes/activemq/server1
                   
                
             
diff --git a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/activemq-configuration.xml
index be10b3dc44..482f52a5f3 100644
--- a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ b/examples/jms/replicated-failback-static/src/main/resources/hornetq/server0/activemq-configuration.xml
@@ -1,6 +1,6 @@
 
+         xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
 
    ${build.directory}/server0/data/messaging/bindings
 
diff --git a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/activemq-configuration.xml b/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/activemq-configuration.xml
index 8efc20aef3..4f698014c6 100644
--- a/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/activemq-configuration.xml
+++ b/examples/jms/replicated-failback-static/src/main/resources/hornetq/server1/activemq-configuration.xml
@@ -1,6 +1,6 @@
 
+         xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
 
    ${build.directory}/server1/data/messaging/bindings
 
diff --git a/examples/jms/replicated-failback/pom.xml b/examples/jms/replicated-failback/pom.xml
index 930019aab9..570e4d8fa1 100644
--- a/examples/jms/replicated-failback/pom.xml
+++ b/examples/jms/replicated-failback/pom.xml
@@ -36,7 +36,7 @@
                      start
                   
                   
-                     ${basedir}/target/classes/hornetq/server0
+                     ${basedir}/target/classes/activemq/server0
                      
                         
                            build.directory
@@ -57,7 +57,7 @@
                   
                      1199
                      1198
-                     ${basedir}/target/classes/hornetq/server1
+                     ${basedir}/target/classes/activemq/server1
                      true
                      
                         
@@ -85,7 +85,7 @@
                      
                         
                            exampleConfigDir
-                           ${basedir}/target/classes/hornetq
+                           ${basedir}/target/classes/activemq
                         
                      
                   
@@ -96,7 +96,7 @@
                      stop
                   
                   
-                     ${basedir}/target/classes/hornetq/server0
+                     ${basedir}/target/classes/activemq/server0
                   
                
                
@@ -105,7 +105,7 @@
                      stop
                   
                   
-                     ${basedir}/target/classes/hornetq/server1
+                     ${basedir}/target/classes/activemq/server1
                   
                
             
diff --git a/examples/jms/replicated-failback/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/replicated-failback/src/main/resources/hornetq/server0/activemq-configuration.xml
index dc63477d76..fd176b609e 100644
--- a/examples/jms/replicated-failback/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ b/examples/jms/replicated-failback/src/main/resources/hornetq/server0/activemq-configuration.xml
@@ -1,6 +1,6 @@
 
+         xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
 
    ${build.directory}/server0/data/messaging/bindings
 
diff --git a/examples/jms/replicated-failback/src/main/resources/hornetq/server1/activemq-configuration.xml b/examples/jms/replicated-failback/src/main/resources/hornetq/server1/activemq-configuration.xml
index cb37bc9c1d..6e9d929d22 100644
--- a/examples/jms/replicated-failback/src/main/resources/hornetq/server1/activemq-configuration.xml
+++ b/examples/jms/replicated-failback/src/main/resources/hornetq/server1/activemq-configuration.xml
@@ -1,6 +1,6 @@
 
+         xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
 
    ${build.directory}/server1/data/messaging/bindings
 
diff --git a/examples/jms/replicated-multiple-failover/pom.xml b/examples/jms/replicated-multiple-failover/pom.xml
index 2a7748a0b8..e6c503a83d 100644
--- a/examples/jms/replicated-multiple-failover/pom.xml
+++ b/examples/jms/replicated-multiple-failover/pom.xml
@@ -36,7 +36,7 @@
                      start
                   
                   
-                     ${basedir}/target/classes/hornetq/server0
+                     ${basedir}/target/classes/activemq/server0
                      
                         
                            build.directory
@@ -57,7 +57,7 @@
                   
                      1199
                      1198
-                     ${basedir}/target/classes/hornetq/server1
+                     ${basedir}/target/classes/activemq/server1
                      true
                      
                         
@@ -79,7 +79,7 @@
                   
                      1299
                      1298
-                     ${basedir}/target/classes/hornetq/server2
+                     ${basedir}/target/classes/activemq/server2
                      true
                      
                         
@@ -108,7 +108,7 @@
                      
                         
                            exampleConfigDir
-                           ${basedir}/target/classes/hornetq
+                           ${basedir}/target/classes/activemq
                         
                      
                   
@@ -119,7 +119,7 @@
                      stop
                   
                   
-                     ${basedir}/target/classes/hornetq/server0
+                     ${basedir}/target/classes/activemq/server0
                   
                
                
@@ -128,7 +128,7 @@
                      stop
                   
                   
-                     ${basedir}/target/classes/hornetq/server1
+                     ${basedir}/target/classes/activemq/server1
                   
                
                
@@ -137,7 +137,7 @@
                      stop
                   
                   
-                     ${basedir}/target/classes/hornetq/server2
+                     ${basedir}/target/classes/activemq/server2
                   
                
             
diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
index dd2ed3f990..437b70ecd3 100644
--- a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
@@ -1,6 +1,6 @@
 
+         xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
 
    ${build.directory}/server0/data/messaging/bindings
 
diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server1/activemq-configuration.xml b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
index 835dc389a5..b9fb02e20e 100644
--- a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
+++ b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
@@ -1,6 +1,6 @@
 
+         xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
 
    ${build.directory}/server1/data/messaging/bindings
 
diff --git a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server2/activemq-configuration.xml b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server2/activemq-configuration.xml
index 5fa9ed2e62..b25cb75d00 100644
--- a/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server2/activemq-configuration.xml
+++ b/examples/jms/replicated-multiple-failover/src/main/resources/hornetq/server2/activemq-configuration.xml
@@ -1,6 +1,6 @@
 
+         xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
 
    ${build.directory}/server2/data/messaging/bindings
 
diff --git a/examples/jms/replicated-transaction-failover/pom.xml b/examples/jms/replicated-transaction-failover/pom.xml
index 5cadc10fc9..02f9ea87c6 100644
--- a/examples/jms/replicated-transaction-failover/pom.xml
+++ b/examples/jms/replicated-transaction-failover/pom.xml
@@ -36,7 +36,7 @@
                      start
                   
                   
-                     ${basedir}/target/classes/hornetq/server0
+                     ${basedir}/target/classes/activemq/server0
                      
                         
                            build.directory
@@ -57,7 +57,7 @@
                   
                      1199
                      1198
-                     ${basedir}/target/classes/hornetq/server1
+                     ${basedir}/target/classes/activemq/server1
                      
                         
                            build.directory
@@ -85,7 +85,7 @@
                      
                         
                            exampleConfigDir
-                           ${basedir}/target/classes/hornetq
+                           ${basedir}/target/classes/activemq
                         
                      
                   
@@ -96,7 +96,7 @@
                      stop
                   
                   
-                     ${basedir}/target/classes/hornetq/server0
+                     ${basedir}/target/classes/activemq/server0
                   
                
                
@@ -105,7 +105,7 @@
                      stop
                   
                   
-                     ${basedir}/target/classes/hornetq/server1
+                     ${basedir}/target/classes/activemq/server1
                   
                
             
diff --git a/examples/jms/request-reply/pom.xml b/examples/jms/request-reply/pom.xml
index 56275124ae..3c50986132 100644
--- a/examples/jms/request-reply/pom.xml
+++ b/examples/jms/request-reply/pom.xml
@@ -107,7 +107,7 @@
             
             
                false
-               ${basedir}/target/classes/hornetq/server0
+               ${basedir}/target/classes/activemq/server0
             
          
       
diff --git a/examples/jms/rest/dup-send/README.txt b/examples/jms/rest/dup-send/README.txt
index 9d267d21e9..da8eb48333 100644
--- a/examples/jms/rest/dup-send/README.txt
+++ b/examples/jms/rest/dup-send/README.txt
@@ -5,7 +5,7 @@ with earlier or later versions of Maven.
 
 This is an example of using duplicate detection for posted messages.  The first file to look at is:
 
-src/main/resource/hornetq-rest.xml
+src/main/resource/activemq-rest.xml
 
 You see that by default, all messages posted to msg-create URLs will follow the duplicate detection pattern talked
 about in the documentation.
diff --git a/examples/jms/rest/dup-send/src/main/webapp/WEB-INF/web.xml b/examples/jms/rest/dup-send/src/main/webapp/WEB-INF/web.xml
index 49a8436bee..c9afc2f7f3 100644
--- a/examples/jms/rest/dup-send/src/main/webapp/WEB-INF/web.xml
+++ b/examples/jms/rest/dup-send/src/main/webapp/WEB-INF/web.xml
@@ -5,7 +5,7 @@
 
     
         rest.messaging.config.file
-        hornetq-rest.xml
+        activemq-rest.xml
     
 
 
diff --git a/examples/jms/rest/jms-to-rest/receiveOrder.py b/examples/jms/rest/jms-to-rest/receiveOrder.py
index f853e079a2..2117f1b365 100644
--- a/examples/jms/rest/jms-to-rest/receiveOrder.py
+++ b/examples/jms/rest/jms-to-rest/receiveOrder.py
@@ -34,7 +34,7 @@ try:
             raise Exception('failed')
 finally:
     if session != None:
-        print "deleting hornetq session..."
+        print "deleting activemq session..."
         createParsed = urlparse.urlparse(session)
         conn = httplib.HTTPConnection(createParsed.netloc)
         conn.request("DELETE", createParsed.path)
diff --git a/examples/jms/scale-down/pom.xml b/examples/jms/scale-down/pom.xml
index 676b310c9d..4264551707 100644
--- a/examples/jms/scale-down/pom.xml
+++ b/examples/jms/scale-down/pom.xml
@@ -36,7 +36,7 @@
                      start
                   
                   
-                     ${basedir}/target/classes/hornetq/server0
+                     ${basedir}/target/classes/activemq/server0
                      
                         
                            udp-address
@@ -53,7 +53,7 @@
                   
                      1199
                      1198
-                     ${basedir}/target/classes/hornetq/server1
+                     ${basedir}/target/classes/activemq/server1
                      true
                      
                         
@@ -77,7 +77,7 @@
                       
                           
                               exampleConfigDir
-                              ${basedir}/target/classes/hornetq
+                              ${basedir}/target/classes/activemq
                           
                       
                   
@@ -88,7 +88,7 @@
                      stop
                   
                   
-                     ${basedir}/target/classes/hornetq/server0
+                     ${basedir}/target/classes/activemq/server0
                   
                
                
@@ -97,7 +97,7 @@
                      stop
                   
                   
-                     ${basedir}/target/classes/hornetq/server1
+                     ${basedir}/target/classes/activemq/server1
                   
                
             
diff --git a/examples/jms/scale-down/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/scale-down/src/main/resources/hornetq/server0/activemq-configuration.xml
index e63f3b23b5..784a5bff73 100644
--- a/examples/jms/scale-down/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ b/examples/jms/scale-down/src/main/resources/hornetq/server0/activemq-configuration.xml
@@ -76,7 +76,7 @@
          
          
       
-      
+      
          
          
          
@@ -85,7 +85,7 @@
          
          
       
-      
+      
          
          
          
diff --git a/examples/jms/scheduled-message/pom.xml b/examples/jms/scheduled-message/pom.xml
index 6e24f1a0b9..ba480a8ac7 100644
--- a/examples/jms/scheduled-message/pom.xml
+++ b/examples/jms/scheduled-message/pom.xml
@@ -107,7 +107,7 @@
             
             
                false
-               ${basedir}/target/classes/hornetq/server0
+               ${basedir}/target/classes/activemq/server0
             
          
       
diff --git a/examples/jms/security/pom.xml b/examples/jms/security/pom.xml
index 127a811923..d943938ae3 100644
--- a/examples/jms/security/pom.xml
+++ b/examples/jms/security/pom.xml
@@ -107,7 +107,7 @@
             
             
                false
-               ${basedir}/target/classes/hornetq/server0
+               ${basedir}/target/classes/activemq/server0
             
          
       
diff --git a/examples/jms/security/readme.html b/examples/jms/security/readme.html
index a55096f97d..bcd6100b5c 100644
--- a/examples/jms/security/readme.html
+++ b/examples/jms/security/readme.html
@@ -23,12 +23,12 @@
      
      This example demonstrates how to configure users/roles, how to configure topics with proper permissions using wild-card
      expressions, and how they take effects in a simple program. 
      
      
-     
      First we need to configure users with roles. Users and Roles are configured in hornetq-users.xml. This example has four users
+     
      First we need to configure users with roles. Users and Roles are configured in activemq-users.xml. This example has four users
      configured as below 
      
      
      
            
-		   <user name="bill" password="hornetq">
+		   <user name="bill" password="activemq">
 		      <role name="user"/>
 		   </user>
 		  
@@ -58,7 +58,7 @@
      
      
      User name and password consists of a valid account that can be used to establish connections to a ActiveMQ server, while 
      roles are used in controlling the access privileges against ActiveMQ topics and queues. You can achieve this control by
-     configuring proper permissions in hornetq-configuration.xml, like the following
+     configuring proper permissions in activemq-configuration.xml, like the following
      
      
      
      
       <security-settings>
@@ -108,8 +108,8 @@
      jms.topic.news.europe.#' wild-cards, and topic 'news.us.usTopic' matches 'jms.topic.news.us.#'.
      
      
      
      With ActiveMQ, the security manager is also configurable. You can use JAASSecurityManager or JBossASSecurityManager based on you need. Please
-     check out the hornetq-beans.xml for how to do. In this example we just use the basic ActiveMQSecurityManagerImpl which reads users/roles/passwords from the xml
-     file hornetq-users.xml.
+     check out the activemq-beans.xml for how to do. In this example we just use the basic ActiveMQSecurityManagerImpl which reads users/roles/passwords from the xml
+     file activemq-users.xml.
 
 
      
      Example step-by-step
      
@@ -173,7 +173,7 @@
         
    7. Bill makes a good connection.
      8. 
         
                 
-           billConnection = createConnection("bill", "hornetq", cf);
+           billConnection = createConnection("bill", "activemq", cf);
            billConnection.start();
           
        
      
diff --git a/examples/jms/security/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/security/src/main/resources/hornetq/server0/activemq-users.xml
index ab67a02b6b..651a44b896 100644
--- a/examples/jms/security/src/main/resources/hornetq/server0/activemq-users.xml
+++ b/examples/jms/security/src/main/resources/hornetq/server0/activemq-users.xml
@@ -1,7 +1,7 @@
 
    
-   
+   
       
    
   
diff --git a/examples/jms/send-acknowledgements/pom.xml b/examples/jms/send-acknowledgements/pom.xml
index cfc41c93cf..07485c6a12 100644
--- a/examples/jms/send-acknowledgements/pom.xml
+++ b/examples/jms/send-acknowledgements/pom.xml
@@ -107,7 +107,7 @@
             
             
                false
-               ${basedir}/target/classes/hornetq/server0
+               ${basedir}/target/classes/activemq/server0
             
          
       
diff --git a/examples/jms/spring-integration/pom.xml b/examples/jms/spring-integration/pom.xml
index eac214a5c9..b0ec32c38a 100644
--- a/examples/jms/spring-integration/pom.xml
+++ b/examples/jms/spring-integration/pom.xml
@@ -96,7 +96,7 @@
             
             
                false
-               ${basedir}/target/classes/hornetq/server0
+               ${basedir}/target/classes/activemq/server0
             
          
       
diff --git a/examples/jms/ssl-enabled/pom.xml b/examples/jms/ssl-enabled/pom.xml
index d3b2095e6f..8ff5d643ab 100644
--- a/examples/jms/ssl-enabled/pom.xml
+++ b/examples/jms/ssl-enabled/pom.xml
@@ -107,7 +107,7 @@
             
             
                false
-               ${basedir}/target/classes/hornetq/server0
+               ${basedir}/target/classes/activemq/server0
             
          
       
diff --git a/examples/jms/ssl-enabled/readme.html b/examples/jms/ssl-enabled/readme.html
index d128ce6dc9..4b463e5c77 100644
--- a/examples/jms/ssl-enabled/readme.html
+++ b/examples/jms/ssl-enabled/readme.html
@@ -20,30 +20,30 @@
 
       <connector name="netty-ssl-connector">
          <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
-         <param key="hornetq.remoting.netty.host" value="localhost" type="String"/>
-         <param key="hornetq.remoting.netty.port" value="5500" type="Integer"/>	                     
-         <param key="hornetq.remoting.netty.ssl-enabled" value="true" type="Boolean"/>
-         <param key="hornetq.remoting.netty.trust-store-path" value="server0/hornetq.example.truststore" type="String"/>
-         <param key="hornetq.remoting.netty.trust-store-password" value="hornetqexample" type="String"/>
+         <param key="activemq.remoting.netty.host" value="localhost" type="String"/>
+         <param key="activemq.remoting.netty.port" value="5500" type="Integer"/>
+         <param key="activemq.remoting.netty.ssl-enabled" value="true" type="Boolean"/>
+         <param key="activemq.remoting.netty.trust-store-path" value="server0/activemq.example.truststore" type="String"/>
+         <param key="activemq.remoting.netty.trust-store-password" value="hornetqexample" type="String"/>
       </connector>
 
       <!-- Acceptor -->
 
       <acceptor name="netty-ssl-acceptor">
          <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
-         <param key="hornetq.remoting.netty.host" value="localhost" type="String"/>
-         <param key="hornetq.remoting.netty.port" value="5500" type="Integer"/>	                     
-         <param key="hornetq.remoting.netty.ssl-enabled" value="true" type="Boolean"/>
-         <param key="hornetq.remoting.netty.key-store-path" value="hornetq.example.keystore" type="String"/>
-         <param key="hornetq.remoting.netty.key-store-password" value="hornetqexample" type="String"/>
+         <param key="activemq.remoting.netty.host" value="localhost" type="String"/>
+         <param key="activemq.remoting.netty.port" value="5500" type="Integer"/>
+         <param key="activemq.remoting.netty.ssl-enabled" value="true" type="Boolean"/>
+         <param key="activemq.remoting.netty.key-store-path" value="activemq.example.keystore" type="String"/>
+         <param key="activemq.remoting.netty.key-store-password" value="hornetqexample" type="String"/>
       </acceptor>
 
                  
         
      
      
      
      
-     
      In the configuration, the hornetq.example.keystore is the key store file holding the server's certificate. The hornetq.example.truststore
-     is the file holding the certificates which the client trusts (i.e. the server's certificate exported from hornetq.example.keystore). They are pre-generated for illustration purpose1.
      
+     
      In the configuration, the activemq.example.keystore is the key store file holding the server's certificate. The activemq.example.truststore
+     is the file holding the certificates which the client trusts (i.e. the server's certificate exported from activemq.example.keystore). They are pre-generated for illustration purpose1.
      
      
 
      
      Example step-by-step
      
@@ -127,9 +127,9 @@
      
        
          
      1. The stores were generating using the following commands ↩:
              
          
-                 
        • create the keystore: keytool -genkey -keystore hornetq.example.keystore -storepass hornetqexample
          • 
-                 
        • export the certificate: keytool -export -keystore hornetq.example.keystore -file hornetq.cer
          • 
-                 
        • create the truststore: keytool -import -file hornetq.cer -keystore hornetq.example.truststore -storepass hornetqexample
          • 
+                 
        • create the keystore: keytool -genkey -keystore activemq.example.keystore -storepass hornetqexample
          • 
+                 
        • export the certificate: keytool -export -keystore activemq.example.keystore -file activemq.cer
          • 
+                 
        • create the truststore: keytool -import -file activemq.cer -keystore activemq.example.truststore -storepass hornetqexample
          • 
             
        
          
        2. 
     
      
diff --git a/examples/jms/ssl-enabled/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/ssl-enabled/src/main/resources/hornetq/server0/activemq-configuration.xml
index 279d981e7b..8c8c6c22ee 100644
--- a/examples/jms/ssl-enabled/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ b/examples/jms/ssl-enabled/src/main/resources/hornetq/server0/activemq-configuration.xml
@@ -19,7 +19,7 @@
          
          
          
-         
+         
          
       
    
@@ -31,7 +31,7 @@
          
          
          
-         
+         
          
       
    
diff --git a/examples/jms/static-selector-jms/pom.xml b/examples/jms/static-selector-jms/pom.xml
index 0742838626..f687e768f7 100644
--- a/examples/jms/static-selector-jms/pom.xml
+++ b/examples/jms/static-selector-jms/pom.xml
@@ -107,7 +107,7 @@
             
             
                false
-               ${basedir}/target/classes/hornetq/server0
+               ${basedir}/target/classes/activemq/server0
             
          
       
diff --git a/examples/jms/static-selector-jms/readme.html b/examples/jms/static-selector-jms/readme.html
index efb6310e88..c16a9b5606 100644
--- a/examples/jms/static-selector-jms/readme.html
+++ b/examples/jms/static-selector-jms/readme.html
@@ -12,7 +12,7 @@
      
      
      Static message selectors are ActiveMQ's extension to message selectors as defined in JMS spec 1.1.
      Rather than specifying the selector in the application code, static message selectors are defined in one of 
-     ActiveMQ's configuration files, hornetq-jms.xml, as an element called 'selector' inside each JMS queue
+     ActiveMQ's configuration files, activemq-jms.xml, as an element called 'selector' inside each JMS queue
      definition:
      
      
      
      
diff --git a/examples/jms/static-selector/pom.xml b/examples/jms/static-selector/pom.xml
index fa21cf0721..b8019cf7e4 100644
--- a/examples/jms/static-selector/pom.xml
+++ b/examples/jms/static-selector/pom.xml
@@ -107,7 +107,7 @@
             
             
                false
-               ${basedir}/target/classes/hornetq/server0
+               ${basedir}/target/classes/activemq/server0
             
          
       
diff --git a/examples/jms/static-selector/readme.html b/examples/jms/static-selector/readme.html
index b4846df58b..bf656560e6 100644
--- a/examples/jms/static-selector/readme.html
+++ b/examples/jms/static-selector/readme.html
@@ -14,7 +14,7 @@
      
      
      Static message selectors are ActiveMQ's extension to message selectors as defined in JMS spec 1.1.
      Rather than specifying the selector in the application code, static message selectors are defined in one of 
-     ActiveMQ's configuration files, hornetq-configuration.xml, as an element called 'filter' inside each queue
+     ActiveMQ's configuration files, activemq-configuration.xml, as an element called 'filter' inside each queue
      definition, like
      
      
      
      
diff --git a/examples/jms/stomp-websockets/pom.xml b/examples/jms/stomp-websockets/pom.xml
index b88adf99d3..cae3206e5c 100644
--- a/examples/jms/stomp-websockets/pom.xml
+++ b/examples/jms/stomp-websockets/pom.xml
@@ -36,7 +36,7 @@
                      start
                   
                   
-                     ${basedir}/target/classes/hornetq/server0
+                     ${basedir}/target/classes/activemq/server0
                   
                
                
@@ -52,7 +52,7 @@
                      
                         
                            exampleConfigDir
-                           ${basedir}/target/classes/hornetq
+                           ${basedir}/target/classes/activemq
                         
                      
                   
@@ -63,7 +63,7 @@
                      stop
                   
                   
-                     ${basedir}/target/classes/hornetq/server0
+                     ${basedir}/target/classes/activemq/server0
                   
                
             
diff --git a/examples/jms/stomp/pom.xml b/examples/jms/stomp/pom.xml
index 74e77d466f..61e45354e9 100644
--- a/examples/jms/stomp/pom.xml
+++ b/examples/jms/stomp/pom.xml
@@ -112,7 +112,7 @@
             
             
                false
-               ${basedir}/target/classes/hornetq/server0
+               ${basedir}/target/classes/activemq/server0
             
          
       
diff --git a/examples/jms/stomp1.1/pom.xml b/examples/jms/stomp1.1/pom.xml
index 51f5993c0e..71ace4abe9 100644
--- a/examples/jms/stomp1.1/pom.xml
+++ b/examples/jms/stomp1.1/pom.xml
@@ -112,7 +112,7 @@
             
             
                false
-               ${basedir}/target/classes/hornetq/server0
+               ${basedir}/target/classes/activemq/server0
             
          
       
diff --git a/examples/jms/stomp1.2/pom.xml b/examples/jms/stomp1.2/pom.xml
index d7fb9385d5..8e658ebe70 100644
--- a/examples/jms/stomp1.2/pom.xml
+++ b/examples/jms/stomp1.2/pom.xml
@@ -112,7 +112,7 @@
             
             
                false
-               ${basedir}/target/classes/hornetq/server0
+               ${basedir}/target/classes/activemq/server0
             
          
       
diff --git a/examples/jms/stop-server-failover/pom.xml b/examples/jms/stop-server-failover/pom.xml
index f931dda471..776da9530d 100644
--- a/examples/jms/stop-server-failover/pom.xml
+++ b/examples/jms/stop-server-failover/pom.xml
@@ -36,7 +36,7 @@
                      start
                   
                   
-                     ${basedir}/target/classes/hornetq/server0
+                     ${basedir}/target/classes/activemq/server0
                      
                         
                            build.directory
@@ -57,7 +57,7 @@
                   
                      1199
                      1198
-                     ${basedir}/target/classes/hornetq/server1
+                     ${basedir}/target/classes/activemq/server1
                      true
                      
                         
@@ -85,7 +85,7 @@
                      
                         
                            exampleConfigDir
-                           ${basedir}/target/classes/hornetq
+                           ${basedir}/target/classes/activemq
                         
                      
                   
@@ -96,7 +96,7 @@
                      stop
                   
                   
-                     ${basedir}/target/classes/hornetq/server0
+                     ${basedir}/target/classes/activemq/server0
                   
                
                
@@ -105,7 +105,7 @@
                      stop
                   
                   
-                     ${basedir}/target/classes/hornetq/server1
+                     ${basedir}/target/classes/activemq/server1
                   
                
             
diff --git a/examples/jms/stop-server-failover/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/stop-server-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
index fff09435b6..ec4de64b1e 100644
--- a/examples/jms/stop-server-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ b/examples/jms/stop-server-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
@@ -1,6 +1,6 @@
 
+         xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
 
    ${build.directory}/server0/data/messaging/bindings
 
diff --git a/examples/jms/stop-server-failover/src/main/resources/hornetq/server1/activemq-configuration.xml b/examples/jms/stop-server-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
index 0157ef7879..b74f4cea46 100644
--- a/examples/jms/stop-server-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
+++ b/examples/jms/stop-server-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
@@ -1,6 +1,6 @@
 
+         xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
 
    ${build.directory}/server0/data/messaging/bindings
 
diff --git a/examples/jms/symmetric-cluster/pom.xml b/examples/jms/symmetric-cluster/pom.xml
index 6d946aa27e..b1de2cfb82 100644
--- a/examples/jms/symmetric-cluster/pom.xml
+++ b/examples/jms/symmetric-cluster/pom.xml
@@ -36,7 +36,7 @@
                      start
                   
                   
-                     ${basedir}/target/classes/hornetq/server0
+                     ${basedir}/target/classes/activemq/server0
                      
                         
                            build.directory
@@ -57,7 +57,7 @@
                   
                      1199
                      1198
-                     ${basedir}/target/classes/hornetq/server1
+                     ${basedir}/target/classes/activemq/server1
                      true
                      
                         
@@ -79,7 +79,7 @@
                   
                      1299
                      1298
-                     ${basedir}/target/classes/hornetq/server2
+                     ${basedir}/target/classes/activemq/server2
                      true
                      
                         
@@ -101,7 +101,7 @@
                   
                      1399
                      1398
-                     ${basedir}/target/classes/hornetq/server3
+                     ${basedir}/target/classes/activemq/server3
                      true
                      
                         
@@ -123,7 +123,7 @@
                   
                      1499
                      1498
-                     ${basedir}/target/classes/hornetq/server4
+                     ${basedir}/target/classes/activemq/server4
                      true
                      
                         
@@ -145,7 +145,7 @@
                   
                      1599
                      1598
-                     ${basedir}/target/classes/hornetq/server5
+                     ${basedir}/target/classes/activemq/server5
                      true
                      
                         
@@ -177,7 +177,7 @@
                      
                         
                            exampleConfigDir
-                           ${basedir}/target/classes/hornetq
+                           ${basedir}/target/classes/activemq
                         
                      
                   
@@ -188,7 +188,7 @@
                      stop
                   
                   
-                     ${basedir}/target/classes/hornetq/server0
+                     ${basedir}/target/classes/activemq/server0
                   
                
                
@@ -197,7 +197,7 @@
                      stop
                   
                   
-                     ${basedir}/target/classes/hornetq/server1
+                     ${basedir}/target/classes/activemq/server1
                   
                
                
@@ -206,7 +206,7 @@
                      stop
                   
                   
-                     ${basedir}/target/classes/hornetq/server2
+                     ${basedir}/target/classes/activemq/server2
                   
                
                
@@ -215,7 +215,7 @@
                      stop
                   
                   
-                     ${basedir}/target/classes/hornetq/server3
+                     ${basedir}/target/classes/activemq/server3
                   
                
                
@@ -224,7 +224,7 @@
                      stop
                   
                   
-                     ${basedir}/target/classes/hornetq/server4
+                     ${basedir}/target/classes/activemq/server4
                   
                
                
@@ -233,7 +233,7 @@
                      stop
                   
                   
-                     ${basedir}/target/classes/hornetq/server5
+                     ${basedir}/target/classes/activemq/server5
                   
                
             
diff --git a/examples/jms/symmetric-cluster/readme.html b/examples/jms/symmetric-cluster/readme.html
index d42b0139a6..2d8621ff46 100644
--- a/examples/jms/symmetric-cluster/readme.html
+++ b/examples/jms/symmetric-cluster/readme.html
@@ -20,7 +20,7 @@
      
      The configuration used in this example is very similar to the configuration used by ActiveMQ
      when installed as a clustered profile in JBoss Application Server.
      
      
      To set up ActiveMQ to form a symmetric cluster we simply need to mark each server as clustered
-     and we need to define a cluster-connection in hornetq-configuration.xml.
      
+     and we need to define a cluster-connection in activemq-configuration.xml.
      
      
      The cluster-connection tells the nodes what other nodes to make connections to.
      With a cluster-connection each node that we connect to can either be specified
      indivually, or we can use UDP discovery to find out what other nodes are in the cluster.
      
diff --git a/examples/jms/temp-queue/pom.xml b/examples/jms/temp-queue/pom.xml
index d05d1659dd..88ed4b9e6e 100644
--- a/examples/jms/temp-queue/pom.xml
+++ b/examples/jms/temp-queue/pom.xml
@@ -107,7 +107,7 @@
             
             
                false
-               ${basedir}/target/classes/hornetq/server0
+               ${basedir}/target/classes/activemq/server0
             
          
       
diff --git a/examples/jms/topic-hierarchies/pom.xml b/examples/jms/topic-hierarchies/pom.xml
index f997f3eeff..301caf3b0c 100644
--- a/examples/jms/topic-hierarchies/pom.xml
+++ b/examples/jms/topic-hierarchies/pom.xml
@@ -107,7 +107,7 @@
             
             
                false
-               ${basedir}/target/classes/hornetq/server0
+               ${basedir}/target/classes/activemq/server0
             
          
       
diff --git a/examples/jms/topic-hierarchies/readme.html b/examples/jms/topic-hierarchies/readme.html
index a0e81eedb1..11cf24ce34 100644
--- a/examples/jms/topic-hierarchies/readme.html
+++ b/examples/jms/topic-hierarchies/readme.html
@@ -18,7 +18,7 @@
      
      For more information on the wild-card syntax please consult the user manual.
      
      
      Example step-by-step
      
      
      To run the example, simply type mvn verify from this directory
      
-     
      In this example we will define a hierarchy of topics in the file hornetq-jms.xml
      
+     
      In this example we will define a hierarchy of topics in the file activemq-jms.xml
      
      
               
    <topic name="news">
diff --git a/examples/jms/topic-selector-example1/pom.xml b/examples/jms/topic-selector-example1/pom.xml
index c5bb053bfa..73782ab34a 100644
--- a/examples/jms/topic-selector-example1/pom.xml
+++ b/examples/jms/topic-selector-example1/pom.xml
@@ -107,7 +107,7 @@
             
             
                false
-               ${basedir}/target/classes/hornetq/server0
+               ${basedir}/target/classes/activemq/server0
             
          
       
diff --git a/examples/jms/topic-selector-example2/pom.xml b/examples/jms/topic-selector-example2/pom.xml
index a49beccc4c..7e9c9a1751 100644
--- a/examples/jms/topic-selector-example2/pom.xml
+++ b/examples/jms/topic-selector-example2/pom.xml
@@ -107,7 +107,7 @@
             
             
                false
-               ${basedir}/target/classes/hornetq/server0
+               ${basedir}/target/classes/activemq/server0
             
          
       
diff --git a/examples/jms/topic/pom.xml b/examples/jms/topic/pom.xml
index 4f7100037b..51368c8122 100644
--- a/examples/jms/topic/pom.xml
+++ b/examples/jms/topic/pom.xml
@@ -107,7 +107,7 @@
             
             
                false
-               ${basedir}/target/classes/hornetq/server0
+               ${basedir}/target/classes/activemq/server0
             
          
       
diff --git a/examples/jms/transaction-failover/pom.xml b/examples/jms/transaction-failover/pom.xml
index 5fa5c9b653..1e72729083 100644
--- a/examples/jms/transaction-failover/pom.xml
+++ b/examples/jms/transaction-failover/pom.xml
@@ -36,7 +36,7 @@
                      start
                   
                   
-                     ${basedir}/target/classes/hornetq/server0
+                     ${basedir}/target/classes/activemq/server0
                      
                         
                            build.directory
@@ -57,7 +57,7 @@
                   
                      1199
                      1198
-                     ${basedir}/target/classes/hornetq/server1
+                     ${basedir}/target/classes/activemq/server1
                      true
                      
                         
@@ -85,7 +85,7 @@
                      
                         
                            exampleConfigDir
-                           ${basedir}/target/classes/hornetq
+                           ${basedir}/target/classes/activemq
                         
                      
                   
@@ -96,7 +96,7 @@
                      stop
                   
                   
-                     ${basedir}/target/classes/hornetq/server0
+                     ${basedir}/target/classes/activemq/server0
                   
                
                
@@ -105,7 +105,7 @@
                      stop
                   
                   
-                     ${basedir}/target/classes/hornetq/server1
+                     ${basedir}/target/classes/activemq/server1
                   
                
             
diff --git a/examples/jms/transaction-failover/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/transaction-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
index 2d25a1072c..34a26c1e15 100644
--- a/examples/jms/transaction-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ b/examples/jms/transaction-failover/src/main/resources/hornetq/server0/activemq-configuration.xml
@@ -1,6 +1,6 @@
 
+         xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
 
    ${build.directory}/server0/data/messaging/bindings
 
diff --git a/examples/jms/transaction-failover/src/main/resources/hornetq/server1/activemq-configuration.xml b/examples/jms/transaction-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
index e82484f847..2e226bdb7b 100644
--- a/examples/jms/transaction-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
+++ b/examples/jms/transaction-failover/src/main/resources/hornetq/server1/activemq-configuration.xml
@@ -1,6 +1,6 @@
 
+         xsi:schemaLocation="urn:activemq ../../../../../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
 
    ${build.directory}/server0/data/messaging/bindings
 
diff --git a/examples/jms/transactional/pom.xml b/examples/jms/transactional/pom.xml
index bdbe4e1a8b..f0925e0445 100644
--- a/examples/jms/transactional/pom.xml
+++ b/examples/jms/transactional/pom.xml
@@ -107,7 +107,7 @@
             
             
                false
-               ${basedir}/target/classes/hornetq/server0
+               ${basedir}/target/classes/activemq/server0
             
          
       
diff --git a/examples/jms/xa-heuristic/pom.xml b/examples/jms/xa-heuristic/pom.xml
index 95c122f604..64bb8a8be7 100644
--- a/examples/jms/xa-heuristic/pom.xml
+++ b/examples/jms/xa-heuristic/pom.xml
@@ -130,7 +130,7 @@
             
             
                false
-               ${basedir}/target/classes/hornetq/server0
+               ${basedir}/target/classes/activemq/server0
             
          
       
diff --git a/examples/jms/xa-receive/pom.xml b/examples/jms/xa-receive/pom.xml
index 625078684e..a5e45be36c 100644
--- a/examples/jms/xa-receive/pom.xml
+++ b/examples/jms/xa-receive/pom.xml
@@ -107,7 +107,7 @@
             
             
                false
-               ${basedir}/target/classes/hornetq/server0
+               ${basedir}/target/classes/activemq/server0
             
          
       
diff --git a/examples/jms/xa-send/pom.xml b/examples/jms/xa-send/pom.xml
index 08bfd5c366..48e12eb9ac 100644
--- a/examples/jms/xa-send/pom.xml
+++ b/examples/jms/xa-send/pom.xml
@@ -107,7 +107,7 @@
             
             
                false
-               ${basedir}/target/classes/hornetq/server0
+               ${basedir}/target/classes/activemq/server0
             
          
       
diff --git a/examples/jms/xa-with-jta/pom.xml b/examples/jms/xa-with-jta/pom.xml
index 8753828c97..08c7f11a0f 100644
--- a/examples/jms/xa-with-jta/pom.xml
+++ b/examples/jms/xa-with-jta/pom.xml
@@ -116,7 +116,7 @@
             
             
                false
-               ${basedir}/target/classes/hornetq/server0
+               ${basedir}/target/classes/activemq/server0
             
          
       
diff --git a/examples/soak/normal/README b/examples/soak/normal/README
index 9f2361d2c2..acbd2f7a57 100644
--- a/examples/soak/normal/README
+++ b/examples/soak/normal/README
@@ -27,15 +27,15 @@ settings.
 
 To run a server with the same configuration but on a different host.  Check out this source on the host machine and
 change:
-* hornetq.remoting.netty.host property in hornetq-configuration.xml
-* bindAddress and rmiBindAddress properties in hornetq-beans.xml
+* activemq.remoting.netty.host property in activemq-configuration.xml
+* bindAddress and rmiBindAddress properties in activemq-beans.xml
 
   $ mvn verify -P server
 
 Configure Server Dump
 =====================
 
-The server can "dump" info at regular interval. In hornetq-configuration.xml, set
+The server can "dump" info at regular interval. In activemq-configuration.xml, set
 
    10000
 
diff --git a/examples/soak/normal/server0/activemq-configuration.xml b/examples/soak/normal/server0/activemq-configuration.xml
index 8ec646d871..43d329775e 100644
--- a/examples/soak/normal/server0/activemq-configuration.xml
+++ b/examples/soak/normal/server0/activemq-configuration.xml
@@ -1,6 +1,6 @@
 
+            xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd">
 
    
       
diff --git a/hornetq_doap.rdf b/hornetq_doap.rdf
index 2dd7031e21..1591eb3127 100644
--- a/hornetq_doap.rdf
+++ b/hornetq_doap.rdf
@@ -68,7 +68,7 @@
       
         
         
-        hornetq
+        activemq
       
     
   
diff --git a/integration/activemq-aerogear-integration/pom.xml b/integration/activemq-aerogear-integration/pom.xml
index 1fe0b3da1a..4acd2a018a 100644
--- a/integration/activemq-aerogear-integration/pom.xml
+++ b/integration/activemq-aerogear-integration/pom.xml
@@ -14,7 +14,7 @@
    ActiveMQ6 Aerogear Integration
 
    
-      ${project.basedir}/../..
+      ${project.basedir}/../..
    
 
    
diff --git a/integration/activemq-jboss-as-integration/pom.xml b/integration/activemq-jboss-as-integration/pom.xml
index 1512c61f92..bb7eaa3099 100644
--- a/integration/activemq-jboss-as-integration/pom.xml
+++ b/integration/activemq-jboss-as-integration/pom.xml
@@ -14,7 +14,7 @@
    ActiveMQ6 JBoss AS Integration
 
    
-      ${project.basedir}/../..
+      ${project.basedir}/../..
    
 
    
diff --git a/integration/activemq-spring-integration/pom.xml b/integration/activemq-spring-integration/pom.xml
index c9df7c4247..d3b9c1b0d4 100644
--- a/integration/activemq-spring-integration/pom.xml
+++ b/integration/activemq-spring-integration/pom.xml
@@ -27,7 +27,7 @@
    ActiveMQ6 Spring Integration
 
    
-      ${project.basedir}/../..
+      ${project.basedir}/../..
    
 
    
diff --git a/integration/activemq-twitter-integration/pom.xml b/integration/activemq-twitter-integration/pom.xml
index 42720f0bde..8248b0c08f 100644
--- a/integration/activemq-twitter-integration/pom.xml
+++ b/integration/activemq-twitter-integration/pom.xml
@@ -14,7 +14,7 @@
    ActiveMQ6 Twitter Integration
 
    
-      ${project.basedir}/../..
+      ${project.basedir}/../..
    
 
    
diff --git a/integration/activemq-vertx-integration/pom.xml b/integration/activemq-vertx-integration/pom.xml
index 0624f962a6..e32d0e0b65 100644
--- a/integration/activemq-vertx-integration/pom.xml
+++ b/integration/activemq-vertx-integration/pom.xml
@@ -16,7 +16,7 @@
 
   
 
-    ${project.basedir}/../..
+    ${project.basedir}/../..
 
     UTF-8
 
diff --git a/pom.xml b/pom.xml
index bef5a51014..5ca41c3e5f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,7 +11,7 @@
    
 
    ActiveMQ6 Parent
-   http://hornetq.org
+   http://apache.org/activemq
    
       Putting the buzz in messaging
    
@@ -73,19 +73,19 @@
      -->
  
       -Djava.util.logging.manager=org.jboss.logmanager.LogManager
-         -Dlogging.configuration=file:${hornetq.basedir}/tests/config/logging.properties
-         -Djava.library.path=${hornetq.basedir}/activemq-native/bin/ -Djgroups.bind_addr=localhost
+         -Dlogging.configuration=file:${activemq.basedir}/tests/config/logging.properties
+         -Djava.library.path=${activemq.basedir}/activemq-native/bin/ -Djgroups.bind_addr=localhost
          -Djava.net.preferIPv4Stack=true
       
-      ${project.basedir}
+      ${project.basedir}
       false
       false
    
 
    
-      scm:git:git://github.com/hornetq/hornetq.git
-      scm:git://github.com/hornetq/hornetq.git
-      https://github.com/hornetq/hornetq
+      scm:git:git://github.com/activemq/activemq.git
+      scm:git://github.com/activemq/activemq.git
+      https://github.com/activemq/activemq
    
 
    
@@ -110,8 +110,8 @@
       
          clebertsuconic
          Clebert Suconic
-         csuconic@redhat.com
-         http://hornetq.com
+         clebertsuconic@apache.org
+         http://twitter.com/clebertsuconic
          
             project-owner
          
@@ -838,6 +838,7 @@
                
                
+                  
                   org.hornetq
                   hornetq-checkstyle-checks
                   0.2
@@ -845,7 +846,7 @@
             
             
                ${skipStyleCheck}
-               ${hornetq.basedir}/etc/checkstyle.xml
+               ${activemq.basedir}/etc/checkstyle.xml
                false
                true
                true
@@ -879,7 +880,7 @@
             2.5
             
                ${skipLicenseCheck}
-               ${hornetq.basedir}
+               ${activemq.basedir}
                
      etc/license-header.txt
      
                
                   2005-2014
@@ -933,7 +934,7 @@
             maven-checkstyle-plugin
             2.12
             
-               ${hornetq.basedir}/etc/checkstyle.xml
+               ${activemq.basedir}/etc/checkstyle.xml
                false
             
          
diff --git a/scripts/replace-wildfly.sh b/scripts/replace-wildfly.sh
deleted file mode 100755
index bc70bcd37c..0000000000
--- a/scripts/replace-wildfly.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-
-#this script is useful to replace libraries on a wildfly master
-# it assumes JBOSS_HOME pre defined
-# run this from the project home
-
-export JBOSS_HOME=$1
-
-
-# fis the VERSION before running it
-export VERSION="2.4.0-SNAPSHOT"
-#replace jars
-echo cp ./hornetq-core-client/target/hornetq-core-client-$VERSION.jar $JBOSS_HOME/modules/system/layers/base/org.apache.activemq/main/hornetq-core-client*.jar
-cp ./hornetq-core-client/target/hornetq-core-client-$VERSION.jar $JBOSS_HOME/modules/system/layers/base/org.apache.activemq/main/hornetq-core-client*.jar
-cp ./hornetq-server/target/hornetq-server-$VERSION.jar $JBOSS_HOME/modules/system/layers/base/org.apache.activemq/main/hornetq-server*.jar
-cp ./hornetq-commons/target/hornetq-commons-$VERSION.jar $JBOSS_HOME/modules/system/layers/base/org.apache.activemq/main/hornetq-commons*.jar
-cp ./hornetq-journal/target/hornetq-journal-$VERSION.jar $JBOSS_HOME/modules/system/layers/base/org.apache.activemq/main/hornetq-journal*.jar
-cp ./hornetq-jms-client/target/hornetq-jms-client-$VERSION.jar $JBOSS_HOME/modules/system/layers/base/org.apache.activemq/main/hornetq-jms-client*.jar
-cp ./hornetq-jms-server/target/hornetq-jms-server-$VERSION.jar $JBOSS_HOME/modules/system/layers/base/org.apache.activemq/main/hornetq-jms-server*.jar
-cp ./hornetq-ra/target/hornetq-ra-$VERSION.jar $JBOSS_HOME/modules/system/layers/base/org.apache.activemq/ra/main/hornetq-ra*.jar
-
-#update jboss-client.jar
-rm -rf tmp
-mkdir ./tmp
-cd ./tmp
-unzip $JBOSS_HOME/bin/client/jboss-client.jar
-rm -rf ./org.apache.activemq
-unzip -o ../hornetq-jms-client/target/hornetq-jms-client-$VERSION.jar  -x META-INF\*
-unzip -o ../hornetq-core-client/target/hornetq-core-client-$VERSION.jar -x \*META-INF\* 
-unzip -o ../hornetq-commons/target/hornetq-commons-$VERSION.jar -x \*META-INF\*
-zip -r jboss-client.jar *
-cp jboss-client.jar $JBOSS_HOME/bin/client/jboss-client.jar
-cd ..
-rm -rf tmp
-
diff --git a/tests/byteman-tests/pom.xml b/tests/byteman-tests/pom.xml
index 192f9a52a0..f6b848f57a 100644
--- a/tests/byteman-tests/pom.xml
+++ b/tests/byteman-tests/pom.xml
@@ -14,7 +14,7 @@
    
       ${java.home}/../lib/tools.jar
       2.2.0
-      ${project.basedir}/../..
+      ${project.basedir}/../..
    
 
    
diff --git a/tests/concurrent-tests/pom.xml b/tests/concurrent-tests/pom.xml
index 44cebc401a..35e02cd302 100644
--- a/tests/concurrent-tests/pom.xml
+++ b/tests/concurrent-tests/pom.xml
@@ -25,7 +25,7 @@
    ActiveMQ6 concurrent Tests
 
    
-      ${project.basedir}/../..
+      ${project.basedir}/../..
    
 
    
diff --git a/tests/config/logging.properties b/tests/config/logging.properties
index 25fdedef76..30d3b272ee 100644
--- a/tests/config/logging.properties
+++ b/tests/config/logging.properties
@@ -52,7 +52,7 @@ handler.FILE=org.jboss.logmanager.handlers.FileHandler
 handler.FILE.level=FINE
 handler.FILE.properties=autoFlush,fileName
 handler.FILE.autoFlush=true
-handler.FILE.fileName=target/hornetq.log
+handler.FILE.fileName=target/activemq.log
 handler.FILE.formatter=PATTERN
 
 # Console handler configuration
diff --git a/tests/config/logging.properties.trace b/tests/config/logging.properties.trace
index 3197b3dd75..2bc32a7158 100644
--- a/tests/config/logging.properties.trace
+++ b/tests/config/logging.properties.trace
@@ -54,7 +54,7 @@ handler.FILE=org.jboss.logmanager.handlers.FileHandler
 handler.FILE.level=FINE
 handler.FILE.properties=autoFlush,fileName
 handler.FILE.autoFlush=true
-handler.FILE.fileName=target/hornetq.log
+handler.FILE.fileName=target/activemq.log
 handler.FILE.formatter=PATTERN
 
 # Console handler configuration
diff --git a/tests/config/server-start-stop-backup-config1.xml b/tests/config/server-start-stop-backup-config1.xml
index 2b9a47976a..00d8dc2650 100644
--- a/tests/config/server-start-stop-backup-config1.xml
+++ b/tests/config/server-start-stop-backup-config1.xml
@@ -5,7 +5,7 @@
    
    true
    
-   /tmp/hornetq-unit-test/start-stop-data-backup
+   /tmp/activemq-unit-test/start-stop-data-backup
    
    
 
diff --git a/tests/config/server-start-stop-live-config1.xml b/tests/config/server-start-stop-live-config1.xml
index 5633166580..92c8385c07 100644
--- a/tests/config/server-start-stop-live-config1.xml
+++ b/tests/config/server-start-stop-live-config1.xml
@@ -5,7 +5,7 @@
    
    
    
-   /tmp/hornetq-unit-test/start-stop-data-live
+   /tmp/activemq-unit-test/start-stop-data-live
    
    
 
diff --git a/tests/integration-tests/pom.xml b/tests/integration-tests/pom.xml
index 5ab98b4bfa..ab54fbac68 100644
--- a/tests/integration-tests/pom.xml
+++ b/tests/integration-tests/pom.xml
@@ -12,7 +12,7 @@
    ActiveMQ6 Integration Tests
 
    
-      ${project.basedir}/../..
+      ${project.basedir}/../..
       2.1.2
       2.0.3-final
    
diff --git a/tests/integration-tests/src/test/resources/colocated-server-start-stop-config1.xml b/tests/integration-tests/src/test/resources/colocated-server-start-stop-config1.xml
index 7bfccde8de..260d4d2382 100644
--- a/tests/integration-tests/src/test/resources/colocated-server-start-stop-config1.xml
+++ b/tests/integration-tests/src/test/resources/colocated-server-start-stop-config1.xml
@@ -8,10 +8,10 @@
             
          
 
-   /tmp/hornetq-unit-test/live1/paging
-   /tmp/hornetq-unit-test/live1/binding
-   /tmp/hornetq-unit-test/live1/journal
-   /tmp/hornetq-unit-test/live1/largemessages
+   /tmp/activemq-unit-test/live1/paging
+   /tmp/activemq-unit-test/live1/binding
+   /tmp/activemq-unit-test/live1/journal
+   /tmp/activemq-unit-test/live1/largemessages
    
    
       
@@ -50,10 +50,10 @@
    
       
           
-              /tmp/hornetq-unit-test/live2/paging
-              /tmp/hornetq-unit-test/live2/binding
-              /tmp/hornetq-unit-test/live2/journal
-              /tmp/hornetq-unit-test/live2/largemessages
+              /tmp/activemq-unit-test/live2/paging
+              /tmp/activemq-unit-test/live2/binding
+              /tmp/activemq-unit-test/live2/journal
+              /tmp/activemq-unit-test/live2/largemessages
           
       
    
diff --git a/tests/integration-tests/src/test/resources/colocated-server-start-stop-config2.xml b/tests/integration-tests/src/test/resources/colocated-server-start-stop-config2.xml
index 7eabd5b973..d3e8aff938 100644
--- a/tests/integration-tests/src/test/resources/colocated-server-start-stop-config2.xml
+++ b/tests/integration-tests/src/test/resources/colocated-server-start-stop-config2.xml
@@ -9,10 +9,10 @@
       
    
 
-   /tmp/hornetq-unit-test/live2/paging
-   /tmp/hornetq-unit-test/live2/binding
-   /tmp/hornetq-unit-test/live2/journal
-   /tmp/hornetq-unit-test/live2/largemessages
+   /tmp/activemq-unit-test/live2/paging
+   /tmp/activemq-unit-test/live2/binding
+   /tmp/activemq-unit-test/live2/journal
+   /tmp/activemq-unit-test/live2/largemessages
    
    
       
@@ -51,10 +51,10 @@
    
       
           
-              /tmp/hornetq-unit-test/live1/paging
-              /tmp/hornetq-unit-test/live1/binding
-              /tmp/hornetq-unit-test/live1/journal
-              /tmp/hornetq-unit-test/live1/largemessages
+              /tmp/activemq-unit-test/live1/paging
+              /tmp/activemq-unit-test/live1/binding
+              /tmp/activemq-unit-test/live1/journal
+              /tmp/activemq-unit-test/live1/largemessages
           
       
    
diff --git a/tests/integration-tests/src/test/resources/restricted-security-client.policy b/tests/integration-tests/src/test/resources/restricted-security-client.policy
index 8794b57070..11e1fb1f29 100644
--- a/tests/integration-tests/src/test/resources/restricted-security-client.policy
+++ b/tests/integration-tests/src/test/resources/restricted-security-client.policy
@@ -8,8 +8,8 @@ grant {
         permission java.net.SocketPermission "*:1024-", "connect";
         // Note1: normally, we don't need this permission since the applet allows reading jars loaded by the applet
         // Note2: Which of the following two java.io.FilePermission is necessary depends on the exact Maven command
-        permission java.io.FilePermission "${user.dir}/hornetq-core-client/target/classes/-", "read";
-        permission java.io.FilePermission "${user.dir}/hornetq-core-client/target/hornetq-core-client-${project.version}.jar", "read";
+        permission java.io.FilePermission "${user.dir}/activemq-core-client/target/classes/-", "read";
+        permission java.io.FilePermission "${user.dir}/activemq-core-client/target/activemq-core-client-${project.version}.jar", "read";
         permission java.util.PropertyPermission "activemq.version.property.filename", "read";
         permission java.util.PropertyPermission "io.netty.eventLoopThreads", "read";
         permission java.util.PropertyPermission "io.netty.noUnsafe", "read";
diff --git a/tests/integration-tests/src/test/resources/server-start-stop-config1.xml b/tests/integration-tests/src/test/resources/server-start-stop-config1.xml
index 578f9be4b7..59378ae5ab 100644
--- a/tests/integration-tests/src/test/resources/server-start-stop-config1.xml
+++ b/tests/integration-tests/src/test/resources/server-start-stop-config1.xml
@@ -8,7 +8,7 @@
       
    
    
-   /tmp/hornetq-unit-test/start-stop-data
+   /tmp/activemq-unit-test/start-stop-data
    
    
       
diff --git a/tests/integration-tests/src/test/resources/spring-jms-beans.xml b/tests/integration-tests/src/test/resources/spring-jms-beans.xml
index 4f92b8cafb..7dee3194de 100644
--- a/tests/integration-tests/src/test/resources/spring-jms-beans.xml
+++ b/tests/integration-tests/src/test/resources/spring-jms-beans.xml
@@ -5,8 +5,8 @@
            http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
 
    
-       
-       
+       
+       
    
 
     
diff --git a/tests/jms-tests/pom.xml b/tests/jms-tests/pom.xml
index 138861731b..e9a6aee00c 100644
--- a/tests/jms-tests/pom.xml
+++ b/tests/jms-tests/pom.xml
@@ -12,7 +12,7 @@
    ActiveMQ6 JMS Tests
 
    
-      ${project.basedir}/../..
+      ${project.basedir}/../..
    
 
    
diff --git a/tests/joram-tests/pom.xml b/tests/joram-tests/pom.xml
index eb4397e5b1..009d54d3a2 100644
--- a/tests/joram-tests/pom.xml
+++ b/tests/joram-tests/pom.xml
@@ -25,7 +25,7 @@
    ActiveMQ6 Joram Tests
 
    
-      ${project.basedir}/../..
+      ${project.basedir}/../..
    
 
    
diff --git a/tests/joram-tests/src/test/java/org/apache/activemq/jms/ActiveMQQAdmin.java b/tests/joram-tests/src/test/java/org/apache/activemq/jms/ActiveMQQAdmin.java
index 9d3c897863..6d7b3ffeda 100644
--- a/tests/joram-tests/src/test/java/org/apache/activemq/jms/ActiveMQQAdmin.java
+++ b/tests/joram-tests/src/test/java/org/apache/activemq/jms/ActiveMQQAdmin.java
@@ -59,7 +59,7 @@ public class ActiveMQQAdmin implements Admin
     * {@link ActiveMQQAdmin#serverStop()}. This is used when testing combinations of client and
     * servers with different versions.
     *
-    * @see https://github.com/hornetq/hornetq-version-tests
+    * @see https://github.com/activemq/activemq-version-tests
     */
    private final boolean serverLifeCycleActive;
    private static final String SERVER_LIVE_CYCLE_PROPERTY = "org.apache.activemq.jms.ActiveMQAdmin.serverLifeCycle";
diff --git a/tests/performance-tests/pom.xml b/tests/performance-tests/pom.xml
index d205793874..599d7356f4 100644
--- a/tests/performance-tests/pom.xml
+++ b/tests/performance-tests/pom.xml
@@ -25,7 +25,7 @@
    ActiveMQ6 performance Tests
 
    
-      ${project.basedir}/../..
+      ${project.basedir}/../..
    
 
    
diff --git a/tests/pom.xml b/tests/pom.xml
index 598bbc5714..7aa593d35a 100644
--- a/tests/pom.xml
+++ b/tests/pom.xml
@@ -13,7 +13,7 @@
    pom
 
    
-      ${project.basedir}/..
+      ${project.basedir}/..
    
 
    
diff --git a/tests/soak-tests/pom.xml b/tests/soak-tests/pom.xml
index 7078702605..488d7f865c 100644
--- a/tests/soak-tests/pom.xml
+++ b/tests/soak-tests/pom.xml
@@ -25,7 +25,7 @@
    ActiveMQ6 soak Tests
 
    
-      ${project.basedir}/../..
+      ${project.basedir}/../..
    
 
    
diff --git a/tests/stress-tests/pom.xml b/tests/stress-tests/pom.xml
index 9339bd3f65..386bc0ada4 100644
--- a/tests/stress-tests/pom.xml
+++ b/tests/stress-tests/pom.xml
@@ -25,7 +25,7 @@
    ActiveMQ6 stress Tests
 
    
-      ${project.basedir}/../..
+      ${project.basedir}/../..
    
 
    
diff --git a/tests/timing-tests/pom.xml b/tests/timing-tests/pom.xml
index 6c14f78b58..2000a4df86 100644
--- a/tests/timing-tests/pom.xml
+++ b/tests/timing-tests/pom.xml
@@ -25,7 +25,7 @@
    ActiveMQ6 timing Tests
 
    
-      ${project.basedir}/../..
+      ${project.basedir}/../..
    
 
    
diff --git a/tests/unit-tests/pom.xml b/tests/unit-tests/pom.xml
index 28dd063674..b159159a1a 100644
--- a/tests/unit-tests/pom.xml
+++ b/tests/unit-tests/pom.xml
@@ -12,7 +12,7 @@
    ActiveMQ6 Unit Tests
 
    
-      ${project.basedir}/../..
+      ${project.basedir}/../..