merg #21 Remove hq refs - more refactoring

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

@@ -3,7 +3,7 @@
                xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
    <!--
    if you want to run this as a backup on different ports you would need to set the following variable
-   export CLUSTER_PROPS="-Djnp.port=1199 -Djnp.rmiPort=1198 -Djnp.host=localhost -Dactivemq.remoting.netty.host=localhost -Dactivemq.remoting.netty.port=5545 -Dhornetq.remoting.netty.batch.port=5555 -Dhornetq.backup=true"
+   export CLUSTER_PROPS="-Djnp.port=1199 -Djnp.rmiPort=1198 -Djnp.host=localhost -Dactivemq.remoting.netty.host=localhost -Dactivemq.remoting.netty.port=5545 -Dactivemq.remoting.netty.batch.port=5555 -Dactivemq.backup=true"
    -->
 
    <paging-directory>${data.dir:../data}/paging</paging-directory>

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

@@ -3,7 +3,7 @@
                xsi:schemaLocation="urn:activemq /schema/activemq-configuration.xsd">
    <!--
    if you want to run this as a backup on different ports you would need to set the following variable
-   export CLUSTER_PROPS="-Djnp.port=1199 -Djnp.rmiPort=1198 -Djnp.host=localhost -Dactivemq.remoting.netty.host=localhost -Dactivemq.remoting.netty.port=5545 -Dhornetq.remoting.netty.batch.port=5555 -Dhornetq.backup=true"
+   export CLUSTER_PROPS="-Djnp.port=1199 -Djnp.rmiPort=1198 -Djnp.host=localhost -Dactivemq.remoting.netty.host=localhost -Dactivemq.remoting.netty.port=5545 -Dactivemq.remoting.netty.batch.port=5555 -Dactivemq.backup=true"
    -->
 
    <paging-directory>${data.dir:../data}/paging</paging-directory>

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

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

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>
-</programlisting>你还可以将hornetq-ra.rar改名为jms-ra.rar而不需要任何annotation或额外的部署描述信息。但是你需要
+</programlisting>你还可以将activemq-ra.rar改名为jms-ra.rar而不需要任何annotation或额外的部署描述信息。但是你需要
             编辑<literal>jms-ds.xml</literal>文件，将其中的<literal>rar-name</literal>项改成相应的值。</para>
         <note>
            <para>ActiveMQ是JBoss AS 6默认的JMS提供者。从这个版本开始ActiveMQ的资源适配器名字是

docs/user-manual/zh/management.xml

@@ -542,7 +542,7 @@
          <para>它的默认地址是<literal>jms.queue.activemq.management</literal> （地址前缀加上
             “jms.queue”是为了方便JMS客户端也可以向它发送管理消息。</para>
          <para>管理地址需要一个<emphasis>特殊</emphasis>的用户权限
-               <literal>manage</literal>来接收并处理管理消息。这个权限也在hornetq-configuration.xml文件中配置：</para>
+               <literal>manage</literal>来接收并处理管理消息。这个权限也在activemq-configuration.xml文件中配置：</para>
          <programlisting>
    &lt;!-- users with the admin role will be allowed to manage --&gt; 
    &lt;!-- ActiveMQ using management messages        --&gt;

docs/user-manual/zh/persistence.xml

@@ -231,7 +231,7 @@
     </section>
     <section id="persistence.importexport">
         <title>导入入/导出日志数据</title>
-        <para>有时你需要使用导入／导出工具来查看日志文件的记录。这个导入／导出工具类在hornetq-core.jar文件中。
+        <para>有时你需要使用导入／导出工具来查看日志文件的记录。这个导入／导出工具类在activemq-core.jar文件中。
 　　　       使用以下命令可以将日志文件导出为文本文件：</para>
         <para><literal>java -cp activemq-core.jar org.apache.activemq.core.journal.impl.ExportJournal
                 &lt;JournalDirectory> &lt;JournalPrefix> &lt;FileExtension> &lt;FileSize>

docs/user-manual/zh/using-server.xml

@@ -275,7 +275,7 @@
 </server>
             </programlisting>
         </para>
-        <para>这个jboss-service.xml包含在hornetq-service.sar文件中，它用来配置AS4中嵌入运行的ActiveMQ。
+        <para>这个jboss-service.xml包含在activemq-server.sar文件中，它用来配置AS4中嵌入运行的ActiveMQ。
               在这个配置文件中我们启动了以下几个服务：</para>
         <itemizedlist>
             <listitem>

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>

examples/jms/clustered-standalone/readme.html

@@ -32,10 +32,10 @@
         <li>in the first terminal, go to the <code>bin</code> directory and start the first server (with default configuration):
            <pre class="prettyprint"><code>./run.sh ../config/stand-alone/clustered</code></pre>
         <li>in the second terminal, start the second server:
-           <pre class="prettyprint"><code>export CLUSTER_PROPS="-Ddata.dir=../data-server2 -Djnp.port=2099 -Djnp.rmiPort=2098 -Dactivemq.remoting.netty.port=6445 -Dhornetq.remoting.netty.batch.port=6455"
+           <pre class="prettyprint"><code>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</code></pre>
         <li>in the third terminal, start the third server (with default configuration):
-           <pre class="prettyprint"><code>export CLUSTER_PROPS="-Ddata.dir=../data-server3 -Djnp.port=3099 -Djnp.rmiPort=3098 -Dactivemq.remoting.netty.port=7445 -Dhornetq.remoting.netty.batch.port=7455"
+           <pre class="prettyprint"><code>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</code></pre>
         <li>finally, in the fourth terminal, start the example
            <pre class="prettyprint"><code>./build.sh runRemote</code> (or <code>build.bat runRemote</code> on windows)</pre>

examples/jms/embedded/readme.html

@@ -28,7 +28,7 @@
 
          <li>Create the ActiveMQ core server</li>
          <pre class="prettyprint">
-            <code>ActiveMQServer hornetqServer = ActiveMQ.newActiveMQServer(configuration);</code>
+            <code>ActiveMQServer activemqServer = ActiveMQ.newActiveMQServer(configuration);</code>
          </pre>
         
          <li>Create and start the JNDI server (using JBoss JNDI implementation)</li>
@@ -75,7 +75,7 @@
      
          <li>Start the JMS Server using the ActiveMQ core server and the JMS configuration</li>
          <pre class="prettyprint">
-            <code>JMSServerManager jmsServer = new JMSServerManagerImpl(hornetqServer, jmsConfig);
+            <code>JMSServerManager jmsServer = new JMSServerManagerImpl(activemqServer, jmsConfig);
             jmsServer.start();</code>
          </pre>
 

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 @@
         <li>Andrew makes a good connection</li>
          <pre class="prettyprint">
            <code>
-           andrewConnection = createConnection("andrew", "hornetq1", cf);
+           andrewConnection = createConnection("andrew", "activemq1", cf);
            andrewConnection.start();
            </code>
          </pre>
@@ -189,7 +189,7 @@
         <li>Frank makes a good connection</li>
         <pre class="prettyprint">
            <code>
-           frankConnection = createConnection("frank", "hornetq2", cf);
+           frankConnection = createConnection("frank", "activemq2", cf);
            frankConnection.start();
            </code>
         </pre>
@@ -197,7 +197,7 @@
         <li>Sam makes a good connection</li>
         <pre class="prettyprint">
            <code>
-           samConnection = createConnection("sam", "hornetq3", cf);
+           samConnection = createConnection("sam", "activemq3", cf);
            samConnection.start();
            </code>
         </pre>

examples/jms/security/src/main/resources/hornetq/server0/activemq-users.xml

@@ -5,18 +5,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>

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>
 
            </code>
@@ -127,9 +127,9 @@
      <ol>
          <li><a id="fn1"/>The stores were generating using the following commands&nbsp;<a href="readme.html#fnr1">&#8617;</a>:
              <ul>
-                 <li>create the keystore: <code>keytool -genkey -keystore activemq.example.keystore -storepass hornetqexample</code></li>
+                 <li>create the keystore: <code>keytool -genkey -keystore activemq.example.keystore -storepass activemqexample</code></li>
                  <li>export the certificate: <code>keytool -export -keystore activemq.example.keystore -file activemq.cer</code></li>
-                 <li>create the truststore: <code>keytool -import -file activemq.cer -keystore activemq.example.truststore -storepass hornetqexample</code></li>
+                 <li>create the truststore: <code>keytool -import -file activemq.cer -keystore activemq.example.truststore -storepass activemqexample</code></li>
             </ul>
          </li>
     </ol>

examples/jms/ssl-enabled/src/main/resources/hornetq/server0/activemq-configuration.xml

@@ -20,7 +20,7 @@
          <param key="port" value="5500"/>
          <param key="ssl-enabled" value="true"/>
          <param key="trust-store-path" value="activemq/server0/activemq.example.truststore"/>
-         <param key="trust-store-password" value="hornetqexample"/>
+         <param key="trust-store-password" value="activemqexample"/>
       </connector>
    </connectors>
    
@@ -32,7 +32,7 @@
          <param key="port" value="5500"/>
          <param key="ssl-enabled" value="true"/>
          <param key="key-store-path" value="activemq/server0/activemq.example.keystore"/>
-         <param key="key-store-password" value="hornetqexample"/>
+         <param key="key-store-password" value="activemqexample"/>
       </acceptor>
    </acceptors>
 

pom.xml

@@ -138,6 +138,13 @@
          <url>http://hornetq.com</url>
          <timezone>0</timezone>
       </developer>
+      <developer>
+         <id>martyntaylor</id>
+         <name>Martyn Taylor</name>
+         <email>mtaylor@redhat.com</email>
+         <url>http://www.redhat.com</url>
+         <timezone>0</timezone>
+      </developer>
    </developers>
 
    <contributors>