Fix m2 build: the distribution is nearly identical to the m1 dist.

Remaining problems: missing STATUS file, and activemq.rar is way too big

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

activecluster/pom.xml

@@ -20,12 +20,10 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>incubator-activemq</groupId>
-    <artifactId>activemq</artifactId>
+    <artifactId>activemq-parent</artifactId>
     <version>4.0-SNAPSHOT</version>
   </parent>
-  <groupId>org.apache.activemq.activecluster</groupId>
   <artifactId>activecluster</artifactId>
-  <version>1.3-SNAPSHOT</version>
   <name>ActiveCluster</name>
 
   <dependencies>

activeio/pom.xml

@@ -6,7 +6,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>incubator-activemq</groupId>
-    <artifactId>activemq</artifactId>
+    <artifactId>activemq-parent</artifactId>
     <version>4.0-SNAPSHOT</version>
   </parent>
 

activemq-console/pom.xml

@@ -25,7 +25,7 @@
 
   <parent>
     <groupId>incubator-activemq</groupId>
-    <artifactId>activemq</artifactId>
+    <artifactId>activemq-parent</artifactId>
     <version>4.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>

activemq-core/pom.xml

@@ -25,7 +25,7 @@
 
   <parent>
     <groupId>incubator-activemq</groupId>
-    <artifactId>activemq</artifactId>
+    <artifactId>activemq-parent</artifactId>
     <version>4.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>

activemq-dotnet/pom.xml

@@ -2,7 +2,7 @@
 <project>
   <parent>
     <groupId>incubator-activemq</groupId>
-    <artifactId>activemq</artifactId>
+    <artifactId>activemq-parent</artifactId>
     <version>4.0-SNAPSHOT</version>
   </parent>
 

activemq-gbean-management/pom.xml

@@ -25,7 +25,7 @@
 
   <parent>
     <groupId>incubator-activemq</groupId>
-    <artifactId>activemq</artifactId>
+    <artifactId>activemq-parent</artifactId>
     <version>4.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>

activemq-gbean/pom.xml

@@ -25,7 +25,7 @@
 
   <parent>
     <groupId>incubator-activemq</groupId>
-    <artifactId>activemq</artifactId>
+    <artifactId>activemq-parent</artifactId>
     <version>4.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>

activemq-jaas/pom.xml

@@ -25,7 +25,7 @@
 
   <parent>
     <groupId>incubator-activemq</groupId>
-    <artifactId>activemq</artifactId>
+    <artifactId>activemq-parent</artifactId>
     <version>4.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>

activemq-optional/pom.xml

@@ -25,7 +25,7 @@
 
   <parent>
     <groupId>incubator-activemq</groupId>
-    <artifactId>activemq</artifactId>
+    <artifactId>activemq-parent</artifactId>
     <version>4.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>

activemq-ra/pom.xml

@@ -25,7 +25,7 @@
 
   <parent>
     <groupId>incubator-activemq</groupId>
-    <artifactId>activemq</artifactId>
+    <artifactId>activemq-parent</artifactId>
     <version>4.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>

activemq-systest/pom.xml

@@ -19,7 +19,7 @@
 
   <parent>
     <groupId>incubator-activemq</groupId>
-    <artifactId>activemq</artifactId>
+    <artifactId>activemq-parent</artifactId>
     <version>4.0-SNAPSHOT</version>
   </parent>
 

activemq-web-demo/pom.xml

@@ -25,7 +25,7 @@
 
   <parent>
     <groupId>incubator-activemq</groupId>
-    <artifactId>activemq</artifactId>
+    <artifactId>activemq-parent</artifactId>
     <version>4.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>

activemq-web/pom.xml

@@ -25,7 +25,7 @@
 
   <parent>
     <groupId>incubator-activemq</groupId>
-    <artifactId>activemq</artifactId>
+    <artifactId>activemq-parent</artifactId>
     <version>4.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>

assembly/pom.xml

@@ -25,12 +25,12 @@
 
   <parent>
     <groupId>incubator-activemq</groupId>
-    <artifactId>activemq</artifactId>
+    <artifactId>activemq-parent</artifactId>
     <version>4.0-SNAPSHOT</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 
-  <artifactId>activemq-assembly</artifactId>
+  <artifactId>activemq</artifactId>
   <packaging>jar</packaging>
   <name>ActiveMQ :: Assembly</name>
   <description>Puts together the ActiveMQ distribution</description>
@@ -69,7 +69,7 @@
     </dependency>
     <dependency>
       <groupId>${pom.groupId}</groupId>
-      <artifactId>activemq-web</artifactId>
+      <artifactId>activemq-web-demo</artifactId>
       <type>war</type>
     </dependency>
     <dependency>
@@ -77,6 +77,12 @@
       <artifactId>activecluster</artifactId>
       <optional>true</optional>
     </dependency>
+    <dependency>
+      <groupId>${pom.groupId}</groupId>
+      <artifactId>activemq-ra</artifactId>
+      <type>rar</type>
+      <optional>true</optional>
+    </dependency>
     
     <!-- commons -->
     <dependency>
@@ -223,6 +229,22 @@
           </includes>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>incubator-activemq</groupId>
+        <artifactId>maven-bundle-plugin</artifactId>
+        <version>${pom.version}</version>
+        <executions>
+          <execution>
+            <phase>compile</phase>
+            <goals>
+              <goal>createbundle</goal>
+            </goals>
+            <configuration>
+              <includes>activemq-core,activemq-console,activeio-core,activemq-optional,backport-util-concurrent,commons-logging,geronimo-jms_1.1_spec,geronimo-j2ee-management_1.0_spec,derby</includes>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-assembly-plugin</artifactId>
@@ -242,20 +264,6 @@
               <appendAssemblyId>false</appendAssemblyId>
             </configuration>
           </execution>
-          <execution>
-            <id>full</id>
-            <phase>package</phase>
-            <goals>
-              <goal>assembly</goal>
-            </goals>
-            <configuration>
-              <descriptors>
-                 <descriptor>src/main/descriptors/all-jar.xml</descriptor>
-              </descriptors>
-              <finalName>activemq-full-${pom.version}</finalName>
-              <appendAssemblyId>false</appendAssemblyId>
-            </configuration>
-          </execution>
         </executions>
       </plugin>
 

assembly/src/main/descriptors/bin.xml

@@ -24,6 +24,7 @@
   <fileSets>
     <fileSet>
       <includes>
+        <include>STATUS*</include>
         <include>README*</include>
         <include>LICENSE*</include>
         <include>NOTICE*</include>
@@ -71,17 +72,19 @@
       <unpack>false</unpack>
       <scope>runtime</scope>
       <includes>
-          <!-- <include>${pom.groupId}:activemq-ra</include> -->
+         <include>incubator-activemq:activemq-ra</include>
          <include>incubator-activemq:activemq-optional</include>
-         <include>activecluster:activecluster</include>
+         <include>incubator-activemq:activecluster</include>
          <include>commons-beanutils:commons-beanutils</include>
          <include>commons-collections:commons-collections</include>
          <include>commons-httpclient:commons-httpclient</include>
          <include>commons-dbcp:commons-dbcp</include>
          <include>commons-pool:commons-pool</include>
-         <include>jetty:jetty</include>
+         <include>org.mortbay.jetty:jetty</include>
+         <include>org.mortbay.jetty:servlet-api-2.5</include>
          <include>log4j:log4j</include>
          <include>mx4j:mx4j-remote</include>
+         <include>mx4j:mx4j-tools</include>
          <include>org.apache.derby:derby</include>
          <include>org.apache.geronimo.specs:geronimo-j2ee-jacc_1.0_spec</include>
          <include>org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec</include>

jmeter/pom.xml

@@ -19,7 +19,7 @@
     
     <parent>
         <groupId>activemq</groupId>
-        <artifactId>activemq</artifactId>
+        <artifactId>activemq-parent</artifactId>
         <version>4.0-SNAPSHOT</version>
     </parent>
     
@@ -122,7 +122,7 @@
       
         <dependency>
             <groupId>activemq</groupId>
-            <artifactId>activemq</artifactId>
+            <artifactId>activemq-parent</artifactId>
             <version>${version}</version>
         </dependency>
         

maven-bundle-plugin/pom.xml

@@ -0,0 +1,69 @@
+<?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.
+-->
+
+<project
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xmlns="http://maven.apache.org/POM/4.0.0">
+  
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>incubator-activemq</groupId>
+    <artifactId>activemq-parent</artifactId>
+    <version>4.0-SNAPSHOT</version>
+    <relativePath>../pom.xml</relativePath>
+  </parent>
+
+  <artifactId>maven-bundle-plugin</artifactId>
+  <packaging>maven-plugin</packaging>
+  <name>Bundle Plugin</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-project</artifactId>
+      <version>2.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-archiver</artifactId>
+      <version>1.0-alpha-5</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-archiver</artifactId>
+      <version>2.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-plugin-api</artifactId>
+      <version>2.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-utils</artifactId>
+      <version>1.1</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-artifact</artifactId>
+      <version>2.0</version>
+    </dependency>
+  </dependencies>
+</project>

maven-bundle-plugin/src/main/java/org/apache/activemq/maven/BundleMojo.java

@@ -0,0 +1,113 @@
+package org.apache.activemq.maven;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.project.MavenProject;
+import org.codehaus.plexus.archiver.ArchiverException;
+import org.codehaus.plexus.archiver.UnArchiver;
+import org.codehaus.plexus.archiver.manager.ArchiverManager;
+import org.codehaus.plexus.archiver.manager.NoSuchArchiverException;
+import org.codehaus.plexus.util.FileUtils;
+
+/**
+ * @goal createbundle
+ * @description Creates an xfire bundle
+ */
+public class BundleMojo extends AbstractMojo 
+{
+    /**
+     * The output directory of the assembled distribution file.
+     *
+     * @parameter expression="${project.build.outputDirectory}"
+     * @required
+     */
+    protected File outputDirectory;
+    
+    /**
+     * Inclusion list
+     *
+     * @parameter
+     */
+    String includes = "";
+    
+    /**
+     * The Maven Project.
+     *
+     * @parameter expression="${project}"
+     * @required
+     * @readonly
+     */
+    MavenProject project;
+    
+    /**
+     * To look up Archiver/UnArchiver implementations
+     *
+     * @parameter expression="${component.org.codehaus.plexus.archiver.manager.ArchiverManager}"
+     * @required
+     */
+    protected ArchiverManager archiverManager;
+    
+    public void execute() throws MojoExecutionException 
+    {
+        String[] include = includes.split(",");
+        List includeList = Arrays.asList(include);
+        getLog().info("Inclusions: " + includeList);
+        getLog().info("OutputDirectory: " + outputDirectory);
+        outputDirectory.mkdirs();
+        
+        for (Iterator itr = project.getArtifacts().iterator(); itr.hasNext();)
+        {
+            Artifact a = (Artifact) itr.next();
+
+            if (includeList.contains(a.getArtifactId()))
+            {
+                getLog().info("Found " + a.getArtifactId());
+                
+                try 
+                {
+                    unpack( a.getFile(), outputDirectory );
+                } 
+                catch (MojoExecutionException e) {
+                    // TODO Auto-generated catch block
+                    e.printStackTrace();
+                } 
+                catch (NoSuchArchiverException e) {
+                    // TODO Auto-generated catch block
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+    
+    protected void unpack( File file, File location )
+        throws MojoExecutionException, NoSuchArchiverException
+    {
+        String archiveExt = FileUtils.getExtension( file.getAbsolutePath() ).toLowerCase();
+    
+        try
+        {
+            UnArchiver unArchiver = this.archiverManager.getUnArchiver( archiveExt );
+    
+            unArchiver.setSourceFile( file );
+    
+            unArchiver.setDestDirectory( location );
+    
+            unArchiver.extract();
+        }
+        catch ( IOException e )
+        {
+            throw new MojoExecutionException( "Error unpacking file: " + file + "to: " + location, e );
+        }
+        catch ( ArchiverException e )
+        {
+            throw new MojoExecutionException( "Error unpacking file: " + file + "to: " + location, e );
+        }
+    }
+}

pom.xml

@@ -24,7 +24,7 @@
   <modelVersion>4.0.0</modelVersion>
   
   <groupId>incubator-activemq</groupId>
-  <artifactId>activemq</artifactId>
+  <artifactId>activemq-parent</artifactId>
   <version>4.0-SNAPSHOT</version>
   <packaging>pom</packaging>
   <name>ActiveMQ</name>
@@ -120,6 +120,7 @@
   </distributionManagement>
 
   <modules>
+    <module>activeio</module>
     <module>activecluster</module>
     <module>activemq-jaas</module>
     <module>activemq-core</module>
@@ -131,6 +132,7 @@
     <module>activemq-gbean</module>
     <module>activemq-gbean-management</module>
     <!--module>activemq-systest</module -->
+    <module>maven-bundle-plugin</module>
     <module>assembly</module>
 
 <!--
@@ -188,6 +190,7 @@
         <groupId>${pom.groupId}</groupId>
         <artifactId>activemq-web-demo</artifactId>
         <version>${pom.version}</version>
+        <type>war</type>
       </dependency>
       <dependency>
         <groupId>${pom.groupId}</groupId>

sandbox/pom.xml

@@ -20,7 +20,7 @@
   <modelVersion>4.0.0</modelVersion>
   <parent>
     <groupId>incubator-activemq</groupId>
-    <artifactId>activemq</artifactId>
+    <artifactId>activemq-parent</artifactId>
     <version>4.0-SNAPSHOT</version>
   </parent>
   <groupId>org.apache.activemq.sandbox</groupId>