Author: gnodet
Date: Sat Apr 15 16:33:05 2006
New Revision: 394399
URL: http://svn.apache.org/viewcvs?rev=394399&view=rev
Log:
Fix m2 build: the distribution is nearly identical to the m1 dist.
Remaining problems: missing STATUS file, and activemq.rar is way too big
Added:
incubator/activemq/trunk/maven-bundle-plugin/
incubator/activemq/trunk/maven-bundle-plugin/pom.xml
incubator/activemq/trunk/maven-bundle-plugin/src/
incubator/activemq/trunk/maven-bundle-plugin/src/main/
incubator/activemq/trunk/maven-bundle-plugin/src/main/java/
incubator/activemq/trunk/maven-bundle-plugin/src/main/java/org/
incubator/activemq/trunk/maven-bundle-plugin/src/main/java/org/apache/
incubator/activemq/trunk/maven-bundle-plugin/src/main/java/org/apache/activemq/
incubator/activemq/trunk/maven-bundle-plugin/src/main/java/org/apache/activemq/maven/
incubator/activemq/trunk/maven-bundle-plugin/src/main/java/org/apache/activemq/maven/BundleMojo.java
Modified:
incubator/activemq/trunk/activecluster/pom.xml
incubator/activemq/trunk/activeio/pom.xml
incubator/activemq/trunk/activemq-console/pom.xml
incubator/activemq/trunk/activemq-core/pom.xml
incubator/activemq/trunk/activemq-dotnet/pom.xml
incubator/activemq/trunk/activemq-gbean-management/pom.xml
incubator/activemq/trunk/activemq-gbean/pom.xml
incubator/activemq/trunk/activemq-jaas/pom.xml
incubator/activemq/trunk/activemq-optional/pom.xml
incubator/activemq/trunk/activemq-ra/pom.xml
incubator/activemq/trunk/activemq-systest/pom.xml
incubator/activemq/trunk/activemq-web-demo/pom.xml
incubator/activemq/trunk/activemq-web/pom.xml
incubator/activemq/trunk/assembly/pom.xml
incubator/activemq/trunk/assembly/src/main/descriptors/bin.xml
incubator/activemq/trunk/jmeter/pom.xml
incubator/activemq/trunk/pom.xml
incubator/activemq/trunk/sandbox/pom.xml
Modified: incubator/activemq/trunk/activecluster/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activecluster/pom.xml?rev=394399&r1=394398&r2=394399&view=diff
==============================================================================
--- incubator/activemq/trunk/activecluster/pom.xml (original)
+++ incubator/activemq/trunk/activecluster/pom.xml Sat Apr 15 16:33:05 2006
@@ -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>
Modified: incubator/activemq/trunk/activeio/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activeio/pom.xml?rev=394399&r1=394398&r2=394399&view=diff
==============================================================================
--- incubator/activemq/trunk/activeio/pom.xml (original)
+++ incubator/activemq/trunk/activeio/pom.xml Sat Apr 15 16:33:05 2006
@@ -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>
Modified: incubator/activemq/trunk/activemq-console/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-console/pom.xml?rev=394399&r1=394398&r2=394399&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-console/pom.xml (original)
+++ incubator/activemq/trunk/activemq-console/pom.xml Sat Apr 15 16:33:05 2006
@@ -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>
@@ -136,4 +136,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: incubator/activemq/trunk/activemq-core/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-core/pom.xml?rev=394399&r1=394398&r2=394399&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-core/pom.xml (original)
+++ incubator/activemq/trunk/activemq-core/pom.xml Sat Apr 15 16:33:05 2006
@@ -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>
@@ -304,4 +304,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: incubator/activemq/trunk/activemq-dotnet/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-dotnet/pom.xml?rev=394399&r1=394398&r2=394399&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-dotnet/pom.xml (original)
+++ incubator/activemq/trunk/activemq-dotnet/pom.xml Sat Apr 15 16:33:05 2006
@@ -1,145 +1,145 @@
-<?xml version="1.0"?>
-<project>
- <parent>
- <groupId>incubator-activemq</groupId>
- <artifactId>activemq</artifactId>
- <version>4.0-SNAPSHOT</version>
- </parent>
-
- <modelVersion>4.0.0</modelVersion>
- <artifactId>activemq-dotnet</artifactId>
- <packaging>dotnet-library</packaging>
-
- <build>
-
- <outputDirectory>target/dotnet-assembly</outputDirectory>
- <testOutputDirectory>target/test-dotnet-assembly</testOutputDirectory>
- <sourceDirectory>src/main/csharp</sourceDirectory>
- <testSourceDirectory>src/test/csharp</testSourceDirectory>
-
- <plugins>
-
- <!-- Manages the lifecycle of a dotnet project -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-csharp-lifecycle-plugin</artifactId>
- <version>1.0.RC6-SNAPSHOT</version>
- <extensions>true</extensions>
- </plugin>
-
- <!-- Used to customize the dotnet compiler options -->
- <plugin>
- <artifactId>maven-compiler-plugin</artifactId>
- <version>2.0</version>
- <extensions>true</extensions>
-
- <configuration>
- <compilerId>csharp</compilerId>
- <fork>true</fork>
-
- <compilerArguments>
- <doc>true</doc>
- <!-- example of ignoring warnings -->
- <nowarn>1591</nowarn>
- </compilerArguments>
-
- <includes>
- <include>**/*.cs</include>
- </includes>
-
- </configuration>
-
- <!-- executions need to be specified for the dotnet plugin (is
slightly ugly, hopefully can get rid of in future -->
- <executions>
-
- <!-- this configuration is required to tell the compiler what is
different about the main compile as apposed to the test compile -->
- <execution>
- <id>compile</id>
- <phase>compile</phase>
- <goals>
- <goal>compile</goal>
- </goals>
- <configuration>
- <compilerArguments>
- <target>library</target>
- <!-- mainClass>MyNamespace.MyStaticMainClass</mainClass -->
- </compilerArguments>
- </configuration>
- </execution>
-
- <!-- this configuration is required to tell the compiler what is
different about the main compile as apposed to the test compile -->
- <execution>
- <id>testCompile</id>
- <phase>test-compile</phase>
- <goals>
- <goal>testCompile</goal>
- </goals>
- <configuration>
- <compilerArguments>
- <!-- the library element is required for test compile -->
- <target>library</target>
- <!-- the isTest element is required for the test compile -->
- <out>unit-tests.dll</out>
- </compilerArguments>
- </configuration>
- </execution>
- </executions>
-
- <dependencies>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-compiler-csharp</artifactId>
- <version>1.6-SNAPSHOT</version>
- </dependency>
- </dependencies>
- </plugin>
-
- <!-- For Running NUNIT tests -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-nunit-plugin</artifactId>
- <version>1.0.RC6-SNAPSHOT</version>
- <!-- configuration>
- <configFile>src/main/resources/App.config</configFile>
- </configuration -->
- </plugin>
-
- <!-- For VS.NET project generation -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-vstudio-plugin</artifactId>
- <version>1.0.RC6-SNAPSHOT</version>
- <configuration>
- <frameworkHome>${dotnet.home}</frameworkHome>
- <includes>
- <include>**/*.aspx</include>
- <include>**/*.resx</include>
- <include>**/*.cs</include>
- </includes>
- </configuration>
- </plugin>
-
- </plugins>
- </build>
-
- <dependencies>
- <!-- example of a system dependency -->
- <!-- dependency>
- <groupId>System</groupId>
- <artifactId>System</artifactId>
- <version>1.1</version>
- <type>dotnet-library</type>
- <scope>system</scope>
- <systemPath>${dotnet.home}/System.dll</systemPath>
- </dependency -->
-
- <dependency>
- <groupId>nunit</groupId>
- <artifactId>nunit-console</artifactId>
- <version>2.2</version>
- <type>dotnet-exe</type>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
-</project>
+<?xml version="1.0"?>
+<project>
+ <parent>
+ <groupId>incubator-activemq</groupId>
+ <artifactId>activemq-parent</artifactId>
+ <version>4.0-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>activemq-dotnet</artifactId>
+ <packaging>dotnet-library</packaging>
+
+ <build>
+
+ <outputDirectory>target/dotnet-assembly</outputDirectory>
+ <testOutputDirectory>target/test-dotnet-assembly</testOutputDirectory>
+ <sourceDirectory>src/main/csharp</sourceDirectory>
+ <testSourceDirectory>src/test/csharp</testSourceDirectory>
+
+ <plugins>
+
+ <!-- Manages the lifecycle of a dotnet project -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-csharp-lifecycle-plugin</artifactId>
+ <version>1.0.RC6-SNAPSHOT</version>
+ <extensions>true</extensions>
+ </plugin>
+
+ <!-- Used to customize the dotnet compiler options -->
+ <plugin>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.0</version>
+ <extensions>true</extensions>
+
+ <configuration>
+ <compilerId>csharp</compilerId>
+ <fork>true</fork>
+
+ <compilerArguments>
+ <doc>true</doc>
+ <!-- example of ignoring warnings -->
+ <nowarn>1591</nowarn>
+ </compilerArguments>
+
+ <includes>
+ <include>**/*.cs</include>
+ </includes>
+
+ </configuration>
+
+ <!-- executions need to be specified for the dotnet plugin (is
slightly ugly, hopefully can get rid of in future -->
+ <executions>
+
+ <!-- this configuration is required to tell the compiler what is
different about the main compile as apposed to the test compile -->
+ <execution>
+ <id>compile</id>
+ <phase>compile</phase>
+ <goals>
+ <goal>compile</goal>
+ </goals>
+ <configuration>
+ <compilerArguments>
+ <target>library</target>
+ <!-- mainClass>MyNamespace.MyStaticMainClass</mainClass -->
+ </compilerArguments>
+ </configuration>
+ </execution>
+
+ <!-- this configuration is required to tell the compiler what is
different about the main compile as apposed to the test compile -->
+ <execution>
+ <id>testCompile</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>testCompile</goal>
+ </goals>
+ <configuration>
+ <compilerArguments>
+ <!-- the library element is required for test compile -->
+ <target>library</target>
+ <!-- the isTest element is required for the test compile -->
+ <out>unit-tests.dll</out>
+ </compilerArguments>
+ </configuration>
+ </execution>
+ </executions>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-compiler-csharp</artifactId>
+ <version>1.6-SNAPSHOT</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+
+ <!-- For Running NUNIT tests -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-nunit-plugin</artifactId>
+ <version>1.0.RC6-SNAPSHOT</version>
+ <!-- configuration>
+ <configFile>src/main/resources/App.config</configFile>
+ </configuration -->
+ </plugin>
+
+ <!-- For VS.NET project generation -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-vstudio-plugin</artifactId>
+ <version>1.0.RC6-SNAPSHOT</version>
+ <configuration>
+ <frameworkHome>${dotnet.home}</frameworkHome>
+ <includes>
+ <include>**/*.aspx</include>
+ <include>**/*.resx</include>
+ <include>**/*.cs</include>
+ </includes>
+ </configuration>
+ </plugin>
+
+ </plugins>
+ </build>
+
+ <dependencies>
+ <!-- example of a system dependency -->
+ <!-- dependency>
+ <groupId>System</groupId>
+ <artifactId>System</artifactId>
+ <version>1.1</version>
+ <type>dotnet-library</type>
+ <scope>system</scope>
+ <systemPath>${dotnet.home}/System.dll</systemPath>
+ </dependency -->
+
+ <dependency>
+ <groupId>nunit</groupId>
+ <artifactId>nunit-console</artifactId>
+ <version>2.2</version>
+ <type>dotnet-exe</type>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+
+</project>
Modified: incubator/activemq/trunk/activemq-gbean-management/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-gbean-management/pom.xml?rev=394399&r1=394398&r2=394399&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-gbean-management/pom.xml (original)
+++ incubator/activemq/trunk/activemq-gbean-management/pom.xml Sat Apr 15
16:33:05 2006
@@ -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>
@@ -54,4 +54,4 @@
<artifactId>log4j</artifactId>
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: incubator/activemq/trunk/activemq-gbean/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-gbean/pom.xml?rev=394399&r1=394398&r2=394399&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-gbean/pom.xml (original)
+++ incubator/activemq/trunk/activemq-gbean/pom.xml Sat Apr 15 16:33:05 2006
@@ -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>
@@ -106,4 +106,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: incubator/activemq/trunk/activemq-jaas/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-jaas/pom.xml?rev=394399&r1=394398&r2=394399&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-jaas/pom.xml (original)
+++ incubator/activemq/trunk/activemq-jaas/pom.xml Sat Apr 15 16:33:05 2006
@@ -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>
@@ -121,4 +121,4 @@
</dependency>
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: incubator/activemq/trunk/activemq-optional/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-optional/pom.xml?rev=394399&r1=394398&r2=394399&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-optional/pom.xml (original)
+++ incubator/activemq/trunk/activemq-optional/pom.xml Sat Apr 15 16:33:05 2006
@@ -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>
Modified: incubator/activemq/trunk/activemq-ra/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-ra/pom.xml?rev=394399&r1=394398&r2=394399&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-ra/pom.xml (original)
+++ incubator/activemq/trunk/activemq-ra/pom.xml Sat Apr 15 16:33:05 2006
@@ -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>
@@ -100,4 +100,4 @@
</build>
-</project>
\ No newline at end of file
+</project>
Modified: incubator/activemq/trunk/activemq-systest/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-systest/pom.xml?rev=394399&r1=394398&r2=394399&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-systest/pom.xml (original)
+++ incubator/activemq/trunk/activemq-systest/pom.xml Sat Apr 15 16:33:05 2006
@@ -19,7 +19,7 @@
<parent>
<groupId>incubator-activemq</groupId>
- <artifactId>activemq</artifactId>
+ <artifactId>activemq-parent</artifactId>
<version>4.0-SNAPSHOT</version>
</parent>
Modified: incubator/activemq/trunk/activemq-web-demo/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-web-demo/pom.xml?rev=394399&r1=394398&r2=394399&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-web-demo/pom.xml (original)
+++ incubator/activemq/trunk/activemq-web-demo/pom.xml Sat Apr 15 16:33:05 2006
@@ -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>
Modified: incubator/activemq/trunk/activemq-web/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/activemq-web/pom.xml?rev=394399&r1=394398&r2=394399&view=diff
==============================================================================
--- incubator/activemq/trunk/activemq-web/pom.xml (original)
+++ incubator/activemq/trunk/activemq-web/pom.xml Sat Apr 15 16:33:05 2006
@@ -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>
Modified: incubator/activemq/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/pom.xml?rev=394399&r1=394398&r2=394399&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/pom.xml (original)
+++ incubator/activemq/trunk/assembly/pom.xml Sat Apr 15 16:33:05 2006
@@ -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>
@@ -224,35 +230,37 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.1-SNAPSHOT</version>
+ <groupId>incubator-activemq</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <version>${pom.version}</version>
<executions>
<execution>
- <id>bin</id>
- <phase>package</phase>
+ <phase>compile</phase>
<goals>
- <goal>assembly</goal>
+ <goal>createbundle</goal>
</goals>
<configuration>
- <descriptors>
- <descriptor>src/main/descriptors/bin.xml</descriptor>
- </descriptors>
- <finalName>activemq-${pom.version}</finalName>
- <appendAssemblyId>false</appendAssemblyId>
+
<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>
+ <version>2.1-SNAPSHOT</version>
+ <executions>
<execution>
- <id>full</id>
+ <id>bin</id>
<phase>package</phase>
<goals>
<goal>assembly</goal>
</goals>
<configuration>
<descriptors>
- <descriptor>src/main/descriptors/all-jar.xml</descriptor>
+ <descriptor>src/main/descriptors/bin.xml</descriptor>
</descriptors>
- <finalName>activemq-full-${pom.version}</finalName>
+ <finalName>activemq-${pom.version}</finalName>
<appendAssemblyId>false</appendAssemblyId>
</configuration>
</execution>
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=394399&r1=394398&r2=394399&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/main/descriptors/bin.xml (original)
+++ incubator/activemq/trunk/assembly/src/main/descriptors/bin.xml Sat Apr 15
16:33:05 2006
@@ -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>
@@ -123,4 +126,4 @@
</dependencySets>
-->
-</assembly>
\ No newline at end of file
+</assembly>
Modified: incubator/activemq/trunk/jmeter/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/jmeter/pom.xml?rev=394399&r1=394398&r2=394399&view=diff
==============================================================================
--- incubator/activemq/trunk/jmeter/pom.xml (original)
+++ incubator/activemq/trunk/jmeter/pom.xml Sat Apr 15 16:33:05 2006
@@ -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>
Added: incubator/activemq/trunk/maven-bundle-plugin/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/maven-bundle-plugin/pom.xml?rev=394399&view=auto
==============================================================================
--- incubator/activemq/trunk/maven-bundle-plugin/pom.xml (added)
+++ incubator/activemq/trunk/maven-bundle-plugin/pom.xml Sat Apr 15 16:33:05
2006
@@ -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>
Added:
incubator/activemq/trunk/maven-bundle-plugin/src/main/java/org/apache/activemq/maven/BundleMojo.java
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/maven-bundle-plugin/src/main/java/org/apache/activemq/maven/BundleMojo.java?rev=394399&view=auto
==============================================================================
---
incubator/activemq/trunk/maven-bundle-plugin/src/main/java/org/apache/activemq/maven/BundleMojo.java
(added)
+++
incubator/activemq/trunk/maven-bundle-plugin/src/main/java/org/apache/activemq/maven/BundleMojo.java
Sat Apr 15 16:33:05 2006
@@ -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 );
+ }
+ }
+}
Modified: incubator/activemq/trunk/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/pom.xml?rev=394399&r1=394398&r2=394399&view=diff
==============================================================================
--- incubator/activemq/trunk/pom.xml (original)
+++ incubator/activemq/trunk/pom.xml Sat Apr 15 16:33:05 2006
@@ -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>
Modified: incubator/activemq/trunk/sandbox/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/sandbox/pom.xml?rev=394399&r1=394398&r2=394399&view=diff
==============================================================================
--- incubator/activemq/trunk/sandbox/pom.xml (original)
+++ incubator/activemq/trunk/sandbox/pom.xml Sat Apr 15 16:33:05 2006
@@ -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>
