diff --git a/distribution/activemq/src/main/resources/config/replicated/activemq-configuration.xml b/distribution/activemq/src/main/resources/config/replicated/activemq-configuration.xml index 5bc5b61810..5f41085a35 100644 --- a/distribution/activemq/src/main/resources/config/replicated/activemq-configuration.xml +++ b/distribution/activemq/src/main/resources/config/replicated/activemq-configuration.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd"> ${data.dir:../data}/paging diff --git a/distribution/activemq/src/main/resources/config/shared-store/activemq-configuration.xml b/distribution/activemq/src/main/resources/config/shared-store/activemq-configuration.xml index 45f3820fa8..e738d2f3bd 100644 --- a/distribution/activemq/src/main/resources/config/shared-store/activemq-configuration.xml +++ b/distribution/activemq/src/main/resources/config/shared-store/activemq-configuration.xml @@ -3,7 +3,7 @@ xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd"> ${data.dir:../data}/paging diff --git a/docs/quickstart-guide/en/examples.xml b/docs/quickstart-guide/en/examples.xml index ccacb14d99..b0289eb694 100644 --- a/docs/quickstart-guide/en/examples.xml +++ b/docs/quickstart-guide/en/examples.xml @@ -257,7 +257,7 @@ INFO: Starting container with: [/home/andy/devtools/jdk1.6.0_25//bin/java, -Djbo 10:58:08,840 INFO [org.jboss.as.messaging] (MSC service thread 1-3) JBAS011601: Bound messaging object to jndi name java:jboss/exported/jms/queues/testQueue 10:58:08,859 INFO [org.jboss.as.deployment.connector] (MSC service thread 1-9) JBAS010406: Registered connection factory java:/JmsXA 10:58:08,866 INFO [org.apache.activemq.ra.ActiveMQResourceAdapter] (MSC service thread 1-9) ActiveMQ resource adaptor started -10:58:08,867 INFO [org.jboss.as.connector.services.ResourceAdapterActivatorService$ResourceAdapterActivator] (MSC service thread 1-9) IJ020002: Deployed: file://RaActivatorhornetq-ra +10:58:08,867 INFO [org.jboss.as.connector.services.ResourceAdapterActivatorService$ResourceAdapterActivator] (MSC service thread 1-9) IJ020002: Deployed: file://RaActivatoractivemq-ra 10:58:08,870 INFO [org.jboss.as.deployment.connector] (MSC service thread 1-5) JBAS010401: Bound JCA ConnectionFactory [java:/JmsXA] 10:58:08,898 INFO [org.jboss.as.server.deployment] (MSC service thread 1-10) JBAS015876: Starting deployment of "ONT001-1.0.war" 10:58:09,146 INFO [org.jboss.wsf.stack.cxf.metadata.MetadataBuilder] (MSC service thread 1-1) Add Service diff --git a/docs/quickstart-guide/en/running.xml b/docs/quickstart-guide/en/running.xml index 6514659ee8..6253f56c0b 100644 --- a/docs/quickstart-guide/en/running.xml +++ b/docs/quickstart-guide/en/running.xml @@ -113,7 +113,7 @@ 14:47:44,439 INFO [org.jboss.as.messaging] (ServerService Thread Pool -- 60) JBAS011601: Bound messaging object to jndi name java:jboss/exported/jms/RemoteConnectionFactory 14:47:44,462 INFO [org.jboss.as.connector.deployment] (MSC service thread 1-3) JBAS010406: Registered connection factory java:/JmsXA 14:47:44,531 INFO [org.apache.activemq.ra] (MSC service thread 1-3) ActiveMQ resource adaptor started - 14:47:44,532 INFO [org.jboss.as.connector.services.resourceadapters.ResourceAdapterActivatorService$ResourceAdapterActivator] (MSC service thread 1-3) IJ020002: Deployed: file://RaActivatorhornetq-ra + 14:47:44,532 INFO [org.jboss.as.connector.services.resourceadapters.ResourceAdapterActivatorService$ResourceAdapterActivator] (MSC service thread 1-3) IJ020002: Deployed: file://RaActivatoractivemq-ra 14:47:44,535 INFO [org.jboss.as.connector.deployment] (MSC service thread 1-12) JBAS010401: Bound JCA ConnectionFactory [java:/JmsXA] 14:47:44,536 INFO [org.jboss.as.messaging] (MSC service thread 1-15) JBAS011601: Bound messaging object to jndi name java:jboss/DefaultJMSConnectionFactory 14:47:44,719 INFO [org.jboss.as] (Controller Boot Thread) JBAS015961: Http management interface listening on http://127.0.0.1:9990/management diff --git a/docs/user-manual/zh/appserver-integration.xml b/docs/user-manual/zh/appserver-integration.xml index 2c7beea0d5..9f975e40b1 100644 --- a/docs/user-manual/zh/appserver-integration.xml +++ b/docs/user-manual/zh/appserver-integration.xml @@ -52,7 +52,7 @@ public class MDBExample implements MessageListener <ejb-name>ExampleMDB</ejb-name> <resource-adapter-name>activemq-ra.rar</resource-adapter-name> </message-driven> -你还可以将hornetq-ra.rar改名为jms-ra.rar而不需要任何annotation或额外的部署描述信息。但是你需要 +你还可以将activemq-ra.rar改名为jms-ra.rar而不需要任何annotation或额外的部署描述信息。但是你需要 编辑jms-ds.xml文件，将其中的rar-name项改成相应的值。 ActiveMQ是JBoss AS 6默认的JMS提供者。从这个版本开始ActiveMQ的资源适配器名字是 diff --git a/docs/user-manual/zh/management.xml b/docs/user-manual/zh/management.xml index f1111a01a7..484eec5682 100644 --- a/docs/user-manual/zh/management.xml +++ b/docs/user-manual/zh/management.xml @@ -542,7 +542,7 @@ 它的默认地址是jms.queue.activemq.management （地址前缀加上 “jms.queue”是为了方便JMS客户端也可以向它发送管理消息。 管理地址需要一个特殊的用户权限 - manage来接收并处理管理消息。这个权限也在hornetq-configuration.xml文件中配置： + manage来接收并处理管理消息。这个权限也在activemq-configuration.xml文件中配置： <!-- users with the admin role will be allowed to manage --> <!-- ActiveMQ using management messages --> diff --git a/docs/user-manual/zh/persistence.xml b/docs/user-manual/zh/persistence.xml index 22b5cb8bb2..272ffa78e2 100644 --- a/docs/user-manual/zh/persistence.xml +++ b/docs/user-manual/zh/persistence.xml @@ -231,7 +231,7 @@
导入入/导出日志数据 - 有时你需要使用导入／导出工具来查看日志文件的记录。这个导入／导出工具类在hornetq-core.jar文件中。 + 有时你需要使用导入／导出工具来查看日志文件的记录。这个导入／导出工具类在activemq-core.jar文件中。 　　　 使用以下命令可以将日志文件导出为文本文件： java -cp activemq-core.jar org.apache.activemq.core.journal.impl.ExportJournal <JournalDirectory> <JournalPrefix> <FileExtension> <FileSize> diff --git a/docs/user-manual/zh/using-server.xml b/docs/user-manual/zh/using-server.xml index 2cf70df75f..5354e48a73 100644 --- a/docs/user-manual/zh/using-server.xml +++ b/docs/user-manual/zh/using-server.xml @@ -275,7 +275,7 @@ </server> - 这个jboss-service.xml包含在hornetq-service.sar文件中，它用来配置AS4中嵌入运行的ActiveMQ。 + 这个jboss-service.xml包含在activemq-server.sar文件中，它用来配置AS4中嵌入运行的ActiveMQ。 在这个配置文件中我们启动了以下几个服务： diff --git a/examples/jms/clustered-jgroups/readme.html b/examples/jms/clustered-jgroups/readme.html index def6288e16..4ba75eb58d 100644 --- a/examples/jms/clustered-jgroups/readme.html +++ b/examples/jms/clustered-jgroups/readme.html @@ -26,7 +26,7 @@ <broadcast-group name="my-broadcast-group"> <broadcast-period>5000</broadcast-period> <jgroups-file>test-jgroups-file_ping.xml</jgroups-file> - <jgroups-channel>hornetq_broadcast_channel</jgroups-channel> + <jgroups-channel>activemq_broadcast_channel</jgroups-channel> <connector-ref>netty-connector</connector-ref> </broadcast-group> </broadcast-groups> @@ -34,7 +34,7 @@ <discovery-groups> <discovery-group name="my-discovery-group"> <jgroups-file>test-jgroups-file_ping.xml</jgroups-file> - <jgroups-channel>hornetq_broadcast_channel</jgroups-channel> + <jgroups-channel>activemq_broadcast_channel</jgroups-channel> <refresh-timeout>10000</refresh-timeout> </discovery-group> </discovery-groups> diff --git a/examples/jms/clustered-standalone/readme.html b/examples/jms/clustered-standalone/readme.html index 220e76a1c2..2e59706136 100644 --- a/examples/jms/clustered-standalone/readme.html +++ b/examples/jms/clustered-standalone/readme.html @@ -32,10 +32,10 @@
  • in the first terminal, go to the bin directory and start the first server (with default configuration): 
    ./run.sh ../config/stand-alone/clustered
  • in the second terminal, start the second server: - 
    export CLUSTER_PROPS="-Ddata.dir=../data-server2 -Djnp.port=2099 -Djnp.rmiPort=2098 -Dactivemq.remoting.netty.port=6445 -Dhornetq.remoting.netty.batch.port=6455"
+           
    export CLUSTER_PROPS="-Ddata.dir=../data-server2 -Djnp.port=2099 -Djnp.rmiPort=2098 -Dactivemq.remoting.netty.port=6445 -Dactivemq.remoting.netty.batch.port=6455"
 ./run.sh ../config/stand-alone/clustered
    
         
  • in the third terminal, start the third server (with default configuration):
-           
    export CLUSTER_PROPS="-Ddata.dir=../data-server3 -Djnp.port=3099 -Djnp.rmiPort=3098 -Dactivemq.remoting.netty.port=7445 -Dhornetq.remoting.netty.batch.port=7455"
+           
    export CLUSTER_PROPS="-Ddata.dir=../data-server3 -Djnp.port=3099 -Djnp.rmiPort=3098 -Dactivemq.remoting.netty.port=7445 -Dactivemq.remoting.netty.batch.port=7455"
 ./run.sh ../config/stand-alone/clustered
    
         
  • finally, in the fourth terminal, start the example
            
    ./build.sh runRemote (or build.bat runRemote on windows)
    
diff --git a/examples/jms/embedded/readme.html b/examples/jms/embedded/readme.html
index e49a0b0955..8964d14b83 100644
--- a/examples/jms/embedded/readme.html
+++ b/examples/jms/embedded/readme.html
@@ -28,7 +28,7 @@
 
          
  • Create the ActiveMQ core server
    • 
          
    -            ActiveMQServer hornetqServer = ActiveMQ.newActiveMQServer(configuration);
+            ActiveMQServer activemqServer = ActiveMQ.newActiveMQServer(configuration);
          
    
         
          
  • Create and start the JNDI server (using JBoss JNDI implementation)
    • 
@@ -75,7 +75,7 @@
      
          
  • Start the JMS Server using the ActiveMQ core server and the JMS configuration
    • 
          
    -            JMSServerManager jmsServer = new JMSServerManagerImpl(hornetqServer, jmsConfig);
+            JMSServerManager jmsServer = new JMSServerManagerImpl(activemqServer, jmsConfig);
             jmsServer.start();
          
    
 
diff --git a/examples/jms/security/readme.html b/examples/jms/security/readme.html
index bcd6100b5c..1fafdd80cb 100644
--- a/examples/jms/security/readme.html
+++ b/examples/jms/security/readme.html
@@ -32,18 +32,18 @@
 		      <role name="user"/>
 		   </user>
 		  
-		   <user name="andrew" password="hornetq1">
+		   <user name="andrew" password="activemq1">
 		      <role name="europe-user"/>
 		      <role name="user"/>
 		   </user>
 		   
-		   <user name="frank" password="hornetq2">
+		   <user name="frank" password="activemq2">
 		      <role name="us-user"/>
 		      <role name="news-user"/>
 		      <role name="user"/>
 		   </user>
 		   
-		   <user name="sam" password="hornetq3">
+		   <user name="sam" password="activemq3">
 		      <role name="news-user"/>
 		      <role name="user"/>
 		   </user>
@@ -160,7 +160,7 @@
            billConnection = null;
            try
            {
-              billConnection = createConnection("bill", "hornetq1", cf);
+              billConnection = createConnection("bill", "activemq1", cf);
               result = false;
            }
            catch (JMSException e)
@@ -181,7 +181,7 @@
         
  • Andrew makes a good connection
    • 
          
                
-           andrewConnection = createConnection("andrew", "hornetq1", cf);
+           andrewConnection = createConnection("andrew", "activemq1", cf);
            andrewConnection.start();
            
          
    
@@ -189,7 +189,7 @@
         
  • Frank makes a good connection
    • 
         
                
-           frankConnection = createConnection("frank", "hornetq2", cf);
+           frankConnection = createConnection("frank", "activemq2", cf);
            frankConnection.start();
            
         
    
@@ -197,7 +197,7 @@
         
  • Sam makes a good connection
    • 
         
                
-           samConnection = createConnection("sam", "hornetq3", cf);
+           samConnection = createConnection("sam", "activemq3", cf);
            samConnection.start();
            
         
    
diff --git a/examples/jms/security/src/main/resources/hornetq/server0/activemq-users.xml b/examples/jms/security/src/main/resources/hornetq/server0/activemq-users.xml
index 651a44b896..92b0328c59 100644
--- a/examples/jms/security/src/main/resources/hornetq/server0/activemq-users.xml
+++ b/examples/jms/security/src/main/resources/hornetq/server0/activemq-users.xml
@@ -5,18 +5,18 @@
       
    
   
-   
+   
       
       
    
    
-   
+   
       
       
       
    
    
-   
+   
       
       
    
diff --git a/examples/jms/ssl-enabled/readme.html b/examples/jms/ssl-enabled/readme.html
index 4b463e5c77..c9248f3fe9 100644
--- a/examples/jms/ssl-enabled/readme.html
+++ b/examples/jms/ssl-enabled/readme.html
@@ -24,7 +24,7 @@
          <param key="activemq.remoting.netty.port" value="5500" type="Integer"/>
          <param key="activemq.remoting.netty.ssl-enabled" value="true" type="Boolean"/>
          <param key="activemq.remoting.netty.trust-store-path" value="server0/activemq.example.truststore" type="String"/>
-         <param key="activemq.remoting.netty.trust-store-password" value="hornetqexample" type="String"/>
+         <param key="activemq.remoting.netty.trust-store-password" value="activemqexample" type="String"/>
       </connector>
 
       <!-- Acceptor -->
@@ -35,7 +35,7 @@
          <param key="activemq.remoting.netty.port" value="5500" type="Integer"/>
          <param key="activemq.remoting.netty.ssl-enabled" value="true" type="Boolean"/>
          <param key="activemq.remoting.netty.key-store-path" value="activemq.example.keystore" type="String"/>
-         <param key="activemq.remoting.netty.key-store-password" value="hornetqexample" type="String"/>
+         <param key="activemq.remoting.netty.key-store-password" value="activemqexample" type="String"/>
       </acceptor>
 
                
@@ -127,9 +127,9 @@
      
      
          
    1. The stores were generating using the following commands ↩:
              
        
-                 
      • create the keystore: keytool -genkey -keystore activemq.example.keystore -storepass hornetqexample
        • 
+                 
      • create the keystore: keytool -genkey -keystore activemq.example.keystore -storepass activemqexample
        • 
                  
      • export the certificate: keytool -export -keystore activemq.example.keystore -file activemq.cer
        • 
-                 
      • create the truststore: keytool -import -file activemq.cer -keystore activemq.example.truststore -storepass hornetqexample
        • 
+                 
      • create the truststore: keytool -import -file activemq.cer -keystore activemq.example.truststore -storepass activemqexample
        • 
             
      
          
      2. 
     
    
diff --git a/examples/jms/ssl-enabled/src/main/resources/hornetq/server0/activemq-configuration.xml b/examples/jms/ssl-enabled/src/main/resources/hornetq/server0/activemq-configuration.xml
index 8c8c6c22ee..8bba0898a8 100644
--- a/examples/jms/ssl-enabled/src/main/resources/hornetq/server0/activemq-configuration.xml
+++ b/examples/jms/ssl-enabled/src/main/resources/hornetq/server0/activemq-configuration.xml
@@ -20,7 +20,7 @@
          
          
          
-         
+         
       
    
    
@@ -32,7 +32,7 @@
          
          
          
-         
+         
       
    
 
diff --git a/pom.xml b/pom.xml
index 5ca41c3e5f..568df795bd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -138,6 +138,13 @@
          http://hornetq.com
          0
       
+      
+         martyntaylor
+         Martyn Taylor
+         mtaylor@redhat.com
+         http://www.redhat.com
+         0
+