http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/docs/quickstart-guide/en/examples.xml ---------------------------------------------------------------------- diff --git a/docs/quickstart-guide/en/examples.xml b/docs/quickstart-guide/en/examples.xml index 7574664..ccacb14 100644 --- a/docs/quickstart-guide/en/examples.xml +++ b/docs/quickstart-guide/en/examples.xml @@ -48,7 +48,7 @@ <para>This contains the source code for the example</para> </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. There may be multiple configuration directories <literal>server0</literal>, <literal >server1</literal> etc for clustered examples etc.</para> @@ -69,45 +69,45 @@ [INFO] Building ActiveMQ JMS Queue Example 2.3.0.BETA-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] -[INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ hornetq-jms-queue-example --- +[INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ activemq-jms-queue-example --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 3 resources [INFO] -[INFO] --- maven-compiler-plugin:3.0:compile (default-compile) @ hornetq-jms-queue-example --- +[INFO] --- maven-compiler-plugin:3.0:compile (default-compile) @ activemq-jms-queue-example --- [INFO] Nothing to compile - all classes are up to date [INFO] -[INFO] --- maven-resources-plugin:2.6:testResources (default-testResources) @ hornetq-jms-queue-example --- +[INFO] --- maven-resources-plugin:2.6:testResources (default-testResources) @ activemq-jms-queue-example --- [INFO] Using 'UTF-8' encoding to copy filtered resources. -[INFO] skip non existing resourceDirectory /home/andy/projects/hornetq-master/examples/jms/queue/src/test/resources +[INFO] skip non existing resourceDirectory /home/andy/projects/activemq-master/examples/jms/queue/src/test/resources [INFO] -[INFO] --- maven-compiler-plugin:3.0:testCompile (default-testCompile) @ hornetq-jms-queue-example --- +[INFO] --- maven-compiler-plugin:3.0:testCompile (default-testCompile) @ activemq-jms-queue-example --- [INFO] No sources to compile [INFO] -[INFO] --- maven-surefire-plugin:2.13:test (default-test) @ hornetq-jms-queue-example --- +[INFO] --- maven-surefire-plugin:2.13:test (default-test) @ activemq-jms-queue-example --- [INFO] -[INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ hornetq-jms-queue-example --- -[INFO] Building jar: /home/andy/projects/hornetq-master/examples/jms/queue/target/hornetq-jms-queue-example-2.3.0.BETA-SNAPSHOT.jar +[INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ activemq-jms-queue-example --- +[INFO] Building jar: /home/andy/projects/activemq-master/examples/jms/queue/target/activemq-jms-queue-example-2.3.0.BETA-SNAPSHOT.jar [INFO] -[INFO] >>> maven-source-plugin:2.2.1:jar (attach-sources) @ hornetq-jms-queue-example >>> +[INFO] >>> maven-source-plugin:2.2.1:jar (attach-sources) @ activemq-jms-queue-example >>> [INFO] -[INFO] <<< maven-source-plugin:2.2.1:jar (attach-sources) @ hornetq-jms-queue-example <<< +[INFO] <<< maven-source-plugin:2.2.1:jar (attach-sources) @ activemq-jms-queue-example <<< [INFO] -[INFO] --- maven-source-plugin:2.2.1:jar (attach-sources) @ hornetq-jms-queue-example --- -[INFO] Building jar: /home/andy/projects/hornetq-master/examples/jms/queue/target/hornetq-jms-queue-example-2.3.0.BETA-SNAPSHOT-sources.jar +[INFO] --- maven-source-plugin:2.2.1:jar (attach-sources) @ activemq-jms-queue-example --- +[INFO] Building jar: /home/andy/projects/activemq-master/examples/jms/queue/target/activemq-jms-queue-example-2.3.0.BETA-SNAPSHOT-sources.jar [INFO] -[INFO] >>> maven-source-plugin:2.2.1:jar (default) @ hornetq-jms-queue-example >>> +[INFO] >>> maven-source-plugin:2.2.1:jar (default) @ activemq-jms-queue-example >>> [INFO] -[INFO] <<< maven-source-plugin:2.2.1:jar (default) @ hornetq-jms-queue-example <<< +[INFO] <<< maven-source-plugin:2.2.1:jar (default) @ activemq-jms-queue-example <<< [INFO] -[INFO] --- maven-source-plugin:2.2.1:jar (default) @ hornetq-jms-queue-example --- -[WARNING] Artifact org.apache.activemq.examples.jms:hornetq-jms-queue-example:java-source:sources:2.3.0.BETA-SNAPSHOT already attached to project, ignoring duplicate +[INFO] --- maven-source-plugin:2.2.1:jar (default) @ activemq-jms-queue-example --- +[WARNING] Artifact org.apache.activemq.examples.jms:activemq-jms-queue-example:java-source:sources:2.3.0.BETA-SNAPSHOT already attached to project, ignoring duplicate [INFO] -[INFO] --- hornetq-maven-plugin:1.1.1-SNAPSHOT:start (start) @ hornetq-jms-queue-example --- -[file:/home/andy/projects/hornetq-master/examples/jms/queue/target/classes/hornetq/server0/] +[INFO] --- activemq-maven-plugin:1.1.1-SNAPSHOT:start (start) @ activemq-jms-queue-example --- +[file:/home/andy/projects/activemq-master/examples/jms/queue/target/classes/activemq/server0/] Apr 17, 2013 10:51:01 AM org.apache.activemq.core.deployers.impl.FileConfigurationParser parseMainConfig WARN: HQ222018: AIO was not located on this platform, it will fall back to using pure Java NIO. If your platform is Linux, install LibAIO to enable the AIO journal Apr 17, 2013 10:51:01 AM org.apache.activemq.core.server.impl.ActiveMQServerImpl start -INFO: HQ221000: live server is starting with configuration ActiveMQ Configuration (clustered=false,backup=false,sharedStore=true,journalDirectory=/home/andy/projects/hornetq-master/examples/jms/queue/target//server0/data/messaging/journal,bindingsDirectory=/home/andy/projects/hornetq-master/examples/jms/queue/target//server0/data/messaging/bindings,largeMessagesDirectory=/home/andy/projects/hornetq-master/examples/jms/queue/target//server0/data/messaging/largemessages,pagingDirectory=/home/andy/projects/hornetq-master/examples/jms/queue/target//server0/data/messaging/paging) +INFO: HQ221000: live server is starting with configuration ActiveMQ Configuration (clustered=false,backup=false,sharedStore=true,journalDirectory=/home/andy/projects/activemq-master/examples/jms/queue/target//server0/data/messaging/journal,bindingsDirectory=/home/andy/projects/activemq-master/examples/jms/queue/target//server0/data/messaging/bindings,largeMessagesDirectory=/home/andy/projects/activemq-master/examples/jms/queue/target//server0/data/messaging/largemessages,pagingDirectory=/home/andy/projects/activemq-master/examples/jms/queue/target//server0/data/messaging/paging) Apr 17, 2013 10:51:01 AM org.apache.activemq.core.server.impl.ActiveMQServerImpl$SharedStoreLiveActivation run INFO: HQ221006: Waiting to obtain live lock Apr 17, 2013 10:51:01 AM org.apache.activemq.core.persistence.impl.journal.JournalStorageManager <init> @@ -127,7 +127,7 @@ INFO: HQ221007: Server is now live Apr 17, 2013 10:51:02 AM org.apache.activemq.core.server.impl.ActiveMQServerImpl start INFO: HQ221001: ActiveMQ Server version 2.3.0.SNAPSHOT (black'n'yellow, 123) [a57893ff-7783-11e2-9787-07ca142fc9f7] [INFO] -[INFO] --- hornetq-maven-plugin:1.1.1-SNAPSHOT:runClient (runClient) @ hornetq-jms-queue-example --- +[INFO] --- activemq-maven-plugin:1.1.1-SNAPSHOT:runClient (runClient) @ activemq-jms-queue-example --- Apr 17, 2013 10:51:02 AM org.apache.activemq.common.example.ActiveMQExample getContext INFO: using jnp://localhost:1099 for jndi Sent message: This is a text message @@ -138,7 +138,7 @@ example complete ### SUCCESS! ### ##################### [INFO] -[INFO] --- hornetq-maven-plugin:1.1.1-SNAPSHOT:stop (stop) @ hornetq-jms-queue-example --- +[INFO] --- activemq-maven-plugin:1.1.1-SNAPSHOT:stop (stop) @ activemq-jms-queue-example --- Apr 17, 2013 10:51:03 AM org.apache.activemq.core.server.management.impl.ManagementServiceImpl stop WARN: HQ222113: On ManagementService stop, there are 1 unexpected registered MBeans: [core.acceptor.netty-acceptor] Apr 17, 2013 10:51:03 AM org.apache.activemq.core.server.impl.ActiveMQServerImpl stop @@ -175,28 +175,28 @@ INFO: HQ221002: ActiveMQ Server version 2.3.0.SNAPSHOT (black'n'yellow, 123) [a5 [INFO] Building ActiveMQ JEE MDB Example 2.3.0.BETA-SNAPSHOT [INFO] ------------------------------------------------------------------------ [INFO] -[INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ hornetq-jee-mdb-bmt-example --- +[INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ activemq-jee-mdb-bmt-example --- [INFO] Using 'UTF-8' encoding to copy filtered resources. -[INFO] skip non existing resourceDirectory /home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/src/main/resources +[INFO] skip non existing resourceDirectory /home/andy/projects/activemq-master/examples/javaee/mdb-bmt/src/main/resources [INFO] -[INFO] --- maven-compiler-plugin:3.0:compile (default-compile) @ hornetq-jee-mdb-bmt-example --- +[INFO] --- maven-compiler-plugin:3.0:compile (default-compile) @ activemq-jee-mdb-bmt-example --- [INFO] Nothing to compile - all classes are up to date [INFO] -[INFO] --- maven-resources-plugin:2.6:copy-resources (as-node-0) @ hornetq-jee-mdb-bmt-example --- +[INFO] --- maven-resources-plugin:2.6:copy-resources (as-node-0) @ activemq-jee-mdb-bmt-example --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 1112 resources [INFO] Copying 5 resources [INFO] -[INFO] --- maven-resources-plugin:2.6:testResources (default-testResources) @ hornetq-jee-mdb-bmt-example --- +[INFO] --- maven-resources-plugin:2.6:testResources (default-testResources) @ activemq-jee-mdb-bmt-example --- [INFO] Using 'UTF-8' encoding to copy filtered resources. [INFO] Copying 1 resource [INFO] -[INFO] --- maven-compiler-plugin:3.0:testCompile (default-testCompile) @ hornetq-jee-mdb-bmt-example --- +[INFO] --- maven-compiler-plugin:3.0:testCompile (default-testCompile) @ activemq-jee-mdb-bmt-example --- [INFO] Changes detected - recompiling the module! -[INFO] Compiling 1 source file to /home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/test-classes +[INFO] Compiling 1 source file to /home/andy/projects/activemq-master/examples/javaee/mdb-bmt/target/test-classes [INFO] -[INFO] --- maven-surefire-plugin:2.12:test (default-test) @ hornetq-jee-mdb-bmt-example --- -[INFO] Surefire report directory: /home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/surefire-reports +[INFO] --- maven-surefire-plugin:2.12:test (default-test) @ activemq-jee-mdb-bmt-example --- +[INFO] Surefire report directory: /home/andy/projects/activemq-master/examples/javaee/mdb-bmt/target/surefire-reports ------------------------------------------------------- T E S T S @@ -210,7 +210,7 @@ WARNING: Configuration contain properties not supported by the backing object or Unused property entries: {waitForPortsTimeoutInSeconds=8, waitForPorts=8787 9999} Supported property names: [jbossHome, outputToConsole, enableAssertions, password, managementPort, javaHome, javaVmArguments, username, serverConfig, allowConnectingToRunningServer, managementAddress, startupTimeoutInSeconds, modulePath] Apr 17, 2013 10:58:04 AM org.jboss.as.arquillian.container.managed.ManagedDeployableContainer startInternal -INFO: Starting container with: [/home/andy/devtools/jdk1.6.0_25//bin/java, -Djboss.inst=/home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/jbossas-node0, -ea, -Djboss.home.dir=/home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/jbossas-node0, -Dorg.jboss.boot.log.file=/home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/log/boot.log, -Dlogging.configuration=file:/home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/configuration/logging.properties, -Djboss.modules.dir=/home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/jbossas-node0/modules, -Djboss.bundles.dir=/home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/jbossas-node0/bundles, -jar, /home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/jbossas-node0/jboss-modules.jar, -mp, /home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/jbossas-node0/modules, -jaxpmodule, javax.xml. jaxp-provider, org.jboss.as.standalone, -server-config, standalone-example.xml] +INFO: Starting container with: [/home/andy/devtools/jdk1.6.0_25//bin/java, -Djboss.inst=/home/andy/projects/activemq-master/examples/javaee/mdb-bmt/target/jbossas-node0, -ea, -Djboss.home.dir=/home/andy/projects/activemq-master/examples/javaee/mdb-bmt/target/jbossas-node0, -Dorg.jboss.boot.log.file=/home/andy/projects/activemq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/log/boot.log, -Dlogging.configuration=file:/home/andy/projects/activemq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/configuration/logging.properties, -Djboss.modules.dir=/home/andy/projects/activemq-master/examples/javaee/mdb-bmt/target/jbossas-node0/modules, -Djboss.bundles.dir=/home/andy/projects/activemq-master/examples/javaee/mdb-bmt/target/jbossas-node0/bundles, -jar, /home/andy/projects/activemq-master/examples/javaee/mdb-bmt/target/jbossas-node0/jboss-modules.jar, -mp, /home/andy/projects/activemq-master/examples/javaee/mdb-bmt/target/jbossas-node0/modules, -jaxpmodule, ja vax.xml.jaxp-provider, org.jboss.as.standalone, -server-config, standalone-example.xml] 10:58:04,525 INFO [org.jboss.modules] JBoss Modules version 1.1.1.GA 10:58:04,664 INFO [org.jboss.msc] JBoss MSC version 1.0.2.GA 10:58:04,703 INFO [org.jboss.as] JBAS015899: JBoss AS 7.1.1.Final "Brontes" starting @@ -235,7 +235,7 @@ INFO: Starting container with: [/home/andy/devtools/jdk1.6.0_25//bin/java, -Djbo 10:58:05,831 INFO [org.jboss.ws.common.management.AbstractServerConfig] (MSC service thread 1-4) JBoss Web Services - Stack CXF Server 4.0.2.GA 10:58:05,943 INFO [org.apache.coyote.http11.Http11Protocol] (MSC service thread 1-6) Starting Coyote HTTP/1.1 on http-localhost.localdomain-127.0.0.1-8080 10:58:05,966 INFO [org.jboss.as.jacorb] (MSC service thread 1-2) JBAS016330: CORBA ORB Service started -10:58:05,988 INFO [org.apache.activemq.core.server.impl.ActiveMQServerImpl] (MSC service thread 1-11) live server is starting with configuration ActiveMQ Configuration (clustered=false,backup=false,sharedStore=true,journalDirectory=/home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/messagingjournal,bindingsDirectory=/home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/messagingbindings,largeMessagesDirectory=/home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/messaginglargemessages,pagingDirectory=/home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/messagingpaging) +10:58:05,988 INFO [org.apache.activemq.core.server.impl.ActiveMQServerImpl] (MSC service thread 1-11) live server is starting with configuration ActiveMQ Configuration (clustered=false,backup=false,sharedStore=true,journalDirectory=/home/andy/projects/activemq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/messagingjournal,bindingsDirectory=/home/andy/projects/activemq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/messagingbindings,largeMessagesDirectory=/home/andy/projects/activemq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/messaginglargemessages,pagingDirectory=/home/andy/projects/activemq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/messagingpaging) 10:58:05,996 INFO [org.apache.activemq.core.server.impl.ActiveMQServerImpl] (MSC service thread 1-11) Waiting to obtain live lock 10:58:06,037 INFO [org.apache.activemq.core.persistence.impl.journal.JournalStorageManager] (MSC service thread 1-11) Using AIO Journal 10:58:06,122 INFO [org.jboss.as.jacorb] (MSC service thread 1-14) JBAS016328: CORBA Naming Service started @@ -244,7 +244,7 @@ INFO: Starting container with: [/home/andy/devtools/jdk1.6.0_25//bin/java, -Djbo 10:58:06,205 INFO [org.apache.activemq.core.server.impl.AIOFileLockNodeManager] (MSC service thread 1-11) Live Server Obtained live lock 10:58:06,434 INFO [org.jboss.as.remoting] (MSC service thread 1-2) JBAS017100: Listening on localhost.localdomain/127.0.0.1:4447 10:58:06,434 INFO [org.jboss.as.remoting] (MSC service thread 1-15) JBAS017100: Listening on /127.0.0.1:9999 -10:58:06,436 INFO [org.jboss.as.server.deployment.scanner] (MSC service thread 1-16) JBAS015012: Started FileSystemDeploymentService for directory /home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/deployments +10:58:06,436 INFO [org.jboss.as.server.deployment.scanner] (MSC service thread 1-16) JBAS015012: Started FileSystemDeploymentService for directory /home/andy/projects/activemq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/deployments 10:58:08,790 INFO [org.apache.activemq.core.remoting.impl.netty.NettyAcceptor] (MSC service thread 1-11) Started Netty Acceptor version 3.2.5.Final-a96d88c localhost.localdomain:5445 for CORE protocol 10:58:08,793 INFO [org.apache.activemq.core.remoting.impl.netty.NettyAcceptor] (MSC service thread 1-11) Started Netty Acceptor version 3.2.5.Final-a96d88c localhost.localdomain:5455 for CORE protocol 10:58:08,795 INFO [org.apache.activemq.core.server.impl.ActiveMQServerImpl] (MSC service thread 1-11) Server is now live @@ -273,7 +273,7 @@ INFO: Starting container with: [/home/andy/devtools/jdk1.6.0_25//bin/java, -Djbo 10:58:09,517 INFO [org.jboss.wsf.stack.cxf.transport.AddressRewritingEndpointInfo] (MSC service thread 1-1) Setting new service endpoint address in wsdl: http://ONT001-HPM.rhcloud.com:80/BasicWService 10:58:09,656 INFO [org.jboss.wsf.stack.cxf.transport.AddressRewritingEndpointInfo] (MSC service thread 1-1) Setting new service endpoint address in wsdl: http://localhost:8080/hpm/BasicWService 10:58:09,688 INFO [org.apache.cxf.endpoint.ServerImpl] (MSC service thread 1-1) Setting the server's publish address to be http://localhost:8080/hpm/BasicWService -10:58:09,729 INFO [org.jboss.wsf.stack.cxf.deployment.WSDLFilePublisher] (MSC service thread 1-1) WSDL published to: file:/home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/wsdl/ONT001-1.0.war/BasicWService.wsdl +10:58:09,729 INFO [org.jboss.wsf.stack.cxf.deployment.WSDLFilePublisher] (MSC service thread 1-1) WSDL published to: file:/home/andy/projects/activemq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/wsdl/ONT001-1.0.war/BasicWService.wsdl 10:58:09,735 INFO [org.jboss.as.webservices] (MSC service thread 1-11) JBAS015539: Starting service jboss.ws.port-component-link 10:58:09,748 INFO [org.jboss.as.webservices] (MSC service thread 1-10) JBAS015539: Starting service jboss.ws.endpoint."ONT001-1.0.war"."com.hpm.webservices.BasicWSImpl" 10:58:09,753 INFO [org.jboss.ws.common.management.DefaultEndpointRegistry] (MSC service thread 1-10) register: jboss.ws:context=hpm,endpoint=com.hpm.webservices.BasicWSImpl @@ -288,7 +288,7 @@ mdb.jar: /org.apache.activemq/javaee/example/ /org.apache.activemq/javaee/example/server/ /org.apache.activemq/javaee/example/server/MDB_BMTExample.class -10:58:11,612 INFO [org.jboss.as.repository] (management-handler-thread - 2) JBAS014900: Content added at location /home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/content/f0/e2d589ab9490193e109c8bc833f725c87defae/content +10:58:11,612 INFO [org.jboss.as.repository] (management-handler-thread - 2) JBAS014900: Content added at location /home/andy/projects/activemq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/content/f0/e2d589ab9490193e109c8bc833f725c87defae/content 10:58:11,620 INFO [org.jboss.as.server.deployment] (MSC service thread 1-8) JBAS015876: Starting deployment of "arquillian-service" 10:58:11,811 WARN [org.jboss.as.dependency.private] (MSC service thread 1-1) JBAS018567: Deployment "deployment.arquillian-service" is using a private module ("org.jboss.as.jmx:main") which may be changed or removed in future versions without notice. 10:58:11,812 WARN [org.jboss.as.dependency.private] (MSC service thread 1-1) JBAS018567: Deployment "deployment.arquillian-service" is using a private module ("org.jboss.as.server:main") which may be changed or removed in future versions without notice. @@ -296,21 +296,21 @@ mdb.jar: 10:58:11,815 WARN [org.jboss.as.dependency.private] (MSC service thread 1-1) JBAS018567: Deployment "deployment.arquillian-service" is using a private module ("org.jboss.jandex:main") which may be changed or removed in future versions without notice. 10:58:11,817 WARN [org.jboss.as.dependency.private] (MSC service thread 1-1) JBAS018567: Deployment "deployment.arquillian-service" is using a private module ("org.jboss.osgi.framework:main") which may be changed or removed in future versions without notice. 10:58:11,953 INFO [org.jboss.as.server] (management-handler-thread - 2) JBAS018559: Deployed "arquillian-service" -10:58:12,328 INFO [org.jboss.as.repository] (management-handler-thread - 3) JBAS014900: Content added at location /home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/content/59/7dcdb0f420ed57aea638b2599f7a86eecf6c85/content +10:58:12,328 INFO [org.jboss.as.repository] (management-handler-thread - 3) JBAS014900: Content added at location /home/andy/projects/activemq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/content/59/7dcdb0f420ed57aea638b2599f7a86eecf6c85/content 10:58:12,333 INFO [org.jboss.as.server.deployment] (MSC service thread 1-7) JBAS015876: Starting deployment of "mdb.jar" 10:58:12,401 INFO [org.jboss.as.arquillian] (MSC service thread 1-14) Arquillian deployment detected: ArquillianConfig[service=jboss.arquillian.config."mdb.jar",unit=mdb.jar,tests=[org.apache.activemq.javaee.example.server.ExampleRunnerTest]] -10:58:12,418 INFO [org.jboss.as.ejb3] (MSC service thread 1-15) JBAS014142: Started message driven bean 'MDB_BMTExample' with 'hornetq-ra' resource adapter +10:58:12,418 INFO [org.jboss.as.ejb3] (MSC service thread 1-15) JBAS014142: Started message driven bean 'MDB_BMTExample' with 'activemq-ra' resource adapter 10:58:12,562 INFO [org.jboss.as.server] (management-handler-thread - 3) JBAS018559: Deployed "mdb.jar" Sent message: This is a text message 10:58:13,229 INFO [org.jboss.as.naming] (Remoting "localhost" task-3) JBAS011806: Channel end notification received, closing channel Channel ID 57be4578 (inbound) of Remoting connection 3ac552d5 to /127.0.0.1:58571 10:58:13,255 INFO [stdout] (Thread-0 (ActiveMQ-client-global-threads-1402019528)) message This is a text message received 10:58:13,257 INFO [stdout] (Thread-0 (ActiveMQ-client-global-threads-1402019528)) we're in the middle of a transaction: org.jboss.tm.usertx.client.ServerVMClientUserTransaction@6b04d3c8 10:58:14,292 INFO [org.jboss.as.server.deployment] (MSC service thread 1-5) JBAS015877: Stopped deployment mdb.jar in 33ms -10:58:14,413 INFO [org.jboss.as.repository] (management-handler-thread - 1) JBAS014901: Content removed from location /home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/content/59/7dcdb0f420ed57aea638b2599f7a86eecf6c85/content +10:58:14,413 INFO [org.jboss.as.repository] (management-handler-thread - 1) JBAS014901: Content removed from location /home/andy/projects/activemq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/content/59/7dcdb0f420ed57aea638b2599f7a86eecf6c85/content 10:58:14,415 INFO [org.jboss.as.server] (management-handler-thread - 1) JBAS018558: Undeployed "mdb.jar" Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 10.609 sec 10:58:14,436 INFO [org.jboss.as.server.deployment] (MSC service thread 1-5) JBAS015877: Stopped deployment arquillian-service in 6ms -10:58:14,530 INFO [org.jboss.as.repository] (management-handler-thread - 2) JBAS014901: Content removed from location /home/andy/projects/hornetq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/content/f0/e2d589ab9490193e109c8bc833f725c87defae/content +10:58:14,530 INFO [org.jboss.as.repository] (management-handler-thread - 2) JBAS014901: Content removed from location /home/andy/projects/activemq-master/examples/javaee/mdb-bmt/target/jbossas-node0/standalone/data/content/f0/e2d589ab9490193e109c8bc833f725c87defae/content 10:58:14,532 INFO [org.jboss.as.server] (management-handler-thread - 2) JBAS018558: Undeployed "arquillian-service" Results :
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/docs/quickstart-guide/en/running.xml ---------------------------------------------------------------------- diff --git a/docs/quickstart-guide/en/running.xml b/docs/quickstart-guide/en/running.xml index 826c514..6514659 100644 --- a/docs/quickstart-guide/en/running.xml +++ b/docs/quickstart-guide/en/running.xml @@ -26,10 +26,10 @@ <section id="running.standalone"> <title>Standalone ActiveMQ</title> <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 - >./hornetq.cmd run</literal> on Windows) and you should see the following output </para> + <literal>bin</literal> directory. Then execute <literal>./activemq run</literal> (or <literal + >./activemq.cmd run</literal> on Windows) and you should see the following output </para> <programlisting> - bin$ ./hornetq run + bin$ ./activemq run 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>Both the run and the stop scripts use the config under <literal >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> - <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 id="running.jboss.Wildfly"> <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,781 INFO [org.jboss.as.jacorb] (MSC service thread 1-1) JBAS016330: CORBA ORB Service started 14:47:44,115 INFO [org.jboss.as.jacorb] (MSC service thread 1-13) JBAS016328: CORBA Naming Service started - 14:47:44,345 INFO [org.wildfly.extension.undertow] (MSC service thread 1-3) JBAS018210: Register web context: /hornetq-server + 14:47:44,345 INFO [org.wildfly.extension.undertow] (MSC service thread 1-3) JBAS018210: Register web context: /activemq-server 14:47:44,361 INFO [org.apache.activemq.core.server] (ServerService Thread Pool -- 58) HQ221020: Started Netty Acceptor version 3.6.6.Final-90e1eb2 127.0.0.1:5455 for CORE protocol 14:47:44,362 INFO [org.apache.activemq.core.server] (ServerService Thread Pool -- 58) HQ221020: Started Netty Acceptor version 3.6.6.Final-90e1eb2 127.0.0.1:5445 for CORE protocol 14:47:44,364 INFO [org.apache.activemq.core.server] (ServerService Thread Pool -- 58) HQ221020: Started Netty Acceptor version 3.6.6.Final-90e1eb2 org.apache.activemq.default.servlet:5445 for CORE protocol http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/docs/quickstart-guide/zh/download.xml ---------------------------------------------------------------------- diff --git a/docs/quickstart-guide/zh/download.xml b/docs/quickstart-guide/zh/download.xml index c1575e5..34ee2f3 100644 --- a/docs/quickstart-guide/zh/download.xml +++ b/docs/quickstart-guide/zh/download.xml @@ -18,13 +18,13 @@ <!-- ============================================================================= --> <chapter id="download"> <title>ä¸è½½</title> - <para>ActiveMQ项ç®çå®æ¹å°åæ¯ <ulink url="http://hornetq.org/"; - >http://hornetq.org/</ulink>ã</para> + <para>ActiveMQ项ç®çå®æ¹å°åæ¯ <ulink url="http://activemq.org/"; + >http://activemq.org/</ulink>ã</para> <section id="download.software"> <title>软件ä¸è½½</title> <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 id="download.git"> <title>项ç®ä¿¡æ¯</title> @@ -45,24 +45,24 @@ >å¼å论å</ulink></para> </listitem> <listitem> - <para>请å å ¥æ们ç<ulink url="irc://irc.freenode.net:6667/hornetq" + <para>请å å ¥æ们ç<ulink url="irc://irc.freenode.net:6667/activemq" >IRCé¢é</ulink>ä¸æ们çæ ¸å¿å¼åå·¥ç¨å¸äº¤æµã</para> </listitem> <listitem> - <para>æ们项ç®æèªå·±ç <ulink url="http://hornetq.blogspot.com/";>å客</ulink></para> + <para>æ们项ç®æèªå·±ç <ulink url="http://activemq.blogspot.com/";>å客</ulink></para> </listitem> <listitem> - <para>è¿å¯ä»¥è·è¸ªæ们ç<ulink url="http://twitter.com/hornetq";>twitter</ulink></para> + <para>è¿å¯ä»¥è·è¸ªæ们ç<ulink url="http://twitter.com/activemq";>twitter</ulink></para> </listitem> <listitem> <para>ActiveMQçGit代ç åºå°å <ulink - url="https://github.com/hornetq/hornetq"; - >https://github.com/hornetq/hornetq</ulink></para> + url="https://github.com/activemq/activemq"; + >https://github.com/activemq/activemq</ulink></para> </listitem> <listitem> <para>æ¯æ¬¡åå¸ççæ¬æ ç¾é½å¨<ulink - url="https://github.com/hornetq/hornetq/tags"; - >https://github.com/hornetq/hornetq/tags</ulink>ä¸è½æ¾å°ã</para> + url="https://github.com/activemq/activemq/tags"; + >https://github.com/activemq/activemq/tags</ulink>ä¸è½æ¾å°ã</para> </listitem> </itemizedlist> </para> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/docs/quickstart-guide/zh/examples.xml ---------------------------------------------------------------------- diff --git a/docs/quickstart-guide/zh/examples.xml b/docs/quickstart-guide/zh/examples.xml index 8f7cba8..44be24e 100644 --- a/docs/quickstart-guide/zh/examples.xml +++ b/docs/quickstart-guide/zh/examples.xml @@ -58,17 +58,17 @@ run: init: compile: - [echo] src.example.dir=/home/andy/projects/hornetq/trunk/examples/jms/queue/src - [javac] Compiling 5 source files to /home/andy/projects/hornetq/trunk/examples/jms/queue + [echo] src.example.dir=/home/andy/projects/activemq/trunk/examples/jms/queue/src + [javac] Compiling 5 source files to /home/andy/projects/activemq/trunk/examples/jms/queue /build/classes runExample: - [java] 10:41:04,149 INFO @main [JMSExample] hornetq.example.runServer is true + [java] 10:41:04,149 INFO @main [JMSExample] activemq.example.runServer is true [java] 10:41:04,149 INFO @main [JMSExample] starting server with config 'server0' logServerOutput true [java] 10:41:04,149 INFO @main [JMSExample] and vm args: -Xms512M,-Xmx512M,-XX:+U seParallelGC,-XX:+AggressiveOpts,-XX:+UseFastAccessorMethods,-Djava.util.logging.config. -file=/home/andy/projects/hornetq/trunk/examples/jms/common/../../../src/config/stand-alone/no +file=/home/andy/projects/activemq/trunk/examples/jms/common/../../../src/config/stand-alone/no n-clustered/logging.properties [java] org.apache.activemq.jms.example.SpawnedJMSServer out:10:41:08,437 INFO @main [Journal StorageManager] AIO journal selected @@ -129,20 +129,20 @@ deploy: deploy-resources: [copy] Copying 1 file to /home/andy/projects/jbossas5.1/build/output/jboss-5.1.0.GA - /server/default-with-hornetq/deploy/hornetq.sar + /server/default-with-activemq/deploy/activemq.sar [copy] Copying 1 file to /home/andy/projects/jbossas5.1/build/output/jboss-5.1.0.GA - /server/default-with-hornetq/deploy/hornetq.sar + /server/default-with-activemq/deploy/activemq.sar init: compile: jar: - [jar] Building jar: /home/andy/projects/hornetq/trunk/examples/javaee/mdb/build/mdb-exa + [jar] Building jar: /home/andy/projects/activemq/trunk/examples/javaee/mdb/build/mdb-exa mple.jar ear: - [jar] Building jar: /home/andy/projects/hornetq/trunk/examples/javaee/mdb/build/mdb-exa + [jar] Building jar: /home/andy/projects/activemq/trunk/examples/javaee/mdb/build/mdb-exa mple.ear deploy-ear: @@ -198,11 +198,11 @@ undeploy: undeploy-misc: [delete] Deleting: /home/andy/projects/jbossas5.1/build/output/jboss-5.1.0.GA - /server/default-with-hornetq/deploy/mdb-example.ear + /server/default-with-activemq/deploy/mdb-example.ear [delete] Deleting: /home/andy/projects/jbossas5.1/build/output/jboss-5.1.0.GA - /server/default-with-hornetq/deploy/hornetq.sar/activemq-queues.xml + /server/default-with-activemq/deploy/activemq.sar/activemq-queues.xml [delete] Deleting: /home/andy/projects/jbossas5.1/build/output/jboss-5.1.0.GA - /server/default-with-hornetq/deploy/hornetq.sar/hornetq-jms.xml + /server/default-with-activemq/deploy/activemq.sar/activemq-jms.xml BUILD SUCCESSFUL Total time: 1 second http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/docs/quickstart-guide/zh/installation.xml ---------------------------------------------------------------------- diff --git a/docs/quickstart-guide/zh/installation.xml b/docs/quickstart-guide/zh/installation.xml index f29fdaa..7f69620 100644 --- a/docs/quickstart-guide/zh/installation.xml +++ b/docs/quickstart-guide/zh/installation.xml @@ -110,18 +110,18 @@ <para>è¿å°ä¼å¨<literal>$JBOSS_HOME/server</literal>å建两个æå¡å¨é ç½®ï¼</para> <itemizedlist> <listitem> - <para><literal>default-with-hornetq</literal> -- è¿ä¸ªç¸å½äºAS 5ç<literal + <para><literal>default-with-activemq</literal> -- è¿ä¸ªç¸å½äºAS 5ç<literal >default</literal>é ç½®ä½å ¶JMSæä¾è æ¿æ¢æ为ActiveMQãå¨è¿ä¸ªé ç½®ä¸çActiveMQ æ¯<emphasis>éé群</emphasis>çã</para> </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 æ¯<emphasis>é群</emphasis>çã</para> </listitem> </itemizedlist> <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 id="installation.jboss.as4"> <title>ActiveMQè¿è¡äºJBossåºç¨æå¡å¨4.x</title> @@ -142,17 +142,17 @@ <para>è¿å°ä¼å¨<literal>$JBOSS_HOME/server</literal>å建两个æå¡å¨é ç½®ï¼</para> <itemizedlist> <listitem> - <para><literal>default-with-hornetq</literal> -- è¿ä¸ªç¸å½äºAS 4ç<literal + <para><literal>default-with-activemq</literal> -- è¿ä¸ªç¸å½äºAS 4ç<literal >default</literal>é ç½®ä½å ¶JMSæä¾è æ¿æ¢æ为ActiveMQãå¨è¿ä¸ªé ç½®ä¸çActiveMQ æ¯<emphasis>éé群</emphasis>çã</para> </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 æ¯<emphasis>é群</emphasis>çã</para> </listitem> </itemizedlist> <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> </chapter> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/docs/quickstart-guide/zh/running.xml ---------------------------------------------------------------------- diff --git a/docs/quickstart-guide/zh/running.xml b/docs/quickstart-guide/zh/running.xml index 9a571b5..867ab80 100644 --- a/docs/quickstart-guide/zh/running.xml +++ b/docs/quickstart-guide/zh/running.xml @@ -43,7 +43,7 @@ ä¾å¦ï¼è¦è¿è¡ä¸ä¸ªå¸¦æ<emphasis>éé群</emphasis>çActiveMQæå¡çAS 5ï¼è¿å ¥<literal >$JBOSS_HOME/bin</literal>ç®å½ï¼ç¶åé®å ¥ï¼</para> <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,462 INFO [ServerImpl] Release ID: JBoss (Microcontainer) [5.1.0.GA (build: SVNTag= http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/docs/user-manual/user-manual.xpr ---------------------------------------------------------------------- diff --git a/docs/user-manual/user-manual.xpr b/docs/user-manual/user-manual.xpr index fc5025a..615a6b9 100644 --- a/docs/user-manual/user-manual.xpr +++ b/docs/user-manual/user-manual.xpr @@ -25,7 +25,7 @@ <file name="en/core-bridges.xml"/> <file name="en/diverts.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/filter-expressions.xml"/> <file name="en/flow-control.xml"/> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/docs/user-manual/zh/appserver-integration.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/zh/appserver-integration.xml b/docs/user-manual/zh/appserver-integration.xml index 82e9b00..2c7beea 100644 --- a/docs/user-manual/zh/appserver-integration.xml +++ b/docs/user-manual/zh/appserver-integration.xml @@ -35,7 +35,7 @@ @ActivationConfigProperty(propertyName = "destinationType", propertyValue = "javax.jms.Queue"), @ActivationConfigProperty(propertyName = "destination", propertyValue = "queue/testQueue") }) -@ResourceAdapter("hornetq-ra.rar") +@ResourceAdapter("activemq-ra.rar") public class MDBExample implements MessageListener { public void onMessage(Message message)... @@ -50,7 +50,7 @@ public class MDBExample implements MessageListener >jboss.xml</literal>ä¸å å ¥ç±»ä¼¼ä»¥ä¸çå å®¹ï¼ <programlisting><message-driven> <ejb-name>ExampleMDB</ejb-name> - <resource-adapter-name>hornetq-ra.rar</resource-adapter-name> + <resource-adapter-name>activemq-ra.rar</resource-adapter-name> </message-driven> </programlisting>ä½ è¿å¯ä»¥å°hornetq-ra.raræ¹å为jms-ra.rarèä¸éè¦ä»»ä½annotationæé¢å¤çé¨ç½²æè¿°ä¿¡æ¯ãä½æ¯ä½ éè¦ ç¼è¾<literal>jms-ds.xml</literal>æ件ï¼å°å ¶ä¸ç<literal>rar-name</literal>项æ¹æç¸åºçå¼ã</para> @@ -72,7 +72,7 @@ public class MDBExample implements MessageListener }) @TransactionManagement(value= TransactionManagementType.CONTAINER) @TransactionAttribute(value= TransactionAttributeType.REQUIRED) -@ResourceAdapter("hornetq-ra.rar") +@ResourceAdapter("activemq-ra.rar") public class MDB_CMP_TxRequiredExample implements MessageListener { public void onMessage(Message message)... @@ -108,7 +108,7 @@ public class MDB_CMP_TxRequiredExample implements MessageListener }) @TransactionManagement(value = TransactionManagementType.CONTAINER) @TransactionAttribute(value = TransactionAttributeType.NOT_SUPPORTED) -@ResourceAdapter("hornetq-ra.rar") +@ResourceAdapter("activemq-ra.rar") public class MDB_CMP_TxLocalExample implements MessageListener { public void onMessage(Message message)... @@ -126,7 +126,7 @@ public class MDB_CMP_TxLocalExample implements MessageListener @ActivationConfigProperty(propertyName = "acknowledgeMode", propertyValue = "Dups-ok-acknowledge") }) @TransactionManagement(value= TransactionManagementType.BEAN) -@ResourceAdapter("hornetq-ra.rar") +@ResourceAdapter("activemq-ra.rar") public class MDB_BMPExample implements MessageListener { public void onMessage(Message message) @@ -175,7 +175,7 @@ public class MDB_BMPExample implements MessageListener }) @TransactionManagement(value= TransactionManagementType.CONTAINER) @TransactionAttribute(value= TransactionAttributeType.REQUIRED) -@ResourceAdapter("hornetq-ra.rar") +@ResourceAdapter("activemq-ra.rar") public class MDBMessageSelectorExample implements MessageListener { public void onMessage(Message message).... @@ -195,7 +195,7 @@ public class MDBMessageSelectorExample implements MessageListener }) @TransactionManagement(value= TransactionManagementType.CONTAINER) @TransactionAttribute(value= TransactionAttributeType.REQUIRED) -@ResourceAdapter("hornetq-ra.rar") +@ResourceAdapter("activemq-ra.rar") public class MDBMessageSendTxExample implements MessageListener { @Resource(mappedName = "java:/JmsXA") @@ -263,7 +263,7 @@ public class MDBMessageSendTxExample implements MessageListener }) @TransactionManagement(value= TransactionManagementType.CONTAINER) @TransactionAttribute(value= TransactionAttributeType.REQUIRED) -@ResourceAdapter("hornetq-ra.rar") +@ResourceAdapter("activemq-ra.rar") public class MyMDB implements MessageListener { ....} </programlisting> @@ -646,7 +646,7 @@ public class MyMDB implements MessageListener <title>éé å¨å¤é¨ï¼outboundï¼é ç½®</title> <para>å¤é¨é ç½®åæ°åºè¯¥ä¿æä¸åãè¿æ¯å 为å®æå®ä¹çè¿æ¥å·¥åè¦è¢«Java EEç模åæ使ç¨ãè¿äºè¿æ¥å·¥å å¯ä»¥å®ä¹å¨ååæ ·å¼ä¸º<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>ä¸ç»§æ¿ï¼ ä½æ¯å¯ä»¥å¨è¿ééæ°å®ä¹ãä¸é¢çä¾åä¸ç»åºäºéæ°å®ä¹çæ¹æ³ã</para> <note> @@ -784,7 +784,7 @@ private ConnectionFactory connectionFactory;</programlisting> <section> <title>é ç½®å é¨éé å¨</title> <para>é¦å å¨<literal>deploy</literal>ç®å½ä¸å建ä¸ä¸ªä»¥.rar为ç»å°¾çæ件夹ã - å¨è¿éæ们å°å ¶å½å为<literal>hornetq-ra.rar</literal>ã主注æè¿ä¸ç¹å¾éè¦ï¼å 为MDBåå¤é¨é ç½®é½éè¦å¼ç¨ + å¨è¿éæ们å°å ¶å½å为<literal>activemq-ra.rar</literal>ã主注æè¿ä¸ç¹å¾éè¦ï¼å 为MDBåå¤é¨é ç½®é½éè¦å¼ç¨ 该æ件夹çååã </para> <note> @@ -793,7 +793,7 @@ private ConnectionFactory connectionFactory;</programlisting> </para> </note> <para>å¨æ件夹 - <literal>hornetq-ra.rar</literal> + <literal>activemq-ra.rar</literal> ä¸å建å为 <literal>META-INF</literal> çæ件夹ï¼ç¶åå¨äºæ件夹å å建ä¸ä¸ª @@ -825,8 +825,8 @@ private ConnectionFactory connectionFactory;</programlisting> <section> <title>é ç½®å¤é¨éé å¨</title> - <para>ä½ è¿éè¦å建ä¸ä¸ª<literal>hornetq-ds.xml</literal>æ件æ¥é ç½®å¤é¨è¿æ¥ã该æ件éè¦æ¾ç½®å¨<literal>deploy</literal> - ä¸çä»»æä¸ä¸ªæ件夹ä¸ãå¨ä¸ç¸æ åçå®è£ ä¸è¿ä¸ªæ件夹æ¯<literal>horneq</literal> æè <literal>hornetq.sar</literal>ã + <para>ä½ è¿éè¦å建ä¸ä¸ª<literal>activemq-ds.xml</literal>æ件æ¥é ç½®å¤é¨è¿æ¥ã该æ件éè¦æ¾ç½®å¨<literal>deploy</literal> + ä¸çä»»æä¸ä¸ªæ件夹ä¸ãå¨ä¸ç¸æ åçå®è£ ä¸è¿ä¸ªæ件夹æ¯<literal>horneq</literal> æè <literal>activemq.sar</literal>ã å½ç¶ä½ å¯ä»¥éæ©å ¶å®æ件夹ã该æ件çåååªè¦æ¯ä»¥<literal>-ds.xml</literal>å³å¯ãå¨ActiveMQçåå¸å ä¸å å«æä¸ä¸ªæ¨¡æ¿æä»¶ï¼ å®çååæ¯<literal>jms-ds.xml</literal>ï¼ä½ç½®å°±å¨configæ件夹ä¸ã </para> @@ -835,7 +835,7 @@ private ConnectionFactory connectionFactory;</programlisting> <tx-connection-factory> <jndi-name>RemoteJmsXA</jndi-name> <xa-transaction/> - <rar-name>hornetq-ra.rar</rar-name> + <rar-name>activemq-ra.rar</rar-name> <connection-definition>org.apache.activemq.ra.ActiveMQRAConnectionFactory</connection-definition> <config-property name="SessionDefaultType" type="java.lang.String">javax.jms.Topic</config-property> <config-property name="ConnectorClassName" type="java.lang.String">org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory</config-property> @@ -864,17 +864,17 @@ private ConnectionFactory connectionFactory;</programlisting> </thead> <tbody> <row> - <entry>hornetq-ra.jar</entry> + <entry>activemq-ra.jar</entry> <entry>ActiveMQèµæºéé å¨æ件</entry> - <entry>deploy/hornetq-ra.raræç¸åºçä½ç½®</entry> + <entry>deploy/activemq-ra.raræç¸åºçä½ç½®</entry> </row> <row> - <entry>hornetq-core-client.jar</entry> + <entry>activemq-core-client.jar</entry> <entry>ActiveMQæ ¸å¿å®¢æ·ç±»åº</entry> <entry>å¨JBossçdefault/libä¸æè æ¯$JBOSS_HOME/common/libä¸ã </entry> </row> <row> - <entry>hornetq-jms-client.jar</entry> + <entry>activemq-jms-client.jar</entry> <entry>ActiveMQçJMSç±»</entry> <entry>åä¸</entry> </row> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/docs/user-manual/zh/architecture.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/zh/architecture.xml b/docs/user-manual/zh/architecture.xml index b50f7f3..6cb0f1a 100644 --- a/docs/user-manual/zh/architecture.xml +++ b/docs/user-manual/zh/architecture.xml @@ -53,7 +53,7 @@ <section> <title>å°ActiveMQåµå ¥å°ä½ çåºç¨ç¨åºä¸</title> <para>å¦æä½ çåºç¨ç¨åºå é¨éè¦æ¶æ¯æå¡ï¼ä½åæ¶ä½ åä¸æ³å°æ¶æ¯æå¡æ´é²ä¸ºåç¬çActiveMQæå¡å¨ï¼ä½ å¯ä»¥å¨åºç¨ä¸ç´æ¥å°ActiveMQå®ä¾åã</para> - <para>æå ³åµå ¥å¼ActiveMQç详ç»ä¿¡æ¯è¯·åé <xref linkend="embedding-hornetq" + <para>æå ³åµå ¥å¼ActiveMQç详ç»ä¿¡æ¯è¯·åé <xref linkend="embedding-activemq" />ã</para> </section> <section> @@ -78,7 +78,7 @@ <title>ActiveMQä½ä¸ºç¬ç«çæå¡ï¼standaloneï¼</title> <para>ActiveMQå¯ä»¥é¨ç½²æ为ç¬ç«çæå¡å¨ãå®å¯è¿è¡äºä»»ä½JEEåºç¨æå¡å¨ä¹å¤ï¼ä½ä¸ºä¸ä¸ªç¬ç«çæå¡è¿è¡ã ä½ä¸ºç¬ç«æå¡å¨è¿è¡æ¶ï¼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å®ä¾ã ç¨äºå¯ä»¥éè¿JMXæè¿æ¥ä½¿ç¨è¿äºæ¥å£ãJMSæå¡æ¯åç¬çæå¡ï¼å®ä¸æ¯ActiveMQæ ¸å¿æå¡ãActiveMQçæ ¸å¿ä¸å å«JMSç¸å ³çæå¡ã å¦æä½ ä¸éè¦éè¿æå¡å¨ç«¯çxmlé ç½®æ件é¨ç½²ä»»ä½JMS对象ï¼ä¹ä¸éè¦JMSç管çæ¥å£ï¼ä½ å¯ä»¥éæ©ä¸å¯å¨è¯¥æå¡ã</para> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/docs/user-manual/zh/client-classpath.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/zh/client-classpath.xml b/docs/user-manual/zh/client-classpath.xml index e9fb049..ee85330 100644 --- a/docs/user-manual/zh/client-classpath.xml +++ b/docs/user-manual/zh/client-classpath.xml @@ -27,13 +27,13 @@ <section> <title>使ç¨ActiveMQå æ ¸ç客æ·ç«¯</title> <para>å¦æ客æ·ç«¯åªä½¿ç¨ActiveMQå æ ¸ï¼éJMS客æ·ç«¯ï¼ï¼éè¦å° <literal - >hornetq-core-client.jar</literal>å + >activemq-core-client.jar</literal>å <literal>netty.jar</literal> æ¾å°classpathä¸ã</para> </section> <section> <title>JMS客æ·ç«¯</title> <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> <para><literal>jboss-jms-api.jar</literal>ä¸å å«çåªæ¯ <literal>javax.jms.*</literal> å ä¸çæ¥å£ç±»ã å¦æè¿äºç±»å·²ç»å¨ä½ çclasspathä¸ï¼åä½ å°±ä¸éè¦è¿ä¸ªjaræ件ã</para> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/docs/user-manual/zh/client-reconnection.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/zh/client-reconnection.xml b/docs/user-manual/zh/client-reconnection.xml index c5aec70..ae50e97 100644 --- a/docs/user-manual/zh/client-reconnection.xml +++ b/docs/user-manual/zh/client-reconnection.xml @@ -34,7 +34,7 @@ <literal>ConfirmationWindowSize</literal>åèçå½ä»¤æ¶ï¼ä¼å客æ·ç«¯åéä¸ä¸ªå½ä»¤ç¡®è®¤ï¼ä»¥ä½¿å®¢æ·ç«¯ åæ¶æ¸ é¤ç¼åã</para> <para>å¦æ使ç¨JMSæå¡ï¼å¹¶ä¸JMSçè¿æ¥å·¥åæ¯æ³¨åå°JNDIçè¯ï¼ç¸åºçåæ°æ¯<literal - >hornetq-jms.xml</literal>æ件ä¸ç<literal + >activemq-jms.xml</literal>æ件ä¸ç<literal >confirmation-window-size</literal>项ãå¦æä½ å¹¶ä¸å°JMSè¿æ¥å·¥å注åå°JNDIï¼åä½ éè¦å¨ <literal>ActiveMQConnectionFactory</literal>ä¸ä½¿ç¨ç¸åºçæ¹æ³ç´æ¥è®¾ç½®è¯¥åæ°ã</para> <para>å¦æ使ç¨æ ¸å¿æå¡ï¼ä½ å¯ä»¥ç´æ¥å¨<literal>ClientSessionFactory</literal>å®ä¾ä¸ç´æ¥è®¾ç½®è¯¥åæ°ã</para> @@ -82,7 +82,7 @@ 并éåºã<literal>-1</literal>表示è¿è¡æ é次éè¯ãé»è®¤å¼æ¯<literal>0</literal>ã</para> </listitem> </itemizedlist> - <para>å¦æ使ç¨JMS并ä¸å°JMSçè¿æ¥å·¥åç»å®å°JNDIæå¡ä¸ï¼åéè¦å¨<literal>hornetq-jms.xml</literal> + <para>å¦æ使ç¨JMS并ä¸å°JMSçè¿æ¥å·¥åç»å®å°JNDIæå¡ä¸ï¼åéè¦å¨<literal>activemq-jms.xml</literal> æ件ä¸å¯¹è¿äºåæ°è¿è¡é ç½®ï¼å¦ä¸ä¾æ示ï¼</para> <programlisting> <connection-factory name="ConnectionFactory"> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/docs/user-manual/zh/clusters.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/zh/clusters.xml b/docs/user-manual/zh/clusters.xml index 011e262..107addf 100644 --- a/docs/user-manual/zh/clusters.xml +++ b/docs/user-manual/zh/clusters.xml @@ -169,7 +169,7 @@ <section> <title>使ç¨JMSæ¶å®¢æ·ç«¯åç°çé ç½®æ¹æ³</title> <para>å¦æ使ç¨JMSï¼å¹¶ä¸å¨æå¡å¨ç«¯çJMSè¿æ¥å·¥åæ¯æ³¨åå°JNDIçæ åµä¸ï¼ä½ å¯ä»¥å¨æå¡å¨ç«¯çé ç½®æ件 - <literal>hornetq-jms.xml</literal>ä¸æå®è¿æ¥å·¥åæç¨çåç°ç»ãå¦ä¸é¢æ示ï¼</para> + <literal>activemq-jms.xml</literal>ä¸æå®è¿æ¥å·¥åæç¨çåç°ç»ãå¦ä¸é¢æ示ï¼</para> <programlisting><connection-factory name="ConnectionFactory"> <discovery-group-ref discovery-group-name="my-discovery-group"/> <entries> @@ -342,7 +342,7 @@ Connection jmsConnection2 = jmsConnectionFactory.createConnection();</programlis >org.apache.activemq.api.core.client.loadbalance.ConnectionLoadBalancingPolicy</literal>å³å¯ã</para> <para>æ ¹æ®ä½ 使ç¨çæ¯JMSè¿æ¯æ ¸å¿æ¥å£ï¼æå®è´è½½åè¡¡çæ¹æ³æ¯ææä¸åçãå¦æä½ ä¸æå®çç¥ï¼é»è®¤ççç¥æ¯<literal >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> <connection-factory name="ConnectionFactory"> <discovery-group-ref discovery-group-name="my-discovery-group"/> @@ -385,7 +385,7 @@ factory.setLoadBalancingPolicyClassName("com.acme.MyLoadBalancingPolicy"); <section> <title>使ç¨JMSæ¶æå®æå¡å¨å表</title> <para>å¦æ使ç¨JMSï¼å¹¶ä¸JMSè¿æ¥å·¥åæ¯æ³¨åå°JNDIçè¯ï¼ä½ éè¦å¨æå¡å¨ç«¯çé ç½®æ件 - <literal>hornetq-jms.xml</literal>ä¸æ¥æå®ï¼å¦ä¸é¢çä¾åï¼</para> + <literal>activemq-jms.xml</literal>ä¸æ¥æå®ï¼å¦ä¸é¢çä¾åï¼</para> <programlisting><connection-factory name="ConnectionFactory"> <connectors> <connector-ref connector-name="my-connector1" http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/docs/user-manual/zh/configuration-index.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/zh/configuration-index.xml b/docs/user-manual/zh/configuration-index.xml index 079703b..8f8efd5 100644 --- a/docs/user-manual/zh/configuration-index.xml +++ b/docs/user-manual/zh/configuration-index.xml @@ -209,7 +209,7 @@ >management-address</link></entry> <entry>String</entry> <entry>管çæ¶æ¯åéçå°å</entry> - <entry>jms.queue.hornetq.management</entry> + <entry>jms.queue.activemq.management</entry> </row> <row> <entry><link linkend="clusters.clusteruser" @@ -230,7 +230,7 @@ >management-notification-address</link></entry> <entry>String</entry> <entry>ç¨äºæ¥æ¶ç®¡çéç¥çå°å</entry> - <entry>hornetq.notifications</entry> + <entry>activemq.notifications</entry> </row> <row> <entry><link linkend="configuring.message.counters" @@ -925,7 +925,7 @@ </table> </section> <section> - <title>hornetq-jms.xml</title> + <title>activemq-jms.xml</title> <para>该æ件æ¯æå¡å¨ç«¯JMSæå¡æ使ç¨çï¼ç¨æ¥è£ è½½JMSéåï¼è¯é¢åè¿æ¥å·¥åã</para> <table frame="topbot" border="2"> <title>JMSæå¡å¨é ç½®</title> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/docs/user-manual/zh/configuring-transports.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/zh/configuring-transports.xml b/docs/user-manual/zh/configuring-transports.xml index 1d28de8..333879f 100644 --- a/docs/user-manual/zh/configuring-transports.xml +++ b/docs/user-manual/zh/configuring-transports.xml @@ -75,7 +75,7 @@ org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory <literal>ActiveMQConnectionFactory</literal>æ¶éè¦è¿æ¥å¨çå¿ è¦ä¿¡æ¯ï¼ä»¥ä¾¿è¿ä¸ªè¿æ¥å·¥å è½ç¥éå®å¦ä½ä¸ActiveMQæå¡å¨ç¸è¿æ¥ã</para> <para>è¿ä¸ä¿¡æ¯è¢«å®ä¹å¨é ç½®æ件<literal - >hornetq-jms.xml</literal>ä¸ç<literal>connector-ref</literal>åå ä¸ãä¸é¢è¿æ®µé ç½® + >activemq-jms.xml</literal>ä¸ç<literal>connector-ref</literal>åå ä¸ãä¸é¢è¿æ®µé ç½® å°±æ¯ä»è¯¥é ç½®æ件ä¸æåçç¸å ³é¨åï¼å®å±ç¤ºäºJMSçè¿æ¥å·¥åæ¯å¦ä½å¼ç¨å®ä¹å¨é ç½®æ件<literal >activemq-configuration.xml</literal>ä¸çè¿æ¥å¨çï¼</para> <programlisting> @@ -118,7 +118,7 @@ ClientSession session = sessionFactory.createSession(...); etc </programlisting> <para>å¦æå¨å®¢æ·ç«¯ç´æ¥ä½¿ç¨JMSçè¿æ¥å·¥åçè¯ï¼ä¹å¯ä»¥ç¨ç±»ä¼¼çæ¹æ³èä¸éè¦å¨æå¡å¨ç«¯å®ä¹è¿æ¥å¨æå¨ - <literal>hornetq-jms.xml</literal>é ç½®æ件ä¸å建è¿æ¥å·¥åï¼</para> + <literal>activemq-jms.xml</literal>é ç½®æ件ä¸å建è¿æ¥å·¥åï¼</para> <programlisting> Map<String, Object> connectionParams = new HashMap<String, Object>(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/docs/user-manual/zh/connection-ttl.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/zh/connection-ttl.xml b/docs/user-manual/zh/connection-ttl.xml index c2a3066..d51d7bf 100644 --- a/docs/user-manual/zh/connection-ttl.xml +++ b/docs/user-manual/zh/connection-ttl.xml @@ -120,7 +120,7 @@ at org.acme.yourproject.YourClass (YourClass.java:666) æ¶å°ä»»ä½æ°æ®ï¼å®¢æ·ç«¯å°±è®¤ä¸ºè¿ä»¬è¿æ¥åçäºæ éãæ ¹æ®ä¸åçé ç½®ï¼å®¢æ·ç«¯å¨è¿ç§æ åµä¸è¦ä¹è¿è¡failoverï¼è¦ä¹ è°ç¨<literal>FailureListener</literal>çæ¥å£ï¼æè æ¯JMSç<literal>ExceptionListener</literal>ï¼ã</para> <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> <para>è¿ä¸ªåæ°çé»è®¤å¼æ¯<literal>30000</literal>毫ç§ï¼å³ååéã<literal>-1</literal>表示客æ·ç«¯ä¸æ£æ¥ è¿æ¥çæææ§ãå³ä¸è®ºæ¯å¦ææ°æ®æ¥èªæå¡å¨ï¼è¿æ¥é½ä¸ç´ææãè¿ä¸åæ°é常è¦æ¯æå¡å¨ç«¯çè¿æ¥TTLå°è®¸å¤ï¼ä»¥ä½¿ http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/docs/user-manual/zh/core-bridges.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/zh/core-bridges.xml b/docs/user-manual/zh/core-bridges.xml index 2b25269..fcb226d 100644 --- a/docs/user-manual/zh/core-bridges.xml +++ b/docs/user-manual/zh/core-bridges.xml @@ -70,7 +70,7 @@ <para>è¿ä¸ªéåå¨æ¡¥çå¯å¨ä¹åå¿ é¡»å·²ç»åå¨ã</para> <note> <para>å¦æ使ç¨JMSï¼JMSçé ç½®æ件<literal - >hornetq-jms.xml</literal>å¨æ ¸å¿é ç½®æ件<literal> + >activemq-jms.xml</literal>å¨æ ¸å¿é ç½®æ件<literal> activemq-configuration.xml</literal>ä¹åè£ è½½ãæ以å¦æä½ çæ¡¥è¦ä»JMS éåæ¥æ¶æ¶æ¯ï¼å°±éè¦ä¿è¯JMSéååæ¶è¦ä½ä¸ºæ ¸å¿éåé¨ç½²ãå ·ä½æ¹æ³å¯ä»¥åè§ bridgeä¾åã</para> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/docs/user-manual/zh/embedding-hornetq.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/zh/embedding-hornetq.xml b/docs/user-manual/zh/embedding-hornetq.xml index 9fe437f..2909b61 100644 --- a/docs/user-manual/zh/embedding-hornetq.xml +++ b/docs/user-manual/zh/embedding-hornetq.xml @@ -16,7 +16,7 @@ <!-- and agrees not to assert, Section 4d of CC-BY-SA to the fullest extent --> <!-- permitted by applicable law. --> <!-- ============================================================================= --> -<chapter id="embedding-hornetq"> +<chapter id="embedding-activemq"> <title>åµå ¥å¼ActiveMQ</title> <para>ActiveMQæ¯ç±ç®åä¼ ç»Java对象ï¼POJOï¼å®ç°ï¼å æ¤å®å¯ä»¥å¨ä»»ä½ä¾èµæ³¨å ¥çæ¡æ¶ä¸è¿è¡ï¼æ¯å¦JBoss Microcontainerï¼SprintæGoogle Guiceãå¦å¤å¦æä½ çåºç¨ç¨åºå é¨éè¦æ¶æ¯åè½ï¼ä½ å¯ä»¥å¨ç¨åºä¸ @@ -76,7 +76,7 @@ server.start();</programlisting> <para>ä½ è¿å¯ä»¥ä½¿ç¨ä¸ä¸ªä¾èµæ³¨å ¥æ¡æ¶æ¥å¯å¨ActiveMQï¼æ¯å¦<trademark>JBoss Microcontainer</trademark>æ<trademark>Springæ¡æ¶</trademark>ã</para> <para>ActiveMQç¬ç«æå¡å¨ä½¿ç¨çæ¯JBoss Microcontainerä½ä¸ºå ¶æ¡æ¶ãå¨ActiveMQçåå¸ä¸å æ¬ç<literal - >ActiveMQBootstrapServer</literal>å<literal>hornetq-beans.xml</literal>æä»¶å ±åå®ç°äº + >ActiveMQBootstrapServer</literal>å<literal>activemq-beans.xml</literal>æä»¶å ±åå®ç°äº å¨JBoss Microcontainerä¸å¯¹ActiveMQæå¡å¨çå¼å¯¼ã</para> <para>è¦ä½¿ç¨JBoss Microcontainerï¼éè¦å¨xmlæ件ä¸å£°æ<literal>ActiveMQServer</literal> å<literal>Configuration</literal>对象ãå¦å¤è¿å¯ä»¥æ³¨å ¥ä¸ä¸ªå®å ¨ç®¡çå¨åä¸ä¸ªMBeanæå¡å¨ãä½æ¯è¿äº @@ -103,7 +103,7 @@ server.start();</programlisting> </deployment></programlisting> <para><literal>ActiveMQBootstrapServer</literal>å®ç°äºJBoss Microcontainerçç®åå°è£ ã</para> <programlisting>ActiveMQBootstrapServer bootStrap = - new ActiveMQBootstrapServer(new String[] {"hornetq-beans.xml"}); + new ActiveMQBootstrapServer(new String[] {"activemq-beans.xml"}); bootStrap.run();</programlisting> </section> <section> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/docs/user-manual/zh/filter-expressions.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/zh/filter-expressions.xml b/docs/user-manual/zh/filter-expressions.xml index 1b5db78..6316b63 100644 --- a/docs/user-manual/zh/filter-expressions.xml +++ b/docs/user-manual/zh/filter-expressions.xml @@ -29,7 +29,7 @@ <itemizedlist> <listitem> <para>é¢å®ä¹çéåãå½å¨<literal - >activemq-configuration.xml</literal> æ <literal>hornetq-jms.xml</literal>å®ä¹ + >activemq-configuration.xml</literal> æ <literal>activemq-jms.xml</literal>å®ä¹ éåæ¶ï¼å¯ä»¥ä½¿ç¨è¿æ»¤å¨ãåªæä¸è¿æ»¤å¨è¡¨è¾¾å¼ç¸å¹é çæ¶æ¯æè½è¾¾å°è¯¥éåä¸ã</para> </listitem> <listitem> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/docs/user-manual/zh/flow-control.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/zh/flow-control.xml b/docs/user-manual/zh/flow-control.xml index db69d93..4039451 100644 --- a/docs/user-manual/zh/flow-control.xml +++ b/docs/user-manual/zh/flow-control.xml @@ -83,7 +83,7 @@ </section> <section> <title>使ç¨JMSçæµæ§å¶</title> - <para>è¥ä½¿ç¨JNDIæ¥è·å¾è¿æ¥å·¥åï¼åéè¦éè¿é ç½®<literal>hornetq-jms.xml</literal>æ件æ¥è®¾å®çªå£å¤§å°ï¼</para> + <para>è¥ä½¿ç¨JNDIæ¥è·å¾è¿æ¥å·¥åï¼åéè¦éè¿é ç½®<literal>activemq-jms.xml</literal>æ件æ¥è®¾å®çªå£å¤§å°ï¼</para> <programlisting> <connection-factory name="ConnectionFactory"> <connectors> @@ -118,7 +118,7 @@ </section> <section> <title>使ç¨JMS</title> - <para>å¦æä»JNDIä¸è·åè¿æ¥å·¥åï¼éè¦éè¿é ç½®<literal>hornetq-jms.xml</literal>æ¥è¿è¡éçæµæ§å¶ï¼</para> + <para>å¦æä»JNDIä¸è·åè¿æ¥å·¥åï¼éè¦éè¿é ç½®<literal>activemq-jms.xml</literal>æ¥è¿è¡éçæµæ§å¶ï¼</para> <programlisting><connection-factory name="ConnectionFactory"> <connectors> <connector-ref connector-name="netty-connector"/> @@ -161,7 +161,7 @@ </section> <section> <title>使ç¨JMS</title> - <para>å¦æ使ç¨JNDIæ¥è·å¾è¿æ¥å·¥åï¼åéè¦é ç½®<literal>hornetq-jms.xml</literal>æ件以设å®çªå£å¤§å°ï¼</para> + <para>å¦æ使ç¨JNDIæ¥è·å¾è¿æ¥å·¥åï¼åéè¦é ç½®<literal>activemq-jms.xml</literal>æ件以设å®çªå£å¤§å°ï¼</para> <programlisting> <connection-factory name="ConnectionFactory"> <connectors> @@ -222,7 +222,7 @@ </section> <section> <title>ä½¿ç¨ JMS</title> - <para>å¦æ使ç¨JNDIï¼éè¦é ç½®<literal>hornetq-jms.xml</literal>æ件ï¼</para> + <para>å¦æ使ç¨JNDIï¼éè¦é ç½®<literal>activemq-jms.xml</literal>æ件ï¼</para> <programlisting><connection-factory name="ConnectionFactory"> <connectors> <connector-ref connector-name="netty-connector"/> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/docs/user-manual/zh/ha.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/zh/ha.xml b/docs/user-manual/zh/ha.xml index 298bcd9..11cbb6e 100644 --- a/docs/user-manual/zh/ha.xml +++ b/docs/user-manual/zh/ha.xml @@ -125,7 +125,7 @@ <para>å¦å¤ï¼éè¦å°ä¸»æå¡å¨åå¤ä»½æå¡å¨çæ¥å¿æ件ä½ç½®æå<emphasis>åä¸ä¸ªå ±äº«ä½ç½®</emphasis>ã ï¼åè§<xref linkend="configuring.message.journal"/>ï¼</para> <para>å¦æ客æ·ç«¯ä½¿ç¨JMSèªå¨å¤±æå¤æ´ï¼ä¸»æå¡å¨é¤äºè¦é ç½®ä¸ä¸ªè¿æ¥å¨ä»¥è¿æ¥å°å¤ä»½æå¡å¨å¤ï¼è¿è¦å¨ - é ç½®æ件<literal>hornetq-jms.xml</literal>ä¸æåè¿ä¸ªè¿æ¥å¨ï¼å¦ + é ç½®æ件<literal>activemq-jms.xml</literal>ä¸æåè¿ä¸ªè¿æ¥å¨ï¼å¦ <xref linkend="ha.automatic.failover"/>ä¸æ解éçé£æ ·ã</para> </section> <section> @@ -170,7 +170,7 @@ <para>ææ¶ä½ éè¦å¨ä¸»æå¡å¨æ£å¸¸å ³æºçæ åµä¸ä»ç¶è¿è¡å¤±æå¤æ´ãå¦æ使ç¨JMSï¼ä½ éè¦å°<literal >ActiveMQConnectionFactory</literal>ç<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ã è¿ä¸ªå±æ§çé»è®¤å¼æ¯falseãè¿è¡¨ç¤ºå¦æ主æå¡å¨æ¯æ£å¸¸å ³æºï¼<emphasis>客æ·ç«¯å°ä¸ä¼è¿è¡å¤±æå¤æ´</emphasis>ã</para> <para> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/docs/user-manual/zh/large-messages.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/zh/large-messages.xml b/docs/user-manual/zh/large-messages.xml index 2fcbb8f..71a3039 100644 --- a/docs/user-manual/zh/large-messages.xml +++ b/docs/user-manual/zh/large-messages.xml @@ -64,7 +64,7 @@ factory.setMinLargeMessageSize(25 * 1024);</programlisting> </section> <section> <title>使ç¨JMS</title> - <para>å¦æè¿æ¥å·¥åæ¯éè¿JNDIæ¹å¼è·å¾çï¼åéè¦å¨<literal>hornetq-jms.xml</literal>æ件ä¸å®ä¹ï¼</para> + <para>å¦æè¿æ¥å·¥åæ¯éè¿JNDIæ¹å¼è·å¾çï¼åéè¦å¨<literal>activemq-jms.xml</literal>æ件ä¸å®ä¹ï¼</para> <programlisting>... <connection-factory name="ConnectionFactory"> <connectors> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/docs/user-manual/zh/management.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/zh/management.xml b/docs/user-manual/zh/management.xml index 0b153fb..f1111a0 100644 --- a/docs/user-manual/zh/management.xml +++ b/docs/user-manual/zh/management.xml @@ -520,7 +520,7 @@ <para>ä¾å¦ï¼è¦å¾å°æ ¸å¿éå<literal>exampleQueue</literal>ä¸æ¶æ¯çæ°éï¼</para> <programlisting> ClientSession session = ... - ClientRequestor requestor = new ClientRequestor(session, "jms.queue.hornetq.management"); + ClientRequestor requestor = new ClientRequestor(session, "jms.queue.activemq.management"); ClientMessage message = session.createMessage(false); ManagementHelper.putAttribute(message, "core.queue.exampleQueue", "messageCount"); ClientMessage reply = requestor.request(m); @@ -537,16 +537,16 @@ <para>管çå°åçé ç½®å¨æ件<literal >activemq-configuration.xml</literal>ä¸ï¼</para> <programlisting> - <management-address>jms.queue.hornetq.management</management-address> + <management-address>jms.queue.activemq.management</management-address> </programlisting> - <para>å®çé»è®¤å°åæ¯<literal>jms.queue.hornetq.management</literal> ï¼å°ååç¼å ä¸ + <para>å®çé»è®¤å°åæ¯<literal>jms.queue.activemq.management</literal> ï¼å°ååç¼å ä¸ âjms.queueâæ¯ä¸ºäºæ¹ä¾¿JMS客æ·ç«¯ä¹å¯ä»¥åå®åé管çæ¶æ¯ã</para> <para>管çå°åéè¦ä¸ä¸ª<emphasis>ç¹æ®</emphasis>çç¨æ·æé <literal>manage</literal>æ¥æ¥æ¶å¹¶å¤ç管çæ¶æ¯ãè¿ä¸ªæéä¹å¨hornetq-configuration.xmlæ件ä¸é ç½®ï¼</para> <programlisting> <!-- users with the admin role will be allowed to manage --> <!-- ActiveMQ using management messages --> - <security-setting match="jms.queue.hornetq.management"> + <security-setting match="jms.queue.activemq.management"> <permission type="manage" roles="admin" /> </security-setting> </programlisting> @@ -558,7 +558,7 @@ <para>å ¶ä¸ä¸ä¸ªéè¦çä¸åæ¯JMSéè¦ä¸ä¸ªJMSéåæ¥åéæ¶æ¯ï¼èæ ¸å¿æ¥å£ä½¿ç¨çæ¯ä¸ä¸ªå°åï¼ã</para> <para><emphasis>管çéå</emphasis>æ¯ä¸ä¸ªç¹æ®çéåï¼å®éè¦å®¢æ·ç«¯ç´æ¥å®ä¾åï¼</para> <programlisting> - Queue managementQueue = ActiveMQJMSClient.createQueue("hornetq.management"); + Queue managementQueue = ActiveMQJMSClient.createQueue("activemq.management"); </programlisting> <para>å ¶ä½æ¥éª¤å®å ¨å使ç¨æ ¸å¿æ¥å£ä¸æ ·ï¼åªæ¯ç¸åºç对象ä¸åï¼</para> <orderedlist> @@ -580,7 +580,7 @@ </orderedlist> <para>ä¾å¦ï¼è¦å¾å°ä¸ä¸ªJMSéå<literal>exampleQueue</literal>ä¸æå¤å°æ¶æ¯ï¼</para> <programlisting> - Queue managementQueue = ActiveMQJMSClient.createQueue("hornetq.management"); + Queue managementQueue = ActiveMQJMSClient.createQueue("activemq.management"); QueueSession session = ... QueueRequestor requestor = new QueueRequestor(session, managementQueue); @@ -643,9 +643,9 @@ <title>é ç½®æ ¸å¿ç®¡çéç¥å°å</title> <para>ç¨æ¥åé管çéç¥çå°åå¨æ件ä¸<literal>activemq-configuration.xml</literal>é ç½®ï¼</para> <programlisting> - <management-notification-address>hornetq.notifications</management-notification-address> + <management-notification-address>activemq.notifications</management-notification-address> </programlisting> - <para>é»è®¤çå°åæ¯<literal>hornetq.notifications</literal>ã</para> + <para>é»è®¤çå°åæ¯<literal>activemq.notifications</literal>ã</para> </section> </section> <section> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/docs/user-manual/zh/master.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/zh/master.xml b/docs/user-manual/zh/master.xml index f7cc51f..5468134 100644 --- a/docs/user-manual/zh/master.xml +++ b/docs/user-manual/zh/master.xml @@ -31,7 +31,7 @@ <!ENTITY core-bridges SYSTEM "core-bridges.xml"> <!ENTITY diverts SYSTEM "diverts.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 filter-expressions SYSTEM "filter-expressions.xml"> <!ENTITY flow-control SYSTEM "flow-control.xml"> @@ -118,7 +118,7 @@ &libaio; &thread-pooling; &logging; - &embedding-hornetq; + &embedding-activemq; &intercepting-operations; &interoperability; &perf-tuning; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/docs/user-manual/zh/message-grouping.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/zh/message-grouping.xml b/docs/user-manual/zh/message-grouping.xml index 8f5cc4d..dd4c6b9 100644 --- a/docs/user-manual/zh/message-grouping.xml +++ b/docs/user-manual/zh/message-grouping.xml @@ -54,7 +54,7 @@ producer.send(message); </programlisting> <para>å¦ä¸ä¸ªæ¹æ³æ¯å°<literal>ActiveMQConnectonFactory</literal>ç<literal>autogroup</literal> - å±æ§è®¾ä¸ºtrueï¼æè å¨<literal>hornetq-jms.xml</literal>æ件ä¸è¿è¡é ç½®ï¼</para> + å±æ§è®¾ä¸ºtrueï¼æè å¨<literal>activemq-jms.xml</literal>æ件ä¸è¿è¡é ç½®ï¼</para> <programlisting><connection-factory name="ConnectionFactory"> <connectors> <connector-ref connector-name="netty-connector"/> @@ -65,7 +65,7 @@ <autogroup>true</autogroup> </connection-factory></programlisting> <para>è¿å¯ä»¥éè¿è¿æ¥å·¥åæ¥è®¾ç½®ç»idãæ¥èªè¿ä¸ªè¿æ¥å·¥åçææçåéè ï¼producerï¼åéçæ¶æ¯ç<literal - >JMSXGroupID</literal>å°å ·ææå®çå¼ãè¿ç§æ¹æ³éè¦å¨<literal>hornetq-jms.xml</literal> + >JMSXGroupID</literal>å°å ·ææå®çå¼ãè¿ç§æ¹æ³éè¦å¨<literal>activemq-jms.xml</literal> æ件ä¸ä½å¦ä¸é ç½®ï¼ <programlisting> <connection-factory name="ConnectionFactory"> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/docs/user-manual/zh/perf-tuning.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/zh/perf-tuning.xml b/docs/user-manual/zh/perf-tuning.xml index 3e7573b..15ba760 100644 --- a/docs/user-manual/zh/perf-tuning.xml +++ b/docs/user-manual/zh/perf-tuning.xml @@ -121,7 +121,7 @@ <xref linkend="send-guarantees"/>ã</para> </listitem> <listitem> - <para>éç¨éé»å¡æ¹å¼åéæ¶æ¯ãå°æ件<literal>hornetq-jms.xml</literal>ä¸çåæ° + <para>éç¨éé»å¡æ¹å¼åéæ¶æ¯ãå°æ件<literal>activemq-jms.xml</literal>ä¸çåæ° <literal>block-on-non-durable-send</literal>设为<literal>false</literal> ï¼ä½¿ç¨JMSåJNDIæ¶ï¼æè ç´æ¥å¨ä¸è¿è¡ç¸åºç设置ï¼å¯ä»¥ä½¿ æ¶æ¯åéæ¶ä¸é»å¡çå¾ æå¡å¨çååºãåè§ <xref linkend="send-guarantees"/>ã</para> @@ -171,7 +171,7 @@ serveruser hard nofile 20000 <para>å©ç¨åæ°<literal>batch-delay</literal>并å°åæ°<literal>direct-deliver</literal> 设为falseæ¥æé«å°æ¶æ¯çå¤çæçãActiveMQå¨å ¶<literal>activemq-configuration.xml</literal> ä¸é¢å é ç½®äºä¸ä¸ªè¿æ¥å¨ï¼æ¥åå¨å¯¹ï¼<literal>netty-throughput</literal>ï¼ï¼å¹¶ä¸å¨ - <literal>hornetq-jms.xml</literal>ä¸é ç½®äºä¸ä¸ªJMSè¿æ¥å·¥åï¼ + <literal>activemq-jms.xml</literal>ä¸é ç½®äºä¸ä¸ªJMSè¿æ¥å·¥åï¼ <literal>ThroughputConnectionFactory</literal>ï¼ãå®ä»¬å¯ä»¥ç¨å¨å°æ¶æ¯çå¤çåºç¨ä¸ä»¥æ ä¾æä½³ååéãåè§<xref linkend="configuring-transports"/>ã</para> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/docs/user-manual/zh/persistence.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/zh/persistence.xml b/docs/user-manual/zh/persistence.xml index 4a790b6..22b5cb8 100644 --- a/docs/user-manual/zh/persistence.xml +++ b/docs/user-manual/zh/persistence.xml @@ -61,7 +61,7 @@ <para>ç»å®æ¥å¿</para> <para>è¿ä¸ªæ¥å¿ç¨æ¥ä¿åä¸ç»å®æå ³çæ°æ®ãå ¶ä¸å æ¬å¨ActiveMQä¸é¨ç½²çéååå ¶å±æ§ï¼è¿æIDåºå计æ°å¨ã </para> <para>ç»å®æ¥å¿æ¯ä¸ä¸ªNIOåæ¥å¿ãä¸æ¶æ¯æ¥å¿ç¸æ¯å®çååéæ¯æ¯è¾ä½çã</para> - <para>è¿ç§æ¥å¿æ件çååéç¨<literal>hornetq-bindings</literal>ä½ä¸ºåç¼ãæ¯ä¸ªæ件é½æ + <para>è¿ç§æ¥å¿æ件çååéç¨<literal>activemq-bindings</literal>ä½ä¸ºåç¼ãæ¯ä¸ªæ件é½æ <literal>bindings</literal>è¿æ ·çæ©å±ãæ件大å°æ¯<literal >1048576</literal>ï¼å®çä½ç½®å¨bindingsæ件夹ä¸ã</para> </listitem> @@ -70,7 +70,7 @@ <para>è¿ä¸ªæ¥å¿ä¿åææJMSç¸å ³çæ°æ®ï¼å æ¬JMSéåï¼è¯é¢åè¿æ¥å·¥åï¼ä»¥åå®ä»¬çJNDIç»å®ä¿¡æ¯ã</para> <para>éè¿ç®¡çæ¥å£å建çJMSèµæºå°è¢«ä¿åå¨è¿ä¸ªæ¥å¿ä¸ãä½æ¯éè¿é ç½®æ件é ç½®çèµæºåä¸ä¿åãåªæ使ç¨JMSæ¶JMSçæ¥å¿ æ被å建ã</para> - <para>è¿ç§æ¥å¿æ件çååéç¨<literal>hornetq-jms</literal>ä½ä¸ºåç¼ãæ¯ä¸ªæ件é½æ + <para>è¿ç§æ¥å¿æ件çååéç¨<literal>activemq-jms</literal>ä½ä¸ºåç¼ãæ¯ä¸ªæ件é½æ <literal>jms</literal>è¿æ ·çæ©å±ãæ件大å°æ¯<literal >1048576</literal>ï¼å®çä½ç½®å¨bindingsæ件夹ä¸ã</para> </listitem> @@ -79,7 +79,7 @@ <para>è¿ä¸ªæ¥å¿ç¨æ¥åè´®æææ¶æ¯ç¸å ³çæ°æ®ï¼å æ¬æ¶æ¯æ¬èº«åéå¤IDç¼åã</para> <para>é»è®¤æ åµä¸ActiveMQæ»æ¯ä¼å 使ç¨AIOåæ¥å¿ãå¦æAIOåæ¥å¿ä¸å¯ç¨ï¼æ¯å¦å¨éLinuxå¹³å°ä¸è¿è¡ï¼æç³»ç»å æ ¸çæ¬ä¸åï¼ å®å°èªå¨ä½¿ç¨NIOåæ¥å¿ã</para> - <para>è¿ç§æ¥å¿æ件çååéç¨<literal>hornetq-data</literal>ãä½ä¸ºåç¼ãæ¯ä¸ªæ件é½æ + <para>è¿ç§æ¥å¿æ件çååéç¨<literal>activemq-data</literal>ãä½ä¸ºåç¼ãæ¯ä¸ªæ件é½æ ã<literal>hq</literal>ä½ä¸ºæ©å±åãé»è®¤çæ件大å°æ¯ <literal >10485760</literal> (å¯é ç½®)ãæ件ä¿åå¨journalæ件夹ä¸ã</para> </listitem> @@ -110,7 +110,7 @@ <section id="configuring.message.journal"> <title>é ç½®æ¶æ¯æ¥å¿</title> <para>æ¶æ¯æ¥å¿çé ç½®å¨<literal - >hornetq-configuration.xmlæ件ä¸ã</literal></para> + >activemq-configuration.xmlæ件ä¸ã</literal></para> <itemizedlist> <listitem id="configuring.message.journal.journal-directory"> <para><literal>journal-directory</literal></para> @@ -233,16 +233,16 @@ <title>å¯¼å ¥å ¥/导åºæ¥å¿æ°æ®</title> <para>ææ¶ä½ éè¦ä½¿ç¨å¯¼å ¥ï¼å¯¼åºå·¥å ·æ¥æ¥çæ¥å¿æ件çè®°å½ãè¿ä¸ªå¯¼å ¥ï¼å¯¼åºå·¥å ·ç±»å¨hornetq-core.jaræ件ä¸ã ããã 使ç¨ä»¥ä¸å½ä»¤å¯ä»¥å°æ¥å¿æ件导åºä¸ºææ¬æ件ï¼</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 <JournalDirectory> <JournalPrefix> <FileExtension> <FileSize> <FileOutput></literal></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 <JournalDirectory> <JournalPrefix> <FileExtension> <FileSize> <FileInput></literal></para> <itemizedlist> <listitem> - <para>JournalDirectoryï¼æ件çä½ç½®ï¼å¦./hornetq/data/journal</para> + <para>JournalDirectoryï¼æ件çä½ç½®ï¼å¦./activemq/data/journal</para> </listitem> <listitem> <para>JournalPrefixï¼ æ¥å¿æ件çåç¼ã<link linkend="persistence.journallist">è¿é</link>æå ³äºåç¼ç详ç»æè¿°ã</para> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/docs/user-manual/zh/pre-acknowledge.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/zh/pre-acknowledge.xml b/docs/user-manual/zh/pre-acknowledge.xml index 8029b1b..7ebf627 100644 --- a/docs/user-manual/zh/pre-acknowledge.xml +++ b/docs/user-manual/zh/pre-acknowledge.xml @@ -44,7 +44,7 @@ </note> <section id="pre-acknowledge.configure"> <title>使ç¨PRE_ACKNOWLEDGE</title> - <para>è¿ä¸ªæ¨¡å¼å¨<literal>hornetq-jms.xml</literal>æä»¶ä¸ + <para>è¿ä¸ªæ¨¡å¼å¨<literal>activemq-jms.xml</literal>æä»¶ä¸ ç<literal>connection factory</literal>ä¸é ç½®ï¼</para> <programlisting><connection-factory name="ConnectionFactory"> <connectors> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/89a84c6a/docs/user-manual/zh/project-info.xml ---------------------------------------------------------------------- diff --git a/docs/user-manual/zh/project-info.xml b/docs/user-manual/zh/project-info.xml index cdfba07..1735fae 100644 --- a/docs/user-manual/zh/project-info.xml +++ b/docs/user-manual/zh/project-info.xml @@ -18,12 +18,12 @@ <!-- ============================================================================= --> <chapter id="project-info"> <title>项ç®ä¿¡æ¯</title> - <para>ActiveMQçå®æ¹ç½åæ¯ <ulink url="http://hornetq.org/"; - >http://hornetq.org/</ulink>.</para> + <para>ActiveMQçå®æ¹ç½åæ¯ <ulink url="http://activemq.org/"; + >http://activemq.org/</ulink>.</para> <section id="download.software"> <title>软件ä¸è½½</title> <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 id="download.git"> <title>å ¶å®ç¸å ³ä¿¡æ¯</title> @@ -44,24 +44,24 @@ >å¼å论å</ulink></para> </listitem> <listitem> - <para>请å å ¥æ们ç<ulink url="irc://irc.freenode.net:6667/hornetq" + <para>请å å ¥æ们ç<ulink url="irc://irc.freenode.net:6667/activemq" >IRCé¢é</ulink>ä¸æ们çæ ¸å¿å¼åå·¥ç¨å¸äº¤æµã</para> </listitem> <listitem> - <para>æ们项ç®æèªå·±ç <ulink url="http://hornetq.blogspot.com/";>å客</ulink></para> + <para>æ们项ç®æèªå·±ç <ulink url="http://activemq.blogspot.com/";>å客</ulink></para> </listitem> <listitem> - <para>è¿å¯ä»¥è·è¸ªæ们ç<ulink url="http://twitter.com/hornetq";>twitter</ulink></para> + <para>è¿å¯ä»¥è·è¸ªæ们ç<ulink url="http://twitter.com/activemq";>twitter</ulink></para> </listitem> <listitem> <para>ActiveMQçGit代ç åºå°å <ulink - url="https://github.com/hornetq/hornetq"; - >https://github.com/hornetq/hornetq</ulink></para> + url="https://github.com/activemq/activemq"; + >https://github.com/activemq/activemq</ulink></para> </listitem> <listitem> <para>æ¯æ¬¡åå¸ççæ¬æ ç¾é½å¨<ulink - url="https://github.com/hornetq/hornetq/tags"; - >https://github.com/hornetq/hornetq/tags</ulink>ä¸è½æ¾å°ã</para> + url="https://github.com/activemq/activemq/tags"; + >https://github.com/activemq/activemq/tags</ulink>ä¸è½æ¾å°ã</para> </listitem> </itemizedlist> </para>
