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

merge #19 name changes

This commit is contained in:
Andy Taylor 2014-11-20 08:56:27 +00:00
parent 09123d65de 9b828d2d49
commit 3c83324bb7
307 changed files with 840 additions and 869 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
.gitignore vendored
View File

@ -1,6 +1,6 @@
#idea files #idea files
hornetq-pom.ipr activemq-pom.ipr
hornetq-pom.iws activemq-pom.iws
.idea .idea
*.iml *.iml
*/*.iml */*.iml
@ -33,7 +33,7 @@ org.maven.ide.eclipse.prefs
.classpath .classpath
tests/*-tests/hs_err_pid*.log tests/*-tests/hs_err_pid*.log
tests/**/server.lock tests/**/server.lock
hornetq-core/*.log activemq-core/*.log
.checkstyle .checkstyle
# / # /
@ -48,15 +48,15 @@ hornetq-core/*.log
/target /target
/.metadata /.metadata
integration/hornetq-*-integration/.project integration/activemq-*-integration/.project
# /distribution/ # /distribution/
/distribution/target /distribution/target
/distribution/.project /distribution/.project
/distribution/jboss-mc/.project /distribution/jboss-mc/.project
# /distribution/hornetq/ # /distribution/activemq/
/distribution/hornetq/.project /distribution/activemq/.project
# /distribution/jnp-client/ # /distribution/jnp-client/
/distribution/jnp-client/target /distribution/jnp-client/target
@ -711,26 +711,26 @@ examples/pom-template.xml
# /examples/soak/tx-restarts/ # /examples/soak/tx-restarts/
/examples/soak/tx-restarts/build /examples/soak/tx-restarts/build
# /hornetq-protocols/ # /activemq-protocols/
/hornetq-protocols/hornetq-amqp-protocol/.project /activemq-protocols/activemq-amqp-protocol/.project
/hornetq-protocols/hornetq-stomp-protocol/.project /activemq-protocols/activemq-stomp-protocol/.project
# /hornetq-ra/hornetq-ra-jar/ # /activemq-ra/activemq-ra-jar/
/hornetq-ra/hornetq-ra-jar/target /activemq-ra/activemq-ra-jar/target
/hornetq-ra/hornetq-ra-jar/.project /activemq-ra/activemq-ra-jar/.project
# /hornetq-ra/hornetq-ra-rar/ # /activemq-ra/activemq-ra-rar/
/hornetq-ra/hornetq-ra-rar/target /activemq-ra/activemq-ra-rar/target
/hornetq-ra/hornetq-ra-rar/.project /activemq-ra/activemq-ra-rar/.project
# /hornetq-rest/hornetq-rest/ # /activemq-rest/activemq-rest/
/hornetq-rest/target /activemq-rest/target
/hornetq-rest/.project /activemq-rest/.project
/hornetq-rest/data/ /activemq-rest/data/
# /hornetq-rest/ # /activemq-rest/
/hornetq-*/.project /activemq-*/.project
/hornetq-*/target /activemq-*/target
/tests/.project /tests/.project
/tests/*-tests/.project /tests/*-tests/.project
@ -748,7 +748,7 @@ native/src/.deps
*/*/*.iml */*/*.iml
*/*/*/*.iml */*/*/*.iml
hornetq.log activemq.log
*/hornetq.log */activemq.log
*/*/hornetq.log */*/activemq.log
*/*/*/hornetq.log */*/*/activemq.log

2
.project
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<projectDescription> <projectDescription>
<name>hornetq</name> <name>activemq</name>
<comment></comment> <comment></comment>
<projects> <projects>
</projects> </projects>

4
RELEASING.md
View File

@ -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. 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 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 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``. 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_. 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' 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 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 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). 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) 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)

2
activemq-bootstrap/pom.xml
View File

@ -13,7 +13,7 @@
<name>ActiveMQ6 Bootstrap</name> <name>ActiveMQ6 Bootstrap</name>
<properties> <properties>
<hornetq.basedir>${project.basedir}/..</hornetq.basedir> <activemq.basedir>${project.basedir}/..</activemq.basedir>
</properties> </properties>
<dependencies> <dependencies>

2
activemq-commons/pom.xml
View File

@ -13,7 +13,7 @@
<name>ActiveMQ6 Commons</name> <name>ActiveMQ6 Commons</name>
<properties> <properties>
<hornetq.basedir>${project.basedir}/..</hornetq.basedir> <activemq.basedir>${project.basedir}/..</activemq.basedir>
</properties> </properties>
<dependencies> <dependencies>

2
activemq-core-client/pom.xml
View File

@ -13,7 +13,7 @@
<name>ActiveMQ6 Core Client</name> <name>ActiveMQ6 Core Client</name>
<properties> <properties>
<hornetq.basedir>${project.basedir}/..</hornetq.basedir> <activemq.basedir>${project.basedir}/..</activemq.basedir>
</properties> </properties>
<dependencies> <dependencies>

5
activemq-core-client/src/main/java/org/apache/activemq/core/client/impl/ClientConsumerImpl.java
View File

@ -59,7 +59,10 @@ public final class ClientConsumerImpl implements ClientConsumerInternal
private static final int NUM_PRIORITIES = 10; 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 // Attributes
// ----------------------------------------------------------------------------------- // -----------------------------------------------------------------------------------

4
activemq-dto/pom.xml
View File

@ -13,7 +13,7 @@
<name>ActiveMQ6 DTO</name> <name>ActiveMQ6 DTO</name>
<properties> <properties>
<hornetq.basedir>${project.basedir}/..</hornetq.basedir> <activemq.basedir>${project.basedir}/..</activemq.basedir>
</properties> </properties>
<dependencies> <dependencies>
@ -55,7 +55,7 @@
<echo message="Generating XSD to: ${project.build.directory}/schema/org.apache.activemq/dto"/> <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" <schemagen srcdir="${basedir}/.." destdir="${project.build.directory}/schema/org.apache.activemq/dto"
includeantruntime="false"> 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"/> <classpath refid="maven.compile.classpath"/>
<include name="**/package-info.java"/> <include name="**/package-info.java"/>
<include name="**/*DTO.java"/> <include name="**/*DTO.java"/>

2
activemq-jms-client/pom.xml
View File

@ -13,7 +13,7 @@
<name>ActiveMQ6 JMS Client</name> <name>ActiveMQ6 JMS Client</name>
<properties> <properties>
<hornetq.basedir>${project.basedir}/..</hornetq.basedir> <activemq.basedir>${project.basedir}/..</activemq.basedir>
</properties> </properties>
<dependencies> <dependencies>

2
activemq-jms-server/pom.xml
View File

@ -13,7 +13,7 @@
<name>ActiveMQ6 JMS Server</name> <name>ActiveMQ6 JMS Server</name>
<properties> <properties>
<hornetq.basedir>${project.basedir}/..</hornetq.basedir> <activemq.basedir>${project.basedir}/..</activemq.basedir>
</properties> </properties>
<dependencies> <dependencies>

2
activemq-jms-server/src/main/resources/schema/activemq-jms.xsd
View File

@ -8,7 +8,7 @@
attributeFormDefault="unqualified" attributeFormDefault="unqualified"
version="1.0"> version="1.0">
<xsd:element name="configuration" amq:schema="hornetq-jms-configuration"> <xsd:element name="configuration" amq:schema="activemq-jms-configuration">
<xsd:complexType> <xsd:complexType>
<xsd:sequence> <xsd:sequence>
<xsd:element name="jmx-domain" type="xsd:string" default="org.apache.activemq" <xsd:element name="jmx-domain" type="xsd:string" default="org.apache.activemq"

2
activemq-journal/pom.xml
View File

@ -13,7 +13,7 @@
<name>ActiveMQ6 Journal</name> <name>ActiveMQ6 Journal</name>
<properties> <properties>
<hornetq.basedir>${project.basedir}/..</hornetq.basedir> <activemq.basedir>${project.basedir}/..</activemq.basedir>
</properties> </properties>
<dependencies> <dependencies>

2
activemq-native/pom.xml
View File

@ -120,7 +120,7 @@
<properties> <properties>
<native-package-type>jar</native-package-type> <native-package-type>jar</native-package-type>
<hornetq.basedir>${project.basedir}/..</hornetq.basedir> <activemq.basedir>${project.basedir}/..</activemq.basedir>
</properties> </properties>
</project> </project>

2
activemq-protocols/activemq-amqp-protocol/pom.xml
View File

@ -10,7 +10,7 @@
<artifactId>activemq-amqp-protocol</artifactId> <artifactId>activemq-amqp-protocol</artifactId>
<properties> <properties>
<hornetq.basedir>${project.basedir}/../..</hornetq.basedir> <activemq.basedir>${project.basedir}/../..</activemq.basedir>
</properties> </properties>
<dependencies> <dependencies>

2
activemq-protocols/activemq-openwire-protocol/pom.xml
View File

@ -10,7 +10,7 @@
<artifactId>activemq-openwire-protocol</artifactId> <artifactId>activemq-openwire-protocol</artifactId>
<properties> <properties>
<hornetq.basedir>${project.parent.parent.basedir}</hornetq.basedir> <activemq.basedir>${project.parent.parent.basedir}</activemq.basedir>
</properties> </properties>
<dependencies> <dependencies>

2
activemq-protocols/activemq-proton-plug/pom.xml
View File

@ -10,7 +10,7 @@
<artifactId>activemq-proton-plug</artifactId> <artifactId>activemq-proton-plug</artifactId>
<properties> <properties>
<hornetq.basedir>${project.basedir}/../..</hornetq.basedir> <activemq.basedir>${project.basedir}/../..</activemq.basedir>
</properties> </properties>
<dependencies> <dependencies>

2
activemq-protocols/activemq-stomp-protocol/pom.xml
View File

@ -10,7 +10,7 @@
<artifactId>activemq-stomp-protocol</artifactId> <artifactId>activemq-stomp-protocol</artifactId>
<properties> <properties>
<hornetq.basedir>${project.basedir}/../..</hornetq.basedir> <activemq.basedir>${project.basedir}/../..</activemq.basedir>
</properties> </properties>
<dependencies> <dependencies>

2
activemq-protocols/pom.xml
View File

@ -13,7 +13,7 @@
<packaging>pom</packaging> <packaging>pom</packaging>
<properties> <properties>
<hornetq.basedir>${project.basedir}/..</hornetq.basedir> <activemq.basedir>${project.basedir}/..</activemq.basedir>
</properties> </properties>
<modules> <modules>

2
activemq-ra/pom.xml
View File

@ -13,7 +13,7 @@
<packaging>jar</packaging> <packaging>jar</packaging>
<properties> <properties>
<hornetq.basedir>${project.basedir}/..</hornetq.basedir> <activemq.basedir>${project.basedir}/..</activemq.basedir>
</properties> </properties>
<dependencies> <dependencies>

4
activemq-rest/pom.xml
View File

@ -15,7 +15,7 @@
<properties> <properties>
<activemq.version>${project.version}</activemq.version> <activemq.version>${project.version}</activemq.version>
<hornetq.basedir>${project.basedir}/..</hornetq.basedir> <activemq.basedir>${project.basedir}/..</activemq.basedir>
</properties> </properties>
<dependencies> <dependencies>
@ -96,7 +96,7 @@
<artifactId>maven-surefire-plugin</artifactId> <artifactId>maven-surefire-plugin</artifactId>
<configuration> <configuration>
<argLine> <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> </argLine>
<skipTests>${skipRestTests}</skipTests> <skipTests>${skipRestTests}</skipTests>
<!--includes> <!--includes>

2
activemq-selector/pom.xml
View File

@ -13,7 +13,7 @@
<name>ActiveMQ6 Selector Implementation</name> <name>ActiveMQ6 Selector Implementation</name>
<properties> <properties>
<hornetq.basedir>${project.basedir}/..</hornetq.basedir> <activemq.basedir>${project.basedir}/..</activemq.basedir>
</properties> </properties>
<dependencies> <dependencies>

2
activemq-server/pom.xml
View File

@ -13,7 +13,7 @@
<name>ActiveMQ6 Server</name> <name>ActiveMQ6 Server</name>
<properties> <properties>
<hornetq.basedir>${project.basedir}/..</hornetq.basedir> <activemq.basedir>${project.basedir}/..</activemq.basedir>
</properties> </properties>
<dependencies> <dependencies>

2
activemq-server/src/test/resources/ConfigurationTest-full-config.xml
View File

@ -1,7 +1,7 @@
<configuration <configuration
xmlns="urn:activemq" xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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> <name>SomeNameForUseOnTheApplicationServer</name>
<resolve-protocols>false</resolve-protocols> <resolve-protocols>false</resolve-protocols>
<clustered>true</clustered> <clustered>true</clustered>

2
activemq-server/src/test/resources/colocated-hapolicy-config.xml
View File

@ -1,7 +1,7 @@
<configuration <configuration
xmlns="urn:activemq" xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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> <ha-policy>
<replication> <replication>
<colocated> <colocated>

2
activemq-server/src/test/resources/colocated-hapolicy-config2.xml
View File

@ -1,7 +1,7 @@
<configuration <configuration
xmlns="urn:activemq" xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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> <ha-policy>
<shared-store> <shared-store>
<colocated> <colocated>

2
activemq-server/src/test/resources/live-only-hapolicy-config.xml
View File

@ -1,7 +1,7 @@
<configuration <configuration
xmlns="urn:activemq" xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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> <ha-policy>
<live-only> <live-only>
<scale-down> <scale-down>

2
activemq-server/src/test/resources/live-only-hapolicy-config2.xml
View File

@ -1,7 +1,7 @@
<configuration <configuration
xmlns="urn:activemq" xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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> <ha-policy>
<!--only one of the following--> <!--only one of the following-->
<!--on server shutdown scale down to another live server--> <!--on server shutdown scale down to another live server-->

2
activemq-server/src/test/resources/live-only-hapolicy-config3.xml
View File

@ -1,7 +1,7 @@
<configuration <configuration
xmlns="urn:activemq" xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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> <ha-policy>
<!--only one of the following--> <!--only one of the following-->
<!--on server shutdown scale down to another live server--> <!--on server shutdown scale down to another live server-->

2
activemq-server/src/test/resources/live-only-hapolicy-config4.xml
View File

@ -1,7 +1,7 @@
<configuration <configuration
xmlns="urn:activemq" xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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/> <ha-policy/>
</configuration> </configuration>

2
activemq-server/src/test/resources/live-only-hapolicy-config5.xml
View File

@ -1,6 +1,6 @@
<configuration <configuration
xmlns="urn:activemq" xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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> </configuration>

2
activemq-server/src/test/resources/logging.properties
View File

@ -45,7 +45,7 @@ handler.FILE=org.jboss.logmanager.handlers.FileHandler
handler.FILE.level=FINE handler.FILE.level=FINE
handler.FILE.properties=autoFlush,fileName handler.FILE.properties=autoFlush,fileName
handler.FILE.autoFlush=true handler.FILE.autoFlush=true
handler.FILE.fileName=target/hornetq.log handler.FILE.fileName=target/activemq.log
handler.FILE.formatter=PATTERN handler.FILE.formatter=PATTERN

2
activemq-server/src/test/resources/replica-hapolicy-config.xml
View File

@ -1,7 +1,7 @@
<configuration <configuration
xmlns="urn:activemq" xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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> <ha-policy>
<replication> <replication>
<slave> <slave>

2
activemq-server/src/test/resources/replica-hapolicy-config2.xml
View File

@ -1,7 +1,7 @@
<configuration <configuration
xmlns="urn:activemq" xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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> <ha-policy>
<replication> <replication>
<slave> <slave>

2
activemq-server/src/test/resources/replica-hapolicy-config3.xml
View File

@ -1,7 +1,7 @@
<configuration <configuration
xmlns="urn:activemq" xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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> <ha-policy>
<replication> <replication>
<slave> <slave>

2
activemq-server/src/test/resources/replicated-hapolicy-config.xml
View File

@ -1,7 +1,7 @@
<configuration <configuration
xmlns="urn:activemq" xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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> <ha-policy>
<replication> <replication>
<master> <master>

2
activemq-server/src/test/resources/shared-store-master-hapolicy-config.xml
View File

@ -1,7 +1,7 @@
<configuration <configuration
xmlns="urn:activemq" xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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> <ha-policy>
<shared-store> <shared-store>
<master> <master>

2
activemq-server/src/test/resources/shared-store-slave-hapolicy-config.xml
View File

@ -1,7 +1,7 @@
<configuration <configuration
xmlns="urn:activemq" xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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> <ha-policy>
<shared-store> <shared-store>
<slave> <slave>

2
activemq-server/src/test/resources/shared-store-slave-hapolicy-config2.xml
View File

@ -1,7 +1,7 @@
<configuration <configuration
xmlns="urn:activemq" xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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> <ha-policy>
<shared-store> <shared-store>
<slave> <slave>

2
activemq-server/src/test/resources/shared-store-slave-hapolicy-config3.xml
View File

@ -1,7 +1,7 @@
<configuration <configuration
xmlns="urn:activemq" xmlns="urn:activemq"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 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> <ha-policy>
<shared-store> <shared-store>
<slave> <slave>

2
activemq-tools/pom.xml
View File

@ -34,7 +34,7 @@
</dependencies> </dependencies>
<properties> <properties>
<hornetq.basedir>${project.basedir}/..</hornetq.basedir> <activemq.basedir>${project.basedir}/..</activemq.basedir>
</properties> </properties>
<build> <build>

16
distribution/activemq/src/main/resources/config/clustered/activemq-configuration.xml
View File

@ -15,14 +15,14 @@
<connectors> <connectors>
<connector name="netty"> <connector name="netty">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="host" value="${hornetq.remoting.netty.host:localhost}"/> <param key="host" value="${activemq.remoting.netty.host:localhost}"/>
<param key="port" value="${hornetq.remoting.netty.port:5445}"/> <param key="port" value="${activemq.remoting.netty.port:5445}"/>
</connector> </connector>
<connector name="netty-throughput"> <connector name="netty-throughput">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="host" value="${hornetq.remoting.netty.host:localhost}"/> <param key="host" value="${activemq.remoting.netty.host:localhost}"/>
<param key="port" value="${hornetq.remoting.netty.batch.port:5455}"/> <param key="port" value="${activemq.remoting.netty.batch.port:5455}"/>
<param key="batch-delay" value="50"/> <param key="batch-delay" value="50"/>
</connector> </connector>
</connectors> </connectors>
@ -30,14 +30,14 @@
<acceptors> <acceptors>
<acceptor name="netty"> <acceptor name="netty">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="host" value="${hornetq.remoting.netty.host:localhost}"/> <param key="host" value="${activemq.remoting.netty.host:localhost}"/>
<param key="port" value="${hornetq.remoting.netty.port:5445}"/> <param key="port" value="${activemq.remoting.netty.port:5445}"/>
</acceptor> </acceptor>
<acceptor name="netty-throughput"> <acceptor name="netty-throughput">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="host" value="${hornetq.remoting.netty.host:localhost}"/> <param key="host" value="${activemq.remoting.netty.host:localhost}"/>
<param key="port" value="${hornetq.remoting.netty.batch.port:5455}"/> <param key="port" value="${activemq.remoting.netty.batch.port:5455}"/>
<param key="batch-delay" value="50"/> <param key="batch-delay" value="50"/>
<param key="direct-deliver" value="false"/> <param key="direct-deliver" value="false"/>
</acceptor> </acceptor>

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

@ -12,7 +12,7 @@
permissions and limitations under the License. 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> <core configuration="file:${activemq.home}/config/clustered/activemq-configuration.xml"></core>
<jms configuration="file:${activemq.home}/config/clustered/activemq-jms.xml"></jms> <jms configuration="file:${activemq.home}/config/clustered/activemq-jms.xml"></jms>

2
distribution/activemq/src/main/resources/config/logging.properties
View File

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

16
distribution/activemq/src/main/resources/config/non-clustered/activemq-configuration.xml
View File

@ -15,14 +15,14 @@
<connectors> <connectors>
<connector name="netty"> <connector name="netty">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="host" value="${hornetq.remoting.netty.host:localhost}"/> <param key="host" value="${activemq.remoting.netty.host:localhost}"/>
<param key="port" value="${hornetq.remoting.netty.port:5445}"/> <param key="port" value="${activemq.remoting.netty.port:5445}"/>
</connector> </connector>
<connector name="netty-throughput"> <connector name="netty-throughput">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="host" value="${hornetq.remoting.netty.host:localhost}"/> <param key="host" value="${activemq.remoting.netty.host:localhost}"/>
<param key="port" value="${hornetq.remoting.netty.batch.port:5455}"/> <param key="port" value="${activemq.remoting.netty.batch.port:5455}"/>
<param key="batch-delay" value="50"/> <param key="batch-delay" value="50"/>
</connector> </connector>
</connectors> </connectors>
@ -30,14 +30,14 @@
<acceptors> <acceptors>
<acceptor name="netty"> <acceptor name="netty">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="host" value="${hornetq.remoting.netty.host:localhost}"/> <param key="host" value="${activemq.remoting.netty.host:localhost}"/>
<param key="port" value="${hornetq.remoting.netty.port:5445}"/> <param key="port" value="${activemq.remoting.netty.port:5445}"/>
</acceptor> </acceptor>
<acceptor name="netty-throughput"> <acceptor name="netty-throughput">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="host" value="${hornetq.remoting.netty.host:localhost}"/> <param key="host" value="${activemq.remoting.netty.host:localhost}"/>
<param key="port" value="${hornetq.remoting.netty.batch.port:5455}"/> <param key="port" value="${activemq.remoting.netty.batch.port:5455}"/>
<param key="batch-delay" value="50"/> <param key="batch-delay" value="50"/>
<param key="direct-deliver" value="false"/> <param key="direct-deliver" value="false"/>
</acceptor> </acceptor>

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

@ -12,7 +12,7 @@
permissions and limitations under the License. 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> <core configuration="file:${activemq.home}/config/non-clustered/activemq-configuration.xml"></core>
<jms configuration="file:${activemq.home}/config/non-clustered/activemq-jms.xml"></jms> <jms configuration="file:${activemq.home}/config/non-clustered/activemq-jms.xml"></jms>

16
distribution/activemq/src/main/resources/config/replicated/activemq-configuration.xml
View File

@ -19,14 +19,14 @@
<connectors> <connectors>
<connector name="netty"> <connector name="netty">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="host" value="${hornetq.remoting.netty.host:localhost}"/> <param key="host" value="${activemq.remoting.netty.host:localhost}"/>
<param key="port" value="${hornetq.remoting.netty.port:5445}"/> <param key="port" value="${activemq.remoting.netty.port:5445}"/>
</connector> </connector>
<connector name="netty-throughput"> <connector name="netty-throughput">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="host" value="${hornetq.remoting.netty.host:localhost}"/> <param key="host" value="${activemq.remoting.netty.host:localhost}"/>
<param key="port" value="${hornetq.remoting.netty.batch.port:5455}"/> <param key="port" value="${activemq.remoting.netty.batch.port:5455}"/>
<param key="batch-delay" value="50"/> <param key="batch-delay" value="50"/>
</connector> </connector>
</connectors> </connectors>
@ -34,14 +34,14 @@
<acceptors> <acceptors>
<acceptor name="netty"> <acceptor name="netty">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="host" value="${hornetq.remoting.netty.host:localhost}"/> <param key="host" value="${activemq.remoting.netty.host:localhost}"/>
<param key="port" value="${hornetq.remoting.netty.port:5445}"/> <param key="port" value="${activemq.remoting.netty.port:5445}"/>
</acceptor> </acceptor>
<acceptor name="netty-throughput"> <acceptor name="netty-throughput">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="host" value="${hornetq.remoting.netty.host:localhost}"/> <param key="host" value="${activemq.remoting.netty.host:localhost}"/>
<param key="port" value="${hornetq.remoting.netty.batch.port:5455}"/> <param key="port" value="${activemq.remoting.netty.batch.port:5455}"/>
<param key="batch-delay" value="50"/> <param key="batch-delay" value="50"/>
<param key="direct-deliver" value="false"/> <param key="direct-deliver" value="false"/>
</acceptor> </acceptor>

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

@ -12,7 +12,7 @@
permissions and limitations under the License. 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> <core configuration="file:${activemq.home}/config/replicated/activemq-configuration.xml"></core>
<jms configuration="file:${activemq.home}/config/replicated/activemq-jms.xml"></jms> <jms configuration="file:${activemq.home}/config/replicated/activemq-jms.xml"></jms>

16
distribution/activemq/src/main/resources/config/shared-store/activemq-configuration.xml
View File

@ -19,14 +19,14 @@
<connectors> <connectors>
<connector name="netty"> <connector name="netty">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="host" value="${hornetq.remoting.netty.host:localhost}"/> <param key="host" value="${activemq.remoting.netty.host:localhost}"/>
<param key="port" value="${hornetq.remoting.netty.port:5445}"/> <param key="port" value="${activemq.remoting.netty.port:5445}"/>
</connector> </connector>
<connector name="netty-throughput"> <connector name="netty-throughput">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class> <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</factory-class>
<param key="host" value="${hornetq.remoting.netty.host:localhost}"/> <param key="host" value="${activemq.remoting.netty.host:localhost}"/>
<param key="port" value="${hornetq.remoting.netty.batch.port:5455}"/> <param key="port" value="${activemq.remoting.netty.batch.port:5455}"/>
<param key="batch-delay" value="50"/> <param key="batch-delay" value="50"/>
</connector> </connector>
</connectors> </connectors>
@ -34,14 +34,14 @@
<acceptors> <acceptors>
<acceptor name="netty"> <acceptor name="netty">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="host" value="${hornetq.remoting.netty.host:localhost}"/> <param key="host" value="${activemq.remoting.netty.host:localhost}"/>
<param key="port" value="${hornetq.remoting.netty.port:5445}"/> <param key="port" value="${activemq.remoting.netty.port:5445}"/>
</acceptor> </acceptor>
<acceptor name="netty-throughput"> <acceptor name="netty-throughput">
<factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class> <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
<param key="host" value="${hornetq.remoting.netty.host:localhost}"/> <param key="host" value="${activemq.remoting.netty.host:localhost}"/>
<param key="port" value="${hornetq.remoting.netty.batch.port:5455}"/> <param key="port" value="${activemq.remoting.netty.batch.port:5455}"/>
<param key="batch-delay" value="50"/> <param key="batch-delay" value="50"/>
<param key="direct-deliver" value="false"/> <param key="direct-deliver" value="false"/>
</acceptor> </acceptor>

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

@ -12,7 +12,7 @@
permissions and limitations under the License. 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> <core configuration="file:${activemq.home}/config/shared-store/activemq-configuration.xml"></core>
<jms configuration="file:${activemq.home}/config/shared-store/activemq-jms.xml"></jms> <jms configuration="file:${activemq.home}/config/shared-store/activemq-jms.xml"></jms>

42
docs/eap-manual/en/clusters.xml
View File

@ -133,7 +133,7 @@
</para> </para>
<para>We also need to configure the connection factories used by the client to be HA. This is done by <para>We also need to configure the connection factories used by the client to be HA. This is done by
adding 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: example:
</para> </para>
<programlisting> <programlisting>
@ -201,15 +201,15 @@
for a live server running on a different eap instance. for a live server running on a different eap instance.
</para> </para>
<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 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. are created from the Journal when the backup server becomes live.
</para> </para>
<para> <para>
Firstly we need to define a new ActiveMQ Server that EAP will deploy. We do this by creating a new 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 configuration. We will place this under a new directory
<literal>hornetq-backup1</literal> <literal>activemq-backup1</literal>
which will need creating which will need creating
in the in the
<literal>deploy</literal> <literal>deploy</literal>
@ -223,7 +223,7 @@
&lt;!-- The core configuration --> &lt;!-- The core configuration -->
&lt;bean name="BackupConfiguration" class="org.apache.activemq.core.config.impl.FileConfiguration"> &lt;bean name="BackupConfiguration" class="org.apache.activemq.core.config.impl.FileConfiguration">
&lt;property &lt;property
name="configurationUrl">${jboss.server.home.url}/deploy/hornetq-backup1/activemq-configuration.xml&lt;/property> name="configurationUrl">${jboss.server.home.url}/deploy/activemq-backup1/activemq-configuration.xml&lt;/property>
&lt;/bean> &lt;/bean>
@ -280,7 +280,7 @@
Now let's add the server configuration in Now let's add the server configuration in
<literal>activemq-configuration.xml</literal> <literal>activemq-configuration.xml</literal>
and add it to the same directory and add it to the same directory
<literal>deploy/hornetq-backup1</literal> <literal>deploy/activemq-backup1</literal>
and configure it like so: and configure it like so:
</para> </para>
<programlisting> <programlisting>
@ -298,26 +298,26 @@
&lt;allow-failback>true&lt;/allow-failback> &lt;allow-failback>true&lt;/allow-failback>
&lt;bindings-directory>/media/shared/data/hornetq-backup/bindings&lt;/bindings-directory> &lt;bindings-directory>/media/shared/data/activemq-backup/bindings&lt;/bindings-directory>
&lt;journal-directory>/media/shared/data/hornetq-backup/journal&lt;/journal-directory> &lt;journal-directory>/media/shared/data/activemq-backup/journal&lt;/journal-directory>
&lt;journal-min-files>10&lt;/journal-min-files> &lt;journal-min-files>10&lt;/journal-min-files>
&lt;large-messages-directory>/media/shared/data/hornetq-backup/largemessages&lt;/large-messages-directory> &lt;large-messages-directory>/media/shared/data/activemq-backup/largemessages&lt;/large-messages-directory>
&lt;paging-directory>/media/shared/data/hornetq-backup/paging&lt;/paging-directory> &lt;paging-directory>/media/shared/data/activemq-backup/paging&lt;/paging-directory>
&lt;connectors> &lt;connectors>
&lt;connector name="netty-connector"> &lt;connector name="netty-connector">
&lt;factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory&lt;/factory-class> &lt;factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory&lt;/factory-class>
&lt;param key="host" value="${jboss.bind.address:localhost}"/> &lt;param key="host" value="${jboss.bind.address:localhost}"/>
&lt;param key="port" value="${hornetq.remoting.backup.netty.port:5446}"/> &lt;param key="port" value="${activemq.remoting.backup.netty.port:5446}"/>
&lt;/connector> &lt;/connector>
&lt;connector name="in-vm"> &lt;connector name="in-vm">
&lt;factory-class>org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory&lt;/factory-class> &lt;factory-class>org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory&lt;/factory-class>
&lt;param key="server-id" value="${hornetq.server-id:0}"/> &lt;param key="server-id" value="${activemq.server-id:0}"/>
&lt;/connector> &lt;/connector>
&lt;/connectors> &lt;/connectors>
@ -326,7 +326,7 @@
&lt;acceptor name="netty"> &lt;acceptor name="netty">
&lt;factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory&lt;/factory-class> &lt;factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory&lt;/factory-class>
&lt;param key="host" value="${jboss.bind.address:localhost}"/> &lt;param key="host" value="${jboss.bind.address:localhost}"/>
&lt;param key="port" value="${hornetq.remoting.backup.netty.port:5446}"/> &lt;param key="port" value="${activemq.remoting.backup.netty.port:5446}"/>
&lt;/acceptor> &lt;/acceptor>
&lt;/acceptors> &lt;/acceptors>
@ -452,7 +452,7 @@
<itemizedlist> <itemizedlist>
<listitem> <listitem>
<para> <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. file a unique name, i.e.
</para> </para>
</listitem> </listitem>
@ -461,7 +461,7 @@
<section> <section>
<title>Running the shipped example</title> <title>Running the shipped example</title>
<para> <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 and follow the read me
</para> </para>
</section> </section>
@ -491,9 +491,9 @@
<graphic fileref="images/simple-dedicated-jca.jpg" align="center" format="jpg" scale="30"/> <graphic fileref="images/simple-dedicated-jca.jpg" align="center" format="jpg" scale="30"/>
</para> </para>
<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 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 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 live, messages will be distributed to and from the backup server over ActiveMQ cluster connections and handled
appropriately. appropriately.
@ -516,16 +516,16 @@
</para> </para>
<para> <para>
For the backup server the <literal>activemq-configuration.xml</literal> is unchanged, however since there is 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 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> location of the <literal>activemq-configuration.xml</literal> parameter for the <literal>Configuration</literal>
bean. bean.
</para> </para>
<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>
<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 as in the last diagram. Then simply edit the <literal>jms-ds.xml</literal> and change the following lines to
</para> </para>
<programlisting> <programlisting>
@ -560,7 +560,7 @@
<title>Running the shipped example</title> <title>Running the shipped example</title>
<para> <para>
EAP ships with an example configuration for this topology. Look under 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 and follow the read me
</para> </para>
</section> </section>

24
docs/quickstart-guide/en/download.xml
View File

@ -23,13 +23,13 @@
]> ]>
<chapter id="download"> <chapter id="download">
<title>Download</title> <title>Download</title>
<para>The official ActiveMQ project page is <ulink url="http://hornetq.org/" <para>The official ActiveMQ project page is <ulink url="http://activemq.org/"
>http://hornetq.org/</ulink>.</para> >http://activemq.org/</ulink>.</para>
<section id="download.software"> <section id="download.software">
<title>Software Download</title> <title>Software Download</title>
<para>The software can be download from the Download page:<ulink <para>The software can be download from the Download page:<ulink
url="http://hornetq.org/downloads.html" url="http://activemq.org/downloads.html"
>http://hornetq.org/downloads.html</ulink></para> >http://activemq.org/downloads.html</ulink></para>
</section> </section>
<section id="download.git"> <section id="download.git">
<title>Project Information</title> <title>Project Information</title>
@ -41,7 +41,7 @@
</listitem> </listitem>
<listitem> <listitem>
<para>If you have any user questions please use our <ulink <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> forum</ulink></para>
</listitem> </listitem>
<listitem> <listitem>
@ -50,24 +50,24 @@
>developer forum</ulink></para> >developer forum</ulink></para>
</listitem> </listitem>
<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> >IRC channel</ulink></para>
</listitem> </listitem>
<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>
<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>
<listitem> <listitem>
<para>ActiveMQ Git repository is <ulink <para>ActiveMQ Git repository is <ulink
url="https://github.com/hornetq/hornetq" url="https://github.com/activemq/activemq"
>https://github.com/hornetq/hornetq</ulink></para> >https://github.com/activemq/activemq</ulink></para>
</listitem> </listitem>
<listitem> <listitem>
<para>All release tags are available from <ulink <para>All release tags are available from <ulink
url="https://github.com/hornetq/hornetq/tags" url="https://github.com/activemq/activemq/tags"
>https://github.com/hornetq/hornetq/tags</ulink></para> >https://github.com/activemq/activemq/tags</ulink></para>
</listitem> </listitem>
</itemizedlist> </itemizedlist>
</para> </para>

80
docs/quickstart-guide/en/examples.xml
View File

@ -48,7 +48,7 @@
<para>This contains the source code for the example</para> <para>This contains the source code for the example</para>
</listitem> </listitem>
<listitem> <listitem>
<para><literal>resources/hornetq/server0</literal> configuration directory</para> <para><literal>resources/activemq/server0</literal> configuration directory</para>
<para>This contains the configuration files needed to run the server for the example. <para>This contains the configuration files needed to run the server for the example.
There may be multiple configuration directories <literal>server0</literal>, <literal There may be multiple configuration directories <literal>server0</literal>, <literal
>server1</literal> etc for clustered examples etc.</para> >server1</literal> etc for clustered examples etc.</para>
@ -69,45 +69,45 @@
[INFO] Building ActiveMQ JMS Queue Example 2.3.0.BETA-SNAPSHOT [INFO] Building ActiveMQ JMS Queue Example 2.3.0.BETA-SNAPSHOT
[INFO] ------------------------------------------------------------------------ [INFO] ------------------------------------------------------------------------
[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] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 3 resources [INFO] Copying 3 resources
[INFO] [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] Nothing to compile - all classes are up to date
[INFO] [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] 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]
[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] No sources to compile
[INFO] [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]
[INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ hornetq-jms-queue-example --- [INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ activemq-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] Building jar: /home/andy/projects/activemq-master/examples/jms/queue/target/activemq-jms-queue-example-2.3.0.BETA-SNAPSHOT.jar
[INFO] [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]
[INFO] &lt;&lt;&lt; maven-source-plugin:2.2.1:jar (attach-sources) @ hornetq-jms-queue-example &lt;&lt;&lt; [INFO] &lt;&lt;&lt; maven-source-plugin:2.2.1:jar (attach-sources) @ activemq-jms-queue-example &lt;&lt;&lt;
[INFO] [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] Building jar: /home/andy/projects/hornetq-master/examples/jms/queue/target/hornetq-jms-queue-example-2.3.0.BETA-SNAPSHOT-sources.jar [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]
[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]
[INFO] &lt;&lt;&lt; maven-source-plugin:2.2.1:jar (default) @ hornetq-jms-queue-example &lt;&lt;&lt; [INFO] &lt;&lt;&lt; maven-source-plugin:2.2.1:jar (default) @ activemq-jms-queue-example &lt;&lt;&lt;
[INFO] [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 ---
[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 [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]
[INFO] --- hornetq-maven-plugin:1.1.1-SNAPSHOT:start (start) @ hornetq-jms-queue-example --- [INFO] --- activemq-maven-plugin:1.1.1-SNAPSHOT:start (start) @ activemq-jms-queue-example ---
[file:/home/andy/projects/hornetq-master/examples/jms/queue/target/classes/hornetq/server0/] [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 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 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 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 Apr 17, 2013 10:51:01 AM org.apache.activemq.core.server.impl.ActiveMQServerImpl$SharedStoreLiveActivation run
INFO: HQ221006: Waiting to obtain live lock INFO: HQ221006: Waiting to obtain live lock
Apr 17, 2013 10:51:01 AM org.apache.activemq.core.persistence.impl.journal.JournalStorageManager &lt;init> Apr 17, 2013 10:51:01 AM org.apache.activemq.core.persistence.impl.journal.JournalStorageManager &lt;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 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: HQ221001: ActiveMQ Server version 2.3.0.SNAPSHOT (black'n'yellow, 123) [a57893ff-7783-11e2-9787-07ca142fc9f7]
[INFO] [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 Apr 17, 2013 10:51:02 AM org.apache.activemq.common.example.ActiveMQExample getContext
INFO: using jnp://localhost:1099 for jndi INFO: using jnp://localhost:1099 for jndi
Sent message: This is a text message Sent message: This is a text message
@ -138,7 +138,7 @@ example complete
### SUCCESS! ### ### SUCCESS! ###
##################### #####################
[INFO] [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 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] 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 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] Building ActiveMQ JEE MDB Example 2.3.0.BETA-SNAPSHOT
[INFO] ------------------------------------------------------------------------ [INFO] ------------------------------------------------------------------------
[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] 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]
[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] Nothing to compile - all classes are up to date
[INFO] [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] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 1112 resources [INFO] Copying 1112 resources
[INFO] Copying 5 resources [INFO] Copying 5 resources
[INFO] [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] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 1 resource [INFO] Copying 1 resource
[INFO] [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] 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]
[INFO] --- maven-surefire-plugin:2.12:test (default-test) @ hornetq-jee-mdb-bmt-example --- [INFO] --- maven-surefire-plugin:2.12:test (default-test) @ activemq-jee-mdb-bmt-example ---
[INFO] Surefire report directory: /home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/surefire-reports [INFO] Surefire report directory: /home/andy/projects/activemq-master/examples/javaee/mdb-bmt/target/surefire-reports
------------------------------------------------------- -------------------------------------------------------
T E S T S 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} Unused property entries: {waitForPortsTimeoutInSeconds=8, waitForPorts=8787 9999}
Supported property names: [jbossHome, outputToConsole, enableAssertions, password, managementPort, javaHome, javaVmArguments, username, serverConfig, allowConnectingToRunningServer, managementAddress, startupTimeoutInSeconds, modulePath] 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 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,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,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 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,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,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,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: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,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 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,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-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,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,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,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 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,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,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,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,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,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 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/
/org.apache.activemq/javaee/example/server/ /org.apache.activemq/javaee/example/server/
/org.apache.activemq/javaee/example/server/MDB_BMTExample.class /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,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,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. 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,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,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: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,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,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" 10:58:12,562 INFO [org.jboss.as.server] (management-handler-thread - 3) JBAS018559: Deployed "mdb.jar"
Sent message: This is a text message 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,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,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: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,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" 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 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,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" 10:58:14,532 INFO [org.jboss.as.server] (management-handler-thread - 2) JBAS018558: Undeployed "arquillian-service"
Results : Results :

12
docs/quickstart-guide/en/running.xml
View File

@ -26,10 +26,10 @@
<section id="running.standalone"> <section id="running.standalone">
<title>Standalone ActiveMQ</title> <title>Standalone ActiveMQ</title>
<para>To run a stand-alone server, open up a shell or command prompt and navigate into the <para>To run a stand-alone server, open up a shell or command prompt and navigate into the
<literal>bin</literal> directory. Then execute <literal>./hornetq run</literal> (or <literal <literal>bin</literal> directory. Then execute <literal>./activemq run</literal> (or <literal
>./hornetq.cmd run</literal> on Windows) and you should see the following output </para> >./activemq.cmd run</literal> on Windows) and you should see the following output </para>
<programlisting> <programlisting>
bin$ ./hornetq run bin$ ./activemq run
11:05:06,589 INFO [org.apache.activemq.integration.bootstrap] HQ101000: Starting ActiveMQ Server 11:05:06,589 INFO [org.apache.activemq.integration.bootstrap] HQ101000: Starting ActiveMQ Server
... ...
@ -38,9 +38,9 @@
<para>ActiveMQ is now running.</para> <para>ActiveMQ is now running.</para>
<para>Both the run and the stop scripts use the config under <literal <para>Both the run and the stop scripts use the config under <literal
>config/non-clustered</literal> by default. The configuration can be changed >config/non-clustered</literal> by default. The configuration can be changed
by running <literal>./hornetq run xml:../config/non-clustered/bootstrap.xml</literal> or another config of by running <literal>./activemq run xml:../config/non-clustered/bootstrap.xml</literal> or another config of
your choosing.</para> your choosing.</para>
<para>The server can be stopped by running <literal>./hornetq stop</literal></para> <para>The server can be stopped by running <literal>./activemq stop</literal></para>
</section> </section>
<section id="running.jboss.Wildfly"> <section id="running.jboss.Wildfly">
<title>ActiveMQ In Wildfly</title> <title>ActiveMQ In Wildfly</title>
@ -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,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: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,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,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,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 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

22
docs/quickstart-guide/zh/download.xml
View File

@ -18,13 +18,13 @@
<!-- ============================================================================= --> <!-- ============================================================================= -->
<chapter id="download"> <chapter id="download">
<title>下载</title> <title>下载</title>
<para>ActiveMQ项目的官方地址是 <ulink url="http://hornetq.org/" <para>ActiveMQ项目的官方地址是 <ulink url="http://activemq.org/"
>http://hornetq.org/</ulink>。</para> >http://activemq.org/</ulink>。</para>
<section id="download.software"> <section id="download.software">
<title>软件下载</title> <title>软件下载</title>
<para>ActiveMQ的下载地址是<ulink <para>ActiveMQ的下载地址是<ulink
url="http://hornetq.org/downloads.html/" url="http://activemq.org/downloads.html/"
>http://hornetq.org/downloads.html</ulink></para> >http://activemq.org/downloads.html</ulink></para>
</section> </section>
<section id="download.git"> <section id="download.git">
<title>项目信息</title> <title>项目信息</title>
@ -45,24 +45,24 @@
>开发论坛</ulink></para> >开发论坛</ulink></para>
</listitem> </listitem>
<listitem> <listitem>
<para>请加入我们的<ulink url="irc://irc.freenode.net:6667/hornetq" <para>请加入我们的<ulink url="irc://irc.freenode.net:6667/activemq"
>IRC频道</ulink>与我们的核心开发工程师交流。</para> >IRC频道</ulink>与我们的核心开发工程师交流。</para>
</listitem> </listitem>
<listitem> <listitem>
<para>我们项目有自己的 <ulink url="http://hornetq.blogspot.com/">博客</ulink></para> <para>我们项目有自己的 <ulink url="http://activemq.blogspot.com/">博客</ulink></para>
</listitem> </listitem>
<listitem> <listitem>
<para>还可以跟踪我们的<ulink url="http://twitter.com/hornetq">twitter</ulink></para> <para>还可以跟踪我们的<ulink url="http://twitter.com/activemq">twitter</ulink></para>
</listitem> </listitem>
<listitem> <listitem>
<para>ActiveMQ的Git代码库地址 <ulink <para>ActiveMQ的Git代码库地址 <ulink
url="https://github.com/hornetq/hornetq" url="https://github.com/activemq/activemq"
>https://github.com/hornetq/hornetq</ulink></para> >https://github.com/activemq/activemq</ulink></para>
</listitem> </listitem>
<listitem> <listitem>
<para>每次发布的版本标签都在<ulink <para>每次发布的版本标签都在<ulink
url="https://github.com/hornetq/hornetq/tags" url="https://github.com/activemq/activemq/tags"
>https://github.com/hornetq/hornetq/tags</ulink>下能找到。</para> >https://github.com/activemq/activemq/tags</ulink>下能找到。</para>
</listitem> </listitem>
</itemizedlist> </itemizedlist>
</para> </para>

22
docs/quickstart-guide/zh/examples.xml
View File

@ -58,17 +58,17 @@ run:
init: init:
compile: compile:
[echo] src.example.dir=/home/andy/projects/hornetq/trunk/examples/jms/queue/src [echo] src.example.dir=/home/andy/projects/activemq/trunk/examples/jms/queue/src
[javac] Compiling 5 source files to /home/andy/projects/hornetq/trunk/examples/jms/queue [javac] Compiling 5 source files to /home/andy/projects/activemq/trunk/examples/jms/queue
/build/classes /build/classes
runExample: 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' [java] 10:41:04,149 INFO @main [JMSExample] starting server with config 'server0'
logServerOutput true logServerOutput true
[java] 10:41:04,149 INFO @main [JMSExample] and vm args: -Xms512M,-Xmx512M,-XX:+U [java] 10:41:04,149 INFO @main [JMSExample] and vm args: -Xms512M,-Xmx512M,-XX:+U
seParallelGC,-XX:+AggressiveOpts,-XX:+UseFastAccessorMethods,-Djava.util.logging.config. 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 n-clustered/logging.properties
[java] org.apache.activemq.jms.example.SpawnedJMSServer out:10:41:08,437 INFO @main [Journal [java] org.apache.activemq.jms.example.SpawnedJMSServer out:10:41:08,437 INFO @main [Journal
StorageManager] AIO journal selected StorageManager] AIO journal selected
@ -129,20 +129,20 @@ deploy:
deploy-resources: deploy-resources:
[copy] Copying 1 file to /home/andy/projects/jbossas5.1/build/output/jboss-5.1.0.GA [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 [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: init:
compile: compile:
jar: 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 mple.jar
ear: 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 mple.ear
deploy-ear: deploy-ear:
@ -198,11 +198,11 @@ undeploy:
undeploy-misc: undeploy-misc:
[delete] Deleting: /home/andy/projects/jbossas5.1/build/output/jboss-5.1.0.GA [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 [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 [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 BUILD SUCCESSFUL
Total time: 1 second Total time: 1 second

12
docs/quickstart-guide/zh/installation.xml
View File

@ -110,18 +110,18 @@
<para>这将会在<literal>$JBOSS_HOME/server</literal>创建两个服务器配置：</para> <para>这将会在<literal>$JBOSS_HOME/server</literal>创建两个服务器配置：</para>
<itemizedlist> <itemizedlist>
<listitem> <listitem>
<para><literal>default-with-hornetq</literal> -- 这个相当于AS 5的<literal <para><literal>default-with-activemq</literal> -- 这个相当于AS 5的<literal
>default</literal>配置但其JMS提供者替换成为ActiveMQ。在这个配置中的ActiveMQ >default</literal>配置但其JMS提供者替换成为ActiveMQ。在这个配置中的ActiveMQ
是<emphasis>非集群</emphasis>的。</para> 是<emphasis>非集群</emphasis>的。</para>
</listitem> </listitem>
<listitem> <listitem>
<para><literal>all-with-hornetq</literal> -- 这个相当于AS 5的<literal <para><literal>all-with-activemq</literal> -- 这个相当于AS 5的<literal
>all</literal>配置但其JMS提供者替换成为ActiveMQ。这个配置中的ActiveMQ >all</literal>配置但其JMS提供者替换成为ActiveMQ。这个配置中的ActiveMQ
是<emphasis>集群</emphasis>的。</para> 是<emphasis>集群</emphasis>的。</para>
</listitem> </listitem>
</itemizedlist> </itemizedlist>
<para>这时，你就可以启动上面其中任何一个配置的JBoss AS 5服务器了，例如：</para> <para>这时，你就可以启动上面其中任何一个配置的JBoss AS 5服务器了，例如：</para>
<programlisting>$JBOSS_HOME/bin/run.sh -c default-with-hornetq</programlisting> <programlisting>$JBOSS_HOME/bin/run.sh -c default-with-activemq</programlisting>
</section> </section>
<section id="installation.jboss.as4"> <section id="installation.jboss.as4">
<title>ActiveMQ运行于JBoss应用服务器4.x</title> <title>ActiveMQ运行于JBoss应用服务器4.x</title>
@ -142,17 +142,17 @@
<para>这将会在<literal>$JBOSS_HOME/server</literal>创建两个服务器配置：</para> <para>这将会在<literal>$JBOSS_HOME/server</literal>创建两个服务器配置：</para>
<itemizedlist> <itemizedlist>
<listitem> <listitem>
<para><literal>default-with-hornetq</literal> -- 这个相当于AS 4的<literal <para><literal>default-with-activemq</literal> -- 这个相当于AS 4的<literal
>default</literal>配置但其JMS提供者替换成为ActiveMQ。在这个配置中的ActiveMQ >default</literal>配置但其JMS提供者替换成为ActiveMQ。在这个配置中的ActiveMQ
是<emphasis>非集群</emphasis>的。</para> 是<emphasis>非集群</emphasis>的。</para>
</listitem> </listitem>
<listitem> <listitem>
<para><literal>all-with-hornetq</literal> -- 这个相当于AS 4的<literal <para><literal>all-with-activemq</literal> -- 这个相当于AS 4的<literal
>all</literal>配置但其JMS提供者替换成为ActiveMQ。这个配置中的ActiveMQ >all</literal>配置但其JMS提供者替换成为ActiveMQ。这个配置中的ActiveMQ
是<emphasis>集群</emphasis>的。</para> 是<emphasis>集群</emphasis>的。</para>
</listitem> </listitem>
</itemizedlist> </itemizedlist>
<para>这时，你就可以启动上面其中任何一个配置的JBoss AS 4服务器了，例如：</para> <para>这时，你就可以启动上面其中任何一个配置的JBoss AS 4服务器了，例如：</para>
<programlisting>$JBOSS_HOME/bin/run.sh -c default-with-hornetq</programlisting> <programlisting>$JBOSS_HOME/bin/run.sh -c default-with-activemq</programlisting>
</section> </section>
</chapter> </chapter>

2
docs/quickstart-guide/zh/running.xml
View File

@ -43,7 +43,7 @@
例如，要运行一个带有<emphasis>非集群</emphasis>的ActiveMQ服务的AS 5，进入<literal 例如，要运行一个带有<emphasis>非集群</emphasis>的ActiveMQ服务的AS 5，进入<literal
>$JBOSS_HOME/bin</literal>目录，然后键入：</para> >$JBOSS_HOME/bin</literal>目录，然后键入：</para>
<programlisting> <programlisting>
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,460 INFO [ServerImpl] Starting JBoss (Microcontainer)...
15:18:35,462 INFO [ServerImpl] Release ID: JBoss (Microcontainer) [5.1.0.GA (build: SVNTag= 15:18:35,462 INFO [ServerImpl] Release ID: JBoss (Microcontainer) [5.1.0.GA (build: SVNTag=

2
docs/user-manual/user-manual.xpr
View File

@ -25,7 +25,7 @@
<file name="en/core-bridges.xml"/> <file name="en/core-bridges.xml"/>
<file name="en/diverts.xml"/> <file name="en/diverts.xml"/>
<file name="en/duplicate-detection.xml"/> <file name="en/duplicate-detection.xml"/>
<file name="en/embedding-hornetq.xml"/> <file name="en/embedding-activemq.xml"/>
<file name="en/examples.xml"/> <file name="en/examples.xml"/>
<file name="en/filter-expressions.xml"/> <file name="en/filter-expressions.xml"/>
<file name="en/flow-control.xml"/> <file name="en/flow-control.xml"/>

36
docs/user-manual/zh/appserver-integration.xml
View File

@ -35,7 +35,7 @@
@ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue"), @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue"),
@ActivationConfigProperty(propertyName = "destination", propertyValue = "queue/testQueue") @ActivationConfigProperty(propertyName = "destination", propertyValue = "queue/testQueue")
}) })
@ResourceAdapter("hornetq-ra.rar") @ResourceAdapter("activemq-ra.rar")
public class MDBExample implements MessageListener public class MDBExample implements MessageListener
{ {
public void onMessage(Message message)... public void onMessage(Message message)...
@ -50,7 +50,7 @@ public class MDBExample implements MessageListener
>jboss.xml</literal>中加入类似以下的内容： >jboss.xml</literal>中加入类似以下的内容：
<programlisting>&lt;message-driven> <programlisting>&lt;message-driven>
&lt;ejb-name>ExampleMDB&lt;/ejb-name> &lt;ejb-name>ExampleMDB&lt;/ejb-name>
&lt;resource-adapter-name>hornetq-ra.rar&lt;/resource-adapter-name> &lt;resource-adapter-name>activemq-ra.rar&lt;/resource-adapter-name>
&lt;/message-driven> &lt;/message-driven>
</programlisting>你还可以将hornetq-ra.rar改名为jms-ra.rar而不需要任何annotation或额外的部署描述信息。但是你需要 </programlisting>你还可以将hornetq-ra.rar改名为jms-ra.rar而不需要任何annotation或额外的部署描述信息。但是你需要
编辑<literal>jms-ds.xml</literal>文件，将其中的<literal>rar-name</literal>项改成相应的值。</para> 编辑<literal>jms-ds.xml</literal>文件，将其中的<literal>rar-name</literal>项改成相应的值。</para>
@ -72,7 +72,7 @@ public class MDBExample implements MessageListener
}) })
@TransactionManagement(value= TransactionManagementType.CONTAINER) @TransactionManagement(value= TransactionManagementType.CONTAINER)
@TransactionAttribute(value= TransactionAttributeType.REQUIRED) @TransactionAttribute(value= TransactionAttributeType.REQUIRED)
@ResourceAdapter("hornetq-ra.rar") @ResourceAdapter("activemq-ra.rar")
public class MDB_CMP_TxRequiredExample implements MessageListener public class MDB_CMP_TxRequiredExample implements MessageListener
{ {
public void onMessage(Message message)... public void onMessage(Message message)...
@ -108,7 +108,7 @@ public class MDB_CMP_TxRequiredExample implements MessageListener
}) })
@TransactionManagement(value = TransactionManagementType.CONTAINER) @TransactionManagement(value = TransactionManagementType.CONTAINER)
@TransactionAttribute(value = TransactionAttributeType.NOT_SUPPORTED) @TransactionAttribute(value = TransactionAttributeType.NOT_SUPPORTED)
@ResourceAdapter("hornetq-ra.rar") @ResourceAdapter("activemq-ra.rar")
public class MDB_CMP_TxLocalExample implements MessageListener public class MDB_CMP_TxLocalExample implements MessageListener
{ {
public void onMessage(Message message)... public void onMessage(Message message)...
@ -126,7 +126,7 @@ public class MDB_CMP_TxLocalExample implements MessageListener
@ActivationConfigProperty(propertyName = "acknowledgeMode", propertyValue = "Dups-ok-acknowledge") @ActivationConfigProperty(propertyName = "acknowledgeMode", propertyValue = "Dups-ok-acknowledge")
}) })
@TransactionManagement(value= TransactionManagementType.BEAN) @TransactionManagement(value= TransactionManagementType.BEAN)
@ResourceAdapter("hornetq-ra.rar") @ResourceAdapter("activemq-ra.rar")
public class MDB_BMPExample implements MessageListener public class MDB_BMPExample implements MessageListener
{ {
public void onMessage(Message message) public void onMessage(Message message)
@ -175,7 +175,7 @@ public class MDB_BMPExample implements MessageListener
}) })
@TransactionManagement(value= TransactionManagementType.CONTAINER) @TransactionManagement(value= TransactionManagementType.CONTAINER)
@TransactionAttribute(value= TransactionAttributeType.REQUIRED) @TransactionAttribute(value= TransactionAttributeType.REQUIRED)
@ResourceAdapter("hornetq-ra.rar") @ResourceAdapter("activemq-ra.rar")
public class MDBMessageSelectorExample implements MessageListener public class MDBMessageSelectorExample implements MessageListener
{ {
public void onMessage(Message message).... public void onMessage(Message message)....
@ -195,7 +195,7 @@ public class MDBMessageSelectorExample implements MessageListener
}) })
@TransactionManagement(value= TransactionManagementType.CONTAINER) @TransactionManagement(value= TransactionManagementType.CONTAINER)
@TransactionAttribute(value= TransactionAttributeType.REQUIRED) @TransactionAttribute(value= TransactionAttributeType.REQUIRED)
@ResourceAdapter("hornetq-ra.rar") @ResourceAdapter("activemq-ra.rar")
public class MDBMessageSendTxExample implements MessageListener public class MDBMessageSendTxExample implements MessageListener
{ {
@Resource(mappedName = "java:/JmsXA") @Resource(mappedName = "java:/JmsXA")
@ -263,7 +263,7 @@ public class MDBMessageSendTxExample implements MessageListener
}) })
@TransactionManagement(value= TransactionManagementType.CONTAINER) @TransactionManagement(value= TransactionManagementType.CONTAINER)
@TransactionAttribute(value= TransactionAttributeType.REQUIRED) @TransactionAttribute(value= TransactionAttributeType.REQUIRED)
@ResourceAdapter("hornetq-ra.rar") @ResourceAdapter("activemq-ra.rar")
public class MyMDB implements MessageListener public class MyMDB implements MessageListener
{ ....} { ....}
</programlisting> </programlisting>
@ -646,7 +646,7 @@ public class MyMDB implements MessageListener
<title>适配器外部（outbound）配置</title> <title>适配器外部（outbound）配置</title>
<para>外部配置参数应该保持不变。这是因为它所定义的连接工厂要被Java EE的模块所使用。这些连接工厂 <para>外部配置参数应该保持不变。这是因为它所定义的连接工厂要被Java EE的模块所使用。这些连接工厂
可以定义在名字样式为<literal>*-ds.xml</literal>的配置文件中。在JBoss的部署目录 可以定义在名字样式为<literal>*-ds.xml</literal>的配置文件中。在JBoss的部署目录
<literal>hornetq.sar</literal>下有一个默认的配置文件<literal>jms-ds.xml</literal>。 <literal>activemq.sar</literal>下有一个默认的配置文件<literal>jms-ds.xml</literal>。
在这个文件中的连接工厂的配置从主要的配置文件<literal>ra.xml</literal>中继承， 在这个文件中的连接工厂的配置从主要的配置文件<literal>ra.xml</literal>中继承，
但是可以在这里重新定义。下面的例子中给出了重新定义的方法。</para> 但是可以在这里重新定义。下面的例子中给出了重新定义的方法。</para>
<note> <note>
@ -784,7 +784,7 @@ private ConnectionFactory connectionFactory;</programlisting>
<section> <section>
<title>配置内部适配器</title> <title>配置内部适配器</title>
<para>首先在<literal>deploy</literal>目录下创建一个以.rar为结尾的文件夹。 <para>首先在<literal>deploy</literal>目录下创建一个以.rar为结尾的文件夹。
在这里我们将其命名为<literal>hornetq-ra.rar</literal>。主注意这一点很重要，因为MDB和外部配置都需要引用 在这里我们将其命名为<literal>activemq-ra.rar</literal>。主注意这一点很重要，因为MDB和外部配置都需要引用
该文件夹的名字。 该文件夹的名字。
</para> </para>
<note> <note>
@ -793,7 +793,7 @@ private ConnectionFactory connectionFactory;</programlisting>
</para> </para>
</note> </note>
<para>在文件夹 <para>在文件夹
<literal>hornetq-ra.rar</literal> <literal>activemq-ra.rar</literal>
下创建名为 下创建名为
<literal>META-INF</literal> <literal>META-INF</literal>
的文件夹，然后在些文件夹内创建一个 的文件夹，然后在些文件夹内创建一个
@ -825,8 +825,8 @@ private ConnectionFactory connectionFactory;</programlisting>
<section> <section>
<title>配置外部适配器</title> <title>配置外部适配器</title>
<para>你还需要创建一个<literal>hornetq-ds.xml</literal>文件来配置外部连接。该文件需要放置在<literal>deploy</literal> <para>你还需要创建一个<literal>activemq-ds.xml</literal>文件来配置外部连接。该文件需要放置在<literal>deploy</literal>
下的任意一个文件夹中。在一相标准的安装中这个文件夹是<literal>horneq</literal> 或者 <literal>hornetq.sar</literal>。 下的任意一个文件夹中。在一相标准的安装中这个文件夹是<literal>horneq</literal> 或者 <literal>activemq.sar</literal>。
当然你可以选择其它文件夹。该文件的名字只要是以<literal>-ds.xml</literal>即可。在ActiveMQ的发布包中包含有一个模板文件， 当然你可以选择其它文件夹。该文件的名字只要是以<literal>-ds.xml</literal>即可。在ActiveMQ的发布包中包含有一个模板文件，
它的名字是<literal>jms-ds.xml</literal>，位置就在config文件夹下。 它的名字是<literal>jms-ds.xml</literal>，位置就在config文件夹下。
</para> </para>
@ -835,7 +835,7 @@ private ConnectionFactory connectionFactory;</programlisting>
&lt;tx-connection-factory&gt; &lt;tx-connection-factory&gt;
&lt;jndi-name&gt;RemoteJmsXA&lt;/jndi-name&gt; &lt;jndi-name&gt;RemoteJmsXA&lt;/jndi-name&gt;
&lt;xa-transaction/&gt; &lt;xa-transaction/&gt;
&lt;rar-name&gt;hornetq-ra.rar&lt;/rar-name&gt; &lt;rar-name&gt;activemq-ra.rar&lt;/rar-name&gt;
&lt;connection-definition&gt;org.apache.activemq.ra.ActiveMQRAConnectionFactory&lt;/connection-definition&gt; &lt;connection-definition&gt;org.apache.activemq.ra.ActiveMQRAConnectionFactory&lt;/connection-definition&gt;
&lt;config-property name="SessionDefaultType" type="java.lang.String"&gt;javax.jms.Topic&lt;/config-property&gt; &lt;config-property name="SessionDefaultType" type="java.lang.String"&gt;javax.jms.Topic&lt;/config-property&gt;
&lt;config-property name="ConnectorClassName" type="java.lang.String"&gt;org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory&lt;/config-property&gt; &lt;config-property name="ConnectorClassName" type="java.lang.String"&gt;org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory&lt;/config-property&gt;
@ -864,17 +864,17 @@ private ConnectionFactory connectionFactory;</programlisting>
</thead> </thead>
<tbody> <tbody>
<row> <row>
<entry>hornetq-ra.jar</entry> <entry>activemq-ra.jar</entry>
<entry>ActiveMQ资源适配器文件</entry> <entry>ActiveMQ资源适配器文件</entry>
<entry>deploy/hornetq-ra.rar或相应的位置</entry> <entry>deploy/activemq-ra.rar或相应的位置</entry>
</row> </row>
<row> <row>
<entry>hornetq-core-client.jar</entry> <entry>activemq-core-client.jar</entry>
<entry>ActiveMQ核心客户类库</entry> <entry>ActiveMQ核心客户类库</entry>
<entry>在JBoss的default/lib下或者是$JBOSS_HOME/common/lib下。 </entry> <entry>在JBoss的default/lib下或者是$JBOSS_HOME/common/lib下。 </entry>
</row> </row>
<row> <row>
<entry>hornetq-jms-client.jar</entry> <entry>activemq-jms-client.jar</entry>
<entry>ActiveMQ的JMS类</entry> <entry>ActiveMQ的JMS类</entry>
<entry>同上</entry> <entry>同上</entry>
</row> </row>

4
docs/user-manual/zh/architecture.xml
View File

@ -53,7 +53,7 @@
<section> <section>
<title>将ActiveMQ嵌入到你的应用程序中</title> <title>将ActiveMQ嵌入到你的应用程序中</title>
<para>如果你的应用程序内部需要消息服务，但同时你又不想将消息服务暴露为单独的ActiveMQ服务器，你可以在应用中直接将ActiveMQ实例化。</para> <para>如果你的应用程序内部需要消息服务，但同时你又不想将消息服务暴露为单独的ActiveMQ服务器，你可以在应用中直接将ActiveMQ实例化。</para>
<para>有关嵌入式ActiveMQ的详细信息请参阅 <xref linkend="embedding-hornetq" <para>有关嵌入式ActiveMQ的详细信息请参阅 <xref linkend="embedding-activemq"
/>。</para> />。</para>
</section> </section>
<section> <section>
@ -78,7 +78,7 @@
<title>ActiveMQ作为独立的服务（standalone）</title> <title>ActiveMQ作为独立的服务（standalone）</title>
<para>ActiveMQ可以部署成为独立的服务器。它可运行于任何JEE应用服务器之外，作为一个独立的服务运行。 <para>ActiveMQ可以部署成为独立的服务器。它可运行于任何JEE应用服务器之外，作为一个独立的服务运行。
作为独立服务器运行时，ActiveMQ消息服务器包括一个核心服务器，一个JMS服务以及一个JNDI服务。</para> 作为独立服务器运行时，ActiveMQ消息服务器包括一个核心服务器，一个JMS服务以及一个JNDI服务。</para>
<para>JMS服务用来部署服务器端<literal>hornetq-jms.xml</literal>配置文件中的JMS Queue，Topic和ConnectionFactory实例。 <para>JMS服务用来部署服务器端<literal>activemq-jms.xml</literal>配置文件中的JMS Queue，Topic和ConnectionFactory实例。
此外它还提供一组简单的管理接口，通过这些接口可以创建、消毁（destroy）Queue，Topic和ConnectionFactory实例。 此外它还提供一组简单的管理接口，通过这些接口可以创建、消毁（destroy）Queue，Topic和ConnectionFactory实例。
用于可以通过JMX或连接使用这些接口。JMS服务是单独的服务，它不是ActiveMQ核心服务。ActiveMQ的核心不包含JMS相关的服务。 用于可以通过JMX或连接使用这些接口。JMS服务是单独的服务，它不是ActiveMQ核心服务。ActiveMQ的核心不包含JMS相关的服务。
如果你不需要通过服务器端的xml配置文件部署任何JMS对象，也不需要JMS的管理接口，你可以选择不启动该服务。</para> 如果你不需要通过服务器端的xml配置文件部署任何JMS对象，也不需要JMS的管理接口，你可以选择不启动该服务。</para>

4
docs/user-manual/zh/client-classpath.xml
View File

@ -27,13 +27,13 @@
<section> <section>
<title>使用ActiveMQ内核的客户端</title> <title>使用ActiveMQ内核的客户端</title>
<para>如果客户端只使用ActiveMQ内核（非JMS客户端），需要将 <literal <para>如果客户端只使用ActiveMQ内核（非JMS客户端），需要将 <literal
>hornetq-core-client.jar</literal>和 >activemq-core-client.jar</literal>和
<literal>netty.jar</literal> 放到classpath中。</para> <literal>netty.jar</literal> 放到classpath中。</para>
</section> </section>
<section> <section>
<title>JMS客户端</title> <title>JMS客户端</title>
<para>如果客户端使用JMS，需要在classpath上增加两个jar文件： <literal <para>如果客户端使用JMS，需要在classpath上增加两个jar文件： <literal
>hornetq-jms-client.jar</literal> 和 <literal>jboss-jms-api.jar</literal>。</para> >activemq-jms-client.jar</literal> 和 <literal>jboss-jms-api.jar</literal>。</para>
<note> <note>
<para><literal>jboss-jms-api.jar</literal>中包含的只是 <literal>javax.jms.*</literal> 包中的接口类。 <para><literal>jboss-jms-api.jar</literal>中包含的只是 <literal>javax.jms.*</literal> 包中的接口类。
如果这些类已经在你的classpath中，则你就不需要这个jar文件。</para> 如果这些类已经在你的classpath中，则你就不需要这个jar文件。</para>

4
docs/user-manual/zh/client-reconnection.xml
View File

@ -34,7 +34,7 @@
<literal>ConfirmationWindowSize</literal>字节的命令时，会向客户端发送一个命令确认，以使客户端 <literal>ConfirmationWindowSize</literal>字节的命令时，会向客户端发送一个命令确认，以使客户端
及时清除缓存。</para> 及时清除缓存。</para>
<para>如果使用JMS服务，并且JMS的连接工厂是注册到JNDI的话，相应的参数是<literal <para>如果使用JMS服务，并且JMS的连接工厂是注册到JNDI的话，相应的参数是<literal
>hornetq-jms.xml</literal>文件中的<literal >activemq-jms.xml</literal>文件中的<literal
>confirmation-window-size</literal>项。如果你并不将JMS连接工厂注册到JNDI，则你需要在 >confirmation-window-size</literal>项。如果你并不将JMS连接工厂注册到JNDI，则你需要在
<literal>ActiveMQConnectionFactory</literal>上使用相应的方法直接设置该参数。</para> <literal>ActiveMQConnectionFactory</literal>上使用相应的方法直接设置该参数。</para>
<para>如果使用核心服务，你可以直接在<literal>ClientSessionFactory</literal>实例上直接设置该参数。</para> <para>如果使用核心服务，你可以直接在<literal>ClientSessionFactory</literal>实例上直接设置该参数。</para>
@ -82,7 +82,7 @@
并退出。<literal>-1</literal>表示进行无限次重试。默认值是<literal>0</literal>。</para> 并退出。<literal>-1</literal>表示进行无限次重试。默认值是<literal>0</literal>。</para>
</listitem> </listitem>
</itemizedlist> </itemizedlist>
<para>如果使用JMS并且将JMS的连接工厂绑定到JNDI服务中，则需要在<literal>hornetq-jms.xml</literal> <para>如果使用JMS并且将JMS的连接工厂绑定到JNDI服务中，则需要在<literal>activemq-jms.xml</literal>
文件中对这些参数进行配置，如下例所示：</para> 文件中对这些参数进行配置，如下例所示：</para>
<programlisting> <programlisting>
&lt;connection-factory name="ConnectionFactory"&gt; &lt;connection-factory name="ConnectionFactory"&gt;

6
docs/user-manual/zh/clusters.xml
View File

@ -169,7 +169,7 @@
<section> <section>
<title>使用JMS时客户端发现的配置方法</title> <title>使用JMS时客户端发现的配置方法</title>
<para>如果使用JMS，并且在服务器端的JMS连接工厂是注册到JNDI的情况下，你可以在服务器端的配置文件 <para>如果使用JMS，并且在服务器端的JMS连接工厂是注册到JNDI的情况下，你可以在服务器端的配置文件
<literal>hornetq-jms.xml</literal>中指定连接工厂所用的发现组。如下面所示：</para> <literal>activemq-jms.xml</literal>中指定连接工厂所用的发现组。如下面所示：</para>
<programlisting>&lt;connection-factory name="ConnectionFactory"> <programlisting>&lt;connection-factory name="ConnectionFactory">
&lt;discovery-group-ref discovery-group-name="my-discovery-group"/> &lt;discovery-group-ref discovery-group-name="my-discovery-group"/>
&lt;entries> &lt;entries>
@ -342,7 +342,7 @@ Connection jmsConnection2 = jmsConnectionFactory.createConnection();</programlis
>org.apache.activemq.api.core.client.loadbalance.ConnectionLoadBalancingPolicy</literal>即可。</para> >org.apache.activemq.api.core.client.loadbalance.ConnectionLoadBalancingPolicy</literal>即可。</para>
<para>根据你使用的是JMS还是核心接口，指定负载均衡的方法是有所不同的。如果你不指定策略，默认的策略是<literal <para>根据你使用的是JMS还是核心接口，指定负载均衡的方法是有所不同的。如果你不指定策略，默认的策略是<literal
>org.apache.activemq.api.core.client.loadbalance.RoundRobinConnectionLoadBalancingPolicy</literal>.</para> >org.apache.activemq.api.core.client.loadbalance.RoundRobinConnectionLoadBalancingPolicy</literal>.</para>
<para>如果使用的是JMS，并且JMS连接工厂注册到JNDI，则你需要在<literal>hornetq-jms.xml</literal>文件中定义策略，如： <para>如果使用的是JMS，并且JMS连接工厂注册到JNDI，则你需要在<literal>activemq-jms.xml</literal>文件中定义策略，如：
<programlisting> <programlisting>
&lt;connection-factory name="ConnectionFactory"&gt; &lt;connection-factory name="ConnectionFactory"&gt;
&lt;discovery-group-ref discovery-group-name="my-discovery-group"/&gt; &lt;discovery-group-ref discovery-group-name="my-discovery-group"/&gt;
@ -385,7 +385,7 @@ factory.setLoadBalancingPolicyClassName("com.acme.MyLoadBalancingPolicy");
<section> <section>
<title>使用JMS时指定服务器列表</title> <title>使用JMS时指定服务器列表</title>
<para>如果使用JMS，并且JMS连接工厂是注册到JNDI的话，你需要在服务器端的配置文件 <para>如果使用JMS，并且JMS连接工厂是注册到JNDI的话，你需要在服务器端的配置文件
<literal>hornetq-jms.xml</literal>中来指定，如下面的例子：</para> <literal>activemq-jms.xml</literal>中来指定，如下面的例子：</para>
<programlisting>&lt;connection-factory name="ConnectionFactory"> <programlisting>&lt;connection-factory name="ConnectionFactory">
&lt;connectors> &lt;connectors>
&lt;connector-ref connector-name="my-connector1" &lt;connector-ref connector-name="my-connector1"

6
docs/user-manual/zh/configuration-index.xml
View File

@ -209,7 +209,7 @@
>management-address</link></entry> >management-address</link></entry>
<entry>String</entry> <entry>String</entry>
<entry>管理消息发送的地址</entry> <entry>管理消息发送的地址</entry>
<entry>jms.queue.hornetq.management</entry> <entry>jms.queue.activemq.management</entry>
</row> </row>
<row> <row>
<entry><link linkend="clusters.clusteruser" <entry><link linkend="clusters.clusteruser"
@ -230,7 +230,7 @@
>management-notification-address</link></entry> >management-notification-address</link></entry>
<entry>String</entry> <entry>String</entry>
<entry>用于接收管理通知的地址</entry> <entry>用于接收管理通知的地址</entry>
<entry>hornetq.notifications</entry> <entry>activemq.notifications</entry>
</row> </row>
<row> <row>
<entry><link linkend="configuring.message.counters" <entry><link linkend="configuring.message.counters"
@ -925,7 +925,7 @@
</table> </table>
</section> </section>
<section> <section>
<title>hornetq-jms.xml</title> <title>activemq-jms.xml</title>
<para>该文件是服务器端JMS服务所使用的，用来装载JMS队列，话题和连接工厂。</para> <para>该文件是服务器端JMS服务所使用的，用来装载JMS队列，话题和连接工厂。</para>
<table frame="topbot" border="2"> <table frame="topbot" border="2">
<title>JMS服务器配置</title> <title>JMS服务器配置</title>

4
docs/user-manual/zh/configuring-transports.xml
View File

@ -75,7 +75,7 @@ org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory
<literal>ActiveMQConnectionFactory</literal>时需要连接器的必要信息，以便这个连接工厂 <literal>ActiveMQConnectionFactory</literal>时需要连接器的必要信息，以便这个连接工厂
能知道它如何与ActiveMQ服务器相连接。</para> 能知道它如何与ActiveMQ服务器相连接。</para>
<para>这一信息被定义在配置文件<literal <para>这一信息被定义在配置文件<literal
>hornetq-jms.xml</literal>中的<literal>connector-ref</literal>单元下。下面这段配置 >activemq-jms.xml</literal>中的<literal>connector-ref</literal>单元下。下面这段配置
就是从该配置文件中提取的相关部分，它展示了JMS的连接工厂是如何引用定义在配置文件<literal 就是从该配置文件中提取的相关部分，它展示了JMS的连接工厂是如何引用定义在配置文件<literal
>activemq-configuration.xml</literal>中的连接器的：</para> >activemq-configuration.xml</literal>中的连接器的：</para>
<programlisting> <programlisting>
@ -118,7 +118,7 @@ ClientSession session = sessionFactory.createSession(...);
etc etc
</programlisting> </programlisting>
<para>如果在客户端直接使用JMS的连接工厂的话，也可以用类似的方法而不需要在服务器端定义连接器或在 <para>如果在客户端直接使用JMS的连接工厂的话，也可以用类似的方法而不需要在服务器端定义连接器或在
<literal>hornetq-jms.xml</literal>配置文件中创建连接工厂：</para> <literal>activemq-jms.xml</literal>配置文件中创建连接工厂：</para>
<programlisting> <programlisting>
Map&lt;String, Object&gt; connectionParams = new HashMap&lt;String, Object&gt;(); Map&lt;String, Object&gt; connectionParams = new HashMap&lt;String, Object&gt;();

2
docs/user-manual/zh/connection-ttl.xml
View File

@ -120,7 +120,7 @@ at org.acme.yourproject.YourClass (YourClass.java:666)
收到任何数据，客户端就认为这们连接发生了故障。根据不同的配置，客户端在这种情况下要么进行failover，要么 收到任何数据，客户端就认为这们连接发生了故障。根据不同的配置，客户端在这种情况下要么进行failover，要么
调用<literal>FailureListener</literal>的接口（或者是JMS的<literal>ExceptionListener</literal>）。</para> 调用<literal>FailureListener</literal>的接口（或者是JMS的<literal>ExceptionListener</literal>）。</para>
<para>如果使用JMS，这个参数是<literal>ActiveMQConnectionFactory</literal>的<literal>ClientFailureCheckPeriod</literal>。 <para>如果使用JMS，这个参数是<literal>ActiveMQConnectionFactory</literal>的<literal>ClientFailureCheckPeriod</literal>。
如果你向JNDI部署JMS连接工厂，那么相应的参数在<literal>hornetq-jms.xml</literal>配置文件中，参数名 如果你向JNDI部署JMS连接工厂，那么相应的参数在<literal>activemq-jms.xml</literal>配置文件中，参数名
为<literal>client-failure-check-period</literal>。</para> 为<literal>client-failure-check-period</literal>。</para>
<para>这个参数的默认值是<literal>30000</literal>毫秒，即半分钟。<literal>-1</literal>表示客户端不检查 <para>这个参数的默认值是<literal>30000</literal>毫秒，即半分钟。<literal>-1</literal>表示客户端不检查
连接的有效性。即不论是否有数据来自服务器，连接都一直有效。这一参数通常要比服务器端的连接TTL小许多，以使 连接的有效性。即不论是否有数据来自服务器，连接都一直有效。这一参数通常要比服务器端的连接TTL小许多，以使

2
docs/user-manual/zh/core-bridges.xml
View File

@ -70,7 +70,7 @@
<para>这个队列在桥的启动之前必须已经存在。</para> <para>这个队列在桥的启动之前必须已经存在。</para>
<note> <note>
<para>如果使用JMS，JMS的配置文件<literal <para>如果使用JMS，JMS的配置文件<literal
>hornetq-jms.xml</literal>在核心配置文件<literal> >activemq-jms.xml</literal>在核心配置文件<literal>
activemq-configuration.xml</literal>之后装载。所以如果你的桥要从JMS activemq-configuration.xml</literal>之后装载。所以如果你的桥要从JMS
队列接收消息，就需要保证JMS队列同时要作为核心队列部署。具体方法可以参见 队列接收消息，就需要保证JMS队列同时要作为核心队列部署。具体方法可以参见
bridge例子。</para> bridge例子。</para>

6
docs/user-manual/zh/embedding-hornetq.xml
View File

@ -16,7 +16,7 @@
<!-- and agrees not to assert, Section 4d of CC-BY-SA to the fullest extent --> <!-- and agrees not to assert, Section 4d of CC-BY-SA to the fullest extent -->
<!-- permitted by applicable law. --> <!-- permitted by applicable law. -->
<!-- ============================================================================= --> <!-- ============================================================================= -->
<chapter id="embedding-hornetq"> <chapter id="embedding-activemq">
<title>嵌入式ActiveMQ</title> <title>嵌入式ActiveMQ</title>
<para>ActiveMQ是由简单传统Java对象（POJO）实现，因此它可以在任何依赖注入的框架中运行，比如JBoss <para>ActiveMQ是由简单传统Java对象（POJO）实现，因此它可以在任何依赖注入的框架中运行，比如JBoss
Microcontainer，Sprint或Google Guice。另外如果你的应用程序内部需要消息功能，你可以在程序中 Microcontainer，Sprint或Google Guice。另外如果你的应用程序内部需要消息功能，你可以在程序中
@ -76,7 +76,7 @@ server.start();</programlisting>
<para>你还可以使用一个依赖注入框架来启动ActiveMQ，比如<trademark>JBoss <para>你还可以使用一个依赖注入框架来启动ActiveMQ，比如<trademark>JBoss
Microcontainer</trademark>或<trademark>Spring框架</trademark>。</para> Microcontainer</trademark>或<trademark>Spring框架</trademark>。</para>
<para>ActiveMQ独立服务器使用的是JBoss Microcontainer作为其框架。在ActiveMQ的发布中包括的<literal <para>ActiveMQ独立服务器使用的是JBoss Microcontainer作为其框架。在ActiveMQ的发布中包括的<literal
>ActiveMQBootstrapServer</literal>和<literal>hornetq-beans.xml</literal>文件共同实现了 >ActiveMQBootstrapServer</literal>和<literal>activemq-beans.xml</literal>文件共同实现了
在JBoss Microcontainer中对ActiveMQ服务器的引导。</para> 在JBoss Microcontainer中对ActiveMQ服务器的引导。</para>
<para>要使用JBoss Microcontainer，需要在xml文件中声明<literal>ActiveMQServer</literal> <para>要使用JBoss Microcontainer，需要在xml文件中声明<literal>ActiveMQServer</literal>
和<literal>Configuration</literal>对象。另外还可以注入一个安全管理器和一个MBean服务器。但是这些 和<literal>Configuration</literal>对象。另外还可以注入一个安全管理器和一个MBean服务器。但是这些
@ -103,7 +103,7 @@ server.start();</programlisting>
&lt;/deployment></programlisting> &lt;/deployment></programlisting>
<para><literal>ActiveMQBootstrapServer</literal>实现了JBoss Microcontainer的简单封装。</para> <para><literal>ActiveMQBootstrapServer</literal>实现了JBoss Microcontainer的简单封装。</para>
<programlisting>ActiveMQBootstrapServer bootStrap = <programlisting>ActiveMQBootstrapServer bootStrap =
new ActiveMQBootstrapServer(new String[] {"hornetq-beans.xml"}); new ActiveMQBootstrapServer(new String[] {"activemq-beans.xml"});
bootStrap.run();</programlisting> bootStrap.run();</programlisting>
</section> </section>
<section> <section>

2
docs/user-manual/zh/filter-expressions.xml
View File

@ -29,7 +29,7 @@
<itemizedlist> <itemizedlist>
<listitem> <listitem>
<para>预定义的队列。当在<literal <para>预定义的队列。当在<literal
>activemq-configuration.xml</literal> 或 <literal>hornetq-jms.xml</literal>定义 >activemq-configuration.xml</literal> 或 <literal>activemq-jms.xml</literal>定义
队列时，可以使用过滤器。只有与过滤器表达式相匹配的消息才能达到该队列中。</para> 队列时，可以使用过滤器。只有与过滤器表达式相匹配的消息才能达到该队列中。</para>
</listitem> </listitem>
<listitem> <listitem>

8
docs/user-manual/zh/flow-control.xml
View File

@ -83,7 +83,7 @@
</section> </section>
<section> <section>
<title>使用JMS的流控制</title> <title>使用JMS的流控制</title>
<para>若使用JNDI来获得连接工厂，则需要通过配置<literal>hornetq-jms.xml</literal>文件来设定窗口大小：</para> <para>若使用JNDI来获得连接工厂，则需要通过配置<literal>activemq-jms.xml</literal>文件来设定窗口大小：</para>
<programlisting> <programlisting>
&lt;connection-factory name="ConnectionFactory"&gt; &lt;connection-factory name="ConnectionFactory"&gt;
&lt;connectors> &lt;connectors>
@ -118,7 +118,7 @@
</section> </section>
<section> <section>
<title>使用JMS</title> <title>使用JMS</title>
<para>如果从JNDI中获取连接工厂，需要通过配置<literal>hornetq-jms.xml</literal>来进行速率流控制：</para> <para>如果从JNDI中获取连接工厂，需要通过配置<literal>activemq-jms.xml</literal>来进行速率流控制：</para>
<programlisting>&lt;connection-factory name="ConnectionFactory"> <programlisting>&lt;connection-factory name="ConnectionFactory">
&lt;connectors> &lt;connectors>
&lt;connector-ref connector-name="netty-connector"/> &lt;connector-ref connector-name="netty-connector"/>
@ -161,7 +161,7 @@
</section> </section>
<section> <section>
<title>使用JMS</title> <title>使用JMS</title>
<para>如果使用JNDI来获得连接工厂，则需要配置<literal>hornetq-jms.xml</literal>文件以设定窗口大小：</para> <para>如果使用JNDI来获得连接工厂，则需要配置<literal>activemq-jms.xml</literal>文件以设定窗口大小：</para>
<programlisting> <programlisting>
&lt;connection-factory name="ConnectionFactory"> &lt;connection-factory name="ConnectionFactory">
&lt;connectors> &lt;connectors>
@ -222,7 +222,7 @@
</section> </section>
<section> <section>
<title>使用 JMS</title> <title>使用 JMS</title>
<para>如果使用JNDI，需要配置<literal>hornetq-jms.xml</literal>文件：</para> <para>如果使用JNDI，需要配置<literal>activemq-jms.xml</literal>文件：</para>
<programlisting>&lt;connection-factory name="ConnectionFactory"> <programlisting>&lt;connection-factory name="ConnectionFactory">
&lt;connectors> &lt;connectors>
&lt;connector-ref connector-name="netty-connector"/> &lt;connector-ref connector-name="netty-connector"/>

4
docs/user-manual/zh/ha.xml
View File

@ -125,7 +125,7 @@
<para>另外，需要将主服务器和备份服务器的日志文件位置指向<emphasis>同一个共享位置</emphasis>。 <para>另外，需要将主服务器和备份服务器的日志文件位置指向<emphasis>同一个共享位置</emphasis>。
（参见<xref linkend="configuring.message.journal"/>）</para> （参见<xref linkend="configuring.message.journal"/>）</para>
<para>如果客户端使用JMS自动失效备援，主服务器除了要配置一个连接器以连接到备份服务器外，还要在 <para>如果客户端使用JMS自动失效备援，主服务器除了要配置一个连接器以连接到备份服务器外，还要在
配置文件<literal>hornetq-jms.xml</literal>中指向这个连接器，如 配置文件<literal>activemq-jms.xml</literal>中指向这个连接器，如
<xref linkend="ha.automatic.failover"/>中所解释的那样。</para> <xref linkend="ha.automatic.failover"/>中所解释的那样。</para>
</section> </section>
<section> <section>
@ -170,7 +170,7 @@
<para>有时你需要在主服务器正常关机的情况下仍然进行失效备援。如果使用JMS，你需要将<literal <para>有时你需要在主服务器正常关机的情况下仍然进行失效备援。如果使用JMS，你需要将<literal
>ActiveMQConnectionFactory</literal>的<literal >ActiveMQConnectionFactory</literal>的<literal
>FailoverOnServerShutdown</literal>属性设为true，或者是在<literal >FailoverOnServerShutdown</literal>属性设为true，或者是在<literal
>hornetq-jms.xml</literal>（参数为failover-on-server-shutdown）文件中进行相应的配置。如果使用的是核心接口，可以在创建 >activemq-jms.xml</literal>（参数为failover-on-server-shutdown）文件中进行相应的配置。如果使用的是核心接口，可以在创建
<literal>ClientSessionFactoryImpl</literal>实例时将上述同名属性设置为true。 <literal>ClientSessionFactoryImpl</literal>实例时将上述同名属性设置为true。
这个属性的默认值是false。这表示如果主服务器是正常关机，<emphasis>客户端将不会进行失效备援</emphasis>。</para> 这个属性的默认值是false。这表示如果主服务器是正常关机，<emphasis>客户端将不会进行失效备援</emphasis>。</para>
<para> <para>

2
docs/user-manual/zh/large-messages.xml
View File

@ -64,7 +64,7 @@ factory.setMinLargeMessageSize(25 * 1024);</programlisting>
</section> </section>
<section> <section>
<title>使用JMS</title> <title>使用JMS</title>
<para>如果连接工厂是通过JNDI方式获得的，则需要在<literal>hornetq-jms.xml</literal>文件中定义：</para> <para>如果连接工厂是通过JNDI方式获得的，则需要在<literal>activemq-jms.xml</literal>文件中定义：</para>
<programlisting>... <programlisting>...
&lt;connection-factory name="ConnectionFactory"> &lt;connection-factory name="ConnectionFactory">
&lt;connectors> &lt;connectors>

16
docs/user-manual/zh/management.xml
View File

@ -520,7 +520,7 @@
<para>例如，要得到核心队列<literal>exampleQueue</literal>中消息的数量：</para> <para>例如，要得到核心队列<literal>exampleQueue</literal>中消息的数量：</para>
<programlisting> <programlisting>
ClientSession session = ... 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); ClientMessage message = session.createMessage(false);
ManagementHelper.putAttribute(message, "core.queue.exampleQueue", "messageCount"); ManagementHelper.putAttribute(message, "core.queue.exampleQueue", "messageCount");
ClientMessage reply = requestor.request(m); ClientMessage reply = requestor.request(m);
@ -537,16 +537,16 @@
<para>管理地址的配置在文件<literal <para>管理地址的配置在文件<literal
>activemq-configuration.xml</literal>中：</para> >activemq-configuration.xml</literal>中：</para>
<programlisting> <programlisting>
&lt;management-address&gt;jms.queue.hornetq.management&lt;/management-address&gt; &lt;management-address&gt;jms.queue.activemq.management&lt;/management-address&gt;
</programlisting> </programlisting>
<para>它的默认地址是<literal>jms.queue.hornetq.management</literal> （地址前缀加上 <para>它的默认地址是<literal>jms.queue.activemq.management</literal> （地址前缀加上
“jms.queue”是为了方便JMS客户端也可以向它发送管理消息。</para> “jms.queue”是为了方便JMS客户端也可以向它发送管理消息。</para>
<para>管理地址需要一个<emphasis>特殊</emphasis>的用户权限 <para>管理地址需要一个<emphasis>特殊</emphasis>的用户权限
<literal>manage</literal>来接收并处理管理消息。这个权限也在hornetq-configuration.xml文件中配置：</para> <literal>manage</literal>来接收并处理管理消息。这个权限也在hornetq-configuration.xml文件中配置：</para>
<programlisting> <programlisting>
&lt;!-- users with the admin role will be allowed to manage --&gt; &lt;!-- users with the admin role will be allowed to manage --&gt;
&lt;!-- ActiveMQ using management messages --&gt; &lt;!-- ActiveMQ using management messages --&gt;
&lt;security-setting match="jms.queue.hornetq.management"&gt; &lt;security-setting match="jms.queue.activemq.management"&gt;
&lt;permission type="manage" roles="admin" /&gt; &lt;permission type="manage" roles="admin" /&gt;
&lt;/security-setting&gt; &lt;/security-setting&gt;
</programlisting> </programlisting>
@ -558,7 +558,7 @@
<para>其中一个重要的不同是JMS需要一个JMS队列来发送消息（而核心接口使用的是一个地址）。</para> <para>其中一个重要的不同是JMS需要一个JMS队列来发送消息（而核心接口使用的是一个地址）。</para>
<para><emphasis>管理队列</emphasis>是一个特殊的队列，它需要客户端直接实例化：</para> <para><emphasis>管理队列</emphasis>是一个特殊的队列，它需要客户端直接实例化：</para>
<programlisting> <programlisting>
Queue managementQueue = ActiveMQJMSClient.createQueue("hornetq.management"); Queue managementQueue = ActiveMQJMSClient.createQueue("activemq.management");
</programlisting> </programlisting>
<para>其余步骤完全和使用核心接口一样，只是相应的对象不同：</para> <para>其余步骤完全和使用核心接口一样，只是相应的对象不同：</para>
<orderedlist> <orderedlist>
@ -580,7 +580,7 @@
</orderedlist> </orderedlist>
<para>例如，要得到一个JMS队列<literal>exampleQueue</literal>中有多少消息：</para> <para>例如，要得到一个JMS队列<literal>exampleQueue</literal>中有多少消息：</para>
<programlisting> <programlisting>
Queue managementQueue = ActiveMQJMSClient.createQueue("hornetq.management"); Queue managementQueue = ActiveMQJMSClient.createQueue("activemq.management");
QueueSession session = ... QueueSession session = ...
QueueRequestor requestor = new QueueRequestor(session, managementQueue); QueueRequestor requestor = new QueueRequestor(session, managementQueue);
@ -643,9 +643,9 @@
<title>配置核心管理通知地址</title> <title>配置核心管理通知地址</title>
<para>用来发送管理通知的地址在文件中<literal>activemq-configuration.xml</literal>配置：</para> <para>用来发送管理通知的地址在文件中<literal>activemq-configuration.xml</literal>配置：</para>
<programlisting> <programlisting>
&lt;management-notification-address&gt;hornetq.notifications&lt;/management-notification-address&gt; &lt;management-notification-address&gt;activemq.notifications&lt;/management-notification-address&gt;
</programlisting> </programlisting>
<para>默认的地址是<literal>hornetq.notifications</literal>。</para> <para>默认的地址是<literal>activemq.notifications</literal>。</para>
</section> </section>
</section> </section>
<section> <section>

4
docs/user-manual/zh/master.xml
View File

@ -31,7 +31,7 @@
<!ENTITY core-bridges SYSTEM "core-bridges.xml"> <!ENTITY core-bridges SYSTEM "core-bridges.xml">
<!ENTITY diverts SYSTEM "diverts.xml"> <!ENTITY diverts SYSTEM "diverts.xml">
<!ENTITY duplicate-detection SYSTEM "duplicate-detection.xml"> <!ENTITY duplicate-detection SYSTEM "duplicate-detection.xml">
<!ENTITY embedding-hornetq SYSTEM "embedding-hornetq.xml"> <!ENTITY embedding-activemq SYSTEM "embedding-activemq.xml">
<!ENTITY examples SYSTEM "examples.xml"> <!ENTITY examples SYSTEM "examples.xml">
<!ENTITY filter-expressions SYSTEM "filter-expressions.xml"> <!ENTITY filter-expressions SYSTEM "filter-expressions.xml">
<!ENTITY flow-control SYSTEM "flow-control.xml"> <!ENTITY flow-control SYSTEM "flow-control.xml">
@ -118,7 +118,7 @@
&libaio; &libaio;
&thread-pooling; &thread-pooling;
&logging; &logging;
&embedding-hornetq; &embedding-activemq;
&intercepting-operations; &intercepting-operations;
&interoperability; &interoperability;
&perf-tuning; &perf-tuning;

4
docs/user-manual/zh/message-grouping.xml
View File

@ -54,7 +54,7 @@
producer.send(message); producer.send(message);
</programlisting> </programlisting>
<para>另一个方法是将<literal>ActiveMQConnectonFactory</literal>的<literal>autogroup</literal> <para>另一个方法是将<literal>ActiveMQConnectonFactory</literal>的<literal>autogroup</literal>
属性设为true，或者在<literal>hornetq-jms.xml</literal>文件中进行配置：</para> 属性设为true，或者在<literal>activemq-jms.xml</literal>文件中进行配置：</para>
<programlisting>&lt;connection-factory name="ConnectionFactory"> <programlisting>&lt;connection-factory name="ConnectionFactory">
&lt;connectors> &lt;connectors>
&lt;connector-ref connector-name="netty-connector"/> &lt;connector-ref connector-name="netty-connector"/>
@ -65,7 +65,7 @@
&lt;autogroup>true&lt;/autogroup> &lt;autogroup>true&lt;/autogroup>
&lt;/connection-factory></programlisting> &lt;/connection-factory></programlisting>
<para>还可以通过连接工厂来设置组id。来自这个连接工厂的所有的发送者（producer）发送的消息的<literal <para>还可以通过连接工厂来设置组id。来自这个连接工厂的所有的发送者（producer）发送的消息的<literal
>JMSXGroupID</literal>将具有指定的值。这种方法需要在<literal>hornetq-jms.xml</literal> >JMSXGroupID</literal>将具有指定的值。这种方法需要在<literal>activemq-jms.xml</literal>
文件中作如下配置： 文件中作如下配置：
<programlisting> <programlisting>
&lt;connection-factory name="ConnectionFactory"&gt; &lt;connection-factory name="ConnectionFactory"&gt;

4
docs/user-manual/zh/perf-tuning.xml
View File

@ -121,7 +121,7 @@
<xref linkend="send-guarantees"/>。</para> <xref linkend="send-guarantees"/>。</para>
</listitem> </listitem>
<listitem> <listitem>
<para>采用非阻塞方式发送消息。将文件<literal>hornetq-jms.xml</literal>中的参数 <para>采用非阻塞方式发送消息。将文件<literal>activemq-jms.xml</literal>中的参数
<literal>block-on-non-durable-send</literal>设为<literal>false</literal> <literal>block-on-non-durable-send</literal>设为<literal>false</literal>
（使用JMS和JNDI时）或者直接在上进行相应的设置，可以使 （使用JMS和JNDI时）或者直接在上进行相应的设置，可以使
消息发送时不阻塞等待服务器的响应。参见 <xref linkend="send-guarantees"/>。</para> 消息发送时不阻塞等待服务器的响应。参见 <xref linkend="send-guarantees"/>。</para>
@ -171,7 +171,7 @@ serveruser hard nofile 20000
<para>利用参数<literal>batch-delay</literal>并将参数<literal>direct-deliver</literal> <para>利用参数<literal>batch-delay</literal>并将参数<literal>direct-deliver</literal>
设为false来提高小消息的处理效率。ActiveMQ在其<literal>activemq-configuration.xml</literal> 设为false来提高小消息的处理效率。ActiveMQ在其<literal>activemq-configuration.xml</literal>
中预先配置了一个连接器／接受器对（<literal>netty-throughput</literal>），并且在 中预先配置了一个连接器／接受器对（<literal>netty-throughput</literal>），并且在
<literal>hornetq-jms.xml</literal>中配置了一个JMS连接工厂（ <literal>activemq-jms.xml</literal>中配置了一个JMS连接工厂（
<literal>ThroughputConnectionFactory</literal>）。它们可以用在小消息的处理应用中以提 <literal>ThroughputConnectionFactory</literal>）。它们可以用在小消息的处理应用中以提
供最佳呑吐量。参见<xref 供最佳呑吐量。参见<xref
linkend="configuring-transports"/>。</para> linkend="configuring-transports"/>。</para>

14
docs/user-manual/zh/persistence.xml
View File

@ -61,7 +61,7 @@
<para>绑定日志</para> <para>绑定日志</para>
<para>这个日志用来保存与绑定有关的数据。其中包括在ActiveMQ上部署的队列及其属性，还有ID序列计数器。 </para> <para>这个日志用来保存与绑定有关的数据。其中包括在ActiveMQ上部署的队列及其属性，还有ID序列计数器。 </para>
<para>绑定日志是一个NIO型日志。与消息日志相比它的呑吐量是比较低的。</para> <para>绑定日志是一个NIO型日志。与消息日志相比它的呑吐量是比较低的。</para>
<para>这种日志文件的名字采用<literal>hornetq-bindings</literal>作为前缀。每个文件都有 <para>这种日志文件的名字采用<literal>activemq-bindings</literal>作为前缀。每个文件都有
<literal>bindings</literal>这样的扩展。文件大小是<literal <literal>bindings</literal>这样的扩展。文件大小是<literal
>1048576</literal>，它的位置在bindings文件夹下。</para> >1048576</literal>，它的位置在bindings文件夹下。</para>
</listitem> </listitem>
@ -70,7 +70,7 @@
<para>这个日志保存所有JMS相关的数据，包括JMS队列，话题及连接工厂，以及它们的JNDI绑定信息。</para> <para>这个日志保存所有JMS相关的数据，包括JMS队列，话题及连接工厂，以及它们的JNDI绑定信息。</para>
<para>通过管理接口创建的JMS资源将被保存在这个日志中。但是通过配置文件配置的资源则不保存。只有使用JMS时JMS的日志 <para>通过管理接口创建的JMS资源将被保存在这个日志中。但是通过配置文件配置的资源则不保存。只有使用JMS时JMS的日志
才被创建。</para> 才被创建。</para>
<para>这种日志文件的名字采用<literal>hornetq-jms</literal>作为前缀。每个文件都有 <para>这种日志文件的名字采用<literal>activemq-jms</literal>作为前缀。每个文件都有
<literal>jms</literal>这样的扩展。文件大小是<literal <literal>jms</literal>这样的扩展。文件大小是<literal
>1048576</literal>，它的位置在bindings文件夹下。</para> >1048576</literal>，它的位置在bindings文件夹下。</para>
</listitem> </listitem>
@ -79,7 +79,7 @@
<para>这个日志用来存贮所有消息相关的数据，包括消息本身和重复ID缓存。</para> <para>这个日志用来存贮所有消息相关的数据，包括消息本身和重复ID缓存。</para>
<para>默认情况下ActiveMQ总是优先使用AIO型日志。如果AIO型日志不可用（比如在非Linux平台上运行，或系统内核版本不同） <para>默认情况下ActiveMQ总是优先使用AIO型日志。如果AIO型日志不可用（比如在非Linux平台上运行，或系统内核版本不同）
它将自动使用NIO型日志。</para> 它将自动使用NIO型日志。</para>
<para>这种日志文件的名字采用<literal>hornetq-data</literal>。作为前缀。每个文件都有 <para>这种日志文件的名字采用<literal>activemq-data</literal>。作为前缀。每个文件都有
　<literal>hq</literal>作为扩展名。默认的文件大小是 <literal 　<literal>hq</literal>作为扩展名。默认的文件大小是 <literal
>10485760</literal> (可配置)。文件保存在journal文件夹下。</para> >10485760</literal> (可配置)。文件保存在journal文件夹下。</para>
</listitem> </listitem>
@ -110,7 +110,7 @@
<section id="configuring.message.journal"> <section id="configuring.message.journal">
<title>配置消息日志</title> <title>配置消息日志</title>
<para>消息日志的配置在<literal <para>消息日志的配置在<literal
>hornetq-configuration.xml文件中。</literal></para> >activemq-configuration.xml文件中。</literal></para>
<itemizedlist> <itemizedlist>
<listitem id="configuring.message.journal.journal-directory"> <listitem id="configuring.message.journal.journal-directory">
<para><literal>journal-directory</literal></para> <para><literal>journal-directory</literal></para>
@ -233,16 +233,16 @@
<title>导入入/导出日志数据</title> <title>导入入/导出日志数据</title>
<para>有时你需要使用导入／导出工具来查看日志文件的记录。这个导入／导出工具类在hornetq-core.jar文件中。 <para>有时你需要使用导入／导出工具来查看日志文件的记录。这个导入／导出工具类在hornetq-core.jar文件中。
　　　 使用以下命令可以将日志文件导出为文本文件：</para> 　　　 使用以下命令可以将日志文件导出为文本文件：</para>
<para><literal>java -cp hornetq-core.jar org.apache.activemq.core.journal.impl.ExportJournal <para><literal>java -cp activemq-core.jar org.apache.activemq.core.journal.impl.ExportJournal
&lt;JournalDirectory> &lt;JournalPrefix> &lt;FileExtension> &lt;FileSize> &lt;JournalDirectory> &lt;JournalPrefix> &lt;FileExtension> &lt;FileSize>
&lt;FileOutput></literal></para> &lt;FileOutput></literal></para>
<para>要将日志文件导入，使用下面的命令（注意你需要netty.jar）：</para> <para>要将日志文件导入，使用下面的命令（注意你需要netty.jar）：</para>
<para><literal>java -cp hornetq-core.jar:netty.jar org.apache.activemq.core.journal.impl.ImportJournal <para><literal>java -cp activemq-core.jar:netty.jar org.apache.activemq.core.journal.impl.ImportJournal
&lt;JournalDirectory> &lt;JournalPrefix> &lt;FileExtension> &lt;FileSize> &lt;JournalDirectory> &lt;JournalPrefix> &lt;FileExtension> &lt;FileSize>
&lt;FileInput></literal></para> &lt;FileInput></literal></para>
<itemizedlist> <itemizedlist>
<listitem> <listitem>
<para>JournalDirectory：文件的位置，如./hornetq/data/journal</para> <para>JournalDirectory：文件的位置，如./activemq/data/journal</para>
</listitem> </listitem>
<listitem> <listitem>
<para>JournalPrefix： 日志文件的前缀。<link linkend="persistence.journallist">这里</link>有关于前缀的详细描述。</para> <para>JournalPrefix： 日志文件的前缀。<link linkend="persistence.journallist">这里</link>有关于前缀的详细描述。</para>

2
docs/user-manual/zh/pre-acknowledge.xml
View File

@ -44,7 +44,7 @@
</note> </note>
<section id="pre-acknowledge.configure"> <section id="pre-acknowledge.configure">
<title>使用PRE_ACKNOWLEDGE</title> <title>使用PRE_ACKNOWLEDGE</title>
<para>这个模式在<literal>hornetq-jms.xml</literal>文件中 <para>这个模式在<literal>activemq-jms.xml</literal>文件中
的<literal>connection factory</literal>下配置：</para> 的<literal>connection factory</literal>下配置：</para>
<programlisting>&lt;connection-factory name="ConnectionFactory"> <programlisting>&lt;connection-factory name="ConnectionFactory">
&lt;connectors> &lt;connectors>

20
docs/user-manual/zh/project-info.xml
View File

@ -18,12 +18,12 @@
<!-- ============================================================================= --> <!-- ============================================================================= -->
<chapter id="project-info"> <chapter id="project-info">
<title>项目信息</title> <title>项目信息</title>
<para>ActiveMQ的官方网址是 <ulink url="http://hornetq.org/" <para>ActiveMQ的官方网址是 <ulink url="http://activemq.org/"
>http://hornetq.org/</ulink>.</para> >http://activemq.org/</ulink>.</para>
<section id="download.software"> <section id="download.software">
<title>软件下载</title> <title>软件下载</title>
<para>ActiveMQ的下载地址为：<ulink <para>ActiveMQ的下载地址为：<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>
<section id="download.git"> <section id="download.git">
<title>其它相关信息</title> <title>其它相关信息</title>
@ -44,24 +44,24 @@
>开发论坛</ulink></para> >开发论坛</ulink></para>
</listitem> </listitem>
<listitem> <listitem>
<para>请加入我们的<ulink url="irc://irc.freenode.net:6667/hornetq" <para>请加入我们的<ulink url="irc://irc.freenode.net:6667/activemq"
>IRC频道</ulink>与我们的核心开发工程师交流。</para> >IRC频道</ulink>与我们的核心开发工程师交流。</para>
</listitem> </listitem>
<listitem> <listitem>
<para>我们项目有自己的 <ulink url="http://hornetq.blogspot.com/">博客</ulink></para> <para>我们项目有自己的 <ulink url="http://activemq.blogspot.com/">博客</ulink></para>
</listitem> </listitem>
<listitem> <listitem>
<para>还可以跟踪我们的<ulink url="http://twitter.com/hornetq">twitter</ulink></para> <para>还可以跟踪我们的<ulink url="http://twitter.com/activemq">twitter</ulink></para>
</listitem> </listitem>
<listitem> <listitem>
<para>ActiveMQ的Git代码库地址 <ulink <para>ActiveMQ的Git代码库地址 <ulink
url="https://github.com/hornetq/hornetq" url="https://github.com/activemq/activemq"
>https://github.com/hornetq/hornetq</ulink></para> >https://github.com/activemq/activemq</ulink></para>
</listitem> </listitem>
<listitem> <listitem>
<para>每次发布的版本标签都在<ulink <para>每次发布的版本标签都在<ulink
url="https://github.com/hornetq/hornetq/tags" url="https://github.com/activemq/activemq/tags"
>https://github.com/hornetq/hornetq/tags</ulink>下能找到。</para> >https://github.com/activemq/activemq/tags</ulink>下能找到。</para>
</listitem> </listitem>
</itemizedlist> </itemizedlist>
</para> </para>

2
docs/user-manual/zh/queue-attributes.xml
View File

@ -23,7 +23,7 @@
<section id="predefined.queues"> <section id="predefined.queues">
<title>预定义的队列</title> <title>预定义的队列</title>
<para>通过配置可以定义队列。队列的定义可以在核心层定义，也可以在JMS层来定义。首先我们看一下JMS层。</para> <para>通过配置可以定义队列。队列的定义可以在核心层定义，也可以在JMS层来定义。首先我们看一下JMS层。</para>
<para>下面就是一个在<literal>hornetq-jms.xml</literal>中定义的一个队列的例子：</para> <para>下面就是一个在<literal>activemq-jms.xml</literal>中定义的一个队列的例子：</para>
<programlisting>&lt;queue name="selectorQueue"> <programlisting>&lt;queue name="selectorQueue">
&lt;entry name="/queue/selectorQueue"/> &lt;entry name="/queue/selectorQueue"/>
&lt;selector string="color='red'"/> &lt;selector string="color='red'"/>

10
docs/user-manual/zh/security.xml
View File

@ -146,9 +146,9 @@
</section> </section>
<section id="change-security-manager"> <section id="change-security-manager">
<title>更换安全管理器</title> <title>更换安全管理器</title>
<para>如果你不想用默认的安全管理器，可以通过修改配置文件<literal>hornetq-beans.xml</literal> <para>如果你不想用默认的安全管理器，可以通过修改配置文件<literal>activemq-beans.xml</literal>
（或者在运行JBoss应用服务器情况下<literal （或者在运行JBoss应用服务器情况下<literal
>hornetq-jboss-beans.xml</literal>文件）来更换。同时要更换 >activemq-jboss-beans.xml</literal>文件）来更换。同时要更换
<literal>ActiveMQSecurityManager</literal> bean 的类。</para> <literal>ActiveMQSecurityManager</literal> bean 的类。</para>
<para>让我们看一段默认bean文件的内容：</para> <para>让我们看一段默认bean文件的内容：</para>
<programlisting> <programlisting>
@ -163,8 +163,8 @@
<para>ActiveMQ自带有另外两个安全管理器可供使用。一个是JAAS安全管理器，另一个是用来与JBoss应用服务 <para>ActiveMQ自带有另外两个安全管理器可供使用。一个是JAAS安全管理器，另一个是用来与JBoss应用服务
器集成的安全管理器。此外，你还可以编写实现你自己的安全管理器。首先要实现 器集成的安全管理器。此外，你还可以编写实现你自己的安全管理器。首先要实现
<literal>org.apache.activemq.core.security.SecurityManager</literal>接口，再将你的实现 <literal>org.apache.activemq.core.security.SecurityManager</literal>接口，再将你的实现
类定义到<literal>hornetq-beans.xml</literal>文件中即可（或者在JBoss应用服务器中 类定义到<literal>activemq-beans.xml</literal>文件中即可（或者在JBoss应用服务器中
使用<literal>hornetq-jboss-beans.xml</literal>文件）。</para> 使用<literal>activemq-jboss-beans.xml</literal>文件）。</para>
<para>以下分别介绍这两咱安全管理器</para> <para>以下分别介绍这两咱安全管理器</para>
</section> </section>
<section> <section>
@ -212,7 +212,7 @@
<para>此安全管理器的类是 <literal <para>此安全管理器的类是 <literal
>org.apache.activemq.integration.jboss.security.JBossASSecurityManager</literal>。</para> >org.apache.activemq.integration.jboss.security.JBossASSecurityManager</literal>。</para>
<para>要了解如何配置JBoss安全管理器，可以看一眼ActiveMQ发布包中相关例子中的 <para>要了解如何配置JBoss安全管理器，可以看一眼ActiveMQ发布包中相关例子中的
<literal>hornetq-jboss-beans.xml</literal>文件。</para> <literal>activemq-jboss-beans.xml</literal>文件。</para>
<section> <section>
<title>配置客户端登录</title> <title>配置客户端登录</title>
<para>JBoss可以配置使用客户登录。JEE的模块如servlet或EJB可以将安全认证信息设置到安全上下文（security context）中， <para>JBoss可以配置使用客户登录。JEE的模块如servlet或EJB可以将安全认证信息设置到安全上下文（security context）中，

2
docs/user-manual/zh/send-guarantees.xml
View File

@ -53,7 +53,7 @@
<emphasis>异步发送通知功能</emphasis>。这一功能在<xref linkend="asynchronous-send-acknowledgements"/> <emphasis>异步发送通知功能</emphasis>。这一功能在<xref linkend="asynchronous-send-acknowledgements"/>
进行了描述。</para> 进行了描述。</para>
<para>使用JMS时，如果JMS的连接工厂是在服务器端被注册到JNDI服务，你需要配置 <para>使用JMS时，如果JMS的连接工厂是在服务器端被注册到JNDI服务，你需要配置
<literal>hornetq-jms.xml</literal>文件中的<literal>block-on-durable-send</literal> <literal>activemq-jms.xml</literal>文件中的<literal>block-on-durable-send</literal>
和<literal>block-on-non-durable-send</literal>。如果不使用JNDI，可以调用 和<literal>block-on-non-durable-send</literal>。如果不使用JNDI，可以调用
<literal>ActiveMQConnectionFactory</literal>相应的设置方法进行配置。</para> <literal>ActiveMQConnectionFactory</literal>相应的设置方法进行配置。</para>
<para>如果你使用的是内核服务，你可以直接在<literal <para>如果你使用的是内核服务，你可以直接在<literal

2
docs/user-manual/zh/thread-pooling.xml
View File

@ -91,7 +91,7 @@ myFactory.setThreadPoolMaxSize(-1); </programlisting>
>ConnectionFactory</literal>的实例。如：</para> >ConnectionFactory</literal>的实例。如：</para>
<programlisting>ConnectionFactory myConnectionFactory = ActiveMQJMSClient.createConnectionFactory(myFactory); </programlisting> <programlisting>ConnectionFactory myConnectionFactory = ActiveMQJMSClient.createConnectionFactory(myFactory); </programlisting>
<para>如果你使用JNDI来创建<literal>ActiveMQConnectionFactory</literal> <para>如果你使用JNDI来创建<literal>ActiveMQConnectionFactory</literal>
实例，你还可以在<literal>hornetq-jms.xml</literal>文件中进行配置。如：</para> 实例，你还可以在<literal>activemq-jms.xml</literal>文件中进行配置。如：</para>
<programlisting>&lt;connection-factory name="ConnectionFactory"&gt; <programlisting>&lt;connection-factory name="ConnectionFactory"&gt;
&lt;connectors> &lt;connectors>
&lt;connector-ref connector-name="netty"/&gt; &lt;connector-ref connector-name="netty"/&gt;

4
docs/user-manual/zh/using-jms.xml
View File

@ -37,7 +37,7 @@
</section> </section>
<section id="using-jms.server.configuration"> <section id="using-jms.server.configuration">
<title>JMS服务的配置</title> <title>JMS服务的配置</title>
<para><literal>hornetq-jms.xml</literal>文件包含了需要创建与部署的JMS Queue，Topic和ConnectionFactory <para><literal>activemq-jms.xml</literal>文件包含了需要创建与部署的JMS Queue，Topic和ConnectionFactory
的实例。该文件必须要指定在classpath中。从这个文件中部署好的对象都可以用JNDI来找到。</para> 的实例。该文件必须要指定在classpath中。从这个文件中部署好的对象都可以用JNDI来找到。</para>
<para>JMS客户端可以利用JMS ConnectionFactory对象来创建与服务器的连接。ConnectionFactory中有关于服务器地址的 <para>JMS客户端可以利用JMS ConnectionFactory对象来创建与服务器的连接。ConnectionFactory中有关于服务器地址的
信息以及各种参数。通常使用这些参数的默认值即可。</para> 信息以及各种参数。通常使用这些参数的默认值即可。</para>
@ -158,7 +158,7 @@ java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
</programlisting> </programlisting>
<para>其中的 <literal>myhost</literal> 是 JNDI server的主机名或IP地址。 1099是端口号，根据不同的配置， <para>其中的 <literal>myhost</literal> 是 JNDI server的主机名或IP地址。 1099是端口号，根据不同的配置，
端口号也可能不同。</para> 端口号也可能不同。</para>
<para>在默认的单独方式（standalone）配置中，JNDI服务端口等参数定义在<literal>hornetq-beans.xml</literal> <para>在默认的单独方式（standalone）配置中，JNDI服务端口等参数定义在<literal>activemq-beans.xml</literal>
文件中的 <literal>JNDIServer</literal> bean下，如：</para> 文件中的 <literal>JNDIServer</literal> bean下，如：</para>
<programlisting> <programlisting>
&lt;bean name="JNDIServer" class="org.jnp.server.Main"&gt; &lt;bean name="JNDIServer" class="org.jnp.server.Main"&gt;

16
docs/user-manual/zh/using-server.xml
View File

@ -80,8 +80,8 @@
<para>配置文件的路径定义在 <literal>run.sh</literal> 和 <literal>run.bat</literal> 脚本中的classpath里。该路径下可以包含以下文件：</para> <para>配置文件的路径定义在 <literal>run.sh</literal> 和 <literal>run.bat</literal> 脚本中的classpath里。该路径下可以包含以下文件：</para>
<itemizedlist> <itemizedlist>
<listitem> <listitem>
<para><literal>hornetq-beans.xml</literal> （如果是运行在JBoss应用服务器内，则为 <literal <para><literal>activemq-beans.xml</literal> （如果是运行在JBoss应用服务器内，则为 <literal
>hornetq-jboss-beans.xml</literal>）。这是JBoss Microcontainer的bean配置文件。其中定义了ActiveMQ的 >activemq-jboss-beans.xml</literal>）。这是JBoss Microcontainer的bean配置文件。其中定义了ActiveMQ的
各种bean，以及它们之间的依赖关系。ActiveMQ的bean都是一些POJO。是JBoss Microcontainer保证了这些bean的正确装载和运行。</para> 各种bean，以及它们之间的依赖关系。ActiveMQ的bean都是一些POJO。是JBoss Microcontainer保证了这些bean的正确装载和运行。</para>
</listitem> </listitem>
<listitem> <listitem>
@ -101,7 +101,7 @@
想了解更多关于安全的信息，参见 <xref linkend="security"/>。</para> 想了解更多关于安全的信息，参见 <xref linkend="security"/>。</para>
</listitem> </listitem>
<listitem> <listitem>
<para><literal>hornetq-jms.xml</literal>。这个文件包含有JMS对象。ActiveMQ的默认配置中包含有JMS服务， <para><literal>activemq-jms.xml</literal>。这个文件包含有JMS对象。ActiveMQ的默认配置中包含有JMS服务，
它从这个文件中读取JMS Queue，Topic和ConnectionFactory并将它们部署到JNDI服务中。如果你不使用JMS， 它从这个文件中读取JMS Queue，Topic和ConnectionFactory并将它们部署到JNDI服务中。如果你不使用JMS，
或者你不需要部署这些JMS对象，那么你就不需要这个文件。有关JMS的使用详见<xref linkend="using-jms" 或者你不需要部署这些JMS对象，那么你就不需要这个文件。有关JMS的使用详见<xref linkend="using-jms"
/>。</para> />。</para>
@ -122,12 +122,12 @@
<programlisting>&lt;connector name="netty"> <programlisting>&lt;connector name="netty">
&lt;factory-class>org.apache.activemq.integration.transports.netty.NettyConnectorFactory &lt;factory-class>org.apache.activemq.integration.transports.netty.NettyConnectorFactory
&lt;/factory-class> &lt;/factory-class>
&lt;param key="host" value="${hornetq.remoting.netty.host:localhost}" type="String"/> &lt;param key="host" value="${activemq.remoting.netty.host:localhost}" type="String"/>
&lt;param key="port" value="${hornetq.remoting.netty.port:5445}" type="Integer"/> &lt;param key="port" value="${activemq.remoting.netty.port:5445}" type="Integer"/>
&lt;/connector></programlisting> &lt;/connector></programlisting>
<para>在上面的配置中我们定义了两个系统变量 <literal <para>在上面的配置中我们定义了两个系统变量 <literal
>hornetq.remoting.netty.host</literal> 和 <literal >activemq.remoting.netty.host</literal> 和 <literal
>hornetq.remoting.netty.port</literal>。它们的值会被相应的系统变量的值（如果定义了的话）所替代。 >activemq.remoting.netty.port</literal>。它们的值会被相应的系统变量的值（如果定义了的话）所替代。
如果没有定义这些系统变量，它们的默认值将分别为 localhost 及 5445。也可以不给出默认值，但如果这样就 如果没有定义这些系统变量，它们的默认值将分别为 localhost 及 5445。也可以不给出默认值，但如果这样就
<emphasis>必须</emphasis>要定义相应的系统变量。</para> <emphasis>必须</emphasis>要定义相应的系统变量。</para>
</section> </section>
@ -232,7 +232,7 @@
</listitem> </listitem>
<listitem id="bean-jmsservermanager"> <listitem id="bean-jmsservermanager">
<para>JMSServerManager</para> <para>JMSServerManager</para>
<para>这个对象将<literal>hornetq-jms.xml</literal>文件中定义的JMS的对象进行部署，比如JMS Queues, Topics <para>这个对象将<literal>activemq-jms.xml</literal>文件中定义的JMS的对象进行部署，比如JMS Queues, Topics
以及ConnectionFactory。它还提供一套简单的管理接口以方便地对这些JMS对象进行管理。通常它只是将工作代理给 以及ConnectionFactory。它还提供一套简单的管理接口以方便地对这些JMS对象进行管理。通常它只是将工作代理给
核心服务器。如果你不需要在服务器端进行JMS对象的部署与管理，可以将它从配置中去掉。</para> 核心服务器。如果你不需要在服务器端进行JMS对象的部署与管理，可以将它从配置中去掉。</para>
</listitem> </listitem>

1
etc/checkstyle.xml
View File

@ -76,6 +76,7 @@
<property name="illegalPkgs" value="junit.framework"/> <property name="illegalPkgs" value="junit.framework"/>
</module> </module>
<!-- TODO: Where to place this now? -->
<!-- developed at https://github.com/hornetq/hornetq-checkstyle-checks --> <!-- developed at https://github.com/hornetq/hornetq-checkstyle-checks -->
<module name="org.hornetq.checks.annotation.RequiredAnnotation"> <module name="org.hornetq.checks.annotation.RequiredAnnotation">
<property name="annotationName" value="Parameters"/> <property name="annotationName" value="Parameters"/>

6
etc/findbugs-exclude.xml
View File

@ -109,18 +109,18 @@
<Match> <Match>
<!-- Generated by JavaCC: ignore naming convention violation --> <!-- Generated by JavaCC: ignore naming convention violation -->
<Class name="~org\.hornetq\.core\.filter\.impl\.(FilterParser(|TokenManager|Constants)|TokenMgrError)"/> <Class name="~org\.activemq\.core\.filter\.impl\.(FilterParser(|TokenManager|Constants)|TokenMgrError)"/>
<bug pattern="NM_METHOD_NAMING_CONVENTION,SF_SWITCH_NO_DEFAULT,MS_PKGPROTECT,URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD,MS_OOI_PKGPROTECT"/> <bug pattern="NM_METHOD_NAMING_CONVENTION,SF_SWITCH_NO_DEFAULT,MS_PKGPROTECT,URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD,MS_OOI_PKGPROTECT"/>
</Match> </Match>
<Match> <Match>
<!-- Files generated by JBoss Logging are ignored --> <!-- Files generated by JBoss Logging are ignored -->
<Class name="~org\.hornetq\..*\.ActiveMQ.*(Logger_\$logger|Bundle_\$bundle)"/> <Class name="~org\.activemq\..*\.ActiveMQ.*(Logger_\$logger|Bundle_\$bundle)"/>
</Match> </Match>
<!-- Ignore checks on return values, example File.delete(), on samples/examples --> <!-- Ignore checks on return values, example File.delete(), on samples/examples -->
<Match> <Match>
<Class name="~org\.hornetq\.common\.example.*Example"/> <Class name="~org\.activemq\.common\.example.*Example"/>
<bug pattern="RV_RETURN_VALUE_IGNORED_BAD_PRACTICE"/> <bug pattern="RV_RETURN_VALUE_IGNORED_BAD_PRACTICE"/>
</Match> </Match>

2
examples/core/embedded/readme.html
View File

@ -12,7 +12,7 @@
<p>ActiveMQ was designed to use POJOs (Plain Old Java Objects), what makes embedding ActiveMQ as simple as instantiating a few objects.</p> <p>ActiveMQ was designed to use POJOs (Plain Old Java Objects), what makes embedding ActiveMQ as simple as instantiating a few objects.</p>
<p>In this example, we are using two jars:</p> <p>In this example, we are using two jars:</p>
<ul> <ul>
<li>hornetq-server.jar</li> <li>activemq-server.jar</li>
<li>netty.jar</li> <li>netty.jar</li>
</ul> </ul>

8
examples/core/perf/src/main/resources/server0/hornetq-configuration-messaging-lab.xml
View File

@ -26,10 +26,10 @@
<persistence-enabled>true</persistence-enabled> <persistence-enabled>true</persistence-enabled>
<large-messages-directory>/hornetq-data/large-messages</large-messages-directory> <large-messages-directory>/activemq-data/large-messages</large-messages-directory>
<bindings-directory>/hornetq-data/bindings</bindings-directory> <bindings-directory>/activemq-data/bindings</bindings-directory>
<journal-directory>/hornetq-data/journal</journal-directory> <journal-directory>/activemq-data/journal</journal-directory>
<paging-directory>/hornetq-data/paging</paging-directory> <paging-directory>/activemq-data/paging</paging-directory>
<queues> <queues>
<queue name="perfQueue"> <queue name="perfQueue">

8
examples/javaee/ejb-jms-transaction/server/standalone/configuration/standalone-example.xml
View File

@ -195,7 +195,7 @@
<singleton default-access-timeout="5000"/> <singleton default-access-timeout="5000"/>
</session-bean> </session-bean>
<mdb> <mdb>
<resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:hornetq-ra.rar}"/> <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:activemq-ra.rar}"/>
<bean-instance-pool-ref pool-name="mdb-strict-max-pool"/> <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/>
</mdb> </mdb>
<pools> <pools>
@ -309,7 +309,7 @@
</mail-session> </mail-session>
</subsystem> </subsystem>
<subsystem xmlns="urn:jboss:domain:messaging:2.0"> <subsystem xmlns="urn:jboss:domain:messaging:2.0">
<hornetq-server> <activemq-server>
<persistence-enabled>true</persistence-enabled> <persistence-enabled>true</persistence-enabled>
<journal-file-size>102400</journal-file-size> <journal-file-size>102400</journal-file-size>
<journal-min-files>2</journal-min-files> <journal-min-files>2</journal-min-files>
@ -368,7 +368,7 @@
<entry name="java:jboss/exported/jms/RemoteConnectionFactory"/> <entry name="java:jboss/exported/jms/RemoteConnectionFactory"/>
</entries> </entries>
</connection-factory> </connection-factory>
<pooled-connection-factory name="hornetq-ra"> <pooled-connection-factory name="activemq-ra">
<transaction mode="xa"/> <transaction mode="xa"/>
<connectors> <connectors>
<connector-ref connector-name="in-vm"/> <connector-ref connector-name="in-vm"/>
@ -386,7 +386,7 @@
<entry name="java:jboss/exported/jms/queues/testQueue"/> <entry name="java:jboss/exported/jms/queues/testQueue"/>
</jms-queue> </jms-queue>
</jms-destinations> </jms-destinations>
</hornetq-server> </activemq-server>
</subsystem> </subsystem>
<subsystem xmlns="urn:jboss:domain:naming:2.0"> <subsystem xmlns="urn:jboss:domain:naming:2.0">
<remote-naming/> <remote-naming/>

2
examples/javaee/jca-config/readme.html
View File

@ -99,7 +99,7 @@ public class MDBQueueA implements MessageListener
@ActivationConfigProperty(propertyName = "destination", propertyValue = "B"), @ActivationConfigProperty(propertyName = "destination", propertyValue = "B"),
@ActivationConfigProperty(propertyName = "useJNDI", propertyValue = "false") @ActivationConfigProperty(propertyName = "useJNDI", propertyValue = "false")
}) })
@ResourceAdapter("hornetq-ra-remote.rar") @ResourceAdapter("activemq-ra-remote.rar")
public class MDBQueueB implements MessageListener public class MDBQueueB implements MessageListener
{ {
public void onMessage(Message message)... public void onMessage(Message message)...

8
examples/javaee/jca-config/server/standalone/configuration/standalone-example.xml
View File

@ -182,7 +182,7 @@
<singleton default-access-timeout="5000"/> <singleton default-access-timeout="5000"/>
</session-bean> </session-bean>
<mdb> <mdb>
<resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:hornetq-ra.rar}"/> <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:activemq-ra.rar}"/>
<bean-instance-pool-ref pool-name="mdb-strict-max-pool"/> <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/>
</mdb> </mdb>
<pools> <pools>
@ -296,7 +296,7 @@
</mail-session> </mail-session>
</subsystem> </subsystem>
<subsystem xmlns="urn:jboss:domain:messaging:2.0"> <subsystem xmlns="urn:jboss:domain:messaging:2.0">
<hornetq-server> <activemq-server>
<persistence-enabled>true</persistence-enabled> <persistence-enabled>true</persistence-enabled>
<journal-file-size>102400</journal-file-size> <journal-file-size>102400</journal-file-size>
<journal-min-files>2</journal-min-files> <journal-min-files>2</journal-min-files>
@ -355,7 +355,7 @@
<entry name="java:jboss/exported/jms/RemoteConnectionFactory"/> <entry name="java:jboss/exported/jms/RemoteConnectionFactory"/>
</entries> </entries>
</connection-factory> </connection-factory>
<pooled-connection-factory name="hornetq-ra"> <pooled-connection-factory name="activemq-ra">
<transaction mode="xa"/> <transaction mode="xa"/>
<connectors> <connectors>
<connector-ref connector-name="in-vm"/> <connector-ref connector-name="in-vm"/>
@ -377,7 +377,7 @@
<entry name="java:jboss/exported/queues/B"/> <entry name="java:jboss/exported/queues/B"/>
</jms-queue> </jms-queue>
</jms-destinations> </jms-destinations>
</hornetq-server> </activemq-server>
</subsystem> </subsystem>
<subsystem xmlns="urn:jboss:domain:naming:2.0"> <subsystem xmlns="urn:jboss:domain:naming:2.0">
<remote-naming/> <remote-naming/>

10
examples/javaee/jca-config/server/standalone/configuration/standalone-example2.xml
View File

@ -182,7 +182,7 @@
<singleton default-access-timeout="5000"/> <singleton default-access-timeout="5000"/>
</session-bean> </session-bean>
<mdb> <mdb>
<resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:hornetq-ra.rar}"/> <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:activemq-ra.rar}"/>
<bean-instance-pool-ref pool-name="mdb-strict-max-pool"/> <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/>
</mdb> </mdb>
<pools> <pools>
@ -296,7 +296,7 @@
</mail-session> </mail-session>
</subsystem> </subsystem>
<subsystem xmlns="urn:jboss:domain:messaging:2.0"> <subsystem xmlns="urn:jboss:domain:messaging:2.0">
<hornetq-server> <activemq-server>
<persistence-enabled>true</persistence-enabled> <persistence-enabled>true</persistence-enabled>
<journal-file-size>102400</journal-file-size> <journal-file-size>102400</journal-file-size>
<journal-min-files>2</journal-min-files> <journal-min-files>2</journal-min-files>
@ -356,7 +356,7 @@
<entry name="java:jboss/exported/jms/RemoteConnectionFactory"/> <entry name="java:jboss/exported/jms/RemoteConnectionFactory"/>
</entries> </entries>
</connection-factory> </connection-factory>
<pooled-connection-factory name="hornetq-ra"> <pooled-connection-factory name="activemq-ra">
<transaction mode="xa"/> <transaction mode="xa"/>
<connectors> <connectors>
<connector-ref connector-name="in-vm"/> <connector-ref connector-name="in-vm"/>
@ -367,7 +367,7 @@
<entry name="java:jboss/DefaultJMSConnectionFactory"/> <entry name="java:jboss/DefaultJMSConnectionFactory"/>
</entries> </entries>
</pooled-connection-factory> </pooled-connection-factory>
<pooled-connection-factory name="hornetq-ra-remote"> <pooled-connection-factory name="activemq-ra-remote">
<transaction mode="xa"/> <transaction mode="xa"/>
<user>guest</user> <user>guest</user>
<password>password</password> <password>password</password>
@ -379,7 +379,7 @@
</entries> </entries>
</pooled-connection-factory> </pooled-connection-factory>
</jms-connection-factories> </jms-connection-factories>
</hornetq-server> </activemq-server>
</subsystem> </subsystem>
<subsystem xmlns="urn:jboss:domain:naming:2.0"> <subsystem xmlns="urn:jboss:domain:naming:2.0">
<remote-naming/> <remote-naming/>

6
examples/javaee/jca-remote/readme.html
View File

@ -23,10 +23,10 @@
<li>via a pooled-connection-factory in the "messaging" subsystem</li> <li>via a pooled-connection-factory in the "messaging" subsystem</li>
<li>via the activation configuration properties on the MDB set either via annotations or ejb-jar.xml</li> <li>via the activation configuration properties on the MDB set either via annotations or ejb-jar.xml</li>
</ol> </ol>
<p>In this example the MDB is annotated with <code>@ResourceAdapter("hornetq-ra-remote.rar")</code> which refers to <p>In this example the MDB is annotated with <code>@ResourceAdapter("activemq-ra-remote.rar")</code> which refers to
this pooled-connection-factory:</p> this pooled-connection-factory:</p>
<pre class="prettyprint"> <pre class="prettyprint">
&lt;pooled-connection-factory name="hornetq-ra-remote"> &lt;pooled-connection-factory name="activemq-ra-remote">
&lt;transaction mode="xa"/> &lt;transaction mode="xa"/>
&lt;user>guest&lt;/user> &lt;user>guest&lt;/user>
&lt;password>password&lt;/password> &lt;password>password&lt;/password>
@ -44,7 +44,7 @@
<p>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.</p> <p>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.</p>
<pre class="prettyprint"> <pre class="prettyprint">
&lt;pooled-connection-factory name="hornetq-ra-remote"> &lt;pooled-connection-factory name="activemq-ra-remote">
&lt;transaction mode="xa"/> &lt;transaction mode="xa"/>
&lt;user>guest&lt;/user> &lt;user>guest&lt;/user>
&lt;password>password&lt;/password> &lt;password>password&lt;/password>

10
examples/javaee/jca-remote/server/standalone/configuration/standalone-example.xml
View File

@ -182,7 +182,7 @@
<singleton default-access-timeout="5000"/> <singleton default-access-timeout="5000"/>
</session-bean> </session-bean>
<mdb> <mdb>
<resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:hornetq-ra.rar}"/> <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:activemq-ra.rar}"/>
<bean-instance-pool-ref pool-name="mdb-strict-max-pool"/> <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/>
</mdb> </mdb>
<pools> <pools>
@ -296,7 +296,7 @@
</mail-session> </mail-session>
</subsystem> </subsystem>
<subsystem xmlns="urn:jboss:domain:messaging:2.0"> <subsystem xmlns="urn:jboss:domain:messaging:2.0">
<hornetq-server> <activemq-server>
<persistence-enabled>true</persistence-enabled> <persistence-enabled>true</persistence-enabled>
<journal-file-size>102400</journal-file-size> <journal-file-size>102400</journal-file-size>
<journal-min-files>2</journal-min-files> <journal-min-files>2</journal-min-files>
@ -356,7 +356,7 @@
<entry name="java:jboss/exported/jms/RemoteConnectionFactory"/> <entry name="java:jboss/exported/jms/RemoteConnectionFactory"/>
</entries> </entries>
</connection-factory> </connection-factory>
<pooled-connection-factory name="hornetq-ra"> <pooled-connection-factory name="activemq-ra">
<transaction mode="xa"/> <transaction mode="xa"/>
<connectors> <connectors>
<connector-ref connector-name="in-vm"/> <connector-ref connector-name="in-vm"/>
@ -367,7 +367,7 @@
<entry name="java:jboss/DefaultJMSConnectionFactory"/> <entry name="java:jboss/DefaultJMSConnectionFactory"/>
</entries> </entries>
</pooled-connection-factory> </pooled-connection-factory>
<pooled-connection-factory name="hornetq-ra-remote"> <pooled-connection-factory name="activemq-ra-remote">
<transaction mode="xa"/> <transaction mode="xa"/>
<user>guest</user> <user>guest</user>
<password>password</password> <password>password</password>
@ -379,7 +379,7 @@
</entries> </entries>
</pooled-connection-factory> </pooled-connection-factory>
</jms-connection-factories> </jms-connection-factories>
</hornetq-server> </activemq-server>
</subsystem> </subsystem>
<subsystem xmlns="urn:jboss:domain:naming:2.0"> <subsystem xmlns="urn:jboss:domain:naming:2.0">
<remote-naming/> <remote-naming/>

8
examples/javaee/jca-remote/server/standalone/configuration/standalone-example2.xml
View File

@ -182,7 +182,7 @@
<singleton default-access-timeout="5000"/> <singleton default-access-timeout="5000"/>
</session-bean> </session-bean>
<mdb> <mdb>
<resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:hornetq-ra.rar}"/> <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:activemq-ra.rar}"/>
<bean-instance-pool-ref pool-name="mdb-strict-max-pool"/> <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/>
</mdb> </mdb>
<pools> <pools>
@ -296,7 +296,7 @@
</mail-session> </mail-session>
</subsystem> </subsystem>
<subsystem xmlns="urn:jboss:domain:messaging:2.0"> <subsystem xmlns="urn:jboss:domain:messaging:2.0">
<hornetq-server> <activemq-server>
<persistence-enabled>true</persistence-enabled> <persistence-enabled>true</persistence-enabled>
<journal-file-size>102400</journal-file-size> <journal-file-size>102400</journal-file-size>
<journal-min-files>2</journal-min-files> <journal-min-files>2</journal-min-files>
@ -355,7 +355,7 @@
<entry name="java:jboss/exported/jms/RemoteConnectionFactory"/> <entry name="java:jboss/exported/jms/RemoteConnectionFactory"/>
</entries> </entries>
</connection-factory> </connection-factory>
<pooled-connection-factory name="hornetq-ra"> <pooled-connection-factory name="activemq-ra">
<transaction mode="xa"/> <transaction mode="xa"/>
<connectors> <connectors>
<connector-ref connector-name="in-vm"/> <connector-ref connector-name="in-vm"/>
@ -377,7 +377,7 @@
<entry name="java:jboss/exported/queues/mdbReplyQueue"/> <entry name="java:jboss/exported/queues/mdbReplyQueue"/>
</jms-queue> </jms-queue>
</jms-destinations> </jms-destinations>
</hornetq-server> </activemq-server>
</subsystem> </subsystem>
<subsystem xmlns="urn:jboss:domain:naming:2.0"> <subsystem xmlns="urn:jboss:domain:naming:2.0">
<remote-naming/> <remote-naming/>

2
examples/javaee/jms-bridge/readme.html
View File

@ -25,7 +25,7 @@
<h3>JMS Bridge configuration</h3> <h3>JMS Bridge configuration</h3>
<p>The JMS Bridge is configured in the "messaging" subsystem.<br /> <p>The JMS Bridge is configured in the "messaging" subsystem.<br />
<p>The Bridge is deployed in the application server when you simply type <code>./build.sh deploy</code> (or <code>build.bat deploy</code> on windows) (it is copied to <code>${JBOSS_HOME}/server/default-with-hornetq/deploy/</code>).</p> <p>The Bridge is deployed in the application server when you simply type <code>./build.sh deploy</code> (or <code>build.bat deploy</code> on windows) (it is copied to <code>${JBOSS_HOME}/server/default-with-activemq/deploy/</code>).</p>
<h2>Example step-by-step</h2> <h2>Example step-by-step</h2>

8
examples/javaee/jms-bridge/server/standalone/configuration/standalone-example.xml
View File

@ -182,7 +182,7 @@
<singleton default-access-timeout="5000"/> <singleton default-access-timeout="5000"/>
</session-bean> </session-bean>
<mdb> <mdb>
<resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:hornetq-ra.rar}"/> <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:activemq-ra.rar}"/>
<bean-instance-pool-ref pool-name="mdb-strict-max-pool"/> <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/>
</mdb> </mdb>
<pools> <pools>
@ -296,7 +296,7 @@
</mail-session> </mail-session>
</subsystem> </subsystem>
<subsystem xmlns="urn:jboss:domain:messaging:2.0"> <subsystem xmlns="urn:jboss:domain:messaging:2.0">
<hornetq-server> <activemq-server>
<persistence-enabled>true</persistence-enabled> <persistence-enabled>true</persistence-enabled>
<journal-file-size>102400</journal-file-size> <journal-file-size>102400</journal-file-size>
<journal-min-files>2</journal-min-files> <journal-min-files>2</journal-min-files>
@ -355,7 +355,7 @@
<entry name="java:jboss/exported/jms/RemoteConnectionFactory"/> <entry name="java:jboss/exported/jms/RemoteConnectionFactory"/>
</entries> </entries>
</connection-factory> </connection-factory>
<pooled-connection-factory name="hornetq-ra"> <pooled-connection-factory name="activemq-ra">
<transaction mode="xa"/> <transaction mode="xa"/>
<connectors> <connectors>
<connector-ref connector-name="in-vm"/> <connector-ref connector-name="in-vm"/>
@ -377,7 +377,7 @@
<entry name="java:jboss/exported/jms/queues/targetQueue"/> <entry name="java:jboss/exported/jms/queues/targetQueue"/>
</jms-queue> </jms-queue>
</jms-destinations> </jms-destinations>
</hornetq-server> </activemq-server>
<jms-bridge name="myBridge"> <jms-bridge name="myBridge">
<source> <source>
<connection-factory name="ConnectionFactory" /> <connection-factory name="ConnectionFactory" />

8
examples/javaee/jms-context-injection/server/standalone/configuration/standalone-example.xml
View File

@ -182,7 +182,7 @@
<singleton default-access-timeout="5000"/> <singleton default-access-timeout="5000"/>
</session-bean> </session-bean>
<mdb> <mdb>
<resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:hornetq-ra.rar}"/> <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:activemq-ra.rar}"/>
<bean-instance-pool-ref pool-name="mdb-strict-max-pool"/> <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/>
</mdb> </mdb>
<pools> <pools>
@ -296,7 +296,7 @@
</mail-session> </mail-session>
</subsystem> </subsystem>
<subsystem xmlns="urn:jboss:domain:messaging:2.0"> <subsystem xmlns="urn:jboss:domain:messaging:2.0">
<hornetq-server> <activemq-server>
<persistence-enabled>true</persistence-enabled> <persistence-enabled>true</persistence-enabled>
<journal-file-size>102400</journal-file-size> <journal-file-size>102400</journal-file-size>
<journal-min-files>2</journal-min-files> <journal-min-files>2</journal-min-files>
@ -355,7 +355,7 @@
<entry name="java:jboss/exported/jms/RemoteConnectionFactory"/> <entry name="java:jboss/exported/jms/RemoteConnectionFactory"/>
</entries> </entries>
</connection-factory> </connection-factory>
<pooled-connection-factory name="hornetq-ra"> <pooled-connection-factory name="activemq-ra">
<transaction mode="xa"/> <transaction mode="xa"/>
<connectors> <connectors>
<connector-ref connector-name="in-vm"/> <connector-ref connector-name="in-vm"/>
@ -377,7 +377,7 @@
<entry name="java:jboss/exported/jms/queues/replyQueue"/> <entry name="java:jboss/exported/jms/queues/replyQueue"/>
</jms-queue> </jms-queue>
</jms-destinations> </jms-destinations>
</hornetq-server> </activemq-server>
</subsystem> </subsystem>
<subsystem xmlns="urn:jboss:domain:naming:2.0"> <subsystem xmlns="urn:jboss:domain:naming:2.0">
<remote-naming/> <remote-naming/>

8
examples/javaee/mdb-bmt/server/standalone/configuration/standalone-example.xml
View File

@ -182,7 +182,7 @@
<singleton default-access-timeout="5000"/> <singleton default-access-timeout="5000"/>
</session-bean> </session-bean>
<mdb> <mdb>
<resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:hornetq-ra.rar}"/> <resource-adapter-ref resource-adapter-name="${ejb.resource-adapter-name:activemq-ra.rar}"/>
<bean-instance-pool-ref pool-name="mdb-strict-max-pool"/> <bean-instance-pool-ref pool-name="mdb-strict-max-pool"/>
</mdb> </mdb>
<pools> <pools>
@ -296,7 +296,7 @@
</mail-session> </mail-session>
</subsystem> </subsystem>
<subsystem xmlns="urn:jboss:domain:messaging:2.0"> <subsystem xmlns="urn:jboss:domain:messaging:2.0">
<hornetq-server> <activemq-server>
<persistence-enabled>true</persistence-enabled> <persistence-enabled>true</persistence-enabled>
<journal-file-size>102400</journal-file-size> <journal-file-size>102400</journal-file-size>
<journal-min-files>2</journal-min-files> <journal-min-files>2</journal-min-files>
@ -355,7 +355,7 @@
<entry name="java:jboss/exported/jms/RemoteConnectionFactory"/> <entry name="java:jboss/exported/jms/RemoteConnectionFactory"/>
</entries> </entries>
</connection-factory> </connection-factory>
<pooled-connection-factory name="hornetq-ra"> <pooled-connection-factory name="activemq-ra">
<transaction mode="xa"/> <transaction mode="xa"/>
<connectors> <connectors>
<connector-ref connector-name="in-vm"/> <connector-ref connector-name="in-vm"/>
@ -373,7 +373,7 @@
<entry name="java:jboss/exported/jms/queues/testQueue"/> <entry name="java:jboss/exported/jms/queues/testQueue"/>
</jms-queue> </jms-queue>
</jms-destinations> </jms-destinations>
</hornetq-server> </activemq-server>
</subsystem> </subsystem>
<subsystem xmlns="urn:jboss:domain:naming:2.0"> <subsystem xmlns="urn:jboss:domain:naming:2.0">
<remote-naming/> <remote-naming/>

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