More name changes to activemq more hornetq changes
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/89a84c6a Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/89a84c6a Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/89a84c6a Branch: refs/heads/master Commit: 89a84c6ae20f121573ce76bf0330e8140e1b72f6 Parents: dcde02c Author: Clebert Suconic <[email protected]> Authored: Wed Nov 19 14:58:44 2014 -0500 Committer: Clebert Suconic <[email protected]> Committed: Wed Nov 19 16:01:54 2014 -0500 ---------------------------------------------------------------------- .project | 2 +- RELEASING.md | 4 +- activemq-bootstrap/pom.xml | 2 +- activemq-commons/pom.xml | 2 +- activemq-core-client/pom.xml | 2 +- activemq-dto/pom.xml | 4 +- activemq-jms-client/pom.xml | 2 +- activemq-jms-server/pom.xml | 2 +- .../src/main/resources/schema/activemq-jms.xsd | 2 +- activemq-journal/pom.xml | 2 +- activemq-native/pom.xml | 2 +- .../activemq-amqp-protocol/pom.xml | 2 +- .../activemq-openwire-protocol/pom.xml | 2 +- activemq-protocols/activemq-proton-plug/pom.xml | 2 +- .../activemq-stomp-protocol/pom.xml | 2 +- activemq-protocols/pom.xml | 2 +- activemq-ra/pom.xml | 2 +- activemq-rest/pom.xml | 4 +- activemq-selector/pom.xml | 2 +- activemq-server/pom.xml | 2 +- .../resources/ConfigurationTest-full-config.xml | 2 +- .../resources/colocated-hapolicy-config.xml | 2 +- .../resources/colocated-hapolicy-config2.xml | 2 +- .../resources/live-only-hapolicy-config.xml | 2 +- .../resources/live-only-hapolicy-config2.xml | 2 +- .../resources/live-only-hapolicy-config3.xml | 2 +- .../resources/live-only-hapolicy-config4.xml | 2 +- .../resources/live-only-hapolicy-config5.xml | 2 +- .../src/test/resources/logging.properties | 2 +- .../test/resources/replica-hapolicy-config.xml | 2 +- .../test/resources/replica-hapolicy-config2.xml | 2 +- .../test/resources/replica-hapolicy-config3.xml | 2 +- .../resources/replicated-hapolicy-config.xml | 2 +- .../shared-store-master-hapolicy-config.xml | 2 +- .../shared-store-slave-hapolicy-config.xml | 2 +- .../shared-store-slave-hapolicy-config2.xml | 2 +- .../shared-store-slave-hapolicy-config3.xml | 2 +- activemq-tools/pom.xml | 2 +- .../config/clustered/activemq-configuration.xml | 16 ++-- .../resources/config/clustered/bootstrap.xml | 2 +- .../main/resources/config/logging.properties | 2 +- .../non-clustered/activemq-configuration.xml | 16 ++-- .../config/non-clustered/bootstrap.xml | 2 +- .../replicated/activemq-configuration.xml | 16 ++-- .../resources/config/replicated/bootstrap.xml | 2 +- .../shared-store/activemq-configuration.xml | 16 ++-- .../resources/config/shared-store/bootstrap.xml | 2 +- docs/eap-manual/en/clusters.xml | 42 +++++----- docs/quickstart-guide/en/download.xml | 24 +++--- docs/quickstart-guide/en/examples.xml | 80 ++++++++++---------- docs/quickstart-guide/en/running.xml | 12 +-- docs/quickstart-guide/zh/download.xml | 22 +++--- docs/quickstart-guide/zh/examples.xml | 22 +++--- docs/quickstart-guide/zh/installation.xml | 12 +-- docs/quickstart-guide/zh/running.xml | 2 +- docs/user-manual/user-manual.xpr | 2 +- docs/user-manual/zh/appserver-integration.xml | 36 ++++----- docs/user-manual/zh/architecture.xml | 4 +- docs/user-manual/zh/client-classpath.xml | 4 +- docs/user-manual/zh/client-reconnection.xml | 4 +- docs/user-manual/zh/clusters.xml | 6 +- docs/user-manual/zh/configuration-index.xml | 6 +- docs/user-manual/zh/configuring-transports.xml | 4 +- docs/user-manual/zh/connection-ttl.xml | 2 +- docs/user-manual/zh/core-bridges.xml | 2 +- docs/user-manual/zh/embedding-hornetq.xml | 6 +- docs/user-manual/zh/filter-expressions.xml | 2 +- docs/user-manual/zh/flow-control.xml | 8 +- docs/user-manual/zh/ha.xml | 4 +- docs/user-manual/zh/large-messages.xml | 2 +- docs/user-manual/zh/management.xml | 16 ++-- docs/user-manual/zh/master.xml | 4 +- docs/user-manual/zh/message-grouping.xml | 4 +- docs/user-manual/zh/perf-tuning.xml | 4 +- docs/user-manual/zh/persistence.xml | 14 ++-- docs/user-manual/zh/pre-acknowledge.xml | 2 +- docs/user-manual/zh/project-info.xml | 20 ++--- docs/user-manual/zh/queue-attributes.xml | 2 +- docs/user-manual/zh/security.xml | 10 +-- docs/user-manual/zh/send-guarantees.xml | 2 +- docs/user-manual/zh/thread-pooling.xml | 2 +- docs/user-manual/zh/using-jms.xml | 4 +- docs/user-manual/zh/using-server.xml | 16 ++-- etc/checkstyle.xml | 1 + etc/findbugs-exclude.xml | 6 +- examples/core/embedded/readme.html | 2 +- .../hornetq-configuration-messaging-lab.xml | 8 +- .../configuration/standalone-example.xml | 8 +- examples/javaee/jca-config/readme.html | 2 +- .../configuration/standalone-example.xml | 8 +- .../configuration/standalone-example2.xml | 10 +-- examples/javaee/jca-remote/readme.html | 6 +- .../configuration/standalone-example.xml | 10 +-- .../configuration/standalone-example2.xml | 8 +- examples/javaee/jms-bridge/readme.html | 2 +- .../configuration/standalone-example.xml | 8 +- .../configuration/standalone-example.xml | 8 +- .../configuration/standalone-example.xml | 8 +- .../configuration/standalone-example.xml | 8 +- .../configuration/standalone-example.xml | 8 +- .../configuration/standalone-example.xml | 8 +- .../configuration/standalone-example.xml | 8 +- .../configuration/standalone-example.xml | 8 +- .../configuration/standalone-example.xml | 8 +- .../configuration/standalone-backup.xml | 8 +- .../configuration/standalone-example.xml | 10 +-- .../configuration/standalone-live.xml | 8 +- .../configuration/standalone-backup.xml | 8 +- .../configuration/standalone-example.xml | 10 +-- .../configuration/standalone-live.xml | 8 +- .../configuration/standalone-example.xml | 8 +- examples/javaee/pom.xml | 8 +- .../configuration/standalone-example.xml | 8 +- examples/jms/README.md | 2 +- .../config/logging.properties | 2 +- examples/jms/aerogear/pom.xml | 2 +- examples/jms/aerogear/readme.html | 2 +- examples/jms/applet/applet.html | 2 +- examples/jms/applet/pom.xml | 6 +- examples/jms/application-layer-failover/pom.xml | 12 +-- examples/jms/bridge/pom.xml | 10 +-- examples/jms/bridge/readme.html | 2 +- examples/jms/browser/pom.xml | 2 +- examples/jms/client-kickoff/pom.xml | 2 +- examples/jms/client-kickoff/readme.html | 2 +- .../jms/client-side-failoverlistener/pom.xml | 10 +-- .../client-side-failoverlistener/readme.html | 2 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../hornetq/server1/activemq-configuration.xml | 2 +- examples/jms/client-side-load-balancing/pom.xml | 14 ++-- .../jms/client-side-load-balancing/readme.html | 2 +- .../jms/clustered-durable-subscription/pom.xml | 10 +-- examples/jms/clustered-grouping/pom.xml | 14 ++-- examples/jms/clustered-jgroups/pom.xml | 8 +- examples/jms/clustered-queue/pom.xml | 8 +- examples/jms/clustered-standalone/pom.xml | 14 ++-- examples/jms/clustered-static-discovery/pom.xml | 18 ++--- examples/jms/clustered-static-oneway/pom.xml | 14 ++-- examples/jms/clustered-topic/pom.xml | 10 +-- .../jms/colocated-failover-scale-down/pom.xml | 10 +-- examples/jms/colocated-failover/pom.xml | 10 +-- examples/jms/consumer-rate-limit/pom.xml | 2 +- examples/jms/consumer-rate-limit/readme.html | 4 +- examples/jms/dead-letter/pom.xml | 2 +- examples/jms/dead-letter/readme.html | 4 +- examples/jms/delayed-redelivery/pom.xml | 2 +- examples/jms/delayed-redelivery/readme.html | 2 +- examples/jms/divert/pom.xml | 10 +-- examples/jms/divert/readme.html | 2 +- examples/jms/durable-subscription/pom.xml | 2 +- examples/jms/embedded-simple/pom.xml | 4 +- examples/jms/embedded-simple/readme.html | 2 +- examples/jms/embedded/pom.xml | 2 +- examples/jms/expiry/pom.xml | 2 +- examples/jms/expiry/readme.html | 4 +- examples/jms/ha-policy-autobackup/pom.xml | 10 +-- examples/jms/http-transport/pom.xml | 2 +- examples/jms/http-transport/readme.html | 8 +- .../jms/instantiate-connection-factory/pom.xml | 2 +- examples/jms/interceptor/pom.xml | 2 +- examples/jms/interceptor/readme.html | 2 +- examples/jms/jaas/pom.xml | 2 +- examples/jms/jaas/readme.html | 8 +- examples/jms/jms-auto-closeable/pom.xml | 2 +- examples/jms/jms-bridge/pom.xml | 10 +-- examples/jms/jms-bridge/readme.html | 4 +- examples/jms/jms-completion-listener/pom.xml | 2 +- examples/jms/jms-context/pom.xml | 2 +- examples/jms/jms-shared-consumer/pom.xml | 2 +- examples/jms/jmx/pom.xml | 2 +- examples/jms/large-message/pom.xml | 4 +- examples/jms/large-message/readme.html | 2 +- examples/jms/last-value-queue/pom.xml | 2 +- examples/jms/last-value-queue/readme.html | 2 +- examples/jms/management-notifications/pom.xml | 2 +- .../jms/management-notifications/readme.html | 6 +- .../hornetq/server0/activemq-users.xml | 2 +- examples/jms/management/pom.xml | 2 +- examples/jms/management/readme.html | 12 +-- .../hornetq/server0/activemq-configuration.xml | 4 +- examples/jms/message-counters/pom.xml | 2 +- examples/jms/message-counters/readme.html | 2 +- examples/jms/message-group/pom.xml | 2 +- examples/jms/message-group/readme.html | 2 +- examples/jms/message-group2/pom.xml | 2 +- examples/jms/message-group2/readme.html | 2 +- examples/jms/message-priority/pom.xml | 2 +- examples/jms/multiple-failover-failback/pom.xml | 14 ++-- .../hornetq/server0/activemq-configuration.xml | 2 +- .../hornetq/server1/activemq-configuration.xml | 2 +- .../hornetq/server2/activemq-configuration.xml | 2 +- examples/jms/multiple-failover/pom.xml | 14 ++-- .../hornetq/server0/activemq-configuration.xml | 2 +- .../hornetq/server1/activemq-configuration.xml | 2 +- .../hornetq/server2/activemq-configuration.xml | 2 +- examples/jms/no-consumer-buffering/pom.xml | 2 +- examples/jms/no-consumer-buffering/readme.html | 4 +- examples/jms/non-transaction-failover/pom.xml | 10 +-- examples/jms/openwire/pom.xml | 2 +- examples/jms/paging/pom.xml | 2 +- examples/jms/paging/readme.html | 4 +- examples/jms/perf/pom.xml | 4 +- .../hornetq/server0/activemq-configuration.xml | 2 +- .../hornetq-configuration-messaging-lab.xml | 8 +- examples/jms/pre-acknowledge/pom.xml | 2 +- .../hornetq/server0/activemq-configuration.xml | 2 +- examples/jms/producer-rate-limit/pom.xml | 2 +- examples/jms/producer-rate-limit/readme.html | 4 +- examples/jms/proton-cpp/pom.xml | 4 +- examples/jms/proton-cpp/readme.html | 2 +- examples/jms/proton-j/pom.xml | 2 +- examples/jms/proton-j/readme.html | 2 +- examples/jms/proton-ruby/pom.xml | 2 +- .../jms/queue-message-redistribution/pom.xml | 10 +-- .../queue-message-redistribution/readme.html | 4 +- examples/jms/queue-requestor/pom.xml | 2 +- examples/jms/queue-selector/pom.xml | 2 +- examples/jms/queue/pom.xml | 2 +- examples/jms/reattach-node/pom.xml | 6 +- examples/jms/reattach-node/readme.html | 2 +- .../hornetq/server0/activemq-configuration.xml | 2 +- examples/jms/replicated-failback-static/pom.xml | 10 +-- .../hornetq/server0/activemq-configuration.xml | 2 +- .../hornetq/server1/activemq-configuration.xml | 2 +- examples/jms/replicated-failback/pom.xml | 10 +-- .../hornetq/server0/activemq-configuration.xml | 2 +- .../hornetq/server1/activemq-configuration.xml | 2 +- .../jms/replicated-multiple-failover/pom.xml | 14 ++-- .../hornetq/server0/activemq-configuration.xml | 2 +- .../hornetq/server1/activemq-configuration.xml | 2 +- .../hornetq/server2/activemq-configuration.xml | 2 +- .../jms/replicated-transaction-failover/pom.xml | 10 +-- examples/jms/request-reply/pom.xml | 2 +- examples/jms/rest/dup-send/README.txt | 2 +- .../dup-send/src/main/webapp/WEB-INF/web.xml | 2 +- examples/jms/rest/jms-to-rest/receiveOrder.py | 2 +- examples/jms/scale-down/pom.xml | 10 +-- .../hornetq/server0/activemq-configuration.xml | 4 +- examples/jms/scheduled-message/pom.xml | 2 +- examples/jms/security/pom.xml | 2 +- examples/jms/security/readme.html | 12 +-- .../hornetq/server0/activemq-users.xml | 2 +- examples/jms/send-acknowledgements/pom.xml | 2 +- examples/jms/spring-integration/pom.xml | 2 +- examples/jms/ssl-enabled/pom.xml | 2 +- examples/jms/ssl-enabled/readme.html | 30 ++++---- .../hornetq/server0/activemq-configuration.xml | 4 +- examples/jms/static-selector-jms/pom.xml | 2 +- examples/jms/static-selector-jms/readme.html | 2 +- examples/jms/static-selector/pom.xml | 2 +- examples/jms/static-selector/readme.html | 2 +- examples/jms/stomp-websockets/pom.xml | 6 +- examples/jms/stomp/pom.xml | 2 +- examples/jms/stomp1.1/pom.xml | 2 +- examples/jms/stomp1.2/pom.xml | 2 +- examples/jms/stop-server-failover/pom.xml | 10 +-- .../hornetq/server0/activemq-configuration.xml | 2 +- .../hornetq/server1/activemq-configuration.xml | 2 +- examples/jms/symmetric-cluster/pom.xml | 26 +++---- examples/jms/symmetric-cluster/readme.html | 2 +- examples/jms/temp-queue/pom.xml | 2 +- examples/jms/topic-hierarchies/pom.xml | 2 +- examples/jms/topic-hierarchies/readme.html | 2 +- examples/jms/topic-selector-example1/pom.xml | 2 +- examples/jms/topic-selector-example2/pom.xml | 2 +- examples/jms/topic/pom.xml | 2 +- examples/jms/transaction-failover/pom.xml | 10 +-- .../hornetq/server0/activemq-configuration.xml | 2 +- .../hornetq/server1/activemq-configuration.xml | 2 +- examples/jms/transactional/pom.xml | 2 +- examples/jms/xa-heuristic/pom.xml | 2 +- examples/jms/xa-receive/pom.xml | 2 +- examples/jms/xa-send/pom.xml | 2 +- examples/jms/xa-with-jta/pom.xml | 2 +- examples/soak/normal/README | 6 +- .../normal/server0/activemq-configuration.xml | 2 +- hornetq_doap.rdf | 2 +- .../activemq-aerogear-integration/pom.xml | 2 +- .../activemq-jboss-as-integration/pom.xml | 2 +- integration/activemq-spring-integration/pom.xml | 2 +- .../activemq-twitter-integration/pom.xml | 2 +- integration/activemq-vertx-integration/pom.xml | 2 +- pom.xml | 25 +++--- scripts/replace-wildfly.sh | 34 --------- tests/byteman-tests/pom.xml | 2 +- tests/concurrent-tests/pom.xml | 2 +- tests/config/logging.properties | 2 +- tests/config/logging.properties.trace | 2 +- .../config/server-start-stop-backup-config1.xml | 2 +- tests/config/server-start-stop-live-config1.xml | 2 +- tests/integration-tests/pom.xml | 2 +- .../colocated-server-start-stop-config1.xml | 16 ++-- .../colocated-server-start-stop-config2.xml | 16 ++-- .../resources/restricted-security-client.policy | 4 +- .../resources/server-start-stop-config1.xml | 2 +- .../src/test/resources/spring-jms-beans.xml | 4 +- tests/jms-tests/pom.xml | 2 +- tests/joram-tests/pom.xml | 2 +- .../org/apache/activemq/jms/ActiveMQQAdmin.java | 2 +- tests/performance-tests/pom.xml | 2 +- tests/pom.xml | 2 +- tests/soak-tests/pom.xml | 2 +- tests/stress-tests/pom.xml | 2 +- tests/timing-tests/pom.xml | 2 +- tests/unit-tests/pom.xml | 2 +- 305 files changed, 810 insertions(+), 842 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/.project ---------------------------------------------------------------------- diff --git a/.project b/.project index d928224..fe8261c 100644 --- a/.project +++ b/.project @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <projectDescription> - <name>hornetq</name> + <name>activemq</name> <comment></comment> <projects> </projects> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/RELEASING.md ---------------------------------------------------------------------- diff --git a/RELEASING.md b/RELEASING.md index bf5a5ef..e7e29e9 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) http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/activemq-bootstrap/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-bootstrap/pom.xml b/activemq-bootstrap/pom.xml index f883de3..51b15c7 100644 --- a/activemq-bootstrap/pom.xml +++ b/activemq-bootstrap/pom.xml @@ -13,7 +13,7 @@ <name>ActiveMQ6 Bootstrap</name> <properties> - <hornetq.basedir>${project.basedir}/..</hornetq.basedir> + <activemq.basedir>${project.basedir}/..</activemq.basedir> </properties> <dependencies> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/activemq-commons/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-commons/pom.xml b/activemq-commons/pom.xml index 656b0f6..cae0651 100644 --- a/activemq-commons/pom.xml +++ b/activemq-commons/pom.xml @@ -13,7 +13,7 @@ <name>ActiveMQ6 Commons</name> <properties> - <hornetq.basedir>${project.basedir}/..</hornetq.basedir> + <activemq.basedir>${project.basedir}/..</activemq.basedir> </properties> <dependencies> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/activemq-core-client/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-core-client/pom.xml b/activemq-core-client/pom.xml index c362506..9da2c18 100644 --- a/activemq-core-client/pom.xml +++ b/activemq-core-client/pom.xml @@ -13,7 +13,7 @@ <name>ActiveMQ6 Core Client</name> <properties> - <hornetq.basedir>${project.basedir}/..</hornetq.basedir> + <activemq.basedir>${project.basedir}/..</activemq.basedir> </properties> <dependencies> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/activemq-dto/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-dto/pom.xml b/activemq-dto/pom.xml index 419f8e2..98d9bb7 100644 --- a/activemq-dto/pom.xml +++ b/activemq-dto/pom.xml @@ -13,7 +13,7 @@ <name>ActiveMQ6 DTO</name> <properties> - <hornetq.basedir>${project.basedir}/..</hornetq.basedir> + <activemq.basedir>${project.basedir}/..</activemq.basedir> </properties> <dependencies> @@ -55,7 +55,7 @@ <echo message="Generating XSD to: ${project.build.directory}/schema/org.apache.activemq/dto"/> <schemagen srcdir="${basedir}/.." destdir="${project.build.directory}/schema/org.apache.activemq/dto" includeantruntime="false"> - <schema namespace="http://hornetq.org/schema"; file="hornetq.xsd"/> + <schema namespace="http://activemq.org/schema"; file="activemq.xsd"/> <classpath refid="maven.compile.classpath"/> <include name="**/package-info.java"/> <include name="**/*DTO.java"/> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/activemq-jms-client/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-jms-client/pom.xml b/activemq-jms-client/pom.xml index 04f075b..d6eb810 100644 --- a/activemq-jms-client/pom.xml +++ b/activemq-jms-client/pom.xml @@ -13,7 +13,7 @@ <name>ActiveMQ6 JMS Client</name> <properties> - <hornetq.basedir>${project.basedir}/..</hornetq.basedir> + <activemq.basedir>${project.basedir}/..</activemq.basedir> </properties> <dependencies> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/activemq-jms-server/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-jms-server/pom.xml b/activemq-jms-server/pom.xml index 26ac847..476914b 100644 --- a/activemq-jms-server/pom.xml +++ b/activemq-jms-server/pom.xml @@ -13,7 +13,7 @@ <name>ActiveMQ6 JMS Server</name> <properties> - <hornetq.basedir>${project.basedir}/..</hornetq.basedir> + <activemq.basedir>${project.basedir}/..</activemq.basedir> </properties> <dependencies> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/activemq-jms-server/src/main/resources/schema/activemq-jms.xsd ---------------------------------------------------------------------- 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 a7864eb..7367b15 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"> - <xsd:element name="configuration" amq:schema="hornetq-jms-configuration"> + <xsd:element name="configuration" amq:schema="activemq-jms-configuration"> <xsd:complexType> <xsd:sequence> <xsd:element name="jmx-domain" type="xsd:string" default="org.apache.activemq" http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/activemq-journal/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-journal/pom.xml b/activemq-journal/pom.xml index a0ec4b2..1941313 100644 --- a/activemq-journal/pom.xml +++ b/activemq-journal/pom.xml @@ -13,7 +13,7 @@ <name>ActiveMQ6 Journal</name> <properties> - <hornetq.basedir>${project.basedir}/..</hornetq.basedir> + <activemq.basedir>${project.basedir}/..</activemq.basedir> </properties> <dependencies> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/activemq-native/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-native/pom.xml b/activemq-native/pom.xml index 827385c..22a9515 100644 --- a/activemq-native/pom.xml +++ b/activemq-native/pom.xml @@ -120,7 +120,7 @@ <properties> <native-package-type>jar</native-package-type> - <hornetq.basedir>${project.basedir}/..</hornetq.basedir> + <activemq.basedir>${project.basedir}/..</activemq.basedir> </properties> </project> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/activemq-protocols/activemq-amqp-protocol/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-amqp-protocol/pom.xml b/activemq-protocols/activemq-amqp-protocol/pom.xml index 5090820..ebd5ebe 100644 --- a/activemq-protocols/activemq-amqp-protocol/pom.xml +++ b/activemq-protocols/activemq-amqp-protocol/pom.xml @@ -10,7 +10,7 @@ <artifactId>activemq-amqp-protocol</artifactId> <properties> - <hornetq.basedir>${project.basedir}/../..</hornetq.basedir> + <activemq.basedir>${project.basedir}/../..</activemq.basedir> </properties> <dependencies> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/activemq-protocols/activemq-openwire-protocol/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-openwire-protocol/pom.xml b/activemq-protocols/activemq-openwire-protocol/pom.xml index 2e5fa30..003f600 100644 --- a/activemq-protocols/activemq-openwire-protocol/pom.xml +++ b/activemq-protocols/activemq-openwire-protocol/pom.xml @@ -10,7 +10,7 @@ <artifactId>activemq-openwire-protocol</artifactId> <properties> - <hornetq.basedir>${project.parent.parent.basedir}</hornetq.basedir> + <activemq.basedir>${project.parent.parent.basedir}</activemq.basedir> </properties> <dependencies> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/activemq-protocols/activemq-proton-plug/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-proton-plug/pom.xml b/activemq-protocols/activemq-proton-plug/pom.xml index f60bc40..84c56d8 100644 --- a/activemq-protocols/activemq-proton-plug/pom.xml +++ b/activemq-protocols/activemq-proton-plug/pom.xml @@ -10,7 +10,7 @@ <artifactId>activemq-proton-plug</artifactId> <properties> - <hornetq.basedir>${project.basedir}/../..</hornetq.basedir> + <activemq.basedir>${project.basedir}/../..</activemq.basedir> </properties> <dependencies> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/activemq-protocols/activemq-stomp-protocol/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-protocols/activemq-stomp-protocol/pom.xml b/activemq-protocols/activemq-stomp-protocol/pom.xml index d52bbb0..78727fb 100644 --- a/activemq-protocols/activemq-stomp-protocol/pom.xml +++ b/activemq-protocols/activemq-stomp-protocol/pom.xml @@ -10,7 +10,7 @@ <artifactId>activemq-stomp-protocol</artifactId> <properties> - <hornetq.basedir>${project.basedir}/../..</hornetq.basedir> + <activemq.basedir>${project.basedir}/../..</activemq.basedir> </properties> <dependencies> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/activemq-protocols/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-protocols/pom.xml b/activemq-protocols/pom.xml index d4696df..20235e4 100644 --- a/activemq-protocols/pom.xml +++ b/activemq-protocols/pom.xml @@ -13,7 +13,7 @@ <packaging>pom</packaging> <properties> - <hornetq.basedir>${project.basedir}/..</hornetq.basedir> + <activemq.basedir>${project.basedir}/..</activemq.basedir> </properties> <modules> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/activemq-ra/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-ra/pom.xml b/activemq-ra/pom.xml index a31d51c..b9954b9 100644 --- a/activemq-ra/pom.xml +++ b/activemq-ra/pom.xml @@ -13,7 +13,7 @@ <packaging>jar</packaging> <properties> - <hornetq.basedir>${project.basedir}/..</hornetq.basedir> + <activemq.basedir>${project.basedir}/..</activemq.basedir> </properties> <dependencies> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/activemq-rest/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-rest/pom.xml b/activemq-rest/pom.xml index f54aebd..5ffab7f 100644 --- a/activemq-rest/pom.xml +++ b/activemq-rest/pom.xml @@ -15,7 +15,7 @@ <properties> <activemq.version>${project.version}</activemq.version> - <hornetq.basedir>${project.basedir}/..</hornetq.basedir> + <activemq.basedir>${project.basedir}/..</activemq.basedir> </properties> <dependencies> @@ -96,7 +96,7 @@ <artifactId>maven-surefire-plugin</artifactId> <configuration> <argLine> - -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 </argLine> <skipTests>${skipRestTests}</skipTests> <!--includes> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/activemq-selector/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-selector/pom.xml b/activemq-selector/pom.xml index 21d7f4b..8a07b17 100644 --- a/activemq-selector/pom.xml +++ b/activemq-selector/pom.xml @@ -13,7 +13,7 @@ <name>ActiveMQ6 Selector Implementation</name> <properties> - <hornetq.basedir>${project.basedir}/..</hornetq.basedir> + <activemq.basedir>${project.basedir}/..</activemq.basedir> </properties> <dependencies> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/activemq-server/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-server/pom.xml b/activemq-server/pom.xml index b231518..9f1ea2f 100644 --- a/activemq-server/pom.xml +++ b/activemq-server/pom.xml @@ -13,7 +13,7 @@ <name>ActiveMQ6 Server</name> <properties> - <hornetq.basedir>${project.basedir}/..</hornetq.basedir> + <activemq.basedir>${project.basedir}/..</activemq.basedir> </properties> <dependencies> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/activemq-server/src/test/resources/ConfigurationTest-full-config.xml ---------------------------------------------------------------------- diff --git a/activemq-server/src/test/resources/ConfigurationTest-full-config.xml b/activemq-server/src/test/resources/ConfigurationTest-full-config.xml index 6bf793c..32fda82 100644 --- a/activemq-server/src/test/resources/ConfigurationTest-full-config.xml +++ b/activemq-server/src/test/resources/ConfigurationTest-full-config.xml @@ -1,7 +1,7 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="urn:activemq ../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd"> + xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd"> <name>SomeNameForUseOnTheApplicationServer</name> <resolve-protocols>false</resolve-protocols> <clustered>true</clustered> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/activemq-server/src/test/resources/colocated-hapolicy-config.xml ---------------------------------------------------------------------- diff --git a/activemq-server/src/test/resources/colocated-hapolicy-config.xml b/activemq-server/src/test/resources/colocated-hapolicy-config.xml index e8178a5..3201796 100644 --- a/activemq-server/src/test/resources/colocated-hapolicy-config.xml +++ b/activemq-server/src/test/resources/colocated-hapolicy-config.xml @@ -1,7 +1,7 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="urn:activemq ../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd"> + xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd"> <ha-policy> <replication> <colocated> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/activemq-server/src/test/resources/colocated-hapolicy-config2.xml ---------------------------------------------------------------------- diff --git a/activemq-server/src/test/resources/colocated-hapolicy-config2.xml b/activemq-server/src/test/resources/colocated-hapolicy-config2.xml index 6173210..276d772 100644 --- a/activemq-server/src/test/resources/colocated-hapolicy-config2.xml +++ b/activemq-server/src/test/resources/colocated-hapolicy-config2.xml @@ -1,7 +1,7 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="urn:activemq ../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd"> + xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd"> <ha-policy> <shared-store> <colocated> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/activemq-server/src/test/resources/live-only-hapolicy-config.xml ---------------------------------------------------------------------- diff --git a/activemq-server/src/test/resources/live-only-hapolicy-config.xml b/activemq-server/src/test/resources/live-only-hapolicy-config.xml index aeddb2f..35818e4 100644 --- a/activemq-server/src/test/resources/live-only-hapolicy-config.xml +++ b/activemq-server/src/test/resources/live-only-hapolicy-config.xml @@ -1,7 +1,7 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="urn:activemq ../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd"> + xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd"> <ha-policy> <live-only> <scale-down> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/activemq-server/src/test/resources/live-only-hapolicy-config2.xml ---------------------------------------------------------------------- diff --git a/activemq-server/src/test/resources/live-only-hapolicy-config2.xml b/activemq-server/src/test/resources/live-only-hapolicy-config2.xml index 12cded2..db9d422 100644 --- a/activemq-server/src/test/resources/live-only-hapolicy-config2.xml +++ b/activemq-server/src/test/resources/live-only-hapolicy-config2.xml @@ -1,7 +1,7 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="urn:activemq ../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd"> + xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd"> <ha-policy> <!--only one of the following--> <!--on server shutdown scale down to another live server--> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/activemq-server/src/test/resources/live-only-hapolicy-config3.xml ---------------------------------------------------------------------- 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 fafce39..c77f8e4 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 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="urn:activemq ../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd"> + xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd"> <ha-policy> <!--only one of the following--> <!--on server shutdown scale down to another live server--> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/activemq-server/src/test/resources/live-only-hapolicy-config4.xml ---------------------------------------------------------------------- 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 e41bf09..0e7f45a 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 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="urn:activemq ../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd"> + xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd"> <ha-policy/> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/activemq-server/src/test/resources/live-only-hapolicy-config5.xml ---------------------------------------------------------------------- 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 91dd0de..83c6c33 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 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="urn:activemq ../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd"> + xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd"> </configuration> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/activemq-server/src/test/resources/logging.properties ---------------------------------------------------------------------- diff --git a/activemq-server/src/test/resources/logging.properties b/activemq-server/src/test/resources/logging.properties index fe033b1..67b5e02 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 http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/activemq-server/src/test/resources/replica-hapolicy-config.xml ---------------------------------------------------------------------- diff --git a/activemq-server/src/test/resources/replica-hapolicy-config.xml b/activemq-server/src/test/resources/replica-hapolicy-config.xml index 28a1f11..6874afb 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 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="urn:activemq ../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd"> + xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd"> <ha-policy> <replication> <slave> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/activemq-server/src/test/resources/replica-hapolicy-config2.xml ---------------------------------------------------------------------- diff --git a/activemq-server/src/test/resources/replica-hapolicy-config2.xml b/activemq-server/src/test/resources/replica-hapolicy-config2.xml index 9736237..dba47b0 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 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="urn:activemq ../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd"> + xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd"> <ha-policy> <replication> <slave> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/activemq-server/src/test/resources/replica-hapolicy-config3.xml ---------------------------------------------------------------------- diff --git a/activemq-server/src/test/resources/replica-hapolicy-config3.xml b/activemq-server/src/test/resources/replica-hapolicy-config3.xml index 8269ce3..6dea68d 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 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="urn:activemq ../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd"> + xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd"> <ha-policy> <replication> <slave> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/activemq-server/src/test/resources/replicated-hapolicy-config.xml ---------------------------------------------------------------------- diff --git a/activemq-server/src/test/resources/replicated-hapolicy-config.xml b/activemq-server/src/test/resources/replicated-hapolicy-config.xml index 75c5bee..3cb67e1 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 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="urn:activemq ../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd"> + xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd"> <ha-policy> <replication> <master> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/activemq-server/src/test/resources/shared-store-master-hapolicy-config.xml ---------------------------------------------------------------------- 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 fb2b303..0e29add 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 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="urn:activemq ../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd"> + xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd"> <ha-policy> <shared-store> <master> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/activemq-server/src/test/resources/shared-store-slave-hapolicy-config.xml ---------------------------------------------------------------------- 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 d9cd77e..02ce6de 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 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="urn:activemq ../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd"> + xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd"> <ha-policy> <shared-store> <slave> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/activemq-server/src/test/resources/shared-store-slave-hapolicy-config2.xml ---------------------------------------------------------------------- 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 31a681f..1fd060e 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 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="urn:activemq ../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd"> + xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd"> <ha-policy> <shared-store> <slave> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/activemq-server/src/test/resources/shared-store-slave-hapolicy-config3.xml ---------------------------------------------------------------------- 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 a1eb14e..093804e 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 @@ <configuration xmlns="urn:activemq" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="urn:activemq ../../../../hornetq-server/src/main/resources/schema/activemq-configuration.xsd"> + xsi:schemaLocation="urn:activemq ../../../../activemq-server/src/main/resources/schema/activemq-configuration.xsd"> <ha-policy> <shared-store> <slave> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/activemq-tools/pom.xml ---------------------------------------------------------------------- diff --git a/activemq-tools/pom.xml b/activemq-tools/pom.xml index 2453ced..d3a653c 100644 --- a/activemq-tools/pom.xml +++ b/activemq-tools/pom.xml @@ -34,7 +34,7 @@ </dependencies> <properties> - <hornetq.basedir>${project.basedir}/..</hornetq.basedir> + <activemq.basedir>${project.basedir}/..</activemq.basedir> </properties> <build> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/distribution/activemq/src/main/resources/config/clustered/activemq-configuration.xml ---------------------------------------------------------------------- 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 a09ffe0..5d292fb 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 @@ <connectors> <connector name="netty"> <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> - <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> - <param key="port" value="${hornetq.remoting.netty.port:5445}"/> + <param key="host" value="${activemq.remoting.netty.host:localhost}"/> + <param key="port" value="${activemq.remoting.netty.port:5445}"/> </connector> <connector name="netty-throughput"> <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> - <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> - <param key="port" value="${hornetq.remoting.netty.batch.port:5455}"/> + <param key="host" value="${activemq.remoting.netty.host:localhost}"/> + <param key="port" value="${activemq.remoting.netty.batch.port:5455}"/> <param key="batch-delay" value="50"/> </connector> </connectors> @@ -30,14 +30,14 @@ <acceptors> <acceptor name="netty"> <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> - <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> - <param key="port" value="${hornetq.remoting.netty.port:5445}"/> + <param key="host" value="${activemq.remoting.netty.host:localhost}"/> + <param key="port" value="${activemq.remoting.netty.port:5445}"/> </acceptor> <acceptor name="netty-throughput"> <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> - <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> - <param key="port" value="${hornetq.remoting.netty.batch.port:5455}"/> + <param key="host" value="${activemq.remoting.netty.host:localhost}"/> + <param key="port" value="${activemq.remoting.netty.batch.port:5455}"/> <param key="batch-delay" value="50"/> <param key="direct-deliver" value="false"/> </acceptor> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/distribution/activemq/src/main/resources/config/clustered/bootstrap.xml ---------------------------------------------------------------------- diff --git a/distribution/activemq/src/main/resources/config/clustered/bootstrap.xml b/distribution/activemq/src/main/resources/config/clustered/bootstrap.xml index 28b9dce..d7f2d5b 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. --> -<broker xmlns="http://hornetq.org/schema";> +<broker xmlns="http://activemq.org/schema";> <core configuration="file:${activemq.home}/config/clustered/activemq-configuration.xml"></core> <jms configuration="file:${activemq.home}/config/clustered/activemq-jms.xml"></jms> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/distribution/activemq/src/main/resources/config/logging.properties ---------------------------------------------------------------------- diff --git a/distribution/activemq/src/main/resources/config/logging.properties b/distribution/activemq/src/main/resources/config/logging.properties index e905257..f38bffe 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 http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/distribution/activemq/src/main/resources/config/non-clustered/activemq-configuration.xml ---------------------------------------------------------------------- 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 7175211..1941b92 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 @@ <connectors> <connector name="netty"> <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> - <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> - <param key="port" value="${hornetq.remoting.netty.port:5445}"/> + <param key="host" value="${activemq.remoting.netty.host:localhost}"/> + <param key="port" value="${activemq.remoting.netty.port:5445}"/> </connector> <connector name="netty-throughput"> <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> - <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> - <param key="port" value="${hornetq.remoting.netty.batch.port:5455}"/> + <param key="host" value="${activemq.remoting.netty.host:localhost}"/> + <param key="port" value="${activemq.remoting.netty.batch.port:5455}"/> <param key="batch-delay" value="50"/> </connector> </connectors> @@ -30,14 +30,14 @@ <acceptors> <acceptor name="netty"> <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> - <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> - <param key="port" value="${hornetq.remoting.netty.port:5445}"/> + <param key="host" value="${activemq.remoting.netty.host:localhost}"/> + <param key="port" value="${activemq.remoting.netty.port:5445}"/> </acceptor> <acceptor name="netty-throughput"> <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> - <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> - <param key="port" value="${hornetq.remoting.netty.batch.port:5455}"/> + <param key="host" value="${activemq.remoting.netty.host:localhost}"/> + <param key="port" value="${activemq.remoting.netty.batch.port:5455}"/> <param key="batch-delay" value="50"/> <param key="direct-deliver" value="false"/> </acceptor> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/distribution/activemq/src/main/resources/config/non-clustered/bootstrap.xml ---------------------------------------------------------------------- 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 de3147e..2e93aa4 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. --> -<broker xmlns="http://hornetq.org/schema";> +<broker xmlns="http://activemq.org/schema";> <core configuration="file:${activemq.home}/config/non-clustered/activemq-configuration.xml"></core> <jms configuration="file:${activemq.home}/config/non-clustered/activemq-jms.xml"></jms> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/distribution/activemq/src/main/resources/config/replicated/activemq-configuration.xml ---------------------------------------------------------------------- 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 54bb6f0..06f014a 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 @@ <connectors> <connector name="netty"> <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> - <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> - <param key="port" value="${hornetq.remoting.netty.port:5445}"/> + <param key="host" value="${activemq.remoting.netty.host:localhost}"/> + <param key="port" value="${activemq.remoting.netty.port:5445}"/> </connector> <connector name="netty-throughput"> <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> - <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> - <param key="port" value="${hornetq.remoting.netty.batch.port:5455}"/> + <param key="host" value="${activemq.remoting.netty.host:localhost}"/> + <param key="port" value="${activemq.remoting.netty.batch.port:5455}"/> <param key="batch-delay" value="50"/> </connector> </connectors> @@ -34,14 +34,14 @@ <acceptors> <acceptor name="netty"> <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> - <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> - <param key="port" value="${hornetq.remoting.netty.port:5445}"/> + <param key="host" value="${activemq.remoting.netty.host:localhost}"/> + <param key="port" value="${activemq.remoting.netty.port:5445}"/> </acceptor> <acceptor name="netty-throughput"> <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> - <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> - <param key="port" value="${hornetq.remoting.netty.batch.port:5455}"/> + <param key="host" value="${activemq.remoting.netty.host:localhost}"/> + <param key="port" value="${activemq.remoting.netty.batch.port:5455}"/> <param key="batch-delay" value="50"/> <param key="direct-deliver" value="false"/> </acceptor> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/distribution/activemq/src/main/resources/config/replicated/bootstrap.xml ---------------------------------------------------------------------- diff --git a/distribution/activemq/src/main/resources/config/replicated/bootstrap.xml b/distribution/activemq/src/main/resources/config/replicated/bootstrap.xml index 977dea4..9293b29 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. --> -<broker xmlns="http://hornetq.org/schema";> +<broker xmlns="http://activemq.org/schema";> <core configuration="file:${activemq.home}/config/replicated/activemq-configuration.xml"></core> <jms configuration="file:${activemq.home}/config/replicated/activemq-jms.xml"></jms> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/distribution/activemq/src/main/resources/config/shared-store/activemq-configuration.xml ---------------------------------------------------------------------- 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 11c0476..0f60895 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 @@ <connectors> <connector name="netty"> <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> - <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> - <param key="port" value="${hornetq.remoting.netty.port:5445}"/> + <param key="host" value="${activemq.remoting.netty.host:localhost}"/> + <param key="port" value="${activemq.remoting.netty.port:5445}"/> </connector> <connector name="netty-throughput"> <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> - <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> - <param key="port" value="${hornetq.remoting.netty.batch.port:5455}"/> + <param key="host" value="${activemq.remoting.netty.host:localhost}"/> + <param key="port" value="${activemq.remoting.netty.batch.port:5455}"/> <param key="batch-delay" value="50"/> </connector> </connectors> @@ -34,14 +34,14 @@ <acceptors> <acceptor name="netty"> <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> - <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> - <param key="port" value="${hornetq.remoting.netty.port:5445}"/> + <param key="host" value="${activemq.remoting.netty.host:localhost}"/> + <param key="port" value="${activemq.remoting.netty.port:5445}"/> </acceptor> <acceptor name="netty-throughput"> <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> - <param key="host" value="${hornetq.remoting.netty.host:localhost}"/> - <param key="port" value="${hornetq.remoting.netty.batch.port:5455}"/> + <param key="host" value="${activemq.remoting.netty.host:localhost}"/> + <param key="port" value="${activemq.remoting.netty.batch.port:5455}"/> <param key="batch-delay" value="50"/> <param key="direct-deliver" value="false"/> </acceptor> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/distribution/activemq/src/main/resources/config/shared-store/bootstrap.xml ---------------------------------------------------------------------- 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 192cdb9..03a1ba9 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. --> -<broker xmlns="http://hornetq.org/schema";> +<broker xmlns="http://activemq.org/schema";> <core configuration="file:${activemq.home}/config/shared-store/activemq-configuration.xml"></core> <jms configuration="file:${activemq.home}/config/shared-store/activemq-jms.xml"></jms> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/docs/eap-manual/en/clusters.xml ---------------------------------------------------------------------- diff --git a/docs/eap-manual/en/clusters.xml b/docs/eap-manual/en/clusters.xml index 54c8b6b..19bf1d5 100644 --- a/docs/eap-manual/en/clusters.xml +++ b/docs/eap-manual/en/clusters.xml @@ -133,7 +133,7 @@ </para> <para>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 in<literal>hornetq-jms.xml</literal>. Let's look at an + certain attributes to the connection factories in<literal>activemq-jms.xml</literal>. Let's look at an example: </para> <programlisting> @@ -201,15 +201,15 @@ for a live server running on a different eap instance. </para> <para> - The first thing to mention is that the backup only needs a <literal>hornetq-jboss-beans.xml</literal> + The first thing to mention is that the backup only needs a <literal>activemq-jboss-beans.xml</literal> and a <literal>activemq-configuration.xml</literal> configuration file. This is because any JMS components are created from the Journal when the backup server becomes live. </para> <para> Firstly we need to define a new ActiveMQ Server that EAP will deploy. We do this by creating a new - <literal>hornetq-jboss-beans.xml</literal> + <literal>activemq-jboss-beans.xml</literal> configuration. We will place this under a new directory - <literal>hornetq-backup1</literal> + <literal>activemq-backup1</literal> which will need creating in the <literal>deploy</literal> @@ -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 <literal>activemq-configuration.xml</literal> and add it to the same directory - <literal>deploy/hornetq-backup1</literal> + <literal>deploy/activemq-backup1</literal> and configure it like so: </para> <programlisting> @@ -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 @@ <itemizedlist> <listitem> <para> - Make sure that you give all the beans in the <literal>hornetq-jboss-beans.xml</literal> configuration + Make sure that you give all the beans in the <literal>activemq-jboss-beans.xml</literal> configuration file a unique name, i.e. </para> </listitem> @@ -461,7 +461,7 @@ <section> <title>Running the shipped example</title> <para> - EAP ships with an example configuration for this topology. Look under <literal>extras/hornetq/resources/examples/symmetric-cluster-with-backups-colocated</literal> + EAP ships with an example configuration for this topology. Look under <literal>extras/activemq/resources/examples/symmetric-cluster-with-backups-colocated</literal> and follow the read me </para> </section> @@ -491,9 +491,9 @@ <graphic fileref="images/simple-dedicated-jca.jpg" align="center" format="jpg" scale="30"/> </para> <para> - 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 @@ </para> <para> For the backup server the <literal>activemq-configuration.xml</literal> is unchanged, however since there is - no live server we need to make sure that the <literal>hornetq-jboss-beans.xml</literal> instantiates all + no live server we need to make sure that the <literal>activemq-jboss-beans.xml</literal> instantiates all the beans needed. For this simply use the same configuration as in the live server changing only the location of the <literal>activemq-configuration.xml</literal> parameter for the <literal>Configuration</literal> bean. </para> <para> - As before there will be no <literal>hornetq-jms.xml</literal> or <literal>jms-ds.xml</literal> configuration. + As before there will be no <literal>activemq-jms.xml</literal> or <literal>jms-ds.xml</literal> configuration. </para> <para> - 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 <literal>jms-ds.xml</literal> and change the following lines to </para> <programlisting> @@ -560,7 +560,7 @@ <title>Running the shipped example</title> <para> EAP ships with an example configuration for this topology. Look under - <literal>extras/hornetq/resources/examples/cluster-with-dedicated-backup</literal> + <literal>extras/activemq/resources/examples/cluster-with-dedicated-backup</literal> and follow the read me </para> </section> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/docs/quickstart-guide/en/download.xml ---------------------------------------------------------------------- diff --git a/docs/quickstart-guide/en/download.xml b/docs/quickstart-guide/en/download.xml index 7eeecb8..f47d5a6 100644 --- a/docs/quickstart-guide/en/download.xml +++ b/docs/quickstart-guide/en/download.xml @@ -23,13 +23,13 @@ ]> <chapter id="download"> <title>Download</title> - <para>The official ActiveMQ project page is <ulink url="http://hornetq.org/"; - >http://hornetq.org/</ulink>.</para> + <para>The official ActiveMQ project page is <ulink url="http://activemq.org/"; + >http://activemq.org/</ulink>.</para> <section id="download.software"> <title>Software Download</title> <para>The software can be download from the Download page:<ulink - url="http://hornetq.org/downloads.html"; - >http://hornetq.org/downloads.html</ulink></para> + url="http://activemq.org/downloads.html"; + >http://activemq.org/downloads.html</ulink></para> </section> <section id="download.git"> <title>Project Information</title> @@ -41,7 +41,7 @@ </listitem> <listitem> <para>If you have any user questions please use our <ulink - url="https://community.jboss.org/en/hornetq";>user + url="https://community.jboss.org/en/activemq";>user forum</ulink></para> </listitem> <listitem> @@ -50,24 +50,24 @@ >developer forum</ulink></para> </listitem> <listitem> - <para>Pop in and chat to us in our <ulink url="irc://irc.freenode.net:6667/hornetq" + <para>Pop in and chat to us in our <ulink url="irc://irc.freenode.net:6667/activemq" >IRC channel</ulink></para> </listitem> <listitem> - <para>Our project <ulink url="http://hornetq.blogspot.com/";>blog</ulink></para> + <para>Our project <ulink url="http://activemq.blogspot.com/";>blog</ulink></para> </listitem> <listitem> - <para>Follow us on <ulink url="http://twitter.com/hornetq";>twitter</ulink></para> + <para>Follow us on <ulink url="http://twitter.com/activemq";>twitter</ulink></para> </listitem> <listitem> <para>ActiveMQ Git repository is <ulink - url="https://github.com/hornetq/hornetq"; - >https://github.com/hornetq/hornetq</ulink></para> + url="https://github.com/activemq/activemq"; + >https://github.com/activemq/activemq</ulink></para> </listitem> <listitem> <para>All release tags are available from <ulink - url="https://github.com/hornetq/hornetq/tags"; - >https://github.com/hornetq/hornetq/tags</ulink></para> + url="https://github.com/activemq/activemq/tags"; + >https://github.com/activemq/activemq/tags</ulink></para> </listitem> </itemizedlist> </para>
