You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2013/01/29 00:09:55 UTC

svn commit: r1439685 - in /activemq/trunk: ./ activemq-camel/ activemq-core/ activemq-fileserver/ activemq-http/ activemq-itests-spring31/ activemq-karaf/ activemq-unit-tests/ activemq-unit-tests/src/main/java/org/ activemq-unit-tests/src/main/proto/ a...

Author: tabish
Date: Mon Jan 28 23:09:54 2013
New Revision: 1439685

URL: http://svn.apache.org/viewvc?rev=1439685&view=rev
Log:
fix https://issues.apache.org/jira/browse/AMQ-4280

activemq-core module renamed to activemq-unit-tests

Added:
    activemq/trunk/activemq-unit-tests/
      - copied from r1439603, activemq/trunk/activemq-core/
    activemq/trunk/activemq-unit-tests/pom.xml
      - copied, changed from r1439680, activemq/trunk/activemq-core/pom.xml
Removed:
    activemq/trunk/activemq-core/
    activemq/trunk/activemq-unit-tests/src/main/java/org/
    activemq/trunk/activemq-unit-tests/src/main/proto/
Modified:
    activemq/trunk/activemq-camel/pom.xml
    activemq/trunk/activemq-fileserver/pom.xml
    activemq/trunk/activemq-http/pom.xml
    activemq/trunk/activemq-itests-spring31/pom.xml
    activemq/trunk/activemq-karaf/pom.xml
    activemq/trunk/activemq-web-demo/pom.xml
    activemq/trunk/activemq-web/pom.xml
    activemq/trunk/activemq-xmpp/pom.xml
    activemq/trunk/assembly/pom.xml
    activemq/trunk/pom.xml

Modified: activemq/trunk/activemq-camel/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-camel/pom.xml?rev=1439685&r1=1439684&r2=1439685&view=diff
==============================================================================
--- activemq/trunk/activemq-camel/pom.xml (original)
+++ activemq/trunk/activemq-camel/pom.xml Mon Jan 28 23:09:54 2013
@@ -86,7 +86,7 @@
     <!-- testing helpers -->
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>activemq-core</artifactId>
+      <artifactId>activemq-unit-tests</artifactId>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>

Modified: activemq/trunk/activemq-fileserver/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-fileserver/pom.xml?rev=1439685&r1=1439684&r2=1439685&view=diff
==============================================================================
--- activemq/trunk/activemq-fileserver/pom.xml (original)
+++ activemq/trunk/activemq-fileserver/pom.xml Mon Jan 28 23:09:54 2013
@@ -79,7 +79,7 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>activemq-core</artifactId>
+      <artifactId>activemq-unit-tests</artifactId>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>

Modified: activemq/trunk/activemq-http/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-http/pom.xml?rev=1439685&r1=1439684&r2=1439685&view=diff
==============================================================================
--- activemq/trunk/activemq-http/pom.xml (original)
+++ activemq/trunk/activemq-http/pom.xml Mon Jan 28 23:09:54 2013
@@ -67,7 +67,7 @@
     <!-- =============================== -->
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>activemq-core</artifactId>
+      <artifactId>activemq-unit-tests</artifactId>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>

Modified: activemq/trunk/activemq-itests-spring31/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-itests-spring31/pom.xml?rev=1439685&r1=1439684&r2=1439685&view=diff
==============================================================================
--- activemq/trunk/activemq-itests-spring31/pom.xml (original)
+++ activemq/trunk/activemq-itests-spring31/pom.xml Mon Jan 28 23:09:54 2013
@@ -6,9 +6,9 @@
   The ASF licenses this file to You under the Apache License, Version 2.0
   (the "License"); you may not use this file except in compliance with
   the License.  You may obtain a copy of the License at
-  
+
   http://www.apache.org/licenses/LICENSE-2.0
-  
+
   Unless required by applicable law or agreed to in writing, software
   distributed under the License is distributed on an "AS IS" BASIS,
   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -32,7 +32,7 @@
   <description>ActiveMQ integration test with Spring 3.1</description>
 
   <properties>
-	  <!-- force using spring 3.1.x -->
+      <!-- force using spring 3.1.x -->
     <spring-version>3.1.3.RELEASE</spring-version>
   </properties>
 
@@ -45,15 +45,11 @@
       <groupId>org.slf4j</groupId>
       <artifactId>slf4j-api</artifactId>
     </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>activemq-core</artifactId>
-    </dependency>
 
     <!-- testing helpers -->
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>activemq-core</artifactId>
+      <artifactId>activemq-unit-tests</artifactId>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>

Modified: activemq/trunk/activemq-karaf/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-karaf/pom.xml?rev=1439685&r1=1439684&r2=1439685&view=diff
==============================================================================
--- activemq/trunk/activemq-karaf/pom.xml (original)
+++ activemq/trunk/activemq-karaf/pom.xml Mon Jan 28 23:09:54 2013
@@ -96,10 +96,6 @@
     </dependency>
     <dependency>
       <groupId>org.apache.activemq</groupId>
-      <artifactId>activemq-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.activemq</groupId>
       <artifactId>activemq-http</artifactId>
     </dependency>
     <dependency>

Copied: activemq/trunk/activemq-unit-tests/pom.xml (from r1439680, activemq/trunk/activemq-core/pom.xml)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-unit-tests/pom.xml?p2=activemq/trunk/activemq-unit-tests/pom.xml&p1=activemq/trunk/activemq-core/pom.xml&r1=1439680&r2=1439685&rev=1439685&view=diff
==============================================================================
--- activemq/trunk/activemq-core/pom.xml (original)
+++ activemq/trunk/activemq-unit-tests/pom.xml Mon Jan 28 23:09:54 2013
@@ -26,9 +26,9 @@
     <version>5.8-SNAPSHOT</version>
   </parent>
 
-  <artifactId>activemq-core</artifactId>
-  <name>ActiveMQ :: Core</name>
-  <description>The ActiveMQ Message Broker and Client implementations</description>
+  <artifactId>activemq-unit-tests</artifactId>
+  <name>ActiveMQ :: Unit Tests</name>
+  <description>The ActiveMQ Message Broker and Client Unit Tests</description>
 
   <properties>
     <surefire.argLine>-Xmx512M</surefire.argLine>

Modified: activemq/trunk/activemq-web-demo/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web-demo/pom.xml?rev=1439685&r1=1439684&r2=1439685&view=diff
==============================================================================
--- activemq/trunk/activemq-web-demo/pom.xml (original)
+++ activemq/trunk/activemq-web-demo/pom.xml Mon Jan 28 23:09:54 2013
@@ -76,7 +76,7 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>activemq-core</artifactId>
+      <artifactId>activemq-unit-tests</artifactId>
       <scope>test</scope>
       <type>test-jar</type>
     </dependency>

Modified: activemq/trunk/activemq-web/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-web/pom.xml?rev=1439685&r1=1439684&r2=1439685&view=diff
==============================================================================
--- activemq/trunk/activemq-web/pom.xml (original)
+++ activemq/trunk/activemq-web/pom.xml Mon Jan 28 23:09:54 2013
@@ -57,7 +57,7 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>activemq-core</artifactId>
+      <artifactId>activemq-unit-tests</artifactId>
       <scope>test</scope>
       <type>test-jar</type>
     </dependency>

Modified: activemq/trunk/activemq-xmpp/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-xmpp/pom.xml?rev=1439685&r1=1439684&r2=1439685&view=diff
==============================================================================
--- activemq/trunk/activemq-xmpp/pom.xml (original)
+++ activemq/trunk/activemq-xmpp/pom.xml Mon Jan 28 23:09:54 2013
@@ -78,7 +78,7 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>activemq-core</artifactId>
+      <artifactId>activemq-unit-tests</artifactId>
       <type>test-jar</type>
       <scope>test</scope>
     </dependency>

Modified: activemq/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/assembly/pom.xml?rev=1439685&r1=1439684&r2=1439685&view=diff
==============================================================================
--- activemq/trunk/assembly/pom.xml (original)
+++ activemq/trunk/assembly/pom.xml Mon Jan 28 23:09:54 2013
@@ -68,11 +68,7 @@
     </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>activemq-core</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>${project.groupId}</groupId>
-      <artifactId>activemq-core</artifactId>
+      <artifactId>activemq-unit-tests</artifactId>
       <type>test-jar</type>
     </dependency>
     <dependency>

Modified: activemq/trunk/pom.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/pom.xml?rev=1439685&r1=1439684&r2=1439685&view=diff
==============================================================================
--- activemq/trunk/pom.xml (original)
+++ activemq/trunk/pom.xml Mon Jan 28 23:09:54 2013
@@ -220,7 +220,7 @@
     <module>activemq-jdbc-store</module>
     <module>activemq-leveldb-store</module>
 
-    <module>activemq-core</module>
+    <module>activemq-unit-tests</module>
     <module>activemq-all</module>
     <module>activemq-camel</module>
     <module>activemq-console</module>
@@ -334,12 +334,7 @@
       </dependency>
       <dependency>
         <groupId>org.apache.activemq</groupId>
-        <artifactId>activemq-core</artifactId>
-        <version>${project.version}</version>
-      </dependency>
-      <dependency>
-        <groupId>org.apache.activemq</groupId>
-        <artifactId>activemq-core</artifactId>
+        <artifactId>activemq-unit-tests</artifactId>
         <version>${project.version}</version>
         <type>test-jar</type>
         <scope>test</scope>