Return-Path: 
 <activemq-commits-return-420-apmail-geronimo-activemq-commits-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-activemq-commits-archive@www.apache.org
Received: (qmail 27793 invoked from network); 16 Jan 2006 03:14:35 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 16 Jan 2006 03:14:35 -0000
Received: (qmail 7333 invoked by uid 500); 16 Jan 2006 03:14:34 -0000
Delivered-To: apmail-geronimo-activemq-commits-archive@geronimo.apache.org
Received: (qmail 7318 invoked by uid 500); 16 Jan 2006 03:14:34 -0000
Mailing-List: contact activemq-commits-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:activemq-commits-help@geronimo.apache.org>
List-Unsubscribe: <mailto:activemq-commits-unsubscribe@geronimo.apache.org>
List-Post: <mailto:activemq-commits@geronimo.apache.org>
List-Id: <activemq-commits.geronimo.apache.org>
Reply-To: activemq-dev@geronimo.apache.org
Delivered-To: mailing list activemq-commits@geronimo.apache.org
Received: (qmail 7302 invoked by uid 99); 16 Jan 2006 03:14:34 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 15 Jan 2006 19:14:34 -0800
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194)
    by apache.org (qpsmtpd/0.29) with SMTP; Sun, 15 Jan 2006 19:14:33 -0800
Received: (qmail 27687 invoked by uid 65534); 16 Jan 2006 03:14:13 -0000
Message-ID: <20060116031413.27686.qmail@minotaur.apache.org>
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r369323 - in /incubator/activemq/trunk/assembly:
 maven.xml
 pom.xml src/main/descriptors/all-jar.xml src/main/descriptors/bin.xml
 src/main/descriptors/run-jar.xml
Date: Mon, 16 Jan 2006 03:14:12 -0000
To: activemq-commits@geronimo.apache.org
From: chirino@apache.org
X-Mailer: svnmailer-1.0.5
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

Author: chirino
Date: Sun Jan 15 19:14:10 2006
New Revision: 369323

URL: http://svn.apache.org/viewcvs?rev=369323&view=rev
Log:
Fixed up the m2 distribution.  only thing not being included yet is the run jar and the amq rar

Added:
    incubator/activemq/trunk/assembly/src/main/descriptors/all-jar.xml
    incubator/activemq/trunk/assembly/src/main/descriptors/run-jar.xml
Modified:
    incubator/activemq/trunk/assembly/maven.xml
    incubator/activemq/trunk/assembly/pom.xml
    incubator/activemq/trunk/assembly/src/main/descriptors/bin.xml

Modified: incubator/activemq/trunk/assembly/maven.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/maven.xml?rev=369323&r1=369322&r2=369323&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/maven.xml (original)
+++ incubator/activemq/trunk/assembly/maven.xml Sun Jan 15 19:14:10 2006
@@ -204,11 +204,12 @@
     <ant:copy todir="${maven.dist.src.assembly.dir}">
       <ant:fileset dir="${project.root}">
          <ant:exclude name="**/target/**"/>
-     <ant:exclude name="**/CVS/**"/>
-     <ant:exclude name="**/.*/**"/>
-     <ant:exclude name="**/junit*.properties"/>
-     <ant:exclude name="**/*~"/>
-     <ant:exclude name="**/*.bak"/>
+         <ant:exclude name="*/bin/**"/>
+         <ant:exclude name="**/CVS/**"/>
+         <ant:exclude name="**/.*/**"/>
+         <ant:exclude name="**/junit*.properties"/>
+         <ant:exclude name="**/*~"/>
+         <ant:exclude name="**/*.bak"/>
       </ant:fileset>
     </ant:copy>
 

Modified: incubator/activemq/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/pom.xml?rev=369323&r1=369322&r2=369323&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/pom.xml (original)
+++ incubator/activemq/trunk/assembly/pom.xml Sun Jan 15 19:14:10 2006
@@ -25,7 +25,7 @@
   </parent>
 
   <artifactId>activemq</artifactId>
-  <packaging>jar</packaging>
+  <packaging>pom</packaging>
   <name>ActiveMQ :: Assembly</name>
   <description>Puts together the ActiveMQ distribution</description>
   
@@ -151,6 +151,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
+        <version>2.1-SNAPSHOT</version>
         <executions>
           <execution>
             <phase>install</phase>
@@ -158,7 +159,10 @@
               <goal>assembly</goal>
             </goals>
             <configuration>
-              <descriptor>src/main/descriptors/bin.xml</descriptor>
+              <descriptors>
+                 <descriptor>src/main/descriptors/all-jar.xml</descriptor>
+                 <descriptor>src/main/descriptors/bin.xml</descriptor>
+             </descriptors>
             </configuration>
           </execution>
         </executions>

Added: incubator/activemq/trunk/assembly/src/main/descriptors/all-jar.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/main/descriptors/all-jar.xml?rev=369323&view=auto
==============================================================================
--- incubator/activemq/trunk/assembly/src/main/descriptors/all-jar.xml (added)
+++ incubator/activemq/trunk/assembly/src/main/descriptors/all-jar.xml Sun Jan 15 19:14:10 2006
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright 2005-2006 The Apache Software Foundation
+   
+    Licensed 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.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<assembly>
+  <id></id>
+  <formats>
+    <format>jar</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>/</outputDirectory>
+      <unpack>true</unpack>
+      <scope>runtime</scope>
+      <includes>
+         <include>org.apache.activemq:activemq-core</include>
+         <include>backport-util-concurrent:backport-util-concurrent</include>
+         <include>commons-logging:commons-logging</include>
+         <include>geronimo-spec:geronimo-spec-jms</include>
+         <include>geronimo-spec:geronimo-spec-j2ee-management</include>
+         <include>activeio:activeio</include>
+         <include>mx4j:mx4j</include>
+      </includes>
+    </dependencySet>
+  </dependencySets>
+</assembly>

Modified: incubator/activemq/trunk/assembly/src/main/descriptors/bin.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/main/descriptors/bin.xml?rev=369323&r1=369322&r2=369323&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/main/descriptors/bin.xml (original)
+++ incubator/activemq/trunk/assembly/src/main/descriptors/bin.xml Sun Jan 15 19:14:10 2006
@@ -61,7 +61,7 @@
       <unpack>false</unpack>
       <scope>runtime</scope>
       <includes>
-         <include>${pom.groupId}:activemq-ra</include>
+          <!-- <include>${pom.groupId}:activemq-ra</include> -->
          <include>commons-beanutils:commons-beanutils</include>
          <include>commons-collections:commons-collections</include>
          <include>commons-httpclient:commons-httpclient</include>

Added: incubator/activemq/trunk/assembly/src/main/descriptors/run-jar.xml
URL: http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/main/descriptors/run-jar.xml?rev=369323&view=auto
==============================================================================
--- incubator/activemq/trunk/assembly/src/main/descriptors/run-jar.xml (added)
+++ incubator/activemq/trunk/assembly/src/main/descriptors/run-jar.xml Sun Jan 15 19:14:10 2006
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Copyright 2005-2006 The Apache Software Foundation
+   
+    Licensed 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.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+<assembly>
+  <id>run</id>
+  <formats>
+    <format>jar</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>/</outputDirectory>
+      <unpack>true</unpack>
+      <scope>runtime</scope>
+      <includes>
+         <include>org.apache.activemq:activemq-core</include>
+      </includes>
+    </dependencySet>
+  </dependencySets>
+</assembly>