Return-Path: 
 <activemq-commits-return-183-apmail-geronimo-activemq-commits-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-activemq-commits-archive@www.apache.org
Received: (qmail 21377 invoked from network); 28 Dec 2005 17:32:28 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 28 Dec 2005 17:32:28 -0000
Received: (qmail 32211 invoked by uid 500); 28 Dec 2005 17:32:28 -0000
Delivered-To: apmail-geronimo-activemq-commits-archive@geronimo.apache.org
Received: (qmail 32166 invoked by uid 500); 28 Dec 2005 17:32:27 -0000
Mailing-List: contact activemq-commits-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:activemq-commits-help@geronimo.apache.org>
List-Unsubscribe: <mailto:activemq-commits-unsubscribe@geronimo.apache.org>
List-Post: <mailto:activemq-commits@geronimo.apache.org>
List-Id: <activemq-commits.geronimo.apache.org>
Reply-To: activemq-dev@geronimo.apache.org
Delivered-To: mailing list activemq-commits@geronimo.apache.org
Received: (qmail 32156 invoked by uid 99); 28 Dec 2005 17:32:27 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 28 Dec 2005 09:32:27 -0800
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Wed, 28 Dec 2005 09:32:14 -0800
Received: (qmail 21154 invoked by uid 65534); 28 Dec 2005 17:31:53 -0000
Message-ID: <20051228173153.21153.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r359567 [2/13] - in
 /incubator/activemq/trunk/activemq-core: ./
 src/gram/java/org/activemq/openwire/tool/ src/gram/script/
 src/main/grammar/ src/main/java/org/activemq/
 src/main/java/org/activemq/advisory/ src/main/java/org/activemq/broker/...
Date: Wed, 28 Dec 2005 17:28:57 -0000
To: activemq-commits@geronimo.apache.org
From: chirino@apache.org
X-Mailer: svnmailer-1.0.5
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N


Modified: incubator/activemq/trunk/activemq-core/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/maven.xml?rev=359567&r1=359566&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/maven.xml (original)
+++ incubator/activemq/trunk/activemq-core/maven.xml Wed Dec 28 09:24:02 2005
@@ -61,8 +61,8 @@
   </postGoal>
 
   <goal name="selector:generate" description="Generates the ActiveMQ selector parser.">
-    <mkdir dir="${pom.build.sourceDirectory}/org/activemq/selector" />
-    <javacc target="${basedir}/src/main/grammar/SelectorParser.jj" javacchome="${maven.repo.local}/javacc/jars" outputdirectory="${pom.build.sourceDirectory}/org/activemq/selector" />
+    <mkdir dir="${pom.build.sourceDirectory}/org/apache/activemq/selector" />
+    <javacc target="${basedir}/src/main/grammar/SelectorParser.jj" javacchome="${maven.repo.local}/javacc/jars" outputdirectory="${pom.build.sourceDirectory}/org/apache/activemq/selector" />
   </goal>
 
   <goal name="openwire:generate-control-data" description="Generates the openwire control data." prereqs="test:compile">
@@ -74,7 +74,7 @@
       <path refid="maven.dependency.classpath" />
     </path>
 
-    <java classname="org.activemq.openwire.DataFileGenerator" fork="true">
+    <java classname="org.apache.activemq.openwire.DataFileGenerator" fork="true">
       <classpath refid="test.classpath" />
     </java>
 
@@ -111,7 +111,7 @@
     <java classname="org.codehaus.gram.Gram" fork="true">
       <classpath refid="openwire.classpath" />
       <sysproperty key="openwire.version" value="${openwire.version}" />
-      <arg value="src/main/java/org/activemq/command" />
+      <arg value="src/main/java/org/apache/activemq/command" />
       <arg value="src/gram/script/GenerateJavaMarshalling.groovy" />
       <arg value="src/gram/script/GenerateCMarshalling.groovy" />
       <!--
@@ -164,7 +164,7 @@
     </j:if>
 
     <echo>Running the ActiveMQ broker for the URI ${uri}</echo>
-    <java classname="org.activemq.broker.Main" fork="true">
+    <java classname="org.apache.activemq.broker.Main" fork="true">
       <classpath refid="test.classpath" />
       <arg value="${uri}" />
       <sysproperty key="com.sun.management.jmxremote.port" value="5001" />
@@ -179,7 +179,7 @@
     </j:if>
 
     <echo>Running the ActiveMQ consumer for the URI ${uri}</echo>
-    <java classname="org.activemq.simple.Consumer" fork="false">
+    <java classname="org.apache.activemq.simple.Consumer" fork="false">
       <classpath refid="test.classpath" />
       <arg value="${uri}" />
     </java>

Modified: incubator/activemq/trunk/activemq-core/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/pom.xml?rev=359567&r1=359566&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/pom.xml (original)
+++ incubator/activemq/trunk/activemq-core/pom.xml Wed Dec 28 09:24:02 2005
@@ -250,7 +250,7 @@
             <phase>generate-sources</phase>
             <configuration>
               <sourceDirectory>${basedir}/src/main/grammar</sourceDirectory>
-              <outputDirectory>${basedir}/src/main/java/org/activemq/selector</outputDirectory>
+              <outputDirectory>${basedir}/src/main/java/org/apache/activemq/selector</outputDirectory>
             </configuration>
             <goals>
               <goal>javacc</goal>

Modified: incubator/activemq/trunk/activemq-core/project.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/project.xml?rev=359567&r1=359566&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/project.xml (original)
+++ incubator/activemq/trunk/activemq-core/project.xml Wed Dec 28 09:24:02 2005
@@ -28,55 +28,55 @@
     <description>ActiveMQ is an open source message broker and JMS 1.1 provider</description>
     <shortDescription>ActiveMQ JMS Message Broker</shortDescription>
 
-    <package>org.activemq</package>
+    <package>org.apache.activemq</package>
     <packageGroups>
         <packageGroup>
             <title>Core JMS Client API</title>
-            <packages>org.activemq:org.activemq.message</packages>
+            <packages>org.apache.activemq:org.apache.activemq.message</packages>
         </packageGroup>
         <packageGroup>
             <title>JMS Broker and Region implementations</title>
-            <packages>org.activemq.broker:org.activemq.broker.*</packages>
+            <packages>org.apache.activemq.broker:org.apache.activemq.broker.*</packages>
         </packageGroup>
         <packageGroup>
             <title>Management Statistics</title>
-            <packages>org.activemq.management</packages>
+            <packages>org.apache.activemq.management</packages>
         </packageGroup>
         <packageGroup>
             <title>JNDI support</title>
-            <packages>org.activemq.jndi</packages>
+            <packages>org.apache.activemq.jndi</packages>
         </packageGroup>
         <packageGroup>
             <title>Message filter and router</title>
-            <packages>org.activemq.filter:org.activemq.filter.*:org.activemq.selector</packages>
+            <packages>org.apache.activemq.filter:org.apache.activemq.filter.*:org.apache.activemq.selector</packages>
         </packageGroup>
         <packageGroup>
             <title>Security strategies and implementations</title>
-            <packages>org.activemq.security</packages>
+            <packages>org.apache.activemq.security</packages>
         </packageGroup>
         <packageGroup>
             <title>Transport, Discovery and WireFormat strategies and implementations</title>
-            <packages>org.activemq.transport:org.activemq.transport.*</packages>
+            <packages>org.apache.activemq.transport:org.apache.activemq.transport.*</packages>
         </packageGroup>
         <packageGroup>
             <title>OpenWire support</title>
-            <packages>org.activemq.command:org.activemq.openwire:org.activemq.openwire.*</packages>
+            <packages>org.apache.activemq.command:org.apache.activemq.openwire:org.apache.activemq.openwire.*</packages>
         </packageGroup>
         <packageGroup>
             <title>Support for Networks</title>
-            <packages>org.activemq.network:org.activemq.network.*</packages>
+            <packages>org.apache.activemq.network:org.apache.activemq.network.*</packages>
         </packageGroup>
         <packageGroup>
             <title>Message persistence strategies and implementations</title>
-            <packages>org.activemq.store:org.activemq.store.*</packages>
+            <packages>org.apache.activemq.store:org.apache.activemq.store.*</packages>
         </packageGroup>
         <packageGroup>
             <title>Core router services</title>
-            <packages>org.activemq.service:org.activemq.service.*</packages>
+            <packages>org.apache.activemq.service:org.apache.activemq.service.*</packages>
         </packageGroup>
         <packageGroup>
             <title>Utilities</title>
-            <packages>org.activemq.capacity:org.activemq.io.util:org.activemq.util</packages>
+            <packages>org.apache.activemq.capacity:org.apache.activemq.io.util:org.apache.activemq.util</packages>
         </packageGroup>
     </packageGroups>
     <!-- ============ -->

Modified: incubator/activemq/trunk/activemq-core/src/gram/java/org/activemq/openwire/tool/OpenWireScript.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/gram/java/org/activemq/openwire/tool/OpenWireScript.java?rev=359567&r1=359566&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/gram/java/org/activemq/openwire/tool/OpenWireScript.java (original)
+++ incubator/activemq/trunk/activemq-core/src/gram/java/org/activemq/openwire/tool/OpenWireScript.java Wed Dec 28 09:24:02 2005
@@ -16,7 +16,7 @@
  * limitations under the License.
  *
  **/
-package org.activemq.openwire.tool;
+package org.apache.activemq.openwire.tool;
 
 import org.codehaus.gram.GramSupport;
 import org.codehaus.jam.JAnnotationValue;
@@ -66,7 +66,7 @@
     public boolean isMarshallAware(JClass j) {
         JClass[] interfaces = j.getInterfaces();
         for (int i = 0; i < interfaces.length; i++) {
-            if( interfaces[i].getQualifiedName().equals("org.activemq.command.MarshallAware") ) {
+            if( interfaces[i].getQualifiedName().equals("org.apache.activemq.command.MarshallAware") ) {
                 return true;
             }
         }

Modified: incubator/activemq/trunk/activemq-core/src/gram/script/GenerateCMarshalling.groovy
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/gram/script/GenerateCMarshalling.groovy?rev=359567&r1=359566&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/gram/script/GenerateCMarshalling.groovy (original)
+++ incubator/activemq/trunk/activemq-core/src/gram/script/GenerateCMarshalling.groovy Wed Dec 28 09:24:02 2005
@@ -16,7 +16,7 @@
 * limitations under the License.
 *
 **/
-import org.activemq.openwire.tool.OpenWireScript
+import org.apache.activemq.openwire.tool.OpenWireScript
 
 /**
  * Generates the Java marshalling code for the Open Wire Format

Modified: incubator/activemq/trunk/activemq-core/src/gram/script/GenerateCSharpClasses.groovy
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/gram/script/GenerateCSharpClasses.groovy?rev=359567&r1=359566&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/gram/script/GenerateCSharpClasses.groovy (original)
+++ incubator/activemq/trunk/activemq-core/src/gram/script/GenerateCSharpClasses.groovy Wed Dec 28 09:24:02 2005
@@ -16,7 +16,7 @@
 * limitations under the License.
 *
 **/
-import org.activemq.openwire.tool.OpenWireScript
+import org.apache.activemq.openwire.tool.OpenWireScript
 
 /**
  * Generates the C# marshalling code for the Open Wire Format
@@ -26,7 +26,7 @@
 class GenerateCSharpClasses extends OpenWireScript {
 
     Object run() {
-        def destDir = new File("target/generated/dotnet/cs/org/activemq/openwire")
+        def destDir = new File("target/generated/dotnet/cs/org/apache/activemq/openwire")
         destDir.mkdirs()
 
         def messageClasses = classes.findAll { isMessageType(it) }
@@ -130,9 +130,9 @@
         switch (type) {
             case "java.lang.String":
                 return "string"
-            case "org.activemq.message.ActiveMQDestination":
+            case "org.apache.activemq.message.ActiveMQDestination":
                 return "ActiveMQDestination"
-            case "org.activemq.message.ActiveMQXid":
+            case "org.apache.activemq.message.ActiveMQXid":
                 return "ActiveMQXid"
             default:
                 return name

Modified: incubator/activemq/trunk/activemq-core/src/gram/script/GenerateCSharpMarshalling.groovy
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/gram/script/GenerateCSharpMarshalling.groovy?rev=359567&r1=359566&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/gram/script/GenerateCSharpMarshalling.groovy (original)
+++ incubator/activemq/trunk/activemq-core/src/gram/script/GenerateCSharpMarshalling.groovy Wed Dec 28 09:24:02 2005
@@ -16,7 +16,7 @@
 * limitations under the License.
 *
 **/
-import org.activemq.openwire.tool.OpenWireScript
+import org.apache.activemq.openwire.tool.OpenWireScript
 
 /**
  * Generates the Java marshalling code for the Open Wire Format
@@ -26,7 +26,7 @@
 class GenerateCSharpMarshalling extends OpenWireScript {
 
     Object run() {
-        def destDir = new File("target/generated/dotnet/cs/org/activemq/openwire/io")
+        def destDir = new File("target/generated/dotnet/cs/org/apache/activemq/openwire/io")
         destDir.mkdirs()
 
         def messageClasses = classes.findAll { isMessageType(it) }
@@ -93,7 +93,7 @@
                             out << "dataIn.readUTF()"
                             break;
 
-                        case "org.activemq.message.ActiveMQDestination":
+                        case "org.apache.activemq.message.ActiveMQDestination":
                             out << "readDestination(dataIn)"
                             break;
 
@@ -153,7 +153,7 @@
                             out << "writeUTF($getter, dataOut);"
                             break;
 
-                        case "org.activemq.message.ActiveMQDestination":
+                        case "org.apache.activemq.message.ActiveMQDestination":
                             out << "writeDestination($getter, dataOut);"
                             break;
 

Modified: incubator/activemq/trunk/activemq-core/src/gram/script/GenerateJavaMarshalling.groovy
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/gram/script/GenerateJavaMarshalling.groovy?rev=359567&r1=359566&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/gram/script/GenerateJavaMarshalling.groovy (original)
+++ incubator/activemq/trunk/activemq-core/src/gram/script/GenerateJavaMarshalling.groovy Wed Dec 28 09:24:02 2005
@@ -16,7 +16,7 @@
 * limitations under the License.
 *
 **/
-import org.activemq.openwire.tool.OpenWireScript
+import org.apache.activemq.openwire.tool.OpenWireScript
 
 /**
  * Generates the Java marshalling code for the Open Wire Format
@@ -29,7 +29,7 @@
     
         def openwireVersion = System.getProperty("openwire.version");
         
-        def destDir = new File("src/main/java/org/activemq/openwire/v${openwireVersion}")
+        def destDir = new File("src/main/java/org/apache/activemq/openwire/v${openwireVersion}")
         println "Generating Java marshalling code to directory ${destDir}"
         
         def openwireClasses = classes.findAll {
@@ -78,14 +78,14 @@
  * limitations under the License. 
  * 
  **/
-package org.activemq.openwire.v${openwireVersion};
+package org.apache.activemq.openwire.v${openwireVersion};
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
 
-import org.activemq.openwire.*;
-import org.activemq.command.*;
+import org.apache.activemq.openwire.*;
+import org.apache.activemq.command.*;
 """
 for (pkg in jclass.importedPackages) {
     for (clazz in pkg.classes) {
@@ -93,7 +93,7 @@
     }
 }
 
-def baseClass = "org.activemq.openwire.DataStreamMarshaller"
+def baseClass = "org.apache.activemq.openwire.DataStreamMarshaller"
 if( !jclass.superclass.simpleName.equals("Object") ) {
    baseClass = jclass.superclass.simpleName + "Marshaller";
 }
@@ -450,10 +450,10 @@
  * limitations under the License. 
  * 
  **/
-package org.activemq.openwire.v${openwireVersion};
+package org.apache.activemq.openwire.v${openwireVersion};
 
-import org.activemq.openwire.DataStreamMarshaller;
-import org.activemq.openwire.OpenWireFormat;
+import org.apache.activemq.openwire.DataStreamMarshaller;
+import org.apache.activemq.openwire.OpenWireFormat;
 
 /**
  * MarshallerFactory for Open Wire Format.

Modified: incubator/activemq/trunk/activemq-core/src/main/grammar/SelectorParser.jj
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/grammar/SelectorParser.jj?rev=359567&r1=359566&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/grammar/SelectorParser.jj (original)
+++ incubator/activemq/trunk/activemq-core/src/main/grammar/SelectorParser.jj Wed Dec 28 09:24:02 2005
@@ -35,14 +35,14 @@
 
 PARSER_BEGIN(SelectorParser)
 
-package org.activemq.selector;
+package org.apache.activemq.selector;
 
 import java.io.*;
 import java.util.*;
 
 import javax.jms.InvalidSelectorException;
 
-import org.activemq.filter.*;
+import org.apache.activemq.filter.*;
 
 /** 
  * JMS Selector Parser generated by JavaCC

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQConnection.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQConnection.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQConnection.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnection.java Wed Dec 28 09:24:02 2005
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.activemq;
+package org.apache.activemq;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -43,41 +43,41 @@
 import javax.jms.TopicSession;
 import javax.jms.XAConnection;
 
-import org.activemq.command.ActiveMQDestination;
-import org.activemq.command.ActiveMQMessage;
-import org.activemq.command.ActiveMQTempDestination;
-import org.activemq.command.ActiveMQTempQueue;
-import org.activemq.command.ActiveMQTempTopic;
-import org.activemq.command.BrokerInfo;
-import org.activemq.command.Command;
-import org.activemq.command.ConnectionId;
-import org.activemq.command.ConnectionInfo;
-import org.activemq.command.ConsumerId;
-import org.activemq.command.ConsumerInfo;
-import org.activemq.command.ControlCommand;
-import org.activemq.command.DestinationInfo;
-import org.activemq.command.ExceptionResponse;
-import org.activemq.command.Message;
-import org.activemq.command.MessageDispatch;
-import org.activemq.command.MessageId;
-import org.activemq.command.ProducerId;
-import org.activemq.command.RedeliveryPolicy;
-import org.activemq.command.RemoveSubscriptionInfo;
-import org.activemq.command.Response;
-import org.activemq.command.SessionId;
-import org.activemq.command.ShutdownInfo;
-import org.activemq.management.JMSConnectionStatsImpl;
-import org.activemq.management.JMSStatsImpl;
-import org.activemq.management.StatsCapable;
-import org.activemq.management.StatsImpl;
-import org.activemq.thread.TaskRunnerFactory;
-import org.activemq.transport.Transport;
-import org.activemq.transport.TransportListener;
-import org.activemq.util.IdGenerator;
-import org.activemq.util.IntrospectionSupport;
-import org.activemq.util.JMSExceptionSupport;
-import org.activemq.util.LongSequenceGenerator;
-import org.activemq.util.ServiceSupport;
+import org.apache.activemq.command.ActiveMQDestination;
+import org.apache.activemq.command.ActiveMQMessage;
+import org.apache.activemq.command.ActiveMQTempDestination;
+import org.apache.activemq.command.ActiveMQTempQueue;
+import org.apache.activemq.command.ActiveMQTempTopic;
+import org.apache.activemq.command.BrokerInfo;
+import org.apache.activemq.command.Command;
+import org.apache.activemq.command.ConnectionId;
+import org.apache.activemq.command.ConnectionInfo;
+import org.apache.activemq.command.ConsumerId;
+import org.apache.activemq.command.ConsumerInfo;
+import org.apache.activemq.command.ControlCommand;
+import org.apache.activemq.command.DestinationInfo;
+import org.apache.activemq.command.ExceptionResponse;
+import org.apache.activemq.command.Message;
+import org.apache.activemq.command.MessageDispatch;
+import org.apache.activemq.command.MessageId;
+import org.apache.activemq.command.ProducerId;
+import org.apache.activemq.command.RedeliveryPolicy;
+import org.apache.activemq.command.RemoveSubscriptionInfo;
+import org.apache.activemq.command.Response;
+import org.apache.activemq.command.SessionId;
+import org.apache.activemq.command.ShutdownInfo;
+import org.apache.activemq.management.JMSConnectionStatsImpl;
+import org.apache.activemq.management.JMSStatsImpl;
+import org.apache.activemq.management.StatsCapable;
+import org.apache.activemq.management.StatsImpl;
+import org.apache.activemq.thread.TaskRunnerFactory;
+import org.apache.activemq.transport.Transport;
+import org.apache.activemq.transport.TransportListener;
+import org.apache.activemq.util.IdGenerator;
+import org.apache.activemq.util.IntrospectionSupport;
+import org.apache.activemq.util.JMSExceptionSupport;
+import org.apache.activemq.util.LongSequenceGenerator;
+import org.apache.activemq.util.ServiceSupport;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -559,7 +559,7 @@
      * terminate a broker running in a standalone java process. Server must have
      * property enable.vm.shutdown=true defined to allow this to work.
      */
-    // TODO : org.activemq.message.BrokerAdminCommand not yet implemented.
+    // TODO : org.apache.activemq.message.BrokerAdminCommand not yet implemented.
     /*
      * public void terminateBrokerVM() throws JMSException { BrokerAdminCommand
      * command = new BrokerAdminCommand();

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionConsumer.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQConnectionConsumer.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionConsumer.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionConsumer.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQConnectionConsumer.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQConnectionConsumer.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionConsumer.java Wed Dec 28 09:24:02 2005
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.activemq;
+package org.apache.activemq;
 
 import java.util.Collections;
 import java.util.LinkedList;
@@ -28,8 +28,8 @@
 import javax.jms.ServerSessionPool;
 import javax.jms.Session;
 
-import org.activemq.command.ConsumerInfo;
-import org.activemq.command.MessageDispatch;
+import org.apache.activemq.command.ConsumerInfo;
+import org.apache.activemq.command.MessageDispatch;
 
 /**
  * For application servers, <CODE>Connection</CODE> objects provide a special

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQConnectionFactory.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQConnectionFactory.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQConnectionFactory.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionFactory.java Wed Dec 28 09:24:02 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq;
+package org.apache.activemq;
 
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -30,15 +30,15 @@
 import javax.jms.TopicConnectionFactory;
 import javax.naming.Context;
 
-import org.activemq.management.JMSStatsImpl;
-import org.activemq.management.StatsCapable;
-import org.activemq.management.StatsImpl;
-import org.activemq.transport.Transport;
-import org.activemq.transport.TransportFactory;
-import org.activemq.util.IntrospectionSupport;
-import org.activemq.util.JMSExceptionSupport;
-import org.activemq.util.URISupport;
-import org.activemq.util.URISupport.CompositeData;
+import org.apache.activemq.management.JMSStatsImpl;
+import org.apache.activemq.management.StatsCapable;
+import org.apache.activemq.management.StatsImpl;
+import org.apache.activemq.transport.Transport;
+import org.apache.activemq.transport.TransportFactory;
+import org.apache.activemq.util.IntrospectionSupport;
+import org.apache.activemq.util.JMSExceptionSupport;
+import org.apache.activemq.util.URISupport;
+import org.apache.activemq.util.URISupport.CompositeData;
 
 import edu.emory.mathcs.backport.java.util.concurrent.Executor;
 import edu.emory.mathcs.backport.java.util.concurrent.ScheduledThreadPoolExecutor;

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionMetaData.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQConnectionMetaData.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionMetaData.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionMetaData.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQConnectionMetaData.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQConnectionMetaData.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQConnectionMetaData.java Wed Dec 28 09:24:02 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq;
+package org.apache.activemq;
 
 import java.util.Enumeration;
 import java.util.Hashtable;
@@ -41,7 +41,7 @@
         int major=0;
         int minor=0;
         try {
-            Package p = Package.getPackage("org.activemq");
+            Package p = Package.getPackage("org.apache.activemq");
             if (p != null) {
                 version = p.getImplementationVersion();
                 Pattern pattern = Pattern.compile("(\\d+)\\.(\\d+).*");

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQDispatcher.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQDispatcher.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQDispatcher.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQDispatcher.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQDispatcher.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQDispatcher.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQDispatcher.java Wed Dec 28 09:24:02 2005
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq;
+package org.apache.activemq;
 
-import org.activemq.command.MessageDispatch;
+import org.apache.activemq.command.MessageDispatch;
 
 public interface ActiveMQDispatcher {
     void dispatch(MessageDispatch messageDispatch);

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQInputStream.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQInputStream.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQInputStream.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQInputStream.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQInputStream.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQInputStream.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQInputStream.java Wed Dec 28 09:24:02 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq;
+package org.apache.activemq;
 
 import java.io.IOException;
 import java.io.InputStream;
@@ -23,18 +23,18 @@
 import javax.jms.InvalidDestinationException;
 import javax.jms.JMSException;
 
-import org.activemq.command.ActiveMQBytesMessage;
-import org.activemq.command.ActiveMQDestination;
-import org.activemq.command.ActiveMQMessage;
-import org.activemq.command.CommandTypes;
-import org.activemq.command.ConsumerId;
-import org.activemq.command.ConsumerInfo;
-import org.activemq.command.MessageAck;
-import org.activemq.command.MessageDispatch;
-import org.activemq.command.ProducerId;
-import org.activemq.selector.SelectorParser;
-import org.activemq.util.IOExceptionSupport;
-import org.activemq.util.JMSExceptionSupport;
+import org.apache.activemq.command.ActiveMQBytesMessage;
+import org.apache.activemq.command.ActiveMQDestination;
+import org.apache.activemq.command.ActiveMQMessage;
+import org.apache.activemq.command.CommandTypes;
+import org.apache.activemq.command.ConsumerId;
+import org.apache.activemq.command.ConsumerInfo;
+import org.apache.activemq.command.MessageAck;
+import org.apache.activemq.command.MessageDispatch;
+import org.apache.activemq.command.ProducerId;
+import org.apache.activemq.selector.SelectorParser;
+import org.apache.activemq.util.IOExceptionSupport;
+import org.apache.activemq.util.JMSExceptionSupport;
 
 /**
  * 
@@ -85,9 +85,9 @@
         this.info.setSubcriptionName(name);
 
         if (selector != null && selector.trim().length() != 0) {
-            selector = "JMSType='org.activemq.Stream' AND ( "+selector+" ) ";
+            selector = "JMSType='org.apache.activemq.Stream' AND ( "+selector+" ) ";
         } else {
-            selector = "JMSType='org.activemq.Stream'";
+            selector = "JMSType='org.apache.activemq.Stream'";
         }
         
         new SelectorParser().parse(selector);

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQMessageConsumer.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQMessageConsumer.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQMessageConsumer.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageConsumer.java Wed Dec 28 09:24:02 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq;
+package org.apache.activemq;
 
 import java.util.HashMap;
 import java.util.Iterator;
@@ -27,22 +27,22 @@
 import javax.jms.MessageConsumer;
 import javax.jms.MessageListener;
 
-import org.activemq.command.ActiveMQDestination;
-import org.activemq.command.ActiveMQMessage;
-import org.activemq.command.ConsumerId;
-import org.activemq.command.ConsumerInfo;
-import org.activemq.command.MessageAck;
-import org.activemq.command.MessageDispatch;
-import org.activemq.command.RedeliveryPolicy;
-import org.activemq.management.JMSConsumerStatsImpl;
-import org.activemq.management.StatsCapable;
-import org.activemq.management.StatsImpl;
-import org.activemq.selector.SelectorParser;
-import org.activemq.thread.Scheduler;
-import org.activemq.transaction.Synchronization;
-import org.activemq.util.Callback;
-import org.activemq.util.IntrospectionSupport;
-import org.activemq.util.JMSExceptionSupport;
+import org.apache.activemq.command.ActiveMQDestination;
+import org.apache.activemq.command.ActiveMQMessage;
+import org.apache.activemq.command.ConsumerId;
+import org.apache.activemq.command.ConsumerInfo;
+import org.apache.activemq.command.MessageAck;
+import org.apache.activemq.command.MessageDispatch;
+import org.apache.activemq.command.RedeliveryPolicy;
+import org.apache.activemq.management.JMSConsumerStatsImpl;
+import org.apache.activemq.management.StatsCapable;
+import org.apache.activemq.management.StatsImpl;
+import org.apache.activemq.selector.SelectorParser;
+import org.apache.activemq.thread.Scheduler;
+import org.apache.activemq.transaction.Synchronization;
+import org.apache.activemq.util.Callback;
+import org.apache.activemq.util.IntrospectionSupport;
+import org.apache.activemq.util.JMSExceptionSupport;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageProducer.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQMessageProducer.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageProducer.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageProducer.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQMessageProducer.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQMessageProducer.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageProducer.java Wed Dec 28 09:24:02 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq;
+package org.apache.activemq;
 
 import javax.jms.DeliveryMode;
 import javax.jms.Destination;
@@ -26,12 +26,12 @@
 import javax.jms.MessageProducer;
 
 import org.activeio.Disposable;
-import org.activemq.command.ActiveMQDestination;
-import org.activemq.command.ProducerId;
-import org.activemq.command.ProducerInfo;
-import org.activemq.management.JMSProducerStatsImpl;
-import org.activemq.management.StatsCapable;
-import org.activemq.management.StatsImpl;
+import org.apache.activemq.command.ActiveMQDestination;
+import org.apache.activemq.command.ProducerId;
+import org.apache.activemq.command.ProducerInfo;
+import org.apache.activemq.management.JMSProducerStatsImpl;
+import org.apache.activemq.management.StatsCapable;
+import org.apache.activemq.management.StatsImpl;
 
 import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicLong;
 

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageTransformation.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQMessageTransformation.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageTransformation.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageTransformation.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQMessageTransformation.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQMessageTransformation.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQMessageTransformation.java Wed Dec 28 09:24:02 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq;
+package org.apache.activemq;
 
 import java.util.Enumeration;
 
@@ -32,18 +32,18 @@
 import javax.jms.TextMessage;
 import javax.jms.Topic;
 
-import org.activemq.command.ActiveMQDestination;
 
-import org.activemq.command.ActiveMQBytesMessage;
-import org.activemq.command.ActiveMQMapMessage;
-import org.activemq.command.ActiveMQMessage;
-import org.activemq.command.ActiveMQObjectMessage;
-import org.activemq.command.ActiveMQQueue;
-import org.activemq.command.ActiveMQStreamMessage;
-import org.activemq.command.ActiveMQTempQueue;
-import org.activemq.command.ActiveMQTempTopic;
-import org.activemq.command.ActiveMQTextMessage;
-import org.activemq.command.ActiveMQTopic;
+import org.apache.activemq.command.ActiveMQBytesMessage;
+import org.apache.activemq.command.ActiveMQDestination;
+import org.apache.activemq.command.ActiveMQMapMessage;
+import org.apache.activemq.command.ActiveMQMessage;
+import org.apache.activemq.command.ActiveMQObjectMessage;
+import org.apache.activemq.command.ActiveMQQueue;
+import org.apache.activemq.command.ActiveMQStreamMessage;
+import org.apache.activemq.command.ActiveMQTempQueue;
+import org.apache.activemq.command.ActiveMQTempTopic;
+import org.apache.activemq.command.ActiveMQTextMessage;
+import org.apache.activemq.command.ActiveMQTopic;
 
 /**
  * A helper class for converting normal JMS interfaces into ActiveMQ specific ones.

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQOutputStream.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQOutputStream.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQOutputStream.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQOutputStream.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQOutputStream.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQOutputStream.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQOutputStream.java Wed Dec 28 09:24:02 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq;
+package org.apache.activemq;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -26,13 +26,13 @@
 import javax.jms.JMSException;
 
 import org.activeio.Disposable;
-import org.activemq.command.ActiveMQBytesMessage;
-import org.activemq.command.ActiveMQDestination;
-import org.activemq.command.ActiveMQMessage;
-import org.activemq.command.MessageId;
-import org.activemq.command.ProducerId;
-import org.activemq.command.ProducerInfo;
-import org.activemq.util.IOExceptionSupport;
+import org.apache.activemq.command.ActiveMQBytesMessage;
+import org.apache.activemq.command.ActiveMQDestination;
+import org.apache.activemq.command.ActiveMQMessage;
+import org.apache.activemq.command.MessageId;
+import org.apache.activemq.command.ProducerId;
+import org.apache.activemq.command.ProducerInfo;
+import org.apache.activemq.util.IOExceptionSupport;
 
 /**
  * @version $Revision$
@@ -142,7 +142,7 @@
                 msg.setObjectProperty(key, value);
             }
         }
-        msg.setType("org.activemq.Stream");
+        msg.setType("org.apache.activemq.Stream");
         msg.setGroupID(info.getProducerId().toString());
         if( eosMessage ) {
             msg.setGroupSequence(-1);

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQPrefetchPolicy.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQPrefetchPolicy.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQPrefetchPolicy.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQPrefetchPolicy.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQPrefetchPolicy.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQPrefetchPolicy.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQPrefetchPolicy.java Wed Dec 28 09:24:02 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq;
+package org.apache.activemq;
 
 
 import org.apache.commons.logging.Log;

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQQueueBrowser.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQQueueBrowser.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQQueueBrowser.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQQueueBrowser.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQQueueBrowser.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQQueueBrowser.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQQueueBrowser.java Wed Dec 28 09:24:02 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq;
+package org.apache.activemq;
 
 import java.util.Enumeration;
 
@@ -24,9 +24,9 @@
 import javax.jms.Queue;
 import javax.jms.QueueBrowser;
 
-import org.activemq.command.ActiveMQDestination;
-import org.activemq.command.ConsumerId;
-import org.activemq.command.MessageDispatch;
+import org.apache.activemq.command.ActiveMQDestination;
+import org.apache.activemq.command.ConsumerId;
+import org.apache.activemq.command.MessageDispatch;
 
 import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
 

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQQueueReceiver.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQQueueReceiver.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQQueueReceiver.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQQueueReceiver.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQQueueReceiver.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQQueueReceiver.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQQueueReceiver.java Wed Dec 28 09:24:02 2005
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq;
+package org.apache.activemq;
 
-import org.activemq.command.ActiveMQDestination;
-import org.activemq.command.ConsumerId;
+import org.apache.activemq.command.ActiveMQDestination;
+import org.apache.activemq.command.ConsumerId;
 
 import javax.jms.JMSException;
 import javax.jms.Queue;

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQQueueSender.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQQueueSender.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQQueueSender.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQQueueSender.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQQueueSender.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQQueueSender.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQQueueSender.java Wed Dec 28 09:24:02 2005
@@ -15,14 +15,14 @@
  * limitations under the License.
  */
 
-package org.activemq;
+package org.apache.activemq;
 
 import javax.jms.JMSException;
 import javax.jms.Message;
 import javax.jms.Queue;
 import javax.jms.QueueSender;
 
-import org.activemq.command.ActiveMQDestination;
+import org.apache.activemq.command.ActiveMQDestination;
 
 /**
  * A client uses a <CODE>QueueSender</CODE> object to send messages to a

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQQueueSession.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQQueueSession.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQQueueSession.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQQueueSession.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQQueueSession.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQQueueSession.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQQueueSession.java Wed Dec 28 09:24:02 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq;
+package org.apache.activemq;
 
 import java.io.Serializable;
 

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQSession.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQSession.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQSession.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQSession.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQSession.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQSession.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQSession.java Wed Dec 28 09:24:02 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq;
+package org.apache.activemq;
 
 import java.io.Serializable;
 import java.util.Collections;
@@ -49,33 +49,33 @@
 import javax.jms.TopicSubscriber;
 import javax.jms.TransactionRolledBackException;
 
-import org.activemq.command.ActiveMQBytesMessage;
-import org.activemq.command.ActiveMQDestination;
-import org.activemq.command.ActiveMQMapMessage;
-import org.activemq.command.ActiveMQMessage;
-import org.activemq.command.ActiveMQObjectMessage;
-import org.activemq.command.ActiveMQQueue;
-import org.activemq.command.ActiveMQStreamMessage;
-import org.activemq.command.ActiveMQTextMessage;
-import org.activemq.command.ActiveMQTopic;
-import org.activemq.command.Command;
-import org.activemq.command.ConsumerId;
-import org.activemq.command.MessageAck;
-import org.activemq.command.MessageDispatch;
-import org.activemq.command.MessageId;
-import org.activemq.command.ProducerId;
-import org.activemq.command.RedeliveryPolicy;
-import org.activemq.command.Response;
-import org.activemq.command.SessionId;
-import org.activemq.command.SessionInfo;
-import org.activemq.command.TransactionId;
-import org.activemq.management.JMSSessionStatsImpl;
-import org.activemq.management.StatsCapable;
-import org.activemq.management.StatsImpl;
-import org.activemq.thread.Scheduler;
-import org.activemq.transaction.Synchronization;
-import org.activemq.util.Callback;
-import org.activemq.util.LongSequenceGenerator;
+import org.apache.activemq.command.ActiveMQBytesMessage;
+import org.apache.activemq.command.ActiveMQDestination;
+import org.apache.activemq.command.ActiveMQMapMessage;
+import org.apache.activemq.command.ActiveMQMessage;
+import org.apache.activemq.command.ActiveMQObjectMessage;
+import org.apache.activemq.command.ActiveMQQueue;
+import org.apache.activemq.command.ActiveMQStreamMessage;
+import org.apache.activemq.command.ActiveMQTextMessage;
+import org.apache.activemq.command.ActiveMQTopic;
+import org.apache.activemq.command.Command;
+import org.apache.activemq.command.ConsumerId;
+import org.apache.activemq.command.MessageAck;
+import org.apache.activemq.command.MessageDispatch;
+import org.apache.activemq.command.MessageId;
+import org.apache.activemq.command.ProducerId;
+import org.apache.activemq.command.RedeliveryPolicy;
+import org.apache.activemq.command.Response;
+import org.apache.activemq.command.SessionId;
+import org.apache.activemq.command.SessionInfo;
+import org.apache.activemq.command.TransactionId;
+import org.apache.activemq.management.JMSSessionStatsImpl;
+import org.apache.activemq.management.StatsCapable;
+import org.apache.activemq.management.StatsImpl;
+import org.apache.activemq.thread.Scheduler;
+import org.apache.activemq.transaction.Synchronization;
+import org.apache.activemq.util.Callback;
+import org.apache.activemq.util.LongSequenceGenerator;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -248,7 +248,7 @@
     /*
      * (non-Javadoc)
      * 
-     * @see org.activemq.management.StatsCapable#getStats()
+     * @see org.apache.activemq.management.StatsCapable#getStats()
      */
     public StatsImpl getStats() {
         return stats;

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQSessionExecutor.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQSessionExecutor.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQSessionExecutor.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQSessionExecutor.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQSessionExecutor.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQSessionExecutor.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQSessionExecutor.java Wed Dec 28 09:24:02 2005
@@ -15,18 +15,18 @@
  * limitations under the License.
  */
 
-package org.activemq;
+package org.apache.activemq;
 
 import java.util.Iterator;
 import java.util.List;
 
 import javax.jms.JMSException;
 
-import org.activemq.command.ConsumerId;
-import org.activemq.command.MessageDispatch;
-import org.activemq.thread.Task;
-import org.activemq.thread.TaskRunner;
-import org.activemq.util.JMSExceptionSupport;
+import org.apache.activemq.command.ConsumerId;
+import org.apache.activemq.command.MessageDispatch;
+import org.apache.activemq.thread.Task;
+import org.apache.activemq.thread.TaskRunner;
+import org.apache.activemq.util.JMSExceptionSupport;
 
 /**
  * A utility class used by the Session for dispatching messages asynchronously to consumers

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQTopicPublisher.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQTopicPublisher.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQTopicPublisher.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQTopicPublisher.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQTopicPublisher.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQTopicPublisher.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQTopicPublisher.java Wed Dec 28 09:24:02 2005
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.activemq;
+package org.apache.activemq;
 
-import org.activemq.command.ActiveMQDestination;
+import org.apache.activemq.command.ActiveMQDestination;
 
 import javax.jms.Destination;
 import javax.jms.InvalidDestinationException;

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQTopicSession.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQTopicSession.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQTopicSession.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQTopicSession.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQTopicSession.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQTopicSession.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQTopicSession.java Wed Dec 28 09:24:02 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq;
+package org.apache.activemq;
 
 import java.io.Serializable;
 

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQTopicSubscriber.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQTopicSubscriber.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQTopicSubscriber.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQTopicSubscriber.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQTopicSubscriber.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQTopicSubscriber.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQTopicSubscriber.java Wed Dec 28 09:24:02 2005
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package org.activemq;
+package org.apache.activemq;
 
-import org.activemq.command.ActiveMQDestination;
-import org.activemq.command.ConsumerId;
+import org.apache.activemq.command.ActiveMQDestination;
+import org.apache.activemq.command.ConsumerId;
 
 import javax.jms.JMSException;
 import javax.jms.Topic;

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQXAConnection.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQXAConnection.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQXAConnection.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQXAConnection.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQXAConnection.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQXAConnection.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQXAConnection.java Wed Dec 28 09:24:02 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq;
+package org.apache.activemq;
 
 import javax.jms.JMSException;
 import javax.jms.Session;
@@ -25,8 +25,8 @@
 import javax.jms.XATopicConnection;
 import javax.jms.XATopicSession;
 
-import org.activemq.management.JMSStatsImpl;
-import org.activemq.transport.Transport;
+import org.apache.activemq.management.JMSStatsImpl;
+import org.apache.activemq.transport.Transport;
 
 /**
  * The XAConnection interface extends the capability of Connection by providing

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQXASession.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQXASession.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQXASession.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQXASession.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQXASession.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ActiveMQXASession.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ActiveMQXASession.java Wed Dec 28 09:24:02 2005
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.activemq;
+package org.apache.activemq;
 
 import javax.jms.JMSException;
 import javax.jms.QueueSession;
@@ -26,7 +26,7 @@
 import javax.jms.XATopicSession;
 import javax.transaction.xa.XAResource;
 
-import org.activemq.command.SessionId;
+import org.apache.activemq.command.SessionId;
 
 /**
  * The XASession interface extends the capability of Session by adding access

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/AdvisoryConsumer.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/AdvisoryConsumer.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/AdvisoryConsumer.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/AdvisoryConsumer.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/AdvisoryConsumer.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/AdvisoryConsumer.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/AdvisoryConsumer.java Wed Dec 28 09:24:02 2005
@@ -14,18 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq;
+package org.apache.activemq;
 
 import javax.jms.JMSException;
 
-import org.activemq.advisory.AdvisorySupport;
-import org.activemq.command.ActiveMQDestination;
-import org.activemq.command.ConsumerId;
-import org.activemq.command.ConsumerInfo;
-import org.activemq.command.DataStructure;
-import org.activemq.command.DestinationInfo;
-import org.activemq.command.MessageAck;
-import org.activemq.command.MessageDispatch;
+import org.apache.activemq.advisory.AdvisorySupport;
+import org.apache.activemq.command.ActiveMQDestination;
+import org.apache.activemq.command.ConsumerId;
+import org.apache.activemq.command.ConsumerInfo;
+import org.apache.activemq.command.DataStructure;
+import org.apache.activemq.command.DestinationInfo;
+import org.apache.activemq.command.MessageAck;
+import org.apache.activemq.command.MessageDispatch;
 
 public class AdvisoryConsumer implements ActiveMQDispatcher {
 

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/AlreadyClosedException.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/AlreadyClosedException.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/AlreadyClosedException.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/AlreadyClosedException.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/AlreadyClosedException.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/AlreadyClosedException.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/AlreadyClosedException.java Wed Dec 28 09:24:02 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq;
+package org.apache.activemq;
 
 import javax.jms.JMSException;
 

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/Closeable.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/Closeable.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/Closeable.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/Closeable.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/Closeable.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/Closeable.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/Closeable.java Wed Dec 28 09:24:02 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq;
+package org.apache.activemq;
 
 import javax.jms.JMSException;
 

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ConfigurationException.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ConfigurationException.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ConfigurationException.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ConfigurationException.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ConfigurationException.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ConfigurationException.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ConfigurationException.java Wed Dec 28 09:24:02 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq;
+package org.apache.activemq;
 
 import javax.jms.JMSException;
 

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ConnectionClosedException.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ConnectionClosedException.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ConnectionClosedException.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ConnectionClosedException.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ConnectionClosedException.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ConnectionClosedException.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ConnectionClosedException.java Wed Dec 28 09:24:02 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq;
+package org.apache.activemq;
 
 import javax.jms.IllegalStateException;
 

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ConnectionFailedException.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ConnectionFailedException.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ConnectionFailedException.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ConnectionFailedException.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ConnectionFailedException.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ConnectionFailedException.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ConnectionFailedException.java Wed Dec 28 09:24:02 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq;
+package org.apache.activemq;
 
 import java.io.IOException;
 

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/LocalTransactionEventListener.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/LocalTransactionEventListener.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/LocalTransactionEventListener.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/LocalTransactionEventListener.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/LocalTransactionEventListener.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/LocalTransactionEventListener.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/LocalTransactionEventListener.java Wed Dec 28 09:24:02 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq;
+package org.apache.activemq;
 
 
 /**

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/MessageAvailableConsumer.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/MessageAvailableConsumer.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/MessageAvailableConsumer.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/MessageAvailableConsumer.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/MessageAvailableConsumer.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/MessageAvailableConsumer.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/MessageAvailableConsumer.java Wed Dec 28 09:24:02 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq;
+package org.apache.activemq;
 
 import javax.jms.MessageConsumer;
 

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/MessageAvailableListener.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/MessageAvailableListener.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/MessageAvailableListener.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/MessageAvailableListener.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/MessageAvailableListener.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/MessageAvailableListener.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/MessageAvailableListener.java Wed Dec 28 09:24:02 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq;
+package org.apache.activemq;
 
 import javax.jms.MessageConsumer;
 

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/MessageDispatchChannel.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/MessageDispatchChannel.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/MessageDispatchChannel.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/MessageDispatchChannel.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/MessageDispatchChannel.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/MessageDispatchChannel.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/MessageDispatchChannel.java Wed Dec 28 09:24:02 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq;
+package org.apache.activemq;
 
 import java.util.ArrayList;
 import java.util.LinkedList;
@@ -22,7 +22,7 @@
 
 import javax.jms.JMSException;
 
-import org.activemq.command.MessageDispatch;
+import org.apache.activemq.command.MessageDispatch;
 
 public class MessageDispatchChannel {
 

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/NotStartedException.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/NotStartedException.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/NotStartedException.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/NotStartedException.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/NotStartedException.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/NotStartedException.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/NotStartedException.java Wed Dec 28 09:24:02 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq;
+package org.apache.activemq;
 
 import javax.jms.IllegalStateException;
 

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/Service.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/Service.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/Service.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/Service.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/Service.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/Service.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/Service.java Wed Dec 28 09:24:02 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq;
+package org.apache.activemq;
 
 
 /**

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/StreamConnection.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/StreamConnection.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/StreamConnection.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/StreamConnection.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/StreamConnection.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/StreamConnection.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/StreamConnection.java Wed Dec 28 09:24:02 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq;
+package org.apache.activemq;
 
 import java.io.InputStream;
 import java.io.OutputStream;

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ThreadPriorities.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ThreadPriorities.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ThreadPriorities.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ThreadPriorities.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ThreadPriorities.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/ThreadPriorities.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/ThreadPriorities.java Wed Dec 28 09:24:02 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq;
+package org.apache.activemq;
 
 
 /**

Copied: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/TransactionContext.java (from r359554, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/TransactionContext.java)
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/TransactionContext.java?p2=incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/TransactionContext.java&p1=incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/TransactionContext.java&r1=359554&r2=359567&rev=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/TransactionContext.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/TransactionContext.java Wed Dec 28 09:24:02 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq;
+package org.apache.activemq;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -27,16 +27,16 @@
 import javax.transaction.xa.XAResource;
 import javax.transaction.xa.Xid;
 
-import org.activemq.command.ConnectionId;
-import org.activemq.command.DataArrayResponse;
-import org.activemq.command.IntegerResponse;
-import org.activemq.command.LocalTransactionId;
-import org.activemq.command.TransactionId;
-import org.activemq.command.TransactionInfo;
-import org.activemq.command.XATransactionId;
-import org.activemq.transaction.Synchronization;
-import org.activemq.util.JMSExceptionSupport;
-import org.activemq.util.LongSequenceGenerator;
+import org.apache.activemq.command.ConnectionId;
+import org.apache.activemq.command.DataArrayResponse;
+import org.apache.activemq.command.IntegerResponse;
+import org.apache.activemq.command.LocalTransactionId;
+import org.apache.activemq.command.TransactionId;
+import org.apache.activemq.command.TransactionInfo;
+import org.apache.activemq.command.XATransactionId;
+import org.apache.activemq.transaction.Synchronization;
+import org.apache.activemq.util.JMSExceptionSupport;
+import org.apache.activemq.util.LongSequenceGenerator;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/advisory/AdvisoryBroker.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/advisory/AdvisoryBroker.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/advisory/AdvisoryBroker.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/advisory/AdvisoryBroker.java Wed Dec 28 09:24:02 2005
@@ -14,27 +14,27 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.advisory;
+package org.apache.activemq.advisory;
 
 import java.util.Iterator;
 
-import org.activemq.broker.Broker;
-import org.activemq.broker.BrokerFilter;
-import org.activemq.broker.ConnectionContext;
-import org.activemq.broker.region.Destination;
-import org.activemq.command.ActiveMQDestination;
-import org.activemq.command.ActiveMQMessage;
-import org.activemq.command.ActiveMQTopic;
-import org.activemq.command.Command;
-import org.activemq.command.ConnectionInfo;
-import org.activemq.command.ConsumerId;
-import org.activemq.command.ConsumerInfo;
-import org.activemq.command.DestinationInfo;
-import org.activemq.command.MessageId;
-import org.activemq.command.ProducerId;
-import org.activemq.command.ProducerInfo;
-import org.activemq.util.IdGenerator;
-import org.activemq.util.LongSequenceGenerator;
+import org.apache.activemq.broker.Broker;
+import org.apache.activemq.broker.BrokerFilter;
+import org.apache.activemq.broker.ConnectionContext;
+import org.apache.activemq.broker.region.Destination;
+import org.apache.activemq.command.ActiveMQDestination;
+import org.apache.activemq.command.ActiveMQMessage;
+import org.apache.activemq.command.ActiveMQTopic;
+import org.apache.activemq.command.Command;
+import org.apache.activemq.command.ConnectionInfo;
+import org.apache.activemq.command.ConsumerId;
+import org.apache.activemq.command.ConsumerInfo;
+import org.apache.activemq.command.DestinationInfo;
+import org.apache.activemq.command.MessageId;
+import org.apache.activemq.command.ProducerId;
+import org.apache.activemq.command.ProducerInfo;
+import org.apache.activemq.util.IdGenerator;
+import org.apache.activemq.util.LongSequenceGenerator;
 
 import edu.emory.mathcs.backport.java.util.concurrent.ConcurrentHashMap;
 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/advisory/AdvisorySupport.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/advisory/AdvisorySupport.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/advisory/AdvisorySupport.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/advisory/AdvisorySupport.java Wed Dec 28 09:24:02 2005
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.advisory;
+package org.apache.activemq.advisory;
 
-import org.activemq.command.ActiveMQDestination;
-import org.activemq.command.ActiveMQTopic;
+import org.apache.activemq.command.ActiveMQDestination;
+import org.apache.activemq.command.ActiveMQTopic;
 
 public class AdvisorySupport {
     

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/advisory/ConsumerEvent.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/advisory/ConsumerEvent.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/advisory/ConsumerEvent.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/advisory/ConsumerEvent.java Wed Dec 28 09:24:02 2005
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.advisory;
+package org.apache.activemq.advisory;
 
-import org.activemq.command.ConsumerId;
+import org.apache.activemq.command.ConsumerId;
 
 import javax.jms.Destination;
 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/advisory/ConsumerEventSource.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/advisory/ConsumerEventSource.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/advisory/ConsumerEventSource.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/advisory/ConsumerEventSource.java Wed Dec 28 09:24:02 2005
@@ -14,18 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.advisory;
+package org.apache.activemq.advisory;
 
 import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
 import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger;
 
-import org.activemq.Service;
-import org.activemq.command.ActiveMQDestination;
-import org.activemq.command.ActiveMQMessage;
-import org.activemq.command.ActiveMQTopic;
-import org.activemq.command.ConsumerId;
-import org.activemq.command.ConsumerInfo;
-import org.activemq.command.RemoveInfo;
+import org.apache.activemq.Service;
+import org.apache.activemq.command.ActiveMQDestination;
+import org.apache.activemq.command.ActiveMQMessage;
+import org.apache.activemq.command.ActiveMQTopic;
+import org.apache.activemq.command.ConsumerId;
+import org.apache.activemq.command.ConsumerInfo;
+import org.apache.activemq.command.RemoveInfo;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/advisory/ConsumerListener.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/advisory/ConsumerListener.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/advisory/ConsumerListener.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/advisory/ConsumerListener.java Wed Dec 28 09:24:02 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.advisory;
+package org.apache.activemq.advisory;
 
 /**
  * Listen to the changes in the number of active consumers available for a given destination.

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/advisory/ConsumerStartedEvent.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/advisory/ConsumerStartedEvent.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/advisory/ConsumerStartedEvent.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/advisory/ConsumerStartedEvent.java Wed Dec 28 09:24:02 2005
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.advisory;
+package org.apache.activemq.advisory;
 
-import org.activemq.command.ActiveMQDestination;
-import org.activemq.command.ConsumerInfo;
+import org.apache.activemq.command.ActiveMQDestination;
+import org.apache.activemq.command.ConsumerInfo;
 
 /**
  * An event when a new consumer has started.

Modified: incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/advisory/ConsumerStoppedEvent.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/advisory/ConsumerStoppedEvent.java?rev=359567&r1=359554&r2=359567&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/advisory/ConsumerStoppedEvent.java (original)
+++ incubator/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/advisory/ConsumerStoppedEvent.java Wed Dec 28 09:24:02 2005
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.activemq.advisory;
+package org.apache.activemq.advisory;
 
-import org.activemq.command.ActiveMQDestination;
-import org.activemq.command.ConsumerId;
+import org.apache.activemq.command.ActiveMQDestination;
+import org.apache.activemq.command.ConsumerId;
 
 /**
  * An event generated when a consumer stops.