From 2457c42d7edbc061b9d8b09d54e9cb206726a4f7 Mon Sep 17 00:00:00 2001
From: "Hiram R. Chirino" <chirino@apache.org>
Date: Thu, 22 Dec 2005 03:43:57 +0000
Subject: [PATCH] More m2 build tweeks, brought in the activemq-optional
 module.

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@358476 13f79535-47bb-0310-9956-ffa450edef68
---
 activeio/activeio-aio/pom.xml                 |   2 +-
 activeio/activeio-core/pom.xml                |   2 +-
 activeio/pom.xml                              |   4 +-
 activemq-core/pom.xml                         |   3 +-
 .../java/org/activemq/util/MessageList.java   |   0
 activemq-jaas/pom.xml                         |   3 +-
 activemq-optional/pom.xml                     | 121 ++++++++++++++++++
 activemq-ra/pom.xml                           |   3 +-
 pom.xml                                       |  78 +++++++++--
 9 files changed, 200 insertions(+), 16 deletions(-)
 rename activemq-core/src/{main => test}/java/org/activemq/util/MessageList.java (100%)
 create mode 100755 activemq-optional/pom.xml

diff --git a/activeio/activeio-aio/pom.xml b/activeio/activeio-aio/pom.xml
index 32fa6fb1ce..1eb00b928a 100644
--- a/activeio/activeio-aio/pom.xml
+++ b/activeio/activeio-aio/pom.xml
@@ -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>
diff --git a/activeio/activeio-core/pom.xml b/activeio/activeio-core/pom.xml
index c6f831a016..1bed62513c 100644
--- a/activeio/activeio-core/pom.xml
+++ b/activeio/activeio-core/pom.xml
@@ -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>
diff --git a/activeio/pom.xml b/activeio/pom.xml
index 865cdcf71a..5edd428a7c 100644
--- a/activeio/pom.xml
+++ b/activeio/pom.xml
@@ -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>
diff --git a/activemq-core/pom.xml b/activemq-core/pom.xml
index 6de4f32922..5f00e194db 100755
--- a/activemq-core/pom.xml
+++ b/activemq-core/pom.xml
@@ -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>
diff --git a/activemq-core/src/main/java/org/activemq/util/MessageList.java b/activemq-core/src/test/java/org/activemq/util/MessageList.java
similarity index 100%
rename from activemq-core/src/main/java/org/activemq/util/MessageList.java
rename to activemq-core/src/test/java/org/activemq/util/MessageList.java
diff --git a/activemq-jaas/pom.xml b/activemq-jaas/pom.xml
index 8917ed9d7a..038fb80eb9 100644
--- a/activemq-jaas/pom.xml
+++ b/activemq-jaas/pom.xml
@@ -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>
diff --git a/activemq-optional/pom.xml b/activemq-optional/pom.xml
new file mode 100755
index 0000000000..ce11a11171
--- /dev/null
+++ b/activemq-optional/pom.xml
@@ -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>
diff --git a/activemq-ra/pom.xml b/activemq-ra/pom.xml
index b4430f2414..99e05d33a4 100755
--- a/activemq-ra/pom.xml
+++ b/activemq-ra/pom.xml
@@ -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>
   
diff --git a/pom.xml b/pom.xml
index 6d171df011..fccaeb4f5f 100755
--- a/pom.xml
+++ b/pom.xml
@@ -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>