Fixed up the m2 distribution. only thing not being included yet is the run jar and the amq rar

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@369323 13f79535-47bb-0310-9956-ffa450edef68

assembly/maven.xml

@@ -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>
 

assembly/pom.xml

@@ -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>

assembly/src/main/descriptors/all-jar.xml

@@ -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>

assembly/src/main/descriptors/bin.xml

@@ -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>

assembly/src/main/descriptors/run-jar.xml

@@ -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>