activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r359609 [1/2] - in /incubator/activemq/trunk/assembly: ./ src/release/conf/ src/release/example/conf/ src/release/example/src/ src/sample-conf/ src/test/java/org/activemq/benchmark/ src/test/java/org/activemq/config/ src/test/java/org/activ...
Date Wed, 28 Dec 2005 19:42:18 GMT
Author: chirino
Date: Wed Dec 28 11:42:01 2005
New Revision: 359609

URL: http://svn.apache.org/viewcvs?rev=359609&view=rev
Log:
doing package refactor

Added:
    incubator/activemq/trunk/assembly/src/test/java/org/apache/
    incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/
    incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/benchmark/
      - copied from r359603, incubator/activemq/trunk/assembly/src/test/java/org/activemq/benchmark/
    incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/config/
      - copied from r359603, incubator/activemq/trunk/assembly/src/test/java/org/activemq/config/
    incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/transport/
      - copied from r359603, incubator/activemq/trunk/assembly/src/test/java/org/activemq/transport/
    incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/
      - copied from r359603, incubator/activemq/trunk/assembly/src/test/java/org/activemq/usecases/
    incubator/activemq/trunk/assembly/src/test/resources/org/
    incubator/activemq/trunk/assembly/src/test/resources/org/apache/
    incubator/activemq/trunk/assembly/src/test/resources/org/apache/activemq/
    incubator/activemq/trunk/assembly/src/test/resources/org/apache/activemq/config/
Removed:
    incubator/activemq/trunk/assembly/src/test/java/org/activemq/benchmark/
    incubator/activemq/trunk/assembly/src/test/java/org/activemq/config/
    incubator/activemq/trunk/assembly/src/test/java/org/activemq/transport/
    incubator/activemq/trunk/assembly/src/test/java/org/activemq/usecases/
Modified:
    incubator/activemq/trunk/assembly/maven.xml
    incubator/activemq/trunk/assembly/project.properties
    incubator/activemq/trunk/assembly/src/release/conf/log4j.properties
    incubator/activemq/trunk/assembly/src/release/example/conf/activemq-stomp.xml
    incubator/activemq/trunk/assembly/src/release/example/conf/log4j.properties
    incubator/activemq/trunk/assembly/src/release/example/conf/web.xml
    incubator/activemq/trunk/assembly/src/release/example/src/ToolSupport.java
    incubator/activemq/trunk/assembly/src/sample-conf/journal-example.xml
    incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/benchmark/BenchmarkSupport.java
    incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/benchmark/Consumer.java
    incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/benchmark/Producer.java
    incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/benchmark/ProducerConsumer.java
    incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/config/BrokerXmlConfigFromJNDITest.java
    incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/config/BrokerXmlConfigTest.java
    incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/config/ConfigTest.java
    incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/config/example.xml
    incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/config/spring-test.xml
    incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/transport/QueueClusterTest.java
    incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/transport/TopicClusterTest.java
    incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/ChangeSentMessageTest.java
    incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/ChangeSessionDeliveryModeTest.java
    incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/CompositeConsumeTest.java
    incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/CompositePublishTest.java
    incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/ConsumeQueuePrefetchTest.java
    incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/ConsumeTopicPrefetchTest.java
    incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/CreateLotsOfTemporaryQueuesTest.java
    incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/CreateTemporaryQueueBeforeStartTest.java
    incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/DeadLetterTest.java
    incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/DurableConsumerCloseAndReconnectTest.java
    incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/DurableSubscriptionTestSupport.java
    incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/ExceptionListenerTest.java
    incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/JDBCDurableSubscriptionTest.java
    incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/JournalDurableSubscriptionTest.java
    incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/ProducerConsumerTestSupport.java
    incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/PublishOnDurableTopicConsumedMessageTest.java
    incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/PublishOnQueueConsumedMessageTest.java
    incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/PublishOnQueueConsumedMessageUsingActivemqXMLTest.java
    incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/PublishOnTemporaryQueueConsumedMessageTest.java
    incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/PublishOnTopicConsumedMessageTest.java
    incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/PublishOnTopicConsumerMessageUsingActivemqXMLTest.java
    incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/QueueConsumerCloseAndReconnectTest.java
    incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/QueueDuplicatesTest.java
    incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/QueueRedeliverTest.java
    incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/ReliableReconnectTest.java
    incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/StartAndStopBrokerTest.java
    incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/SubscribeClosePublishThenConsumeTest.java
    incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/TestSupport.java
    incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/TopicRedeliverTest.java
    incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/TransactionRollbackOrderTest.java
    incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/TransactionTest.java
    incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/TransientQueueRedeliverTest.java
    incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/TwoBrokerQueueSendReceiveTest.java
    incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/TwoBrokerTopicSendReceiveTest.java
    incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/TwoBrokerTopicSendReceiveUsingHttpTest.java
    incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/TwoBrokerTopicSendReceiveUsingJavaConfigurationTest.java
    incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/TwoBrokerTopicSendReceiveUsingTcpTest.java
    incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/TwoMulticastDiscoveryBrokerTopicSendReceiveTest.java
    incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/receiver-activecluster.xml
    incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/sender-activecluster.xml
    incubator/activemq/trunk/assembly/src/test/resources/log4j.properties

Modified: incubator/activemq/trunk/assembly/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/maven.xml?rev=359609&r1=359608&r2=359609&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/maven.xml (original)
+++ incubator/activemq/trunk/assembly/maven.xml Wed Dec 28 11:42:01 2005
@@ -35,7 +35,7 @@
     <!-- Default Global Goals -->
     <!-- ==================== -->
     <goal name="default">
-        <ant:copy todir="${basedir}/src/test/org/activemq/usecases" file="${basedir}/src/release/conf/activemq.xml" overwrite="true"/>
+        <ant:copy todir="${basedir}/src/test/org/apache/activemq/usecases" file="${basedir}/src/release/conf/activemq.xml" overwrite="true"/>
         <attainGoal name="dist:build-bin"/>
     </goal>
     
@@ -109,9 +109,9 @@
     </ant:chmod>
 
     <ant:jar destfile="${maven.dist.bin.assembly.dir}/bin/run.jar" basedir="${maven.build.dir}/classes">
-      <ant:include name="org/activemq/broker/Main*.class"/>
+      <ant:include name="org/apache/activemq/broker/Main*.class"/>
       <ant:manifest>
-        <ant:attribute name="Main-Class" value="org.apache.activemq.activemq.broker.Main"/>
+        <ant:attribute name="Main-Class" value="org.apache.activemq.broker.Main"/>
       </ant:manifest>
     </ant:jar>
     <ant:copy todir="${maven.dist.bin.assembly.dir/conf}">
@@ -253,7 +253,7 @@
         </j:if>
 
         <echo>Running an ActiveMQ server with $$config = ${config}</echo>
-        <java classname="org.apache.activemq.activemq.broker.Main" fork="yes" maxmemory="512M">
+        <java classname="org.apache.activemq.broker.Main" fork="yes" maxmemory="512M">
           <classpath refid="test.classpath"/>
           <arg value="${config}"/>
           <j:if test="${!empty(debug)}">
@@ -273,7 +273,7 @@
         <!-- run simple server using just a URL -->
 
         <echo>Running an ActiveMQ server at $$url = ${url}</echo>
-        <java classname="org.apache.activemq.activemq.broker.Main" fork="yes" maxmemory="512M">
+        <java classname="org.apache.activemq.broker.Main" fork="yes" maxmemory="512M">
           <classpath refid="test.classpath"/>
           <arg value="${url}"/>
 
@@ -318,7 +318,7 @@
           <jvmarg value="-Xbootclasspath/a:${OPTIT_HOME}/lib/oibcp.jar"/>
           <jvmarg value="-Xnoclassgc"/>
           <arg value="-pause"/>
-          <arg value="org.apache.activemq.activemq.spring.Main"/>
+          <arg value="org.apache.activemq.spring.Main"/>
           <arg value="${config}"/>
         </java>
       </j:when>
@@ -335,7 +335,7 @@
           <jvmarg value="-Xbootclasspath/a:${OPTIT_HOME}/lib/oibcp.jar"/>
           <jvmarg value="-Xnoclassgc"/>
           <arg value="-pause"/>
-          <arg value="org.apache.activemq.activemq.broker.Main"/>
+          <arg value="org.apache.activemq.broker.Main"/>
           <arg value="${url}"/>
           <sysproperty key="derby.system.home" value="target/derby"/>
           <sysproperty key="derby.storage.fileSyncTransactionLog" value="true"/>
@@ -359,7 +359,7 @@
     </j:if>
 
     <echo>Running an ActiveMQ web server with webapp = ${url}</echo>
-    <java classname="org.apache.activemq.activemq.tool.WebServer" fork="yes">
+    <java classname="org.apache.activemq.tool.WebServer" fork="yes">
       <classpath refid="test.classpath"/>
       <jvmarg value="-server"/>
       <arg value="${url}"/>
@@ -387,7 +387,7 @@
     </j:if>
 
     <echo>Running consumer against server at $$url = ${url} for subject $$subject = ${subject}</echo>
-    <java classname="org.apache.activemq.activemq.tool.ConsumerTool" fork="yes" maxmemory="100M">
+    <java classname="org.apache.activemq.tool.ConsumerTool" fork="yes" maxmemory="100M">
       <classpath refid="test.classpath"/>
       <jvmarg value="-server"/>
       <arg value="${url}"/>
@@ -422,7 +422,7 @@
 
 
     <echo>Running producer against server at $$url = ${url} for subject $$subject = ${subject}</echo>
-    <java classname="org.apache.activemq.activemq.tool.ProducerTool" fork="yes" maxmemory="100M">
+    <java classname="org.apache.activemq.tool.ProducerTool" fork="yes" maxmemory="100M">
       <classpath refid="test.classpath"/>
       <jvmarg value="-server"/>
       <arg value="${url}"/>
@@ -451,7 +451,7 @@
     </j:if>
 
     <echo>Running producer using subject $$subject = ${subject}</echo>
-    <java classname="org.apache.activemq.activemq.demo.SimpleProducer" fork="yes">
+    <java classname="org.apache.activemq.demo.SimpleProducer" fork="yes">
       <classpath refid="test.classpath"/>
       <jvmarg value="-server"/>
       <arg value="${subject}"/>
@@ -471,7 +471,7 @@
     </j:if>
 
     <echo>Running consumer using subject $$subject = ${subject}</echo>
-    <java classname="org.apache.activemq.activemq.demo.SimpleConsumer" fork="yes">
+    <java classname="org.apache.activemq.demo.SimpleConsumer" fork="yes">
       <classpath refid="test.classpath"/>
       <jvmarg value="-server"/>
       <arg value="${subject}"/>
@@ -499,7 +499,7 @@
     </j:if>
 
     <echo>Running topic consumer against server at $$url = ${url} for subject $$subject = ${subject} with $$topic = ${topic}</echo>
-    <java classname="org.apache.activemq.activemq.benchmark.Consumer" fork="yes" maxmemory="100M">
+    <java classname="org.apache.activemq.benchmark.Consumer" fork="yes" maxmemory="100M">
       <classpath refid="test.classpath"/>
       <j:if test="${empty(ignoreServer)}">
         <jvmarg value="-server"/>
@@ -535,7 +535,7 @@
     </j:if>
 
     <echo>Running topic producer against server at $$url = ${url} for subject $$subject = ${subject} with $$topic = ${topic} $$messageSize = ${messageSize}</echo>
-    <java classname="org.apache.activemq.activemq.benchmark.Producer" fork="yes">
+    <java classname="org.apache.activemq.benchmark.Producer" fork="yes">
       <classpath refid="test.classpath"/>
       <j:if test="${empty(ignoreServer)}">
         <jvmarg value="-server"/>
@@ -570,7 +570,7 @@
     </j:if>
 
     <echo>Running topic producer against server at $$url = ${url} for subject $$subject = ${subject} with $$topic = ${topic}</echo>
-    <java classname="org.apache.activemq.activemq.benchmark.ProducerConsumer" fork="yes" maxmemory="100M">
+    <java classname="org.apache.activemq.benchmark.ProducerConsumer" fork="yes" maxmemory="100M">
       <classpath refid="test.classpath"/>
       <j:if test="${empty(ignoreServer)}">
         <jvmarg value="-server"/>
@@ -619,7 +619,7 @@
     </j:if>
 
     <echo>Running ActiveMQ Journal Benchmark</echo>
-    <j:set var="mainClass" value="org.apache.activemq.activemq.journal.impl.JournalPerfTool"/>
+    <j:set var="mainClass" value="org.apache.activemq.journal.impl.JournalPerfTool"/>
     <j:if test="${profile=='true'}">
       <j:set var="mainClass" value="intuitive.audit.Audit"/>
     </j:if>
@@ -631,7 +631,7 @@
         <jvmarg value="-Xnoclassgc"/>
         <classpath path="${OPTIT_HOME}/lib/optit.jar"/>
         <arg value="-pause"/>
-        <arg value="org.apache.activemq.activemq.journal.impl.JournalPerfTool"/>
+        <arg value="org.apache.activemq.journal.impl.JournalPerfTool"/>
       </j:if>
       <j:elseif test="${empty(ignoreServer)}">
         <jvmarg value="-server"/>
@@ -689,7 +689,7 @@
     </j:if>
 
     <echo>Running HOWL Journal Benchmark</echo>
-    <java classname="org.apache.activemq.activemq.journal.howl.JournalPerfTool" fork="no" maxmemory="100M">
+    <java classname="org.apache.activemq.journal.howl.JournalPerfTool" fork="no" maxmemory="100M">
       <classpath refid="test.classpath"/>
       <j:if test="${empty(ignoreServer)}">
         <jvmarg value="-server"/>
@@ -723,7 +723,7 @@
   <goal name="test-create-temp-queues" prereqs="setclasspath, test:compile"
     description="Tests the creation of lots of temporary queues">
 
-    <java classname="org.apache.activemq.activemq.usecases.CreateLotsOfTemporaryQueuesTest" fork="yes" maxmemory="10M">
+    <java classname="org.apache.activemq.usecases.CreateLotsOfTemporaryQueuesTest" fork="yes" maxmemory="10M">
       <classpath refid="test.classpath"/>
       <arg value="${count}"/>
     </java>

Modified: incubator/activemq/trunk/assembly/project.properties
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/project.properties?rev=359609&r1=359608&r2=359609&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/project.properties (original)
+++ incubator/activemq/trunk/assembly/project.properties Wed Dec 28 11:42:01 2005
@@ -18,6 +18,6 @@
 http://cvs.apache.org/repository,\
 http://www.openejb.org/maven
 
-maven.jar.mainclass = org.apache.activemq.activemq.broker.Main
+maven.jar.mainclass = org.apache.activemq.broker.Main
 
 maven.eclipse.classpath.include=src/test/resources

Modified: incubator/activemq/trunk/assembly/src/release/conf/log4j.properties
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/release/conf/log4j.properties?rev=359609&r1=359608&r2=359609&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/release/conf/log4j.properties (original)
+++ incubator/activemq/trunk/assembly/src/release/conf/log4j.properties Wed Dec 28 11:42:01 2005
@@ -2,7 +2,7 @@
 # The logging properties used during tests..
 #
 log4j.rootLogger=INFO, stdout
-log4j.logger.org.apache.activemq.activemq.spring=WARN
+log4j.logger.org.apache.activemq.spring=WARN
 log4j.logger.org.springframework=WARN
 log4j.logger.org.xbean.spring=WARN
 

Modified: incubator/activemq/trunk/assembly/src/release/example/conf/activemq-stomp.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/release/example/conf/activemq-stomp.xml?rev=359609&r1=359608&r2=359609&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/release/example/conf/activemq-stomp.xml (original)
+++ incubator/activemq/trunk/assembly/src/release/example/conf/activemq-stomp.xml Wed Dec 28 11:42:01 2005
@@ -23,11 +23,11 @@
           <!-- Choose one of the following three configurationss to work with mysql-ds-->
           <!--
           <jdbcPersistence dataSourceRef="mysql-ds"
-                         adapterClass="org.apache.activemq.activemq.store.jdbc.adapter.BytesJDBCAdaptor"/>
+                         adapterClass="org.apache.activemq.store.jdbc.adapter.BytesJDBCAdaptor"/>
           <jdbcPersistence dataSourceRef="mysql-ds"
-                         adapterClass="org.apache.activemq.activemq.store.jdbc.adapter.BlobJDBCAdaptor"/>
+                         adapterClass="org.apache.activemq.store.jdbc.adapter.BlobJDBCAdaptor"/>
           <jdbcPersistence dataSourceRef="mysql-ds"
-                         adapterClass="org.apache.activemq.activemq.store.jdbc.adapter.StreamJDBCAdaptor"/>
+                         adapterClass="org.apache.activemq.store.jdbc.adapter.StreamJDBCAdaptor"/>
           -->
         </journalPersistence>
       </cachePersistence>

Modified: incubator/activemq/trunk/assembly/src/release/example/conf/log4j.properties
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/release/example/conf/log4j.properties?rev=359609&r1=359608&r2=359609&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/release/example/conf/log4j.properties (original)
+++ incubator/activemq/trunk/assembly/src/release/example/conf/log4j.properties Wed Dec 28 11:42:01 2005
@@ -18,5 +18,5 @@
 #
 #  You can change logger levels here.
 #
-log4j.logger.org.apache.activemq.activemq=INFO
-log4j.logger.org.apache.activemq.activemq.spring=WARN
+log4j.logger.org.apache.activemq=INFO
+log4j.logger.org.apache.activemq.spring=WARN

Modified: incubator/activemq/trunk/assembly/src/release/example/conf/web.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/release/example/conf/web.xml?rev=359609&r1=359608&r2=359609&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/release/example/conf/web.xml (original)
+++ incubator/activemq/trunk/assembly/src/release/example/conf/web.xml Wed Dec 28 11:42:01 2005
@@ -18,7 +18,7 @@
   </context-param>
 
   <listener>
-    <listener-class>org.apache.activemq.activemq.web.</listener-class>
+    <listener-class>org.apache.activemq.web.</listener-class>
   </listener>
 </web-app>
 

Modified: incubator/activemq/trunk/assembly/src/release/example/src/ToolSupport.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/release/example/src/ToolSupport.java?rev=359609&r1=359608&r2=359609&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/release/example/src/ToolSupport.java (original)
+++ incubator/activemq/trunk/assembly/src/release/example/src/ToolSupport.java Wed Dec 28 11:42:01 2005
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-import org.apache.activemq.activemq.ActiveMQConnection;
-import org.apache.activemq.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.activemq.util.IndentPrinter;
+import org.apache.activemq.ActiveMQConnection;
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.util.IndentPrinter;
 
 import javax.jms.Connection;
 import javax.jms.Destination;

Modified: incubator/activemq/trunk/assembly/src/sample-conf/journal-example.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/sample-conf/journal-example.xml?rev=359609&r1=359608&r2=359609&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/sample-conf/journal-example.xml (original)
+++ incubator/activemq/trunk/assembly/src/sample-conf/journal-example.xml Wed Dec 28 11:42:01 2005
@@ -29,7 +29,7 @@
                 </constructor-arg>
 
                 <constructor-arg index="3">
-                    <bean id="myTaskRunnerFactory" class="org.apache.activemq.activemq.thread.TaskRunnerFactory"/>
+                    <bean id="myTaskRunnerFactory" class="org.apache.activemq.thread.TaskRunnerFactory"/>
                 </constructor-arg>
             </amq:journalPersistenceAdapter>
         </amq:persistenceAdapter>

Modified: incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/benchmark/BenchmarkSupport.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/benchmark/BenchmarkSupport.java?rev=359609&r1=359603&r2=359609&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/benchmark/BenchmarkSupport.java (original)
+++ incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/benchmark/BenchmarkSupport.java Wed Dec 28 11:42:01 2005
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.activemq.benchmark;
+package org.apache.activemq.benchmark;
 
 import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.activemq.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.activemq.util.IdGenerator;
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.util.IdGenerator;
 
 import javax.jms.Connection;
 import javax.jms.Destination;

Modified: incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/benchmark/Consumer.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/benchmark/Consumer.java?rev=359609&r1=359603&r2=359609&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/benchmark/Consumer.java (original)
+++ incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/benchmark/Consumer.java Wed Dec 28 11:42:01 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.activemq.benchmark;
+package org.apache.activemq.benchmark;
 
 import javax.jms.Destination;
 import javax.jms.JMSException;

Modified: incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/benchmark/Producer.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/benchmark/Producer.java?rev=359609&r1=359603&r2=359609&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/benchmark/Producer.java (original)
+++ incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/benchmark/Producer.java Wed Dec 28 11:42:01 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.activemq.benchmark;
+package org.apache.activemq.benchmark;
 
 import javax.jms.DeliveryMode;
 import javax.jms.Destination;

Modified: incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/benchmark/ProducerConsumer.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/benchmark/ProducerConsumer.java?rev=359609&r1=359603&r2=359609&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/benchmark/ProducerConsumer.java (original)
+++ incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/benchmark/ProducerConsumer.java Wed Dec 28 11:42:01 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.activemq.benchmark;
+package org.apache.activemq.benchmark;
 
 
 /**

Modified: incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/config/BrokerXmlConfigFromJNDITest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/config/BrokerXmlConfigFromJNDITest.java?rev=359609&r1=359603&r2=359609&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/config/BrokerXmlConfigFromJNDITest.java (original)
+++ incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/config/BrokerXmlConfigFromJNDITest.java Wed Dec 28 11:42:01 2005
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.activemq.config;
+package org.apache.activemq.config;
 
-import org.apache.activemq.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.activemq.test.JmsTopicSendReceiveWithTwoConnectionsTest;
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.test.JmsTopicSendReceiveWithTwoConnectionsTest;
 
 import javax.naming.InitialContext;
 import javax.naming.Context;
@@ -38,7 +38,7 @@
         // we could put these properties into a jndi.properties
         // on the classpath instead
         Hashtable properties = new Hashtable();
-        properties.put("java.naming.factory.initial", "org.apache.activemq.activemq.jndi.ActiveMQInitialContextFactory");
+        properties.put("java.naming.factory.initial", "org.apache.activemq.jndi.ActiveMQInitialContextFactory");
 
         // configure the embedded broker using an XML config file
         // which is either a URL or a resource on the classpath

Modified: incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/config/BrokerXmlConfigTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/config/BrokerXmlConfigTest.java?rev=359609&r1=359603&r2=359609&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/config/BrokerXmlConfigTest.java (original)
+++ incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/config/BrokerXmlConfigTest.java Wed Dec 28 11:42:01 2005
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.activemq.config;
+package org.apache.activemq.config;
 
-import org.apache.activemq.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.activemq.test.JmsTopicSendReceiveWithTwoConnectionsTest;
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.test.JmsTopicSendReceiveWithTwoConnectionsTest;
 
 import java.net.URI;
 

Modified: incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/config/ConfigTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/config/ConfigTest.java?rev=359609&r1=359603&r2=359609&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/config/ConfigTest.java (original)
+++ incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/config/ConfigTest.java Wed Dec 28 11:42:01 2005
@@ -14,23 +14,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.activemq.config;
+package org.apache.activemq.config;
 
-import org.apache.activemq.activemq.broker.BrokerService;
-import org.apache.activemq.activemq.broker.TransportConnector;
-import org.apache.activemq.activemq.broker.region.policy.*;
-import org.apache.activemq.activemq.xbean.BrokerFactoryBean;
-import org.apache.activemq.activemq.transport.activeio.ActiveIOTransportServer;
-import org.apache.activemq.activemq.transport.tcp.TcpTransportServer;
-import org.apache.activemq.activemq.command.ActiveMQTopic;
-import org.apache.activemq.activemq.openwire.OpenWireFormat;
-import org.apache.activemq.activemq.store.PersistenceAdapter;
-import org.apache.activemq.activemq.store.PersistenceAdapterFactory;
-import org.apache.activemq.activemq.store.DefaultPersistenceAdapterFactory;
-import org.apache.activemq.activemq.store.memory.MemoryPersistenceAdapter;
-import org.apache.activemq.activemq.store.jdbc.JDBCPersistenceAdapter;
-import org.apache.activemq.activemq.store.journal.JournalPersistenceAdapter;
-import org.apache.activemq.activemq.memory.UsageManager;
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.broker.TransportConnector;
+import org.apache.activemq.broker.region.policy.*;
+import org.apache.activemq.xbean.BrokerFactoryBean;
+import org.apache.activemq.transport.activeio.ActiveIOTransportServer;
+import org.apache.activemq.transport.tcp.TcpTransportServer;
+import org.apache.activemq.command.ActiveMQTopic;
+import org.apache.activemq.openwire.OpenWireFormat;
+import org.apache.activemq.store.PersistenceAdapter;
+import org.apache.activemq.store.PersistenceAdapterFactory;
+import org.apache.activemq.store.DefaultPersistenceAdapterFactory;
+import org.apache.activemq.store.memory.MemoryPersistenceAdapter;
+import org.apache.activemq.store.jdbc.JDBCPersistenceAdapter;
+import org.apache.activemq.store.journal.JournalPersistenceAdapter;
+import org.apache.activemq.memory.UsageManager;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.FileSystemResource;
 import org.springframework.core.io.Resource;
@@ -69,7 +69,7 @@
 
         // Create broker from resource
         System.out.print("Creating broker... ");
-        broker = createBroker("org/activemq/config/example.xml");
+        broker = createBroker("org/apache/activemq/config/example.xml");
         System.out.println("Success");
 
         try {
@@ -337,7 +337,7 @@
             }
         }
 
-        broker = createBroker("org/activemq/config/config.xml");
+        broker = createBroker("org/apache/activemq/config/config.xml");
         try {
             assertEquals("Broker Config Error (brokerName)", "brokerXmlConfigHelper", broker.getBrokerName());
         } finally {

Modified: incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/config/example.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/config/example.xml?rev=359609&r1=359603&r2=359609&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/config/example.xml (original)
+++ incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/config/example.xml Wed Dec 28 11:42:01 2005
@@ -68,7 +68,7 @@
         </amq:memoryManager>
 
         <amq:persistenceFactory>
-            <bean id="myPersistenceFactory" class="org.apache.activemq.activemq.store.DefaultPersistenceAdapterFactory">
+            <bean id="myPersistenceFactory" class="org.apache.activemq.store.DefaultPersistenceAdapterFactory">
                 <property name="journalLogFileSize" value="32768" />
                 <property name="journalLogFiles" value="4" />
                 <property name="useJournal" value="true" />
@@ -82,7 +82,7 @@
     </amq:broker>
 
     <!-- testing normal Spring stuff inside the same config file -->
-    <bean id="myTransportServer" class="org.apache.activemq.activemq.transport.activeio.ActiveIOTransportServer">
+    <bean id="myTransportServer" class="org.apache.activemq.transport.activeio.ActiveIOTransportServer">
         <constructor-arg index="0">
             <bean id="brokerURI " class="java.net.URI">
                 <constructor-arg index="0">
@@ -97,7 +97,7 @@
 
         <property name="stopTimeout" value="5000"/>
         <property name="wireFormatFactory">
-            <bean id="myWireFormatFactory" class="org.apache.activemq.activemq.openwire.OpenWireFormatFactory">
+            <bean id="myWireFormatFactory" class="org.apache.activemq.openwire.OpenWireFormatFactory">
                 <property name="stackTraceEnabled" value="false"/>
                 <property name="tcpNoDelayEnabled" value="true"/>
                 <property name="cacheEnabled" value="false" />

Modified: incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/config/spring-test.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/config/spring-test.xml?rev=359609&r1=359603&r2=359609&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/config/spring-test.xml (original)
+++ incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/config/spring-test.xml Wed Dec 28 11:42:01 2005
@@ -2,11 +2,11 @@
 <!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
 
 <beans>
-  <bean id="wireFormat" class="org.apache.activemq.activemq.io.impl.DefaultWireFormat"/>
+  <bean id="wireFormat" class="org.apache.activemq.io.impl.DefaultWireFormat"/>
 
-  <bean id="transport" factory-method="newInstance" class="org.apache.activemq.activemq.transport.TransportServerChannelProvider">
+  <bean id="transport" factory-method="newInstance" class="org.apache.activemq.transport.TransportServerChannelProvider">
     <constructor-arg index="0">
-      <bean class="org.apache.activemq.activemq.io.impl.DefaultWireFormat"/>
+      <bean class="org.apache.activemq.io.impl.DefaultWireFormat"/>
       <!---
       <ref bean="wireFormat"/>
     -->

Modified: incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/transport/QueueClusterTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/transport/QueueClusterTest.java?rev=359609&r1=359603&r2=359609&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/transport/QueueClusterTest.java (original)
+++ incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/transport/QueueClusterTest.java Wed Dec 28 11:42:01 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.activemq.transport;
+package org.apache.activemq.transport;
 
 
 

Modified: incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/transport/TopicClusterTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/transport/TopicClusterTest.java?rev=359609&r1=359603&r2=359609&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/transport/TopicClusterTest.java (original)
+++ incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/transport/TopicClusterTest.java Wed Dec 28 11:42:01 2005
@@ -15,18 +15,18 @@
  * limitations under the License.
  */
 
-package org.apache.activemq.activemq.transport;
+package org.apache.activemq.transport;
 import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.activemq.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.activemq.broker.BrokerService;
-import org.apache.activemq.activemq.broker.TransportConnector;
-import org.apache.activemq.activemq.command.ActiveMQQueue;
-import org.apache.activemq.activemq.command.ActiveMQTextMessage;
-import org.apache.activemq.activemq.command.ActiveMQTopic;
-import org.apache.activemq.activemq.network.NetworkConnector;
-import org.apache.activemq.activemq.transport.discovery.rendezvous.RendezvousDiscoveryAgent;
-import org.apache.activemq.activemq.util.ServiceStopper;
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.broker.TransportConnector;
+import org.apache.activemq.command.ActiveMQQueue;
+import org.apache.activemq.command.ActiveMQTextMessage;
+import org.apache.activemq.command.ActiveMQTopic;
+import org.apache.activemq.network.NetworkConnector;
+import org.apache.activemq.transport.discovery.rendezvous.RendezvousDiscoveryAgent;
+import org.apache.activemq.util.ServiceStopper;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Modified: incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/ChangeSentMessageTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/ChangeSentMessageTest.java?rev=359609&r1=359603&r2=359609&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/ChangeSentMessageTest.java (original)
+++ incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/ChangeSentMessageTest.java Wed Dec 28 11:42:01 2005
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.activemq.activemq.usecases;
+package org.apache.activemq.usecases;
 import java.util.HashMap;
 import javax.jms.Connection;
 import javax.jms.Destination;
@@ -24,7 +24,7 @@
 import javax.jms.ObjectMessage;
 import javax.jms.Session;
 
-import org.apache.activemq.activemq.test.TestSupport;
+import org.apache.activemq.test.TestSupport;
 
 /**
  * @version $Revision: 1.1.1.1 $

Modified: incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/ChangeSessionDeliveryModeTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/ChangeSessionDeliveryModeTest.java?rev=359609&r1=359603&r2=359609&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/ChangeSessionDeliveryModeTest.java (original)
+++ incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/ChangeSessionDeliveryModeTest.java Wed Dec 28 11:42:01 2005
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.activemq.activemq.usecases;
+package org.apache.activemq.usecases;
 import java.util.HashMap;
 import javax.jms.Connection;
 import javax.jms.Destination;
@@ -28,7 +28,7 @@
 import javax.jms.ObjectMessage;
 import javax.jms.Session;
 
-import org.apache.activemq.activemq.test.TestSupport;
+import org.apache.activemq.test.TestSupport;
 
 /**
  * @version $Revision: 1.1.1.1 $

Modified: incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/CompositeConsumeTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/CompositeConsumeTest.java?rev=359609&r1=359603&r2=359609&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/CompositeConsumeTest.java (original)
+++ incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/CompositeConsumeTest.java Wed Dec 28 11:42:01 2005
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.activemq.usecases;
+package org.apache.activemq.usecases;
 
-import org.apache.activemq.activemq.command.ActiveMQTopic;
-import org.apache.activemq.activemq.test.JmsTopicSendReceiveWithTwoConnectionsTest;
+import org.apache.activemq.command.ActiveMQTopic;
+import org.apache.activemq.test.JmsTopicSendReceiveWithTwoConnectionsTest;
 
 import javax.jms.Destination;
 import javax.jms.Message;

Modified: incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/CompositePublishTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/CompositePublishTest.java?rev=359609&r1=359603&r2=359609&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/CompositePublishTest.java (original)
+++ incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/CompositePublishTest.java Wed Dec 28 11:42:01 2005
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.activemq.usecases;
+package org.apache.activemq.usecases;
 
-import org.apache.activemq.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.activemq.command.ActiveMQTopic;
-import org.apache.activemq.activemq.test.JmsSendReceiveTestSupport;
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.command.ActiveMQTopic;
+import org.apache.activemq.test.JmsSendReceiveTestSupport;
 
 import javax.jms.Connection;
 import javax.jms.Destination;

Modified: incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/ConsumeQueuePrefetchTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/ConsumeQueuePrefetchTest.java?rev=359609&r1=359603&r2=359609&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/ConsumeQueuePrefetchTest.java (original)
+++ incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/ConsumeQueuePrefetchTest.java Wed Dec 28 11:42:01 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.activemq.usecases;
+package org.apache.activemq.usecases;
 
 import javax.jms.JMSException;
 

Modified: incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/ConsumeTopicPrefetchTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/ConsumeTopicPrefetchTest.java?rev=359609&r1=359603&r2=359609&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/ConsumeTopicPrefetchTest.java (original)
+++ incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/ConsumeTopicPrefetchTest.java Wed Dec 28 11:42:01 2005
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.activemq.usecases;
+package org.apache.activemq.usecases;
 
 import javax.jms.Connection;
 import javax.jms.JMSException;
 import javax.jms.Message;
 import javax.jms.TextMessage;
 
-import org.apache.activemq.activemq.ActiveMQConnection;
+import org.apache.activemq.ActiveMQConnection;
 
 /**
  * @version $Revision: 1.1.1.1 $

Modified: incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/CreateLotsOfTemporaryQueuesTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/CreateLotsOfTemporaryQueuesTest.java?rev=359609&r1=359603&r2=359609&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/CreateLotsOfTemporaryQueuesTest.java (original)
+++ incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/CreateLotsOfTemporaryQueuesTest.java Wed Dec 28 11:42:01 2005
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.activemq.usecases;
+package org.apache.activemq.usecases;
 
-import org.apache.activemq.activemq.EmbeddedBrokerTestSupport;
+import org.apache.activemq.EmbeddedBrokerTestSupport;
 
 import javax.jms.Connection;
 import javax.jms.Session;

Modified: incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/CreateTemporaryQueueBeforeStartTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/CreateTemporaryQueueBeforeStartTest.java?rev=359609&r1=359603&r2=359609&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/CreateTemporaryQueueBeforeStartTest.java (original)
+++ incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/CreateTemporaryQueueBeforeStartTest.java Wed Dec 28 11:42:01 2005
@@ -15,11 +15,11 @@
  * limitations under the License.
  */
 
-package org.apache.activemq.activemq.usecases;
+package org.apache.activemq.usecases;
 import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger;
 
-import org.apache.activemq.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.activemq.broker.BrokerService;
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.broker.BrokerService;
 
 import javax.jms.Connection;
 import javax.jms.Queue;

Modified: incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/DeadLetterTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/DeadLetterTest.java?rev=359609&r1=359603&r2=359609&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/DeadLetterTest.java (original)
+++ incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/DeadLetterTest.java Wed Dec 28 11:42:01 2005
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.activemq.usecases;
+package org.apache.activemq.usecases;
 
-import org.apache.activemq.activemq.TestSupport;
-import org.apache.activemq.activemq.command.ActiveMQDestination;
+import org.apache.activemq.TestSupport;
+import org.apache.activemq.command.ActiveMQDestination;
 
 import javax.jms.Connection;
 import javax.jms.DeliveryMode;

Modified: incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/DurableConsumerCloseAndReconnectTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/DurableConsumerCloseAndReconnectTest.java?rev=359609&r1=359603&r2=359609&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/DurableConsumerCloseAndReconnectTest.java (original)
+++ incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/DurableConsumerCloseAndReconnectTest.java Wed Dec 28 11:42:01 2005
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.activemq.usecases;
+package org.apache.activemq.usecases;
 
-import org.apache.activemq.activemq.test.TestSupport;
+import org.apache.activemq.test.TestSupport;
 
 import javax.jms.Connection;
 import javax.jms.DeliveryMode;

Modified: incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/DurableSubscriptionTestSupport.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/DurableSubscriptionTestSupport.java?rev=359609&r1=359603&r2=359609&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/DurableSubscriptionTestSupport.java (original)
+++ incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/DurableSubscriptionTestSupport.java Wed Dec 28 11:42:01 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.activemq.usecases;
+package org.apache.activemq.usecases;
 
 import javax.jms.Connection;
 import javax.jms.DeliveryMode;
@@ -28,9 +28,9 @@
 import javax.jms.Topic;
 import javax.jms.TopicSubscriber;
 
-import org.apache.activemq.activemq.TestSupport;
-import org.apache.activemq.activemq.broker.BrokerService;
-import org.apache.activemq.activemq.store.PersistenceAdapter;
+import org.apache.activemq.TestSupport;
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.store.PersistenceAdapter;
 
 /**
  * @version $Revision: 1.1.1.1 $

Modified: incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/ExceptionListenerTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/ExceptionListenerTest.java?rev=359609&r1=359603&r2=359609&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/ExceptionListenerTest.java (original)
+++ incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/ExceptionListenerTest.java Wed Dec 28 11:42:01 2005
@@ -15,7 +15,7 @@
  * limitations under the License. 
  * 
  **/
-package org.apache.activemq.activemq.usecases;
+package org.apache.activemq.usecases;
 
 import javax.jms.ExceptionListener;
 import javax.jms.JMSException;
@@ -39,7 +39,7 @@
         /* TODO not sure yet if this is a valid test
 
         System.setProperty("activemq.persistenceAdapter",
-                "org.apache.activemq.activemq.store.vm.VMPersistenceAdapter");
+                "org.apache.activemq.store.vm.VMPersistenceAdapter");
         // configuration of container and all protocolls
         BrokerContainerImpl container = new
                 BrokerContainerImpl("DefaultBroker");

Modified: incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/JDBCDurableSubscriptionTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/JDBCDurableSubscriptionTest.java?rev=359609&r1=359603&r2=359609&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/JDBCDurableSubscriptionTest.java (original)
+++ incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/JDBCDurableSubscriptionTest.java Wed Dec 28 11:42:01 2005
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.activemq.usecases;
+package org.apache.activemq.usecases;
 
 import java.io.File;
 import java.io.IOException;
 
-import org.apache.activemq.activemq.store.DefaultPersistenceAdapterFactory;
-import org.apache.activemq.activemq.store.PersistenceAdapter;
-import org.apache.activemq.activemq.store.jdbc.JDBCPersistenceAdapter;
+import org.apache.activemq.store.DefaultPersistenceAdapterFactory;
+import org.apache.activemq.store.PersistenceAdapter;
+import org.apache.activemq.store.jdbc.JDBCPersistenceAdapter;
 
 /**
  * @version $Revision: 1.1.1.1 $

Modified: incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/JournalDurableSubscriptionTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/JournalDurableSubscriptionTest.java?rev=359609&r1=359603&r2=359609&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/JournalDurableSubscriptionTest.java (original)
+++ incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/JournalDurableSubscriptionTest.java Wed Dec 28 11:42:01 2005
@@ -15,13 +15,13 @@
  * limitations under the License. 
  *
  **/
-package org.apache.activemq.activemq.usecases;
+package org.apache.activemq.usecases;
 
 import java.io.File;
 import java.io.IOException;
 
-import org.apache.activemq.activemq.store.DefaultPersistenceAdapterFactory;
-import org.apache.activemq.activemq.store.PersistenceAdapter;
+import org.apache.activemq.store.DefaultPersistenceAdapterFactory;
+import org.apache.activemq.store.PersistenceAdapter;
 
 /**
  * @version $Revision: 1.1.1.1 $

Modified: incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/ProducerConsumerTestSupport.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/ProducerConsumerTestSupport.java?rev=359609&r1=359603&r2=359609&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/ProducerConsumerTestSupport.java (original)
+++ incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/ProducerConsumerTestSupport.java Wed Dec 28 11:42:01 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.activemq.usecases;
+package org.apache.activemq.usecases;
 
 import javax.jms.Connection;
 import javax.jms.Destination;

Modified: incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/PublishOnDurableTopicConsumedMessageTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/PublishOnDurableTopicConsumedMessageTest.java?rev=359609&r1=359603&r2=359609&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/PublishOnDurableTopicConsumedMessageTest.java (original)
+++ incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/PublishOnDurableTopicConsumedMessageTest.java Wed Dec 28 11:42:01 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.activemq.usecases;
+package org.apache.activemq.usecases;
 
 /**
  * @version $Revision: 1.1.1.1 $

Modified: incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/PublishOnQueueConsumedMessageTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/PublishOnQueueConsumedMessageTest.java?rev=359609&r1=359603&r2=359609&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/PublishOnQueueConsumedMessageTest.java (original)
+++ incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/PublishOnQueueConsumedMessageTest.java Wed Dec 28 11:42:01 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.activemq.usecases;
+package org.apache.activemq.usecases;
 
 /**
  * @version $Revision: 1.1.1.1 $

Modified: incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/PublishOnQueueConsumedMessageUsingActivemqXMLTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/PublishOnQueueConsumedMessageUsingActivemqXMLTest.java?rev=359609&r1=359603&r2=359609&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/PublishOnQueueConsumedMessageUsingActivemqXMLTest.java (original)
+++ incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/PublishOnQueueConsumedMessageUsingActivemqXMLTest.java Wed Dec 28 11:42:01 2005
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.activemq.usecases;
+package org.apache.activemq.usecases;
 
-import org.apache.activemq.activemq.broker.BrokerService;
-import org.apache.activemq.activemq.xbean.BrokerFactoryBean;
-import org.apache.activemq.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.xbean.BrokerFactoryBean;
+import org.apache.activemq.ActiveMQConnectionFactory;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 
@@ -58,7 +58,7 @@
         recursiveDelete(journalFile);
         // Create broker from resource
         System.out.print("Creating broker... ");
-        broker = createBroker("org/activemq/usecases/activemq.xml");
+        broker = createBroker("org/apache/activemq/usecases/activemq.xml");
         System.out.println("Success");
         super.setUp();
 

Modified: incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/PublishOnTemporaryQueueConsumedMessageTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/PublishOnTemporaryQueueConsumedMessageTest.java?rev=359609&r1=359603&r2=359609&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/PublishOnTemporaryQueueConsumedMessageTest.java (original)
+++ incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/PublishOnTemporaryQueueConsumedMessageTest.java Wed Dec 28 11:42:01 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.activemq.usecases;
+package org.apache.activemq.usecases;
 
 import javax.jms.DeliveryMode;
 

Modified: incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/PublishOnTopicConsumedMessageTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/PublishOnTopicConsumedMessageTest.java?rev=359609&r1=359603&r2=359609&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/PublishOnTopicConsumedMessageTest.java (original)
+++ incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/PublishOnTopicConsumedMessageTest.java Wed Dec 28 11:42:01 2005
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.activemq.usecases;
+package org.apache.activemq.usecases;
 
-import org.apache.activemq.activemq.test.JmsTopicSendReceiveWithTwoConnectionsTest;
+import org.apache.activemq.test.JmsTopicSendReceiveWithTwoConnectionsTest;
 
 import javax.jms.Destination;
 import javax.jms.JMSException;
@@ -34,7 +34,7 @@
 
         // lets resend the message somewhere else
         try {
-            Message msgCopy = (Message)((org.apache.activemq.activemq.command.Message)message).copy();
+            Message msgCopy = (Message)((org.apache.activemq.command.Message)message).copy();
             replyProducer.send(msgCopy);
 
             //System.out.println("Sending reply: " + message);

Modified: incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/PublishOnTopicConsumerMessageUsingActivemqXMLTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/PublishOnTopicConsumerMessageUsingActivemqXMLTest.java?rev=359609&r1=359603&r2=359609&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/PublishOnTopicConsumerMessageUsingActivemqXMLTest.java (original)
+++ incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/PublishOnTopicConsumerMessageUsingActivemqXMLTest.java Wed Dec 28 11:42:01 2005
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.activemq.usecases;
+package org.apache.activemq.usecases;
 
-import org.apache.activemq.activemq.broker.BrokerService;
-import org.apache.activemq.activemq.xbean.BrokerFactoryBean;
-import org.apache.activemq.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.xbean.BrokerFactoryBean;
+import org.apache.activemq.ActiveMQConnectionFactory;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
 import java.io.File;
@@ -57,7 +57,7 @@
         recursiveDelete(journalFile);
         // Create broker from resource
         System.out.print("Creating broker... ");
-        broker = createBroker("org/activemq/usecases/activemq.xml");
+        broker = createBroker("org/apache/activemq/usecases/activemq.xml");
         System.out.println("Success");
         super.setUp();
 

Modified: incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/QueueConsumerCloseAndReconnectTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/QueueConsumerCloseAndReconnectTest.java?rev=359609&r1=359603&r2=359609&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/QueueConsumerCloseAndReconnectTest.java (original)
+++ incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/QueueConsumerCloseAndReconnectTest.java Wed Dec 28 11:42:01 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.activemq.usecases;
+package org.apache.activemq.usecases;
 
 /**
  * @version $Revision: 1.1.1.1 $

Modified: incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/QueueDuplicatesTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/QueueDuplicatesTest.java?rev=359609&r1=359603&r2=359609&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/QueueDuplicatesTest.java (original)
+++ incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/QueueDuplicatesTest.java Wed Dec 28 11:42:01 2005
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.activemq.activemq.usecases;
+package org.apache.activemq.usecases;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.Date;
@@ -35,7 +35,7 @@
 import javax.jms.Session;
 import javax.jms.TextMessage;
 import junit.framework.TestCase;
-import org.apache.activemq.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.ActiveMQConnectionFactory;
 
 public class QueueDuplicatesTest extends TestCase {
     private static DateFormat formatter = new SimpleDateFormat("HH:mm:ss SSS");

Modified: incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/QueueRedeliverTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/QueueRedeliverTest.java?rev=359609&r1=359603&r2=359609&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/QueueRedeliverTest.java (original)
+++ incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/QueueRedeliverTest.java Wed Dec 28 11:42:01 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.activemq.usecases;
+package org.apache.activemq.usecases;
 
 
 /**

Modified: incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/ReliableReconnectTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/ReliableReconnectTest.java?rev=359609&r1=359603&r2=359609&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/ReliableReconnectTest.java (original)
+++ incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/ReliableReconnectTest.java Wed Dec 28 11:42:01 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.activemq.usecases;
+package org.apache.activemq.usecases;
 import java.util.HashMap;
 import java.net.URI;
 import javax.jms.Connection;
@@ -33,13 +33,13 @@
 import javax.jms.Session;
 import javax.jms.TextMessage;
 import javax.jms.Topic;
-import org.apache.activemq.activemq.ActiveMQConnection;
-import org.apache.activemq.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.activemq.broker.BrokerService;
-import org.apache.activemq.activemq.broker.BrokerFactory;
-import org.apache.activemq.activemq.broker.Broker;
-import org.apache.activemq.activemq.test.TestSupport;
-import org.apache.activemq.activemq.util.IdGenerator;
+import org.apache.activemq.ActiveMQConnection;
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.broker.BrokerFactory;
+import org.apache.activemq.broker.Broker;
+import org.apache.activemq.test.TestSupport;
+import org.apache.activemq.util.IdGenerator;
 import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
 import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicInteger;
 

Modified: incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/StartAndStopBrokerTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/StartAndStopBrokerTest.java?rev=359609&r1=359603&r2=359609&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/StartAndStopBrokerTest.java (original)
+++ incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/StartAndStopBrokerTest.java Wed Dec 28 11:42:01 2005
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.activemq.usecases;
+package org.apache.activemq.usecases;
 
 import junit.framework.TestCase;
-import org.apache.activemq.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.activemq.broker.BrokerService;
-import org.apache.activemq.activemq.broker.BrokerFactory;
-import org.apache.activemq.activemq.broker.TransportConnector;
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.broker.BrokerFactory;
+import org.apache.activemq.broker.TransportConnector;
 
 import javax.jms.JMSException;
 import java.net.URI;
@@ -34,7 +34,7 @@
         // This systemproperty is used if we dont want to
         // have persistence messages as a default
         System.setProperty("activemq.persistenceAdapter",
-                "org.apache.activemq.activemq.store.vm.VMPersistenceAdapter");
+                "org.apache.activemq.store.vm.VMPersistenceAdapter");
 
         // configuration of container and all protocolls
         BrokerService broker = createBroker();

Modified: incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/SubscribeClosePublishThenConsumeTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/SubscribeClosePublishThenConsumeTest.java?rev=359609&r1=359603&r2=359609&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/SubscribeClosePublishThenConsumeTest.java (original)
+++ incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/SubscribeClosePublishThenConsumeTest.java Wed Dec 28 11:42:01 2005
@@ -14,10 +14,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.activemq.usecases;
+package org.apache.activemq.usecases;
 
-import org.apache.activemq.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.activemq.test.TestSupport;
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.test.TestSupport;
 
 import javax.jms.Connection;
 import javax.jms.DeliveryMode;

Modified: incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/TestSupport.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/TestSupport.java?rev=359609&r1=359603&r2=359609&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/TestSupport.java (original)
+++ incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/TestSupport.java Wed Dec 28 11:42:01 2005
@@ -14,12 +14,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.activemq.usecases;
+package org.apache.activemq.usecases;
 
-import org.apache.activemq.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.activemq.command.ActiveMQMessage;
-import org.apache.activemq.activemq.command.ActiveMQQueue;
-import org.apache.activemq.activemq.command.ActiveMQTopic;
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.command.ActiveMQMessage;
+import org.apache.activemq.command.ActiveMQQueue;
+import org.apache.activemq.command.ActiveMQTopic;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 

Modified: incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/TopicRedeliverTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/TopicRedeliverTest.java?rev=359609&r1=359603&r2=359609&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/TopicRedeliverTest.java (original)
+++ incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/TopicRedeliverTest.java Wed Dec 28 11:42:01 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.activemq.usecases;
+package org.apache.activemq.usecases;
 
 import javax.jms.Connection;
 import javax.jms.DeliveryMode;
@@ -26,8 +26,8 @@
 import javax.jms.TextMessage;
 import javax.jms.Topic;
 
-import org.apache.activemq.activemq.test.TestSupport;
-import org.apache.activemq.activemq.util.IdGenerator;
+import org.apache.activemq.test.TestSupport;
+import org.apache.activemq.util.IdGenerator;
 
 /**
  * @version $Revision: 1.1.1.1 $

Modified: incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/TransactionRollbackOrderTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/TransactionRollbackOrderTest.java?rev=359609&r1=359603&r2=359609&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/TransactionRollbackOrderTest.java (original)
+++ incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/TransactionRollbackOrderTest.java Wed Dec 28 11:42:01 2005
@@ -14,13 +14,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.activemq.usecases;
+package org.apache.activemq.usecases;
 
 import edu.emory.mathcs.backport.java.util.concurrent.CountDownLatch;
 import junit.framework.TestCase;
-import org.apache.activemq.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.activemq.command.ActiveMQQueue;
-import org.apache.activemq.activemq.command.ActiveMQTopic;
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.command.ActiveMQQueue;
+import org.apache.activemq.command.ActiveMQTopic;
 
 import javax.jms.Connection;
 import javax.jms.Destination;

Modified: incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/TransactionTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/TransactionTest.java?rev=359609&r1=359603&r2=359609&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/TransactionTest.java (original)
+++ incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/TransactionTest.java Wed Dec 28 11:42:01 2005
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.activemq.usecases;
+package org.apache.activemq.usecases;
 
 import junit.framework.TestCase;
-import org.apache.activemq.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.activemq.command.ActiveMQQueue;
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.command.ActiveMQQueue;
 
 import javax.jms.Connection;
 import javax.jms.Destination;

Modified: incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/TransientQueueRedeliverTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/TransientQueueRedeliverTest.java?rev=359609&r1=359603&r2=359609&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/TransientQueueRedeliverTest.java (original)
+++ incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/TransientQueueRedeliverTest.java Wed Dec 28 11:42:01 2005
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.activemq.usecases;
+package org.apache.activemq.usecases;
 
 import javax.jms.DeliveryMode;
 

Modified: incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/TwoBrokerQueueSendReceiveTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/TwoBrokerQueueSendReceiveTest.java?rev=359609&r1=359603&r2=359609&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/TwoBrokerQueueSendReceiveTest.java (original)
+++ incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/TwoBrokerQueueSendReceiveTest.java Wed Dec 28 11:42:01 2005
@@ -15,9 +15,9 @@
  * limitations under the License. 
  * 
  **/
-package org.apache.activemq.activemq.usecases;
+package org.apache.activemq.usecases;
 
-import org.apache.activemq.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.ActiveMQConnectionFactory;
 
 /**
  * @version $Revision: 1.1.1.1 $

Modified: incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/TwoBrokerTopicSendReceiveTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/TwoBrokerTopicSendReceiveTest.java?rev=359609&r1=359603&r2=359609&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/TwoBrokerTopicSendReceiveTest.java (original)
+++ incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/TwoBrokerTopicSendReceiveTest.java Wed Dec 28 11:42:01 2005
@@ -14,16 +14,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.activemq.usecases;
+package org.apache.activemq.usecases;
 
 import javax.jms.Connection;
 import javax.jms.JMSException;
 
-import org.apache.activemq.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.activemq.broker.TransportConnector;
-import org.apache.activemq.activemq.broker.BrokerService;
-import org.apache.activemq.activemq.xbean.BrokerFactoryBean;
-import org.apache.activemq.activemq.test.JmsTopicSendReceiveWithTwoConnectionsTest;
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.broker.TransportConnector;
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.xbean.BrokerFactoryBean;
+import org.apache.activemq.test.JmsTopicSendReceiveWithTwoConnectionsTest;
 import org.springframework.core.io.ClassPathResource;
 
 /**
@@ -41,11 +41,11 @@
     }
 
     protected ActiveMQConnectionFactory createReceiverConnectionFactory() throws JMSException {
-        return createConnectionFactory("org/activemq/usecases/receiver.xml", "receiver", "vm://receiver");
+        return createConnectionFactory("org/apache/activemq/usecases/receiver.xml", "receiver", "vm://receiver");
     }
 
     protected ActiveMQConnectionFactory createSenderConnectionFactory() throws JMSException {
-        return createConnectionFactory("org/activemq/usecases/sender.xml", "sender", "vm://sender");
+        return createConnectionFactory("org/apache/activemq/usecases/sender.xml", "sender", "vm://sender");
     }
 
     protected void tearDown() throws Exception {

Modified: incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/TwoBrokerTopicSendReceiveUsingHttpTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/TwoBrokerTopicSendReceiveUsingHttpTest.java?rev=359609&r1=359603&r2=359609&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/TwoBrokerTopicSendReceiveUsingHttpTest.java (original)
+++ incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/TwoBrokerTopicSendReceiveUsingHttpTest.java Wed Dec 28 11:42:01 2005
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.activemq.usecases;
+package org.apache.activemq.usecases;
 
-import org.apache.activemq.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.ActiveMQConnectionFactory;
 
 import javax.jms.JMSException;
 
@@ -26,10 +26,10 @@
 public class TwoBrokerTopicSendReceiveUsingHttpTest extends TwoBrokerTopicSendReceiveTest {
 
     protected ActiveMQConnectionFactory createReceiverConnectionFactory() throws JMSException {
-        return createConnectionFactory("org/activemq/usecases/receiver-http.xml", "receiver", "vm://receiver");
+        return createConnectionFactory("org/apache/activemq/usecases/receiver-http.xml", "receiver", "vm://receiver");
     }
 
     protected ActiveMQConnectionFactory createSenderConnectionFactory() throws JMSException {
-        return createConnectionFactory("org/activemq/usecases/sender-http.xml", "sender", "vm://sender");
+        return createConnectionFactory("org/apache/activemq/usecases/sender-http.xml", "sender", "vm://sender");
     }
 }

Modified: incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/TwoBrokerTopicSendReceiveUsingJavaConfigurationTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/TwoBrokerTopicSendReceiveUsingJavaConfigurationTest.java?rev=359609&r1=359603&r2=359609&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/TwoBrokerTopicSendReceiveUsingJavaConfigurationTest.java (original)
+++ incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/TwoBrokerTopicSendReceiveUsingJavaConfigurationTest.java Wed Dec 28 11:42:01 2005
@@ -14,11 +14,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.activemq.usecases;
+package org.apache.activemq.usecases;
 
-import org.apache.activemq.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.activemq.store.memory.MemoryPersistenceAdapter;
-import org.apache.activemq.activemq.broker.BrokerService;
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.store.memory.MemoryPersistenceAdapter;
+import org.apache.activemq.broker.BrokerService;
 
 import javax.jms.JMSException;
 

Modified: incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/TwoBrokerTopicSendReceiveUsingTcpTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/TwoBrokerTopicSendReceiveUsingTcpTest.java?rev=359609&r1=359603&r2=359609&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/TwoBrokerTopicSendReceiveUsingTcpTest.java (original)
+++ incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/TwoBrokerTopicSendReceiveUsingTcpTest.java Wed Dec 28 11:42:01 2005
@@ -14,14 +14,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.activemq.usecases;
+package org.apache.activemq.usecases;
 
 import javax.jms.JMSException;
 
-import org.apache.activemq.activemq.ActiveMQConnectionFactory;
-import org.apache.activemq.activemq.xbean.BrokerFactoryBean;
-import org.apache.activemq.activemq.broker.BrokerService;
-import org.apache.activemq.activemq.broker.TransportConnector;
+import org.apache.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.xbean.BrokerFactoryBean;
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.broker.TransportConnector;
 import org.springframework.core.io.ClassPathResource;
 
 import java.io.IOException;
@@ -37,11 +37,11 @@
     protected void setUp() throws Exception {
         BrokerFactoryBean brokerFactory;
 
-        brokerFactory = new BrokerFactoryBean(new ClassPathResource("org/activemq/usecases/receiver.xml"));
+        brokerFactory = new BrokerFactoryBean(new ClassPathResource("org/apache/activemq/usecases/receiver.xml"));
         brokerFactory.afterPropertiesSet();
         receiverBroker = brokerFactory.getBroker();
 
-        brokerFactory = new BrokerFactoryBean(new ClassPathResource("org/activemq/usecases/sender.xml"));
+        brokerFactory = new BrokerFactoryBean(new ClassPathResource("org/apache/activemq/usecases/sender.xml"));
         brokerFactory.afterPropertiesSet();
         senderBroker = brokerFactory.getBroker();
 

Modified: incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/TwoMulticastDiscoveryBrokerTopicSendReceiveTest.java
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/TwoMulticastDiscoveryBrokerTopicSendReceiveTest.java?rev=359609&r1=359603&r2=359609&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/TwoMulticastDiscoveryBrokerTopicSendReceiveTest.java (original)
+++ incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/TwoMulticastDiscoveryBrokerTopicSendReceiveTest.java Wed Dec 28 11:42:01 2005
@@ -14,9 +14,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.activemq.usecases;
+package org.apache.activemq.usecases;
 
-import org.apache.activemq.activemq.ActiveMQConnectionFactory;
+import org.apache.activemq.ActiveMQConnectionFactory;
 
 import javax.jms.JMSException;
 
@@ -26,10 +26,10 @@
 public class TwoMulticastDiscoveryBrokerTopicSendReceiveTest extends TwoBrokerTopicSendReceiveTest {
 
     protected ActiveMQConnectionFactory createReceiverConnectionFactory() throws JMSException {
-        return createConnectionFactory("org/activemq/usecases/receiver-discovery.xml", "receiver", "vm://receiver");
+        return createConnectionFactory("org/apache/activemq/usecases/receiver-discovery.xml", "receiver", "vm://receiver");
     }
 
     protected ActiveMQConnectionFactory createSenderConnectionFactory() throws JMSException {
-        return createConnectionFactory("org/activemq/usecases/sender-discovery.xml", "sender", "vm://sender");
+        return createConnectionFactory("org/apache/activemq/usecases/sender-discovery.xml", "sender", "vm://sender");
     }
 }

Modified: incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/receiver-activecluster.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/receiver-activecluster.xml?rev=359609&r1=359603&r2=359609&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/receiver-activecluster.xml (original)
+++ incubator/activemq/trunk/assembly/src/test/java/org/apache/activemq/usecases/receiver-activecluster.xml Wed Dec 28 11:42:01 2005
@@ -8,7 +8,7 @@
     </connector>
 
     <discoveryAgent>
-      <activeClusterDiscovery uri="multicast://224.1.2.3:2123" subject="org.apache.activemq.activemq.discover"/>
+      <activeClusterDiscovery uri="multicast://224.1.2.3:2123" subject="org.apache.activemq.discover"/>
     </discoveryAgent>
 
     <discoveryNetworkConnector/>



Mime
View raw message