activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r358476 - in /incubator/activemq/trunk: ./ activeio/ activeio/activeio-aio/ activeio/activeio-core/ activemq-core/ activemq-core/src/main/java/org/activemq/util/ activemq-core/src/test/java/org/activemq/util/ activemq-jaas/ activemq-optiona...
Date Thu, 22 Dec 2005 03:44:05 GMT
Author: chirino
Date: Wed Dec 21 19:43:57 2005
New Revision: 358476

URL: http://svn.apache.org/viewcvs?rev=358476&view=rev
Log:
More m2 build tweeks, brought in the activemq-optional module.

Added:
    incubator/activemq/trunk/activemq-core/src/test/java/org/activemq/util/MessageList.java
      - copied unchanged from r358351, incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/util/MessageList.java
    incubator/activemq/trunk/activemq-optional/pom.xml   (with props)
Removed:
    incubator/activemq/trunk/activemq-core/src/main/java/org/activemq/util/MessageList.java
Modified:
    incubator/activemq/trunk/activeio/activeio-aio/pom.xml
    incubator/activemq/trunk/activeio/activeio-core/pom.xml
    incubator/activemq/trunk/activeio/pom.xml
    incubator/activemq/trunk/activemq-core/pom.xml
    incubator/activemq/trunk/activemq-jaas/pom.xml
    incubator/activemq/trunk/activemq-ra/pom.xml
    incubator/activemq/trunk/pom.xml

Modified: incubator/activemq/trunk/activeio/activeio-aio/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-aio/pom.xml?rev=358476&r1=358475&r2=358476&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-aio/pom.xml (original)
+++ incubator/activemq/trunk/activeio/activeio-aio/pom.xml Wed Dec 21 19:43:57 2005
@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>org.apache.activeio</groupId>
-    <artifactId>activeio</artifactId>
+    <artifactId>activeio-project</artifactId>
     <relativePath>../pom.xml</relativePath>
     <version>3.0-SNAPSHOT</version>
   </parent>

Modified: incubator/activemq/trunk/activeio/activeio-core/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/activeio-core/pom.xml?rev=358476&r1=358475&r2=358476&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/activeio-core/pom.xml (original)
+++ incubator/activemq/trunk/activeio/activeio-core/pom.xml Wed Dec 21 19:43:57 2005
@@ -4,7 +4,7 @@
 
   <parent>
     <groupId>org.apache.activeio</groupId>
-    <artifactId>activeio</artifactId>
+    <artifactId>activeio-project</artifactId>
     <relativePath>../pom.xml</relativePath>
     <version>3.0-SNAPSHOT</version>
   </parent>

Modified: incubator/activemq/trunk/activeio/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/pom.xml?rev=358476&r1=358475&r2=358476&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/pom.xml (original)
+++ incubator/activemq/trunk/activeio/pom.xml Wed Dec 21 19:43:57 2005
@@ -2,10 +2,10 @@
 
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.activeio</groupId>
-  <artifactId>activeio</artifactId>
+  <artifactId>activeio-project</artifactId>
   <version>3.0-SNAPSHOT</version>
   <packaging>pom</packaging>
-  <name>ActiveIO</name>
+  <name>ActiveIO Project</name>
   <description>A high performance IO abstraction framework</description>
 
   <mailingLists>

Modified: incubator/activemq/trunk/activemq-core/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/pom.xml?rev=358476&r1=358475&r2=358476&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/pom.xml (original)
+++ incubator/activemq/trunk/activemq-core/pom.xml Wed Dec 21 19:43:57 2005
@@ -10,7 +10,8 @@
 
   <artifactId>activemq-core</artifactId>
   <packaging>jar</packaging>
-  <name>ActiveMQ JMS Broker</name>
+  <name>ActiveMQ :: Core</name>
+  <description>The ActiveMQ Message Broker and Client implementations</description>
 
   <build>
     <plugins>

Modified: incubator/activemq/trunk/activemq-jaas/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-jaas/pom.xml?rev=358476&r1=358475&r2=358476&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-jaas/pom.xml (original)
+++ incubator/activemq/trunk/activemq-jaas/pom.xml Wed Dec 21 19:43:57 2005
@@ -10,7 +10,8 @@
 
   <artifactId>activemq-jaas</artifactId>
   <packaging>jar</packaging>
-  <name>ActiveMQ JAAS Login Modules</name>
+  <name>ActiveMQ :: JAAS</name>
+  <description>A collection of generic JAAS Login Modules</description>
 
   <build>
     <plugins>

Added: incubator/activemq/trunk/activemq-optional/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-optional/pom.xml?rev=358476&view=auto
==============================================================================
--- incubator/activemq/trunk/activemq-optional/pom.xml (added)
+++ incubator/activemq/trunk/activemq-optional/pom.xml Wed Dec 21 19:43:57 2005
@@ -0,0 +1,121 @@
+<model>
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.activemq</groupId>
+    <artifactId>activemq-project</artifactId>
+    <version>4.0-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <artifactId>activemq-optional</artifactId>
+  <packaging>jar</packaging>
+  <name>ActiveMQ :: Optional</name>
+
+  <dependencies>
+  
+    <dependency>
+      <groupId>org.apache.activemq</groupId>
+      <artifactId>activemq-core</artifactId>
+      <version>${version}</version>
+    </dependency>
+
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>compile</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>backport-util-concurrent</groupId>
+      <artifactId>backport-util-concurrent</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>activeio</groupId>
+      <artifactId>activeio</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-logging</groupId>
+      <artifactId>commons-logging</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>log4j</groupId>
+      <artifactId>log4j</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>geronimo-spec</groupId>
+      <artifactId>geronimo-spec-jms</artifactId>
+    </dependency>    
+    <dependency>
+      <groupId>geronimo-spec</groupId>
+      <artifactId>geronimo-spec-jta</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>geronimo-spec</groupId>
+      <artifactId>geronimo-spec-j2ee-jacc</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>geronimo-spec</groupId>
+      <artifactId>geronimo-spec-j2ee-connector</artifactId>
+    </dependency>
+ 
+    <dependency>
+      <groupId>org.springframework</groupId>
+      <artifactId>spring</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>aopalliance</groupId>
+      <artifactId>aopalliance</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>xstream</groupId>
+      <artifactId>xstream</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>xmlpull</groupId>
+      <artifactId>xmlpull</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>jetty</groupId>
+      <artifactId>servlet-api</artifactId>
+    </dependency>    
+    <dependency>
+      <groupId>jetty</groupId>
+      <artifactId>jetty</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>axis</groupId>
+      <artifactId>axis</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-httpclient</groupId>
+      <artifactId>commons-httpclient</artifactId>
+    </dependency>
+    
+    <dependency>
+      <groupId>commons-pool</groupId>
+      <artifactId>commons-pool</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>axis</groupId>
+      <artifactId>axis</artifactId>
+    </dependency>
+
+    <dependency>
+      <groupId>commons-httpclient</groupId>
+      <artifactId>commons-httpclient</artifactId>
+    </dependency>
+    
+  </dependencies>
+
+</model>

Propchange: incubator/activemq/trunk/activemq-optional/pom.xml
------------------------------------------------------------------------------
    svn:executable = *

Modified: incubator/activemq/trunk/activemq-ra/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-ra/pom.xml?rev=358476&r1=358475&r2=358476&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-ra/pom.xml (original)
+++ incubator/activemq/trunk/activemq-ra/pom.xml Wed Dec 21 19:43:57 2005
@@ -10,7 +10,8 @@
 
   <artifactId>activemq-ra</artifactId>
   <packaging>rar</packaging>
-  <name>ActiveMQ JCA Managed Connections and Resource Adapters</name>
+  <name>ActiveMQ :: RA</name>
+  <description>A JCA Resource Adapter used to integrate ActiveMQ with transactional
enterprise containers</description>
 
   <dependencies>
   

Modified: incubator/activemq/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/pom.xml?rev=358476&r1=358475&r2=358476&view=diff
==============================================================================
--- incubator/activemq/trunk/pom.xml (original)
+++ incubator/activemq/trunk/pom.xml Wed Dec 21 19:43:57 2005
@@ -4,7 +4,7 @@
   <artifactId>activemq-project</artifactId>
   <version>4.0-SNAPSHOT</version>
   <packaging>pom</packaging>
-  <name>ActiveMQ JMS Broker Project</name>
+  <name>ActiveMQ Project</name>
 
   <mailingLists>
     <mailingList>
@@ -91,6 +91,7 @@
     <module>activemq-core</module>
     <module>activemq-ra</module>
     <module>activemq-jaas</module>
+    <module>activemq-optional</module>
     <module>activeio</module>
     <module>activecluster</module>
   </modules> 
@@ -366,6 +367,73 @@
         <version>${project.version}</version>
       </dependency>
 
+      <dependency>
+        <groupId>xstream</groupId>
+        <artifactId>xstream</artifactId>
+        <version>1.1.2</version>
+      </dependency>
+
+      <dependency>
+        <groupId>xmlpull</groupId>
+        <artifactId>xmlpull</artifactId>
+        <version>1.1.3.4d_b4_min</version>
+      </dependency>
+
+      <dependency>
+        <groupId>jetty</groupId>
+        <artifactId>servlet-api</artifactId>
+        <version>2.5-6.0.0beta6</version>
+      </dependency>
+      
+      <dependency>
+        <groupId>jetty</groupId>
+        <artifactId>jetty</artifactId>
+        <version>6.0.0beta6</version>
+      </dependency>
+
+      <dependency>
+        <groupId>axis</groupId>
+        <artifactId>axis</artifactId>
+        <version>1.2-RC1</version>
+      </dependency>
+
+      <dependency>
+        <groupId>commons-httpclient</groupId>
+        <artifactId>commons-httpclient</artifactId>
+        <version>2.0.1</version>
+      </dependency>
+
+      <dependency>
+        <groupId>aopalliance</groupId>
+        <artifactId>aopalliance</artifactId>
+        <version>1.0</version>
+      </dependency>
+
+      <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>3.8.1</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>jmock</groupId>
+        <artifactId>jmock</artifactId>
+        <version>1.0.1</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>jmock</groupId>
+        <artifactId>jmock-cglib</artifactId>
+        <version>1.0.1</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>cglib</groupId>
+        <artifactId>cglib-full</artifactId>
+        <version>2.0</version>
+        <scope>test</scope>
+      </dependency>
+ 
     </dependencies>
   </dependencyManagement>
 
@@ -377,26 +445,18 @@
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>jmock</groupId>
       <artifactId>jmock</artifactId>
-      <version>1.0.1</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>jmock</groupId>
       <artifactId>jmock-cglib</artifactId>
-      <version>1.0.1</version>
-      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>cglib</groupId>
       <artifactId>cglib-full</artifactId>
-      <version>2.0</version>
-      <scope>test</scope>
     </dependency>
  
   </dependencies>



Mime
View raw message