activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From andytay...@apache.org
Subject [24/52] [abbrv] [partial] activemq-6 git commit: ACTIVEMQ6-3 renaming package names from activemq6 to activemq
Date Mon, 17 Nov 2014 14:48:59 GMT
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/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 538be7e..a5f3b08 100644
--- a/docs/user-manual/zh/configuration-index.xml
+++ b/docs/user-manual/zh/configuration-index.xml
@@ -195,7 +195,7 @@
                                 >jmx-domain</link></entry>
                             <entry>String</entry>
                             <entry>用于HornetQ MBean注册到MBeanServer的JMX域名</entry>
-                            <entry>org.apache.activemq6</entry>
+                            <entry>org.apache.activemq</entry>
                         </row>
                         <row>
                             <entry><link linkend="large.message.configuring"
@@ -1068,7 +1068,7 @@
                             </entry>
                             <entry>String</entry>
                             <entry>负载均衡类名</entry>
-                            <entry>org.apache.activemq6.api.core.client.loadbalance.RoundRobinConnectionLoadBalancingPolicy</entry>
+                            <entry>org.apache.activemq.api.core.client.loadbalance.RoundRobinConnectionLoadBalancingPolicy</entry>
                         </row>
                         <row>
                             <entry id="configuration.connection-factory.connection-ttl">

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/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 a3b82ad..6b04a77 100644
--- a/docs/user-manual/zh/configuring-transports.xml
+++ b/docs/user-manual/zh/configuring-transports.xml
@@ -28,7 +28,7 @@
 &lt;acceptors&gt;                
     &lt;acceptor name="netty"&gt;
         &lt;factory-class&gt;
-org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory
+org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory
         &lt;/factory-class&gt;
         &lt;param key="port" value="5446"/&gt;
     &lt;/acceptor&gt;
@@ -54,7 +54,7 @@ org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory
 &lt;connectors&gt;
     &lt;connector name="netty"&gt;
         &lt;factory-class&gt;
-            org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory
+            org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory
         &lt;/factory-class&gt;
         &lt;param key="port" value="5446"/&gt;
     &lt;/connector&gt;
@@ -103,12 +103,12 @@ org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory
         <programlisting>
 Map&lt;String, Object&gt; connectionParams = new HashMap&lt;String, Object&gt;();
     
-connectionParams.put(org.apache.activemq6.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME, 
+connectionParams.put(org.apache.activemq.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME,
                     5446);
 
 TransportConfiguration transportConfiguration = 
     new TransportConfiguration(
-    "org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory", 
+    "org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory",
     connectionParams);
 
 ClientSessionFactory sessionFactory = HornetQClient.createClientSessionFactory(transportConfiguration);
@@ -122,11 +122,11 @@ etc
         <programlisting>
 Map&lt;String, Object&gt; connectionParams = new HashMap&lt;String, Object&gt;();
 
-connectionParams.put(org.apache.activemq6.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME, 5446);
+connectionParams.put(org.apache.activemq.core.remoting.impl.netty.TransportConstants.PORT_PROP_NAME, 5446);
 
 TransportConfiguration transportConfiguration = 
     new TransportConfiguration(
-    "org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory", 
+    "org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory",
     connectionParams);
 
 ConnectionFactory connectionFactory = HornetQJMSClient.createConnectionFactory(transportConfiguration);
@@ -151,7 +151,7 @@ etc
             <para>如果你的应用是运行在不信任的网络上,你应该选择使用SSL或HTTPS。</para>
             <para>Netty TCP的所有连接都是从客户端发起的。服务器端不向客户端发起任何连接。在有防火墙的环境中,这种方式
                 是比较适合的。因为防火墙只允许单方向的连接。</para>
-            <para>在<literal>org.apache.activemq6.core.remoting.impl.netty.TransportConstants</literal>类中定义了所
+            <para>在<literal>org.apache.activemq.core.remoting.impl.netty.TransportConstants</literal>类中定义了所
                 有的配置参数的名称(key)。它们当中绝大多娄既用于配置接收器也用于配置连接器,有一些只适用于接收器。
                 下面列出的参数用以配置一个简单的Netty TCP:</para>
             <itemizedlist>
@@ -296,7 +296,7 @@ etc
       &lt;servlet-class>org.jboss.netty.channel.socket.http.HttpTunnelingServlet&lt;/servlet-class>
       &lt;init-param>
              &lt;param-name>endpoint&lt;/param-name>
-             &lt;param-value>local:org.apache.activemq6&lt;/param-value>
+             &lt;param-value>local:org.apache.activemq&lt;/param-value>
            &lt;/init-param>
            &lt;load-on-startup>1&lt;/load-on-startup>
    &lt;/servlet>
@@ -317,10 +317,10 @@ etc
 
       &lt;acceptor name="netty-invm">
          &lt;factory-class>
-            org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory
+            org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory
          &lt;/factory-class>
          &lt;param key="use-invm" value="true"/>
-         &lt;param key="host" value="org.apache.activemq6"/>
+         &lt;param key="host" value="org.apache.activemq"/>
       &lt;/acceptor>
 
 &lt;/acceptors>                                         
@@ -332,7 +332,7 @@ etc
 
       &lt;connector name="netty-servlet">
          &lt;factory-class>
-            org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory
+            org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory
          &lt;/factory-class>
          &lt;param key="host" value="localhost"/>
          &lt;param key="port" value="8080"/>
@@ -353,7 +353,7 @@ etc
             <para>在<literal>web.xml</literal>中定义的servlet的URL形式与在连接器配置文件中定义的
                 <literal>servlet-path</literal>值应该相匹配。</para>
             <para>servlet可以与SSL一起使用。只需要在连接器配置中加上下面的配置即可:<programlisting>    &lt;connector name="netty-servlet">
-         &lt;factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory&lt;/factory-class>
+         &lt;factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory&lt;/factory-class>
          &lt;param key="host" value="localhost"/>
          &lt;param key="port" value="8443"/>
          &lt;param key="use-servlet" value="true"/>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/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 11fda07..4311e3c 100644
--- a/docs/user-manual/zh/connection-ttl.xml
+++ b/docs/user-manual/zh/connection-ttl.xml
@@ -97,13 +97,13 @@ finally
                   是相应的JMS连接):</para>
             <programlisting>
                 
-[Finalizer] 20:14:43,244 WARNING [org.apache.activemq6.core.client.impl.DelegatingSession]  I'm closin
+[Finalizer] 20:14:43,244 WARNING [org.apache.activemq.core.client.impl.DelegatingSession]  I'm closin
 g a ClientSession you left open. Please make sure you close all ClientSessions explicitly before let
 ting them go out of scope!
-[Finalizer] 20:14:43,244 WARNING [org.apache.activemq6.core.client.impl.DelegatingSession]  The sessi
+[Finalizer] 20:14:43,244 WARNING [org.apache.activemq.core.client.impl.DelegatingSession]  The sessi
 on you didn't close was created here:
 java.lang.Exception
-at org.apache.activemq6.core.client.impl.DelegatingSession.&lt;init&gt;(DelegatingSession.java:83)
+at org.apache.activemq.core.client.impl.DelegatingSession.&lt;init&gt;(DelegatingSession.java:83)
 at org.acme.yourproject.YourClass (YourClass.java:666)    
                 
             </programlisting>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/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 cdea000..2ff8964 100644
--- a/docs/user-manual/zh/core-bridges.xml
+++ b/docs/user-manual/zh/core-bridges.xml
@@ -43,7 +43,7 @@
     &lt;forwarding-address&gt;jms.queue.mincing-machine&lt;/forwarding-address&gt;
     &lt;filter-string="name='aardvark'"/&gt;
     &lt;transformer-class-name&gt;
-        org.apache.activemq6.jms.example.HatColourChangeTransformer
+        org.apache.activemq.jms.example.HatColourChangeTransformer
     &lt;/transformer-class-name&gt;
     &lt;retry-interval&gt;1000&lt;/retry-interval&gt;
     &lt;retry-interval-multiplier&gt;1.0&lt;/retry-interval-multiplier&gt;
@@ -87,7 +87,7 @@
             </listitem>
             <listitem>
                 <para><literal>transformer-class-name</literal>。可选的转换器类名。这是一个用户定义的
-                    类,它需要实现接口<literal>org.apache.activemq6.core.server.cluster.Transformer</literal>
+                    类,它需要实现接口<literal>org.apache.activemq.core.server.cluster.Transformer</literal>
                     。</para>
                 <para>如果指定了这个类,每当一个消息被转发之前,它的<literal>transform()</literal>方法
                     就会被调用。用户利用这个机会可以对消息本身或消息头信息进行修改。</para>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/docs/user-manual/zh/diverts.xml
----------------------------------------------------------------------
diff --git a/docs/user-manual/zh/diverts.xml b/docs/user-manual/zh/diverts.xml
index 8637d93..024d6c7 100644
--- a/docs/user-manual/zh/diverts.xml
+++ b/docs/user-manual/zh/diverts.xml
@@ -47,7 +47,7 @@
     &lt;forwarding-address&gt;jms.queue.priceForwarding&lt;/forwarding-address&gt;    
     &lt;filter string="office='New York'"/&gt;
     &lt;transformer-class-name&gt;
-        org.apache.activemq6.jms.example.AddForwardingTimeTransformer
+        org.apache.activemq.jms.example.AddForwardingTimeTransformer
     &lt;/transformer-class-name&gt;     
     &lt;exclusive&gt;true&lt;/exclusive&gt;
 &lt;/divert&gt;                        

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/docs/user-manual/zh/duplicate-detection.xml
----------------------------------------------------------------------
diff --git a/docs/user-manual/zh/duplicate-detection.xml b/docs/user-manual/zh/duplicate-detection.xml
index aa6e636..013c0a0 100644
--- a/docs/user-manual/zh/duplicate-detection.xml
+++ b/docs/user-manual/zh/duplicate-detection.xml
@@ -46,7 +46,7 @@
         <para>如果是在一个事务中发送消息,则只需要设置其中一个消息的属性值。在服务器端如果服务器检测到一个事务中某一个
             消息重复,则会忽略整个事务。</para>
         <para>这个属性的名称由<literal
-                >org.apache.activemq6.api.core.HDR_DUPLICATE_DETECTION_ID</literal>定义,即:
+                >org.apache.activemq.api.core.HDR_DUPLICATE_DETECTION_ID</literal>定义,即:
                <literal>_HQ_DUPL_ID</literal>。</para>
         <para>该属性的值可以是<literal>byte[]</literal>类型或<literal
                 >SimpleString</literal>类型(核心接口)。如果使用JMS,它必须是<literal>String</literal>
@@ -79,7 +79,7 @@ message.setStringProperty(HDR_DUPLICATE_DETECTION_ID.toString(), myUniqueID);
     <section id="duplicate.id.cache">
         <title>配置重复ID缓存</title>
         <para>服务器缓存中保存接收到的消息的<literal
-                >org.apache.activemq6.core.message.impl.HDR_DUPLICATE_DETECTION_ID</literal>属性值。每个地址有
+                >org.apache.activemq.core.message.impl.HDR_DUPLICATE_DETECTION_ID</literal>属性值。每个地址有
               单独的缓存。</para>
         <para>缓存的大小是固定的,循环使用。如果缓存的最大可以存放<literal
                 >n</literal>条记录,那么<literal>n + 1</literal>条记录将会覆盖缓存中的第<literal>0</literal>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/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 3474946..ec213bc 100644
--- a/docs/user-manual/zh/embedding-hornetq.xml
+++ b/docs/user-manual/zh/embedding-hornetq.xml
@@ -31,8 +31,8 @@
         <para>按照以下步骤去做:</para>
         <para>创建配置对象--这个对象包装了HornetQ的配置信息。如果你想使用配置文件,则使用<literal
                 >FileConfigurationImpl</literal>。</para>
-        <programlisting>import org.apache.activemq6.core.config.Configuration;
-import org.apache.activemq6.core.config.impl.FileConfiguration;
+        <programlisting>import org.apache.activemq.core.config.Configuration;
+import org.apache.activemq.core.config.impl.FileConfiguration;
 
 ...
 
@@ -44,8 +44,8 @@ config.start();</programlisting>
             即可。如添加适当的接收器。</para>
         <para><literal>ConfigurationImpl</literal>用来配置接收器。和主要配置文件相似,只需要添加
             <literal>NettyAcceptorFactory</literal>即可。</para>
-        <programlisting>import org.apache.activemq6.core.config.Configuration;
-import org.apache.activemq6.core.config.impl.ConfigurationImpl;
+        <programlisting>import org.apache.activemq.core.config.Configuration;
+import org.apache.activemq.core.config.impl.ConfigurationImpl;
 
 ...
 
@@ -57,9 +57,9 @@ transports.add(new TransportConfiguration(InVMAcceptorFactory.class.getName()));
 
 config.setAcceptorConfigurations(transports);</programlisting>
         <para>接着就需要初始化并启动HornetQ服务。<literal
-                >org.apache.activemq6.api.core.server.HornetQ</literal>类有一些静态方法可用来创建HornetQ服务器。</para>
-        <programlisting>import org.apache.activemq6.api.core.server.HornetQ;
-import org.apache.activemq6.core.server.HornetQServer;
+                >org.apache.activemq.api.core.server.HornetQ</literal>类有一些静态方法可用来创建HornetQ服务器。</para>
+        <programlisting>import org.apache.activemq.api.core.server.HornetQ;
+import org.apache.activemq.core.server.HornetQServer;
 
 ...
 
@@ -88,12 +88,12 @@ server.start();</programlisting>
    
    &lt;!-- The core configuration -->
    &lt;bean name="Configuration" 
-         class="org.apache.activemq6.core.config.impl.FileConfiguration">
+         class="org.apache.activemq.core.config.impl.FileConfiguration">
    &lt;/bean>
 
    	&lt;!-- The core server -->
    &lt;bean name="HornetQServer" 
-         class="org.apache.activemq6.core.server.impl.HornetQServerImpl">      
+         class="org.apache.activemq.core.server.impl.HornetQServerImpl">
       &lt;constructor>
          &lt;parameter>
             &lt;inject bean="Configuration"/>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/docs/user-manual/zh/ha.xml
----------------------------------------------------------------------
diff --git a/docs/user-manual/zh/ha.xml b/docs/user-manual/zh/ha.xml
index 3d4ebd0..ec954bb 100644
--- a/docs/user-manual/zh/ha.xml
+++ b/docs/user-manual/zh/ha.xml
@@ -60,7 +60,7 @@
      &lt;!-- 这个连接器用于连接备份服务喝咖啡    -->
      &lt;!-- 备份服务器在主机"192.168.0.11"上,端口"5445" -->
      &lt;connector name="backup-connector">
-       &lt;factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory&lt;/factory-class>
+       &lt;factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory&lt;/factory-class>
        &lt;param key="host" value="192.168.0.11"/>
        &lt;param key="port" value="5445"/>
      &lt;/connector>
@@ -74,7 +74,7 @@
   
   &lt;acceptors>
      &lt;acceptor name="acceptor">
-        &lt;factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory&lt;/factory-class>
+        &lt;factory-class>org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory&lt;/factory-class>
         &lt;param key="host" value="192.168.0.11"/>
         &lt;param key="port" value="5445"/>
      &lt;/acceptor>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/docs/user-manual/zh/intercepting-operations.xml
----------------------------------------------------------------------
diff --git a/docs/user-manual/zh/intercepting-operations.xml b/docs/user-manual/zh/intercepting-operations.xml
index 933ebd5..04e5750 100644
--- a/docs/user-manual/zh/intercepting-operations.xml
+++ b/docs/user-manual/zh/intercepting-operations.xml
@@ -27,7 +27,7 @@
       <title>实现拦截器</title>
       <para>拦截器必须要实现<literal>Interceptor接口</literal>:</para>
       <programlisting>
-package org.apache.activemq6.api.core.interceptor;
+package org.apache.activemq.api.core.interceptor;
 
 public interface Interceptor
 {   
@@ -51,8 +51,8 @@ public interface Interceptor
       <para>拦截器的配置在<literal>hornetq-configuration.xml</literal>文件中:</para>
       <programlisting>
 &lt;remoting-interceptors&gt;
-   &lt;class-name&gt;org.apache.activemq6.jms.example.LoginInterceptor&lt;/class-name&gt;
-   &lt;class-name&gt;org.apache.activemq6.jms.example.AdditionalPropertyInterceptor&lt;/class-name&gt;
+   &lt;class-name&gt;org.apache.activemq.jms.example.LoginInterceptor&lt;/class-name&gt;
+   &lt;class-name&gt;org.apache.activemq.jms.example.AdditionalPropertyInterceptor&lt;/class-name&gt;
 &lt;/remoting-interceptors&gt;
          </programlisting>
       <para>拦截器的类(以及它们依赖的类)必须要在服务器的classpath中,否则不能被正常初始化及调用。</para>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/docs/user-manual/zh/interoperability.xml
----------------------------------------------------------------------
diff --git a/docs/user-manual/zh/interoperability.xml b/docs/user-manual/zh/interoperability.xml
index db008c1..7fcee0b 100644
--- a/docs/user-manual/zh/interoperability.xml
+++ b/docs/user-manual/zh/interoperability.xml
@@ -30,7 +30,7 @@
             其中的<literal>protocol</literal>参数值应设为<literal>stomp</literal>:</para>
 <programlisting>
 	&lt;acceptor name="stomp-acceptor">
-		&lt;factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory&lt;/factory-class>		&lt;param key="protocol"  value="stomp"/>
+		&lt;factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory&lt;/factory-class>		&lt;param key="protocol"  value="stomp"/>
 		&lt;param key="port"  value="61613"/>
 	&lt;/acceptor>
 </programlisting>
@@ -103,7 +103,7 @@ hello queue orders
             的值为<literal>stomp_ws</literal>:</para>
          <programlisting>
 &lt;acceptor name="stomp-ws-acceptor">
-	&lt;factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory&lt;/factory-class>
+	&lt;factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory&lt;/factory-class>
 	&lt;param key="protocol" value="stomp_ws"/>
 	&lt;param key="port" value="61614"/>
 &lt;/acceptor>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/docs/user-manual/zh/jms-bridge.xml
----------------------------------------------------------------------
diff --git a/docs/user-manual/zh/jms-bridge.xml b/docs/user-manual/zh/jms-bridge.xml
index 794030d..b451bec 100644
--- a/docs/user-manual/zh/jms-bridge.xml
+++ b/docs/user-manual/zh/jms-bridge.xml
@@ -41,7 +41,7 @@
 
 &lt;deployment xmlns="urn:jboss:bean-deployer:2.0">
 
-       &lt;bean name="JMSBridge" class="org.apache.activemq6.api.jms.bridge.impl.JMSBridgeImpl">
+       &lt;bean name="JMSBridge" class="org.apache.activemq.api.jms.bridge.impl.JMSBridgeImpl">
            &lt;!-- HornetQ must be started before the bridge -->
            &lt;depends>HornetQServer&lt;/depends>
            &lt;constructor>
@@ -91,7 +91,7 @@
                &lt;parameter>
                    &lt;inject bean="MBeanServer"/>
                &lt;/parameter>
-               &lt;parameter>org.apache.activemq6:service=JMSBridge&lt;/parameter>
+               &lt;parameter>org.apache.activemq:service=JMSBridge&lt;/parameter>
              &lt;/constructor>
            &lt;property name="transactionManager">
                &lt;inject bean="RealTransactionManager"/>
@@ -101,7 +101,7 @@
        &lt;!-- SourceCFF describes the ConnectionFactory used to connect to the 
             source destination -->
        &lt;bean name="SourceCFF" 
-            class="org.apache.activemq6.api.jms.bridge.impl.JNDIConnectionFactoryFactory">
+            class="org.apache.activemq.api.jms.bridge.impl.JNDIConnectionFactoryFactory">
            &lt;constructor>
                &lt;parameter>
                    &lt;inject bean="JNDI" />
@@ -113,7 +113,7 @@
        &lt;!-- TargetCFF describes the ConnectionFactory used to connect to the 
         target destination -->
        &lt;bean name="TargetCFF" 
-            class="org.apache.activemq6.api.jms.bridge.impl.JNDIConnectionFactoryFactory">
+            class="org.apache.activemq.api.jms.bridge.impl.JNDIConnectionFactoryFactory">
            &lt;constructor>
                &lt;parameter>
                    &lt;inject bean="JNDI" />
@@ -124,7 +124,7 @@
 
        &lt;!-- SourceDestinationFactory describes the Destination used as the source -->
        &lt;bean name="SourceDestinationFactory" 
-            class="org.apache.activemq6.api.jms.bridge.impl.JNDIDestinationFactory">
+            class="org.apache.activemq.api.jms.bridge.impl.JNDIDestinationFactory">
            &lt;constructor>
                &lt;parameter>
                    &lt;inject bean="JNDI" />
@@ -135,7 +135,7 @@
 
        &lt;!-- TargetDestinationFactory describes the Destination used as the target -->
        &lt;bean name="TargetDestinationFactory" 
-            class="org.apache.activemq6.api.jms.bridge.impl.JNDIDestinationFactory">
+            class="org.apache.activemq.api.jms.bridge.impl.JNDIDestinationFactory">
            &lt;constructor>
                &lt;parameter>
                    &lt;inject bean="JNDI" />
@@ -313,14 +313,14 @@
             <para>源工目的的连接工厂分别用于创建到源和到目的的连接。</para>
             <para>上面的配置例子中使用的是HornetQ提供的默认实现。它使用JNDI查找连接工厂。对于其它的应用服务器
                 或JMS提供者,需要实现相应的实现,即实现<literal
-                    >org.apache.activemq6.jms.bridge.ConnectionFactoryFactory</literal>接口。</para>
+                    >org.apache.activemq.jms.bridge.ConnectionFactoryFactory</literal>接口。</para>
         </section>
         <section>
             <title>源和目的的目标工厂</title>
             <para>它们用来创建或查找相应的目标。</para>
             <para>上面例子中,我们使用了HornetQ的默认实现,从JNDI中查找相应的对象。</para>
             <para>要提供新的实现,只要实现接口<literal
-                    >org.apache.activemq6.jms.bridge.DestinationFactory</literal>即可。</para>
+                    >org.apache.activemq.jms.bridge.DestinationFactory</literal>即可。</para>
         </section>
         <section id="quality-of-service">
             <title>服务质量</title>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/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 c1d7d1e..890958f 100644
--- a/docs/user-manual/zh/large-messages.xml
+++ b/docs/user-manual/zh/large-messages.xml
@@ -99,7 +99,7 @@ factory.setMinLargeMessageSize(25 * 1024);</programlisting>
             <para>下表列出了<literal>ClientMessage</literal>上可以使用的方法。
                   通过相应的对象属性也可以在JMS中应用。</para>
             <table frame="topbot" id="large-messages.ClientMessageAPI">
-                <title>org.apache.activemq6.api.core.client.ClientMessage API</title>
+                <title>org.apache.activemq.api.core.client.ClientMessage API</title>
                 <tgroup cols="3">
                     <colspec colname="Name" colnum="1"/>
                     <colspec colname="Descr" colnum="2"/>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/docs/user-manual/zh/logging.xml
----------------------------------------------------------------------
diff --git a/docs/user-manual/zh/logging.xml b/docs/user-manual/zh/logging.xml
index 49980aa..c26c796 100644
--- a/docs/user-manual/zh/logging.xml
+++ b/docs/user-manual/zh/logging.xml
@@ -26,15 +26,15 @@
         方法,将日志输出到屏幕终端(Console)及文件中。请访问Sun公司的相关网址来进一步了解如何配置使用JUL。</para>
     <para>你可以通过编程或定义系统变量的方法来配置不同的日志代理(Logging Delegate)。</para>
     <para>采用编程方法,只需要调用方法:
-        <programlisting>org.apache.activemq6.core.logging.Logger.setDelegateFactory(new Log4jLogDelegateFactory())</programlisting></para>
+        <programlisting>org.apache.activemq.core.logging.Logger.setDelegateFactory(new Log4jLogDelegateFactory())</programlisting></para>
     <para>其中<literal>Log4jLogDelegateFactory</literal>实现了<literal
-            >org.apache.activemq6.spi.core.logging.LogDelegateFactory </literal>接口。</para>
+            >org.apache.activemq.spi.core.logging.LogDelegateFactory </literal>接口。</para>
     <para>如果要使用系统变量方法,则需要设置变量<literal
-            >org.apache.activemq6.logger-delegate-factory-class-name</literal>为相应的代理工厂,即
-        <programlisting>-Dorg.apache.activemq6.logger-delegate-factory-class-name=org.apache.activemq6.integration.logging.Log4jLogDelegateFactory</programlisting></para>
+            >org.apache.activemq.logger-delegate-factory-class-name</literal>为相应的代理工厂,即
+        <programlisting>-Dorg.apache.activemq.logger-delegate-factory-class-name=org.apache.activemq.integration.logging.Log4jLogDelegateFactory</programlisting></para>
     <para>上面的例子可以看出HornetQ提供了一些代理工厂以方便用户使用,它们是:<orderedlist
-                    ><listitem><para>org.apache.activemq6.core.logging.impl.JULLogDelegateFactory - 默认的JUL日志代理工厂。</para>
-                </listitem><listitem><para>org.apache.activemq6.integration.logging.Log4jLogDelegateFactory
+                    ><listitem><para>org.apache.activemq.core.logging.impl.JULLogDelegateFactory - 默认的JUL日志代理工厂。</para>
+                </listitem><listitem><para>org.apache.activemq.integration.logging.Log4jLogDelegateFactory
                     - Log4J的日志代理工厂。</para></listitem></orderedlist></para>
     <para>如果在客户端使用JUL代理,注意要提供<literal>logging.properties</literal>文件,并且在客户端启动之前设置<literal
             >java.util.logging.config.file</literal>属性。</para>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/docs/user-manual/zh/management.xml
----------------------------------------------------------------------
diff --git a/docs/user-manual/zh/management.xml b/docs/user-manual/zh/management.xml
index f24bd04..636ccfd 100644
--- a/docs/user-manual/zh/management.xml
+++ b/docs/user-manual/zh/management.xml
@@ -44,11 +44,11 @@
       <itemizedlist>
          <listitem>
             <para><emphasis>核心</emphasis>资源的管理接口在 <literal
-                  >org.apache.activemq6.api.core.management</literal>包中。</para>
+                  >org.apache.activemq.api.core.management</literal>包中。</para>
          </listitem>
          <listitem>
             <para><emphasis>JMS</emphasis>资源的管理接口在 <literal
-                  >org.apache.activemq6.api.jms.management</literal>包中。</para>
+                  >org.apache.activemq.api.jms.management</literal>包中。</para>
          </listitem>
       </itemizedlist>
       <para>调用<emphasis>管理操作</emphasis>的方法由所使用是方式是JMX、核心消息还是JMS
@@ -69,7 +69,7 @@
                   <para>队列的列表、创建、部署与删除</para>
                   <para><literal>getQueueNames()</literal> method方法用来列出所有已经部署的队列。</para>
                   <para>在<literal>HornetQServerControl</literal> (ObjectName <literal
-                        >org.apache.activemq6:module=Core,type=Server</literal>或资源名<literal
+                        >org.apache.activemq:module=Core,type=Server</literal>或资源名<literal
                         >core.server</literal>)上有队列创建或删除的方法,它们是
                         <literal>createQueue()</literal>、<literal>deployQueue()</literal>和
                         <literal>destroyQueue()</literal>。</para>
@@ -118,7 +118,7 @@
                   <para>使用<literal>getBridgeNames()</literal>可以列出部署的核心桥。
                         使用<literal>getDivertNames()</literal>可以列出部署的转发器。</para>
                   <para>使用<literal>HornetQServerControl</literal> (ObjectName <literal
-                        >org.apache.activemq6:module=Core,type=Server</literal> 或资源名 <literal
+                        >org.apache.activemq:module=Core,type=Server</literal> 或资源名 <literal
                         >core.server</literal>)的方法<literal>createBridge()</literal>
                 和<literal>destroyBridge()</literal>可以创建和删除核心桥。
                         通过<literal>createDivert()</literal>和<literal>destroyDivert()</literal>
@@ -129,7 +129,7 @@
          <section>
             <title>核心地址的管理</title>
             <para>核心地址可以通过<literal>AddressControl</literal>类进行访问(ObjectName
-                  是 <literal>org.apache.activemq6:module=Core,type=Address,name="&lt;the
+                  是 <literal>org.apache.activemq:module=Core,type=Address,name="&lt;the
                   address name&gt;"</literal>或者资源名 <literal>core.address.&lt;the
                   address name&gt;</literal>)。</para>
             <itemizedlist>
@@ -143,7 +143,7 @@
          <section>
             <title>核心队列的管理</title>
             <para>管理接口中的一大部分是管理核心队列的。<literal>QueueControl</literal>类定义了核心队列的管理
-               接口(ObjectName <literal>org.apache.activemq6:module=Core,type=Queue,address="&lt;绑定地址
+               接口(ObjectName <literal>org.apache.activemq:module=Core,type=Queue,address="&lt;绑定地址
                   address&gt;",name="&lt;队列名&gt;"</literal> 或资源名 <literal
                   >core.queue.&lt;队列名&gt;</literal>)。</para>
             <para>绝大部分的队列管理方法需要一个消息ID参数(如删除一个消息)或一个过滤器参数(如将具有某个
@@ -209,7 +209,7 @@
                <listitem>
                   <para>接收器</para>
                   <para>用<literal>AcceptorControl</literal>类(ObjectName <literal
-                        >org.apache.activemq6:module=Core,type=Acceptor,name="&lt;接收器名
+                        >org.apache.activemq:module=Core,type=Acceptor,name="&lt;接收器名
                         &gt;"</literal> 或资源名 <literal>core.acceptor.&lt;地址名
                         &gt;</literal>)的<literal>start()</literal>方法启动,用<literal>
                         stop()</literal>方法停止。接收器的参数可以通过<literal>AcceptorControl</literal>
@@ -219,7 +219,7 @@
                <listitem>
                   <para>转发器</para>
                   <para>用<literal>DivertControl</literal>(ObjectName是 <literal
-                        >org.apache.activemq6:module=Core,type=Divert,name=&lt;转发器名&gt;</literal>
+                        >org.apache.activemq:module=Core,type=Divert,name=&lt;转发器名&gt;</literal>
                         或资源名<literal>core.divert.&lt;转发器&gt;</literal>)类的
                         <literal>start()</literal>方法可以启动,用<literal>stop()</literal>方法可以停止。
                         通过<literal>DivertControl</literal>还可以获得转发器的各种属性。(参见 <xref
@@ -228,7 +228,7 @@
                <listitem>
                   <para>桥</para>
                   <para>桥可以通过<literal>BridgeControl</literal>类(ObjectName <literal
-                        >org.apache.activemq6:module=Core,type=Bridge,name="&lt;桥的名字
+                        >org.apache.activemq:module=Core,type=Bridge,name="&lt;桥的名字
                         &gt;"</literal> 或资源名 <literal>core.bridge.&lt;桥的名字
                         &gt;</literal>)的<literal>start()</literal>
                         方法启动,用<literal>stop()</literal>方法停止。它的属性可以通过
@@ -238,7 +238,7 @@
                <listitem>
                   <para>广播组</para>
                   <para>广播组可以通过<literal>BroadcastGroupControl</literal>类(ObjectName <literal
-                        >org.apache.activemq6:module=Core,type=BroadcastGroup,name="&lt;广播组名
+                        >org.apache.activemq:module=Core,type=BroadcastGroup,name="&lt;广播组名
                         &gt;"</literal> 或者资源名 <literal
                         >core.broadcastgroup.&lt;广播组名&gt;</literal>)的<literal>
                         start()</literal>方法启动,用<literal>stop()</literal>方法停止。
@@ -249,7 +249,7 @@
                <listitem>
                   <para>发现组</para>
                   <para>发现组可以通过<literal>DiscoveryGroupControl</literal>类
-                        (ObjectName <literal>org.apache.activemq6:module=Core,type=DiscoveryGroup,
+                        (ObjectName <literal>org.apache.activemq:module=Core,type=DiscoveryGroup,
                         name="&lt;发现组名&gt;"</literal> 或资源名<literal>core.discovery.&lt;
                         发现组名&gt;</literal>)的
                         <literal>start()</literal>方法启动,用<literal>stop()</literal>方法停止。
@@ -260,7 +260,7 @@
                   <para>集群连接</para>
                   <para>集群连接可以通过<literal>ClusterConnectionControl</literal>类(
                         ObjectName <literal
-                        >org.apache.activemq6:module=Core,type=ClusterConnection,name="&lt;集群连接名
+                        >org.apache.activemq:module=Core,type=ClusterConnection,name="&lt;集群连接名
                         &gt;"</literal> 或资源名 <literal
                         >core.clusterconnection.&lt;集群连接名&gt;</literal>)的<literal>
                         start()</literal>方法启动,用<literal>stop()</literal>方法停止。
@@ -278,7 +278,7 @@
          <section>
             <title>JMS服务器管理</title>
             <para><literal>JMSServerControl</literal>类(ObjectName <literal
-                  >org.apache.activemq6:module=JMS,type=Server</literal> 或资源名<literal
+                  >org.apache.activemq:module=JMS,type=Server</literal> 或资源名<literal
                   >jms.server</literal>)用来创建JMS资源(连接工厂和目标)。</para>
             <itemizedlist>
                <listitem>
@@ -316,7 +316,7 @@
          </section>
          <section>
             <title>JMS连接工厂的管理</title>
-            <para>使用类(ObjectName <literal>org.apache.activemq6:module=JMS,type=ConnectionFactory,
+            <para>使用类(ObjectName <literal>org.apache.activemq:module=JMS,type=ConnectionFactory,
                   name="&lt;连接工厂名&gt;"</literal>或者资源名<literal>jms.connectionfactory.&lt;
                   连接工厂名&gt;</literal>)可以管理JMS的连接工厂。</para>
             <itemizedlist>
@@ -331,7 +331,7 @@
          </section>
          <section>
             <title>JMS队列管理</title>
-            <para>使用<literal>JMSQueueControl</literal>类(ObjectName <literal>org.apache.activemq6:module=JMS,
+            <para>使用<literal>JMSQueueControl</literal>类(ObjectName <literal>org.apache.activemq:module=JMS,
                   type=Queue,name="&lt;队列名&gt;"</literal>或资源名 <literal>jms.queue.&lt;队列名
                   &gt;</literal>可以管理JMS队列。</para>
             <para><emphasis>JMS队列的管理操作与核心队列的管理十分相似。</emphasis></para>
@@ -387,7 +387,7 @@
          <section>
             <title>JMS话题(Topic)的管理</title>
             <para>JMS话题的管理是通过<literal>TopicControl</literal>类(
-               the ObjectName <literal>org.apache.activemq6:module=JMS,type=Topic,name="&lt;话题名&gt;"</literal>
+               the ObjectName <literal>org.apache.activemq:module=JMS,type=Topic,name="&lt;话题名&gt;"</literal>
                或资源名 <literal>jms.topic.&lt;话题名&gt;</literal>)。</para>
             <itemizedlist>
                <listitem>
@@ -417,17 +417,17 @@
       <para>HornetQ提供了<ulink
             url="http://java.sun.com/javase/technologies/core/mntr-mgmt/javamanagement/"
          >JMX</ulink>。</para>
-      <para>HornetQ通过MBean的接口暴露其JMX管理操作。它将自己的资源注册到<literal>org.apache.activemq6</literal>域。</para>
+      <para>HornetQ通过MBean的接口暴露其JMX管理操作。它将自己的资源注册到<literal>org.apache.activemq</literal>域。</para>
       <para>比如,用来管理一个名为<literal>exampleQueue</literal>JMS队列的<literal>ObjectName</literal>是:</para>
       <programlisting>
-   org.apache.activemq6:module=JMS,type=Queue,name="exampleQueue"   
+   org.apache.activemq:module=JMS,type=Queue,name="exampleQueue"
       </programlisting>
       <para>MBean为:</para>
       <programlisting>
-   org.apache.activemq6.api.jms.management.JMSQueueControl   
+   org.apache.activemq.api.jms.management.JMSQueueControl
       </programlisting>
       <para>MBean的<literal>ObjectName</literal>用 <literal
-            >org.apache.activemq6.api.core.management.ObjectNameBuilder</literal>来产生出来的。你也可以使用<literal
+            >org.apache.activemq.api.core.management.ObjectNameBuilder</literal>来产生出来的。你也可以使用<literal
             >jconsole</literal>来查找你想要的MBean的<literal>ObjectName</literal>。</para>
       <para>使用JMX来管理HornetQ与用JMX管理其它Java应用程序没有什么不同。你可以使用反射或者创建MBean代理的方法。</para>
       <section id="management.jmx.configuration">
@@ -444,11 +444,11 @@
            <para>出于安全考虑,默认情况下JMX远程连接是关闭的。参见<ulink url="http://java.sun.com/j2se/1.5.0/docs/guide/management/agent.html#remote"
                >Java管理指南</ulink>来配置服务器的远程管理(系统变量必须在<literal>run.sh</literal>或<literal>run.bat</literal>中定义)。</para>
          </note>
-         <para>HornetQ默认使用JMX域名"org.apache.activemq6"。如果要用一个MBeanServer管理多个HornetQ服务器,可以将每个HornetQ
+         <para>HornetQ默认使用JMX域名"org.apache.activemq"。如果要用一个MBeanServer管理多个HornetQ服务器,可以将每个HornetQ
             服务器配置成不同的JMX域。方法就是在<literal>hornetq-configuration.xml</literal>文件中设置<literal>jmx-domain</literal>:</para>
          <programlisting>
 &lt;!-- use a specific JMX domain for HornetQ MBeans -->
-&lt;jmx-domain>my.org.apache.activemq6&lt;/jmx-domain>            
+&lt;jmx-domain>my.org.apache.activemq&lt;/jmx-domain>
          </programlisting>
          <section>
             <title>MBeanServer的配置</title>
@@ -495,7 +495,7 @@
          </literal>定义)发送一个<emphasis>管理回答</emphasis>。</para>
       <para>一个<literal>ClientConsumer</literal>用来接收管理回答并提取出其中的操作的結果(如果有的话)。
          考虑到可移植性,返回的結果采用的是格式的字符串,而没有采用Java的序列化技术
-         (<literal>org.apache.activemq6.api.core.management.ManagementHelper</literal>可以用来将JSON字符串
+         (<literal>org.apache.activemq.api.core.management.ManagementHelper</literal>可以用来将JSON字符串
          转换成Java对象)。</para>
       <para>使用以下步骤可以简化使用核心消息调用管理操作:</para>
       <orderedlist>
@@ -507,14 +507,14 @@
          </listitem>
          <listitem>
             <para>使用<literal
-                  >org.apache.activemq6.api.core.management.ManagementHelper</literal>类来帮助设置消息的管理参数。</para>
+                  >org.apache.activemq.api.core.management.ManagementHelper</literal>类来帮助设置消息的管理参数。</para>
          </listitem>
          <listitem>
             <para>通过<literal>ClientRequestor</literal>将消息发送</para>
          </listitem>
          <listitem>
             <para>使用 <literal
-                  >org.apache.activemq6.api.core.management.ManagementHelper</literal>类从管理操作結果中提取返回值。</para>
+                  >org.apache.activemq.api.core.management.ManagementHelper</literal>类从管理操作結果中提取返回值。</para>
          </listitem>
       </orderedlist>
       <para>例如,要得到核心队列<literal>exampleQueue</literal>中消息的数量:</para>
@@ -528,7 +528,7 @@
    System.out.println("There are " + count + " messages in exampleQueue");
       </programlisting>
       <para>管理操作名及其参数必须和<literal>management</literal>包中定义的Java接口一致。</para>
-      <para>资源的名称是用<literal>org.apache.activemq6.api.core.management.ResourceNames</literal>类来生成的,
+      <para>资源的名称是用<literal>org.apache.activemq.api.core.management.ResourceNames</literal>类来生成的,
             命名都非常直观(如核心队列<literal>exampleQueue</literal>的名称为<literal>core.queue.exampleQueue</literal>,
             JMS Topic <literal>exampleTopic</literal>的名称为<literal>jms.topic.exampleTopic</literal>,等等)。
 </para>
@@ -569,13 +569,13 @@
             <para>创建一个<literal>消息</literal></para>
          </listitem>
          <listitem>
-            <para>使用 <literal>org.apache.activemq6.api.jms.management.JMSManagementHelper</literal>类向消息中设置管理参数。</para>
+            <para>使用 <literal>org.apache.activemq.api.jms.management.JMSManagementHelper</literal>类向消息中设置管理参数。</para>
          </listitem>
          <listitem>
             <para>再使用<literal>QueueRequestor</literal>发送消息。</para>
          </listitem>
          <listitem>
-            <para>使用<literal>org.apache.activemq6.api.jms.management.JMSManagementHelper</literal>来从回答中提取返回結果。</para>
+            <para>使用<literal>org.apache.activemq.api.jms.management.JMSManagementHelper</literal>来从回答中提取返回結果。</para>
          </listitem>
       </orderedlist>
       <para>例如,要得到一个JMS队列<literal>exampleQueue</literal>中有多少消息:</para>
@@ -622,11 +622,11 @@
                两个MBean来获得通知:</para>
          <itemizedlist>
             <listitem>
-               <para><literal>org.apache.activemq6:module=Core,type=Server</literal> 可以获得有关
+               <para><literal>org.apache.activemq:module=Core,type=Server</literal> 可以获得有关
                      <emphasis>核心</emphasis>资源的通知</para>
             </listitem>
             <listitem>
-               <para><literal>org.apache.activemq6:module=JMS,type=Server</literal>可以获得有关
+               <para><literal>org.apache.activemq:module=JMS,type=Server</literal>可以获得有关
                      <emphasis>JMS</emphasis>资源的通知</para>
             </listitem>
          </itemizedlist>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/docs/user-manual/zh/persistence.xml
----------------------------------------------------------------------
diff --git a/docs/user-manual/zh/persistence.xml b/docs/user-manual/zh/persistence.xml
index 1e30d97..28c42bf 100644
--- a/docs/user-manual/zh/persistence.xml
+++ b/docs/user-manual/zh/persistence.xml
@@ -233,11 +233,11 @@
         <title>导入入/导出日志数据</title>
         <para>有时你需要使用导入/导出工具来查看日志文件的记录。这个导入/导出工具类在hornetq-core.jar文件中。
           使用以下命令可以将日志文件导出为文本文件:</para>
-        <para><literal>java -cp hornetq-core.jar org.apache.activemq6.core.journal.impl.ExportJournal
+        <para><literal>java -cp hornetq-core.jar org.apache.activemq.core.journal.impl.ExportJournal
                 &lt;JournalDirectory> &lt;JournalPrefix> &lt;FileExtension> &lt;FileSize>
                 &lt;FileOutput></literal></para>
         <para>要将日志文件导入,使用下面的命令(注意你需要netty.jar):</para>
-        <para><literal>java -cp hornetq-core.jar:netty.jar org.apache.activemq6.core.journal.impl.ImportJournal
+        <para><literal>java -cp hornetq-core.jar:netty.jar org.apache.activemq.core.journal.impl.ImportJournal
                 &lt;JournalDirectory> &lt;JournalPrefix> &lt;FileExtension> &lt;FileSize>
                 &lt;FileInput></literal></para>
         <itemizedlist>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/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 cafaa8d..d318795 100644
--- a/docs/user-manual/zh/project-info.xml
+++ b/docs/user-manual/zh/project-info.xml
@@ -84,6 +84,6 @@
             </listitem>
          </itemizedlist></para>
       <para> 另外我们还有长期的和刚加入的一些贡献者,非常感謝他们的帮助。参见<ulink
-            url="http://jboss.org.apache.activemq6/community/team.html">完整的贡献者名单</ulink>。 </para>
+            url="http://jboss.org.apache.activemq/community/team.html">完整的贡献者名单</ulink>。 </para>
    </section>
 </chapter>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/docs/user-manual/zh/queue-attributes.xml
----------------------------------------------------------------------
diff --git a/docs/user-manual/zh/queue-attributes.xml b/docs/user-manual/zh/queue-attributes.xml
index 5335e82..c57e212 100644
--- a/docs/user-manual/zh/queue-attributes.xml
+++ b/docs/user-manual/zh/queue-attributes.xml
@@ -65,7 +65,7 @@
     <section>
         <title>使用接口(API)创建队列</title>
         <para>队列还可以使用核心接口或管理接口来创建。</para>
-        <para>核心接口的<literal>org.apache.activemq6.api.core.client.ClientSession</literal>接口可以用来
+        <para>核心接口的<literal>org.apache.activemq.api.core.client.ClientSession</literal>接口可以用来
               创建队列。它有几个<literal>createQueue</literal>方法,可以在创建队列时对上述的属性进行设置。
               除此之外,还有一个额外的属性<literal>temporary</literal>可以设置。如果将其设为true,
               那么队列在会话断开时将被删除。</para>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/docs/user-manual/zh/security.xml
----------------------------------------------------------------------
diff --git a/docs/user-manual/zh/security.xml b/docs/user-manual/zh/security.xml
index 773ed7e..4b82ce6 100644
--- a/docs/user-manual/zh/security.xml
+++ b/docs/user-manual/zh/security.xml
@@ -153,16 +153,16 @@
         <para>让我们看一段默认bean文件的内容:</para>
         <programlisting>           
 &lt;bean name="HornetQSecurityManager" 
-      class="org.apache.activemq6.spi.core.security.HornetQSecurityManagerImpl"&gt;
+      class="org.apache.activemq.spi.core.security.HornetQSecurityManagerImpl"&gt;
     &lt;start ignored="true"/&gt;
     &lt;stop ignored="true"/&gt;
 &lt;/bean&gt;            
         </programlisting>
-        <para><literal>org.apache.activemq6.spi.core.security.HornetQSecurityManagerImpl</literal>
+        <para><literal>org.apache.activemq.spi.core.security.HornetQSecurityManagerImpl</literal>
             类就是HornetQ服务器的在独立运行时的默认的安全管理器。</para>
         <para>HornetQ自带有另外两个安全管理器可供使用。一个是JAAS安全管理器,另一个是用来与JBoss应用服务
             器集成的安全管理器。此外,你还可以编写实现你自己的安全管理器。首先要实现
-            <literal>org.apache.activemq6.core.security.SecurityManager</literal>接口,再将你的实现
+            <literal>org.apache.activemq.core.security.SecurityManager</literal>接口,再将你的实现
             类定义到<literal>hornetq-beans.xml</literal>文件中即可(或者在JBoss应用服务器中
             使用<literal>hornetq-jboss-beans.xml</literal>文件)。</para>
         <para>以下分别介绍这两咱安全管理器</para>
@@ -175,11 +175,11 @@
             下面是一个例子:</para>
         <programlisting><![CDATA[
 &lt;bean name="HornetQSecurityManager"
-      class="org.apache.activemq6.integration.jboss.security.JAASSecurityManager"&gt;
+      class="org.apache.activemq.integration.jboss.security.JAASSecurityManager"&gt;
     &lt;start ignored="true"/&gt;
     &lt;stop ignored="true"/&gt;
 
-    &lt;property name="ConfigurationName"&gt;org.apache.activemq6.jms.example.ExampleLoginModule&lt;/property&gt;
+    &lt;property name="ConfigurationName"&gt;org.apache.activemq.jms.example.ExampleLoginModule&lt;/property&gt;
     &lt;property name="Configuration"&gt;
        &lt;inject bean="ExampleConfiguration"/&gt;
     &lt;/property&gt;
@@ -210,7 +210,7 @@
         <para>JBoss 应用服务器安全管理器适用于当HornetQ运行于JBoss应用服务器内时。它可以与JBoss应用服务器
             的安全模型紧密集成。</para>
         <para>此安全管理器的类是 <literal
-                >org.apache.activemq6.integration.jboss.security.JBossASSecurityManager</literal>。</para>
+                >org.apache.activemq.integration.jboss.security.JBossASSecurityManager</literal>。</para>
         <para>要了解如何配置JBoss安全管理器,可以看一眼HornetQ发布包中相关例子中的
             <literal>hornetq-jboss-beans.xml</literal>文件。</para>
        <section>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/docs/user-manual/zh/send-guarantees.xml
----------------------------------------------------------------------
diff --git a/docs/user-manual/zh/send-guarantees.xml b/docs/user-manual/zh/send-guarantees.xml
index c58721d..0fd9b62 100644
--- a/docs/user-manual/zh/send-guarantees.xml
+++ b/docs/user-manual/zh/send-guarantees.xml
@@ -90,7 +90,7 @@
         <section>
             <title>异步发送通知</title>
             <para>如果使用核心API,你需要实现<literal
-                    >org.apache.activemq6.api.core.client.SendAcknowledgementHandler</literal>接口并将一个实例设置到
+                    >org.apache.activemq.api.core.client.SendAcknowledgementHandler</literal>接口并将一个实例设置到
                     <literal>ClientSession</literal>中。</para>
             <para>然后使用这个<literal>ClientSession</literal>发送消息。当消息到达服务器后,服务器向客户端异步地发送通知,
                 并在客户端调用你的SendAcknowledgementHandler实例的<literal

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/docs/user-manual/zh/using-server.xml
----------------------------------------------------------------------
diff --git a/docs/user-manual/zh/using-server.xml b/docs/user-manual/zh/using-server.xml
index 36c47a1..76a1345 100644
--- a/docs/user-manual/zh/using-server.xml
+++ b/docs/user-manual/zh/using-server.xml
@@ -120,7 +120,7 @@
         </note>
         <para>所有配置文件中的参数都可以用系统变量来定义其值。以下用一个connector的配置来说明:</para>
         <programlisting>&lt;connector name="netty">
-         &lt;factory-class>org.apache.activemq6.integration.transports.netty.NettyConnectorFactory
+         &lt;factory-class>org.apache.activemq.integration.transports.netty.NettyConnectorFactory
            &lt;/factory-class>
          &lt;param key="host"  value="${hornetq.remoting.netty.host:localhost}" type="String"/>
          &lt;param key="port"  value="${hornetq.remoting.netty.port:5445}" type="Integer"/>
@@ -165,18 +165,18 @@
 &lt;/bean&gt; 
 
 &lt;!-- The core configuration --&gt;
-&lt;bean name="Configuration" class="org.apache.activemq6.core.config.impl.FileConfiguration"&gt;
+&lt;bean name="Configuration" class="org.apache.activemq.core.config.impl.FileConfiguration"&gt;
 &lt;/bean&gt;
 
 &lt;!-- The security manager --&gt;
 &lt;bean name="HornetQSecurityManager" 
-      class="org.apache.activemq6.spi.core.security.HornetQSecurityManagerImpl"&gt;
+      class="org.apache.activemq.spi.core.security.HornetQSecurityManagerImpl"&gt;
    &lt;start ignored="true"/&gt;
    &lt;stop ignored="true"/&gt;
 &lt;/bean&gt;
 
 &lt;!-- The core server --&gt;
-&lt;bean name="HornetQServer" class="org.apache.activemq6.core.server.impl.HornetQServerImpl"&gt;
+&lt;bean name="HornetQServer" class="org.apache.activemq.core.server.impl.HornetQServerImpl"&gt;
    &lt;start ignored="true"/&gt;
    &lt;stop ignored="true"/&gt;  
    &lt;constructor&gt;
@@ -194,7 +194,7 @@
 
 &lt;!-- The JMS server --&gt;
 &lt;bean name="JMSServerManager" 
-      class="org.apache.activemq6.jms.server.impl.JMSServerManagerImpl"&gt;
+      class="org.apache.activemq.jms.server.impl.JMSServerManagerImpl"&gt;
    &lt;constructor&gt;         
       &lt;parameter&gt;
          &lt;inject bean="HornetQServer"/&gt;
@@ -247,29 +247,29 @@
             <programlisting>&lt;?xml version="1.0" encoding="UTF-8"?&gt;
 &lt;server&gt;
 
-   &lt;mbean code="org.apache.activemq6.service.HornetQFileConfigurationService"
-      name="org.apache.activemq6:service=HornetQFileConfigurationService"&gt;
+   &lt;mbean code="org.apache.activemq.service.HornetQFileConfigurationService"
+      name="org.apache.activemq:service=HornetQFileConfigurationService"&gt;
    &lt;/mbean&gt;
 
-   &lt;mbean code="org.apache.activemq6.service.JBossASSecurityManagerService"
-      name="org.apache.activemq6:service=JBossASSecurityManagerService"&gt;
+   &lt;mbean code="org.apache.activemq.service.JBossASSecurityManagerService"
+      name="org.apache.activemq:service=JBossASSecurityManagerService"&gt;
    &lt;/mbean&gt;
 
-   &lt;mbean code="org.apache.activemq6.service.HornetQStarterService" 
-      name="org.apache.activemq6:service=HornetQStarterService"&gt;
+   &lt;mbean code="org.apache.activemq.service.HornetQStarterService"
+      name="org.apache.activemq:service=HornetQStarterService"&gt;
       &lt;!--let's let the JMS Server start us--&gt;
          &lt;attribute name="Start"&gt;false&lt;/attribute&gt;
 
       &lt;depends optional-attribute-name="SecurityManagerService"
-         proxy-type="attribute"&gt;org.apache.activemq6:service=JBossASSecurityManagerService&lt;/depends&gt;
+         proxy-type="attribute"&gt;org.apache.activemq:service=JBossASSecurityManagerService&lt;/depends&gt;
       &lt;depends optional-attribute-name="ConfigurationService"
-         proxy-type="attribute"&gt;org.apache.activemq6:service=HornetQFileConfigurationService&lt;/depends&gt;
+         proxy-type="attribute"&gt;org.apache.activemq:service=HornetQFileConfigurationService&lt;/depends&gt;
    &lt;/mbean&gt;
 
-   &lt;mbean code="org.apache.activemq6.service.HornetQJMSStarterService"
-      name="org.apache.activemq6:service=HornetQJMSStarterService"&gt;
+   &lt;mbean code="org.apache.activemq.service.HornetQJMSStarterService"
+      name="org.apache.activemq:service=HornetQJMSStarterService"&gt;
       &lt;depends optional-attribute-name="HornetQServer"
-         proxy-type="attribute"&gt;org.apache.activemq6:service=HornetQStarterService&lt;/depends&gt;
+         proxy-type="attribute"&gt;org.apache.activemq:service=HornetQStarterService&lt;/depends&gt;
    &lt;/mbean&gt;
    
 &lt;/server&gt;

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/etc/findbugs-exclude.xml
----------------------------------------------------------------------
diff --git a/etc/findbugs-exclude.xml b/etc/findbugs-exclude.xml
index 8801d36..6170bed 100644
--- a/etc/findbugs-exclude.xml
+++ b/etc/findbugs-exclude.xml
@@ -2,14 +2,14 @@
 
   <Match>
     <!-- Having str restored to null is fine for our purposes -->
-    <Class name="org.apache.activemq6.api.core.SimpleString"/>
+    <Class name="org.apache.activemq.api.core.SimpleString"/>
     <Field name="str"/>
     <Bug pattern="SE_TRANSIENT_FIELD_NOT_RESTORED"/>
   </Match>
 
   <Match>
     <!-- The whole point of SimpleString is to expose this data without any performance penalty -->
-    <Class name="org.apache.activemq6.api.core.SimpleString"/>
+    <Class name="org.apache.activemq.api.core.SimpleString"/>
     <method name="getData"/>
     <Bug pattern="EI_EXPOSE_REP"/>
   </Match>
@@ -17,19 +17,19 @@
   <!-- Ok to return mutable Object -->
   <Match>
     <Or>
-      <Class name="org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationStartSyncMessage" />
-      <Class name="org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationSyncFileMessage" />
-      <Class name="org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationLargeMessageWriteMessage" />
+      <Class name="org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationStartSyncMessage" />
+      <Class name="org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationSyncFileMessage" />
+      <Class name="org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationLargeMessageWriteMessage" />
     </Or>
     <Bug pattern="EI_EXPOSE_REP"/>
   </Match>
   <!-- Ok to return mutable Object, here restricted to method getRecordData -->
   <Match>
     <Or>
-      <Class name="org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationAddMessage" />
-      <Class name="org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationAddTXMessage" />
-      <Class name="org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationDeleteTXMessage" />
-      <Class name="org.apache.activemq6.core.protocol.core.impl.wireformat.ReplicationPrepareMessage" />
+      <Class name="org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationAddMessage" />
+      <Class name="org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationAddTXMessage" />
+      <Class name="org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationDeleteTXMessage" />
+      <Class name="org.apache.activemq.core.protocol.core.impl.wireformat.ReplicationPrepareMessage" />
     </Or>
     <Method name="getRecordData" />
     <Bug pattern="EI_EXPOSE_REP"/>
@@ -37,7 +37,7 @@
 
   <!-- Comparison is correct within its context -->
   <Match>
-    <Class name="org.apache.activemq6.ra.HornetQRaUtils"/>
+    <Class name="org.apache.activemq.ra.HornetQRaUtils"/>
     <Or>
       <Method name="compare" params="java.lang.Integer,java.lang.Integer" returns="boolean"/>
       <Method name="compare" params="java.lang.Long,java.lang.Long" returns="boolean"/>
@@ -48,14 +48,14 @@
 
   <!-- Comparison is correct within its context -->
   <Match>
-    <Class name="org.apache.activemq6.ra.Util"/>
+    <Class name="org.apache.activemq.ra.Util"/>
     <Method name="compare" params="java.lang.Boolean,java.lang.Boolean" returns="boolean"/>
     <Bug pattern="RC_REF_COMPARISON_BAD_PRACTICE_BOOLEAN"/>
   </Match>
 
   <!-- Comparison is correct within its context -->
   <Match>
-    <Class name="org.apache.activemq6.ra.Util"/>
+    <Class name="org.apache.activemq.ra.Util"/>
     <Method name="compare" params="java.lang.String,java.lang.String" returns="boolean"/>
     <Bug pattern="ES_COMPARING_PARAMETER_STRING_WITH_EQ"/>
   </Match>
@@ -71,7 +71,7 @@
 
          so methods are passed null arguments to trigger the exact same exceptions.
     -->
-    <Class name="org.apache.activemq6.utils.TypedProperties"/>
+    <Class name="org.apache.activemq.utils.TypedProperties"/>
     <Or>
       <Method name="getFloatProperty"/>
       <Method name="getDoubleProperty"/>
@@ -84,26 +84,26 @@
 
   <Match>
     <!-- Code is meant to measure memory usage, so calling Garbage Collection is normal. -->
-    <Class name="org.apache.activemq6.utils.MemorySize"/>
+    <Class name="org.apache.activemq.utils.MemorySize"/>
     <bug pattern="DM_GC"/>
   </Match>
 
   <match>
     <!-- Ignore naming convention violations in generated code -->
-    <class name="org.apache.activemq6.core.filter.impl.FilterParser"/>
+    <class name="org.apache.activemq.core.filter.impl.FilterParser"/>
     <bug pattern="NM_METHOD_NAMING_CONVENTION"/>
   </match>
 
   <Match>
     <!-- field changes are always guarded by PagingStoreImpl.lock.writeLock().lock() -->
-    <Class name="org.apache.activemq6.core.paging.impl.PagingStoreImpl"/>
+    <Class name="org.apache.activemq.core.paging.impl.PagingStoreImpl"/>
     <Field name="numberOfPages" />
     <Bug pattern="VO_VOLATILE_INCREMENT"/>
   </Match>
 
   <Match>
     <!-- File is generated by JavaCC -->
-    <Class name="org.apache.activemq6.core.filter.impl.ParseException"/>
+    <Class name="org.apache.activemq.core.filter.impl.ParseException"/>
     <bug pattern="SBSC_USE_STRINGBUFFER_CONCATENATION"/>
   </Match>
 
@@ -125,12 +125,12 @@
   </Match>
 
   <Match>
-    <Class name="org.apache.activemq6.utils.json.JSONObject$Null"/>
+    <Class name="org.apache.activemq.utils.json.JSONObject$Null"/>
     <Bug pattern="EQ_UNUSUAL"/>
   </Match>
 
   <Match>
-    <Class name="org.apache.activemq6.core.server.impl.HornetQServerImpl$SharedNothingLiveActivation"/>
+    <Class name="org.apache.activemq.core.server.impl.HornetQServerImpl$SharedNothingLiveActivation"/>
     <Method name="isNodeIdUsed"/>
     <Bug pattern="RV_RETURN_VALUE_IGNORED"/>
   </Match>
@@ -138,8 +138,8 @@
   <!-- Examples often verify a null value and use the (null) variable in a sys-out statement -->
   <Match>
     <Or>
-      <Class name="org.apache.activemq6.jms.example.TopicHierarchyExample"/>
-      <Class name="org.apache.activemq6.jms.example.TransactionalExample"/>
+      <Class name="org.apache.activemq.jms.example.TopicHierarchyExample"/>
+      <Class name="org.apache.activemq.jms.example.TransactionalExample"/>
     </Or>
     <Method name="runExample"/>
     <Bug pattern="NP_LOAD_OF_KNOWN_NULL_VALUE"/>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/core/embedded-remote/pom.xml
----------------------------------------------------------------------
diff --git a/examples/core/embedded-remote/pom.xml b/examples/core/embedded-remote/pom.xml
index 49e0759..d84c035 100644
--- a/examples/core/embedded-remote/pom.xml
+++ b/examples/core/embedded-remote/pom.xml
@@ -3,29 +3,29 @@
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
-      <groupId>org.apache.activemq6.examples.core</groupId>
+      <groupId>org.apache.activemq.examples.core</groupId>
       <artifactId>core-examples</artifactId>
       <version>6.0.0-SNAPSHOT</version>
    </parent>
 
-   <artifactId>activemq6-core-embedded-remote-example</artifactId>
+   <artifactId>activemq-core-embedded-remote-example</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ6 Core Embedded Remote Example</name>
 
    <dependencies>
       <dependency>
-         <groupId>org.apache.activemq6</groupId>
-         <artifactId>activemq6-core-client</artifactId>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>activemq-core-client</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
-         <groupId>org.apache.activemq6</groupId>
-         <artifactId>activemq6-commons</artifactId>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>activemq-commons</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
-         <groupId>org.apache.activemq6</groupId>
-         <artifactId>activemq6-server</artifactId>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>activemq-server</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -53,8 +53,8 @@
          <id>server</id>
          <dependencies>
             <dependency>
-               <groupId>org.apache.activemq6</groupId>
-               <artifactId>activemq6-server</artifactId>
+               <groupId>org.apache.activemq</groupId>
+               <artifactId>activemq-server</artifactId>
                <version>${project.version}</version>
             </dependency>
          </dependencies>
@@ -73,7 +73,7 @@
                      </execution>
                   </executions>
                   <configuration>
-                     <mainClass>org.apache.activemq6.core.example.EmbeddedServer</mainClass>
+                     <mainClass>org.apache.activemq.core.example.EmbeddedServer</mainClass>
                   </configuration>
                </plugin>
             </plugins>
@@ -83,8 +83,8 @@
          <id>client</id>
          <dependencies>
             <dependency>
-               <groupId>org.apache.activemq6</groupId>
-               <artifactId>activemq6-core-client</artifactId>
+               <groupId>org.apache.activemq</groupId>
+               <artifactId>activemq-core-client</artifactId>
                <version>${project.version}</version>
             </dependency>
          </dependencies>
@@ -103,7 +103,7 @@
                      </execution>
                   </executions>
                   <configuration>
-                     <mainClass>org.apache.activemq6.core.example.EmbeddedRemoteExample</mainClass>
+                     <mainClass>org.apache.activemq.core.example.EmbeddedRemoteExample</mainClass>
                   </configuration>
                </plugin>
             </plugins>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/core/embedded-remote/src/main/java/org/apache/activemq/core/example/EmbeddedRemoteExample.java
----------------------------------------------------------------------
diff --git a/examples/core/embedded-remote/src/main/java/org/apache/activemq/core/example/EmbeddedRemoteExample.java b/examples/core/embedded-remote/src/main/java/org/apache/activemq/core/example/EmbeddedRemoteExample.java
index 4d69da3..3bf70bb 100644
--- a/examples/core/embedded-remote/src/main/java/org/apache/activemq/core/example/EmbeddedRemoteExample.java
+++ b/examples/core/embedded-remote/src/main/java/org/apache/activemq/core/example/EmbeddedRemoteExample.java
@@ -10,21 +10,21 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.core.example;
+package org.apache.activemq.core.example;
 
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
 
-import org.apache.activemq6.api.core.TransportConfiguration;
-import org.apache.activemq6.api.core.client.ClientConsumer;
-import org.apache.activemq6.api.core.client.ClientMessage;
-import org.apache.activemq6.api.core.client.ClientProducer;
-import org.apache.activemq6.api.core.client.ClientSession;
-import org.apache.activemq6.api.core.client.ClientSessionFactory;
-import org.apache.activemq6.api.core.client.HornetQClient;
-import org.apache.activemq6.api.core.client.ServerLocator;
-import org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory;
+import org.apache.activemq.api.core.TransportConfiguration;
+import org.apache.activemq.api.core.client.ClientConsumer;
+import org.apache.activemq.api.core.client.ClientMessage;
+import org.apache.activemq.api.core.client.ClientProducer;
+import org.apache.activemq.api.core.client.ClientSession;
+import org.apache.activemq.api.core.client.ClientSessionFactory;
+import org.apache.activemq.api.core.client.HornetQClient;
+import org.apache.activemq.api.core.client.ServerLocator;
+import org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory;
 
 /**
  *

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/core/embedded-remote/src/main/java/org/apache/activemq/core/example/EmbeddedServer.java
----------------------------------------------------------------------
diff --git a/examples/core/embedded-remote/src/main/java/org/apache/activemq/core/example/EmbeddedServer.java b/examples/core/embedded-remote/src/main/java/org/apache/activemq/core/example/EmbeddedServer.java
index 03222cb..10c2179 100644
--- a/examples/core/embedded-remote/src/main/java/org/apache/activemq/core/example/EmbeddedServer.java
+++ b/examples/core/embedded-remote/src/main/java/org/apache/activemq/core/example/EmbeddedServer.java
@@ -10,18 +10,18 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.core.example;
+package org.apache.activemq.core.example;
 
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Map;
 
-import org.apache.activemq6.api.core.TransportConfiguration;
-import org.apache.activemq6.core.config.Configuration;
-import org.apache.activemq6.core.config.impl.ConfigurationImpl;
-import org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory;
-import org.apache.activemq6.core.server.HornetQServer;
-import org.apache.activemq6.core.server.HornetQServers;
+import org.apache.activemq.api.core.TransportConfiguration;
+import org.apache.activemq.core.config.Configuration;
+import org.apache.activemq.core.config.impl.ConfigurationImpl;
+import org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory;
+import org.apache.activemq.core.server.HornetQServer;
+import org.apache.activemq.core.server.HornetQServers;
 
 /**
  * An EmbeddedServer

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/core/embedded/pom.xml
----------------------------------------------------------------------
diff --git a/examples/core/embedded/pom.xml b/examples/core/embedded/pom.xml
index c90af1b..c49ff57 100644
--- a/examples/core/embedded/pom.xml
+++ b/examples/core/embedded/pom.xml
@@ -3,29 +3,29 @@
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
-      <groupId>org.apache.activemq6.examples.core</groupId>
+      <groupId>org.apache.activemq.examples.core</groupId>
       <artifactId>core-examples</artifactId>
       <version>6.0.0-SNAPSHOT</version>
    </parent>
 
-   <artifactId>activemq6-core-embedded-example</artifactId>
+   <artifactId>activemq-core-embedded-example</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ6 Core Embedded Example</name>
 
    <dependencies>
       <dependency>
-         <groupId>org.apache.activemq6</groupId>
-         <artifactId>activemq6-server</artifactId>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>activemq-server</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
-         <groupId>org.apache.activemq6</groupId>
-         <artifactId>activemq6-core-client</artifactId>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>activemq-core-client</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
-         <groupId>org.apache.activemq6</groupId>
-         <artifactId>activemq6-commons</artifactId>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>activemq-commons</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -66,7 +66,7 @@
                      </execution>
                   </executions>
                   <configuration>
-                     <mainClass>org.apache.activemq6.core.example.EmbeddedExample</mainClass>
+                     <mainClass>org.apache.activemq.core.example.EmbeddedExample</mainClass>
                   </configuration>
                </plugin>
             </plugins>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/core/embedded/src/main/java/org/apache/activemq/core/example/EmbeddedExample.java
----------------------------------------------------------------------
diff --git a/examples/core/embedded/src/main/java/org/apache/activemq/core/example/EmbeddedExample.java b/examples/core/embedded/src/main/java/org/apache/activemq/core/example/EmbeddedExample.java
index 65f3392..259154a 100644
--- a/examples/core/embedded/src/main/java/org/apache/activemq/core/example/EmbeddedExample.java
+++ b/examples/core/embedded/src/main/java/org/apache/activemq/core/example/EmbeddedExample.java
@@ -10,24 +10,24 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.core.example;
+package org.apache.activemq.core.example;
 
 import java.util.Date;
 
-import org.apache.activemq6.api.core.TransportConfiguration;
-import org.apache.activemq6.api.core.client.ClientConsumer;
-import org.apache.activemq6.api.core.client.ClientMessage;
-import org.apache.activemq6.api.core.client.ClientProducer;
-import org.apache.activemq6.api.core.client.ClientSession;
-import org.apache.activemq6.api.core.client.ClientSessionFactory;
-import org.apache.activemq6.api.core.client.HornetQClient;
-import org.apache.activemq6.api.core.client.ServerLocator;
-import org.apache.activemq6.core.config.Configuration;
-import org.apache.activemq6.core.config.impl.ConfigurationImpl;
-import org.apache.activemq6.core.remoting.impl.invm.InVMAcceptorFactory;
-import org.apache.activemq6.core.remoting.impl.invm.InVMConnectorFactory;
-import org.apache.activemq6.core.server.HornetQServer;
-import org.apache.activemq6.core.server.HornetQServers;
+import org.apache.activemq.api.core.TransportConfiguration;
+import org.apache.activemq.api.core.client.ClientConsumer;
+import org.apache.activemq.api.core.client.ClientMessage;
+import org.apache.activemq.api.core.client.ClientProducer;
+import org.apache.activemq.api.core.client.ClientSession;
+import org.apache.activemq.api.core.client.ClientSessionFactory;
+import org.apache.activemq.api.core.client.HornetQClient;
+import org.apache.activemq.api.core.client.ServerLocator;
+import org.apache.activemq.core.config.Configuration;
+import org.apache.activemq.core.config.impl.ConfigurationImpl;
+import org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory;
+import org.apache.activemq.core.remoting.impl.invm.InVMConnectorFactory;
+import org.apache.activemq.core.server.HornetQServer;
+import org.apache.activemq.core.server.HornetQServers;
 
 /**
  *

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/core/perf/pom.xml
----------------------------------------------------------------------
diff --git a/examples/core/perf/pom.xml b/examples/core/perf/pom.xml
index 3a525d8..5f56bbc 100644
--- a/examples/core/perf/pom.xml
+++ b/examples/core/perf/pom.xml
@@ -3,24 +3,24 @@
    <modelVersion>4.0.0</modelVersion>
 
    <parent>
-      <groupId>org.apache.activemq6.examples.core</groupId>
+      <groupId>org.apache.activemq.examples.core</groupId>
       <artifactId>core-examples</artifactId>
       <version>6.0.0-SNAPSHOT</version>
    </parent>
 
-   <artifactId>activemq6-core-perf-example</artifactId>
+   <artifactId>activemq-core-perf-example</artifactId>
    <packaging>jar</packaging>
    <name>ActiveMQ6 Perf Example</name>
 
    <dependencies>
       <dependency>
-         <groupId>org.apache.activemq6</groupId>
-         <artifactId>activemq6-core-client</artifactId>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>activemq-core-client</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
-         <groupId>org.apache.activemq6</groupId>
-         <artifactId>activemq6-commons</artifactId>
+         <groupId>org.apache.activemq</groupId>
+         <artifactId>activemq-commons</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -39,8 +39,8 @@
          <version>5.0.5.Final</version>
       </dependency>
       <dependency>
-         <groupId>org.apache.activemq6.examples.jms</groupId>
-         <artifactId>activemq6-jms-examples-common</artifactId>
+         <groupId>org.apache.activemq.examples.jms</groupId>
+         <artifactId>activemq-jms-examples-common</artifactId>
          <version>${project.version}</version>
       </dependency>
       <dependency>
@@ -58,8 +58,8 @@
          <build>
             <plugins>
                <plugin>
-                  <groupId>org.apache.activemq6</groupId>
-                  <artifactId>activemq6-maven-plugin</artifactId>
+                  <groupId>org.apache.activemq</groupId>
+                  <artifactId>activemq-maven-plugin</artifactId>
                   <executions>
                      <execution>
                         <id>start</id>
@@ -84,28 +84,28 @@
                   </configuration>
                   <dependencies>
                      <dependency>
-                        <groupId>org.apache.activemq6.examples.core</groupId>
-                        <artifactId>activemq6-core-perf-example</artifactId>
+                        <groupId>org.apache.activemq.examples.core</groupId>
+                        <artifactId>activemq-core-perf-example</artifactId>
                         <version>${project.version}</version>
                      </dependency>
                      <dependency>
-                        <groupId>org.apache.activemq6</groupId>
-                        <artifactId>activemq6-core-client</artifactId>
+                        <groupId>org.apache.activemq</groupId>
+                        <artifactId>activemq-core-client</artifactId>
                         <version>${project.version}</version>
                      </dependency>
                      <dependency>
-                        <groupId>org.apache.activemq6</groupId>
-                        <artifactId>activemq6-server</artifactId>
+                        <groupId>org.apache.activemq</groupId>
+                        <artifactId>activemq-server</artifactId>
                         <version>${project.version}</version>
                      </dependency>
                      <dependency>
-                        <groupId>org.apache.activemq6</groupId>
-                        <artifactId>activemq6-jms-client</artifactId>
+                        <groupId>org.apache.activemq</groupId>
+                        <artifactId>activemq-jms-client</artifactId>
                         <version>${project.version}</version>
                      </dependency>
                      <dependency>
-                        <groupId>org.apache.activemq6</groupId>
-                        <artifactId>activemq6-jms-server</artifactId>
+                        <groupId>org.apache.activemq</groupId>
+                        <artifactId>activemq-jms-server</artifactId>
                         <version>${project.version}</version>
                      </dependency>
                      <dependency>
@@ -145,7 +145,7 @@
                      </execution>
                   </executions>
                   <configuration>
-                     <mainClass>org.apache.activemq6.core.example.PerfListener</mainClass>
+                     <mainClass>org.apache.activemq.core.example.PerfListener</mainClass>
                   </configuration>
                </plugin>
             </plugins>
@@ -168,7 +168,7 @@
                      </execution>
                   </executions>
                   <configuration>
-                     <mainClass>org.apache.activemq6.core.example.PerfSender</mainClass>
+                     <mainClass>org.apache.activemq.core.example.PerfSender</mainClass>
                   </configuration>
                </plugin>
             </plugins>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/core/perf/src/main/java/org/apache/activemq/core/example/PerfBase.java
----------------------------------------------------------------------
diff --git a/examples/core/perf/src/main/java/org/apache/activemq/core/example/PerfBase.java b/examples/core/perf/src/main/java/org/apache/activemq/core/example/PerfBase.java
index b9ea75d..9d0eefe 100644
--- a/examples/core/perf/src/main/java/org/apache/activemq/core/example/PerfBase.java
+++ b/examples/core/perf/src/main/java/org/apache/activemq/core/example/PerfBase.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.core.example;
+package org.apache.activemq.core.example;
 
 import java.io.FileInputStream;
 import java.io.InputStream;
@@ -22,21 +22,21 @@ import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.logging.Logger;
 
-import org.apache.activemq6.api.core.Message;
-import org.apache.activemq6.api.core.TransportConfiguration;
-import org.apache.activemq6.api.core.client.ClientConsumer;
-import org.apache.activemq6.api.core.client.ClientMessage;
-import org.apache.activemq6.api.core.client.ClientProducer;
-import org.apache.activemq6.api.core.client.ClientSession;
-import org.apache.activemq6.api.core.client.ClientSessionFactory;
-import org.apache.activemq6.api.core.client.HornetQClient;
-import org.apache.activemq6.api.core.client.MessageHandler;
-import org.apache.activemq6.api.core.client.SendAcknowledgementHandler;
-import org.apache.activemq6.api.core.client.ServerLocator;
-import org.apache.activemq6.core.remoting.impl.netty.NettyConnectorFactory;
-import org.apache.activemq6.core.remoting.impl.netty.TransportConstants;
-import org.apache.activemq6.utils.TokenBucketLimiter;
-import org.apache.activemq6.utils.TokenBucketLimiterImpl;
+import org.apache.activemq.api.core.Message;
+import org.apache.activemq.api.core.TransportConfiguration;
+import org.apache.activemq.api.core.client.ClientConsumer;
+import org.apache.activemq.api.core.client.ClientMessage;
+import org.apache.activemq.api.core.client.ClientProducer;
+import org.apache.activemq.api.core.client.ClientSession;
+import org.apache.activemq.api.core.client.ClientSessionFactory;
+import org.apache.activemq.api.core.client.HornetQClient;
+import org.apache.activemq.api.core.client.MessageHandler;
+import org.apache.activemq.api.core.client.SendAcknowledgementHandler;
+import org.apache.activemq.api.core.client.ServerLocator;
+import org.apache.activemq.core.remoting.impl.netty.NettyConnectorFactory;
+import org.apache.activemq.core.remoting.impl.netty.TransportConstants;
+import org.apache.activemq.utils.TokenBucketLimiter;
+import org.apache.activemq.utils.TokenBucketLimiterImpl;
 
 /**
  *

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/core/perf/src/main/java/org/apache/activemq/core/example/PerfListener.java
----------------------------------------------------------------------
diff --git a/examples/core/perf/src/main/java/org/apache/activemq/core/example/PerfListener.java b/examples/core/perf/src/main/java/org/apache/activemq/core/example/PerfListener.java
index 6e3f247..5667664 100644
--- a/examples/core/perf/src/main/java/org/apache/activemq/core/example/PerfListener.java
+++ b/examples/core/perf/src/main/java/org/apache/activemq/core/example/PerfListener.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.core.example;
+package org.apache.activemq.core.example;
 
 import java.util.logging.Logger;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/core/perf/src/main/java/org/apache/activemq/core/example/PerfParams.java
----------------------------------------------------------------------
diff --git a/examples/core/perf/src/main/java/org/apache/activemq/core/example/PerfParams.java b/examples/core/perf/src/main/java/org/apache/activemq/core/example/PerfParams.java
index 87a15c6..46fdbf6 100644
--- a/examples/core/perf/src/main/java/org/apache/activemq/core/example/PerfParams.java
+++ b/examples/core/perf/src/main/java/org/apache/activemq/core/example/PerfParams.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.core.example;
+package org.apache.activemq.core.example;
 
 import java.io.Serializable;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/core/perf/src/main/java/org/apache/activemq/core/example/PerfSender.java
----------------------------------------------------------------------
diff --git a/examples/core/perf/src/main/java/org/apache/activemq/core/example/PerfSender.java b/examples/core/perf/src/main/java/org/apache/activemq/core/example/PerfSender.java
index 0342aa2..b18617d 100644
--- a/examples/core/perf/src/main/java/org/apache/activemq/core/example/PerfSender.java
+++ b/examples/core/perf/src/main/java/org/apache/activemq/core/example/PerfSender.java
@@ -10,7 +10,7 @@
  * implied.  See the License for the specific language governing
  * permissions and limitations under the License.
  */
-package org.apache.activemq6.core.example;
+package org.apache.activemq.core.example;
 
 import java.util.logging.Logger;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/examples/core/perf/src/main/resources/server0/hornetq-configuration-messaging-lab.xml
----------------------------------------------------------------------
diff --git a/examples/core/perf/src/main/resources/server0/hornetq-configuration-messaging-lab.xml b/examples/core/perf/src/main/resources/server0/hornetq-configuration-messaging-lab.xml
index d87514d..51c6c9a 100644
--- a/examples/core/perf/src/main/resources/server0/hornetq-configuration-messaging-lab.xml
+++ b/examples/core/perf/src/main/resources/server0/hornetq-configuration-messaging-lab.xml
@@ -14,7 +14,7 @@
    <!-- Acceptors -->
    <acceptors>
       <acceptor name="netty-acceptor">
-         <factory-class>org.apache.activemq6.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>    
+         <factory-class>org.apache.activemq.core.remoting.impl.netty.NettyAcceptorFactory</factory-class>
          <param key="tcp-no-delay" value="false"/>
          <param key="tcp-send-buffer-size" value="1048576"/>
          <param key="tcp-receive-buffer-size" value="1048576"/>


Mime
View raw message