mirror of https://github.com/apache/activemq.git
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
This commit is contained in:
parent
5c03c7df96
commit
bfa4b9bb68
|
@ -20,12 +20,10 @@
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>incubator-activemq</groupId>
|
<groupId>incubator-activemq</groupId>
|
||||||
<artifactId>activemq</artifactId>
|
<artifactId>activemq-parent</artifactId>
|
||||||
<version>4.0-SNAPSHOT</version>
|
<version>4.0-SNAPSHOT</version>
|
||||||
</parent>
|
</parent>
|
||||||
<groupId>org.apache.activemq.activecluster</groupId>
|
|
||||||
<artifactId>activecluster</artifactId>
|
<artifactId>activecluster</artifactId>
|
||||||
<version>1.3-SNAPSHOT</version>
|
|
||||||
<name>ActiveCluster</name>
|
<name>ActiveCluster</name>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>incubator-activemq</groupId>
|
<groupId>incubator-activemq</groupId>
|
||||||
<artifactId>activemq</artifactId>
|
<artifactId>activemq-parent</artifactId>
|
||||||
<version>4.0-SNAPSHOT</version>
|
<version>4.0-SNAPSHOT</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
|
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>incubator-activemq</groupId>
|
<groupId>incubator-activemq</groupId>
|
||||||
<artifactId>activemq</artifactId>
|
<artifactId>activemq-parent</artifactId>
|
||||||
<version>4.0-SNAPSHOT</version>
|
<version>4.0-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
@ -136,4 +136,4 @@
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
|
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>incubator-activemq</groupId>
|
<groupId>incubator-activemq</groupId>
|
||||||
<artifactId>activemq</artifactId>
|
<artifactId>activemq-parent</artifactId>
|
||||||
<version>4.0-SNAPSHOT</version>
|
<version>4.0-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
@ -304,4 +304,4 @@
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
|
|
|
@ -1,145 +1,145 @@
|
||||||
<?xml version="1.0"?>
|
<?xml version="1.0"?>
|
||||||
<project>
|
<project>
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>incubator-activemq</groupId>
|
<groupId>incubator-activemq</groupId>
|
||||||
<artifactId>activemq</artifactId>
|
<artifactId>activemq-parent</artifactId>
|
||||||
<version>4.0-SNAPSHOT</version>
|
<version>4.0-SNAPSHOT</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<artifactId>activemq-dotnet</artifactId>
|
<artifactId>activemq-dotnet</artifactId>
|
||||||
<packaging>dotnet-library</packaging>
|
<packaging>dotnet-library</packaging>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
|
|
||||||
<outputDirectory>target/dotnet-assembly</outputDirectory>
|
<outputDirectory>target/dotnet-assembly</outputDirectory>
|
||||||
<testOutputDirectory>target/test-dotnet-assembly</testOutputDirectory>
|
<testOutputDirectory>target/test-dotnet-assembly</testOutputDirectory>
|
||||||
<sourceDirectory>src/main/csharp</sourceDirectory>
|
<sourceDirectory>src/main/csharp</sourceDirectory>
|
||||||
<testSourceDirectory>src/test/csharp</testSourceDirectory>
|
<testSourceDirectory>src/test/csharp</testSourceDirectory>
|
||||||
|
|
||||||
<plugins>
|
<plugins>
|
||||||
|
|
||||||
<!-- Manages the lifecycle of a dotnet project -->
|
<!-- Manages the lifecycle of a dotnet project -->
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-csharp-lifecycle-plugin</artifactId>
|
<artifactId>maven-csharp-lifecycle-plugin</artifactId>
|
||||||
<version>1.0.RC6-SNAPSHOT</version>
|
<version>1.0.RC6-SNAPSHOT</version>
|
||||||
<extensions>true</extensions>
|
<extensions>true</extensions>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
|
||||||
<!-- Used to customize the dotnet compiler options -->
|
<!-- Used to customize the dotnet compiler options -->
|
||||||
<plugin>
|
<plugin>
|
||||||
<artifactId>maven-compiler-plugin</artifactId>
|
<artifactId>maven-compiler-plugin</artifactId>
|
||||||
<version>2.0</version>
|
<version>2.0</version>
|
||||||
<extensions>true</extensions>
|
<extensions>true</extensions>
|
||||||
|
|
||||||
<configuration>
|
<configuration>
|
||||||
<compilerId>csharp</compilerId>
|
<compilerId>csharp</compilerId>
|
||||||
<fork>true</fork>
|
<fork>true</fork>
|
||||||
|
|
||||||
<compilerArguments>
|
<compilerArguments>
|
||||||
<doc>true</doc>
|
<doc>true</doc>
|
||||||
<!-- example of ignoring warnings -->
|
<!-- example of ignoring warnings -->
|
||||||
<nowarn>1591</nowarn>
|
<nowarn>1591</nowarn>
|
||||||
</compilerArguments>
|
</compilerArguments>
|
||||||
|
|
||||||
<includes>
|
<includes>
|
||||||
<include>**/*.cs</include>
|
<include>**/*.cs</include>
|
||||||
</includes>
|
</includes>
|
||||||
|
|
||||||
</configuration>
|
</configuration>
|
||||||
|
|
||||||
<!-- executions need to be specified for the dotnet plugin (is slightly ugly, hopefully can get rid of in future -->
|
<!-- executions need to be specified for the dotnet plugin (is slightly ugly, hopefully can get rid of in future -->
|
||||||
<executions>
|
<executions>
|
||||||
|
|
||||||
<!-- this configuration is required to tell the compiler what is different about the main compile as apposed to the test compile -->
|
<!-- this configuration is required to tell the compiler what is different about the main compile as apposed to the test compile -->
|
||||||
<execution>
|
<execution>
|
||||||
<id>compile</id>
|
<id>compile</id>
|
||||||
<phase>compile</phase>
|
<phase>compile</phase>
|
||||||
<goals>
|
<goals>
|
||||||
<goal>compile</goal>
|
<goal>compile</goal>
|
||||||
</goals>
|
</goals>
|
||||||
<configuration>
|
<configuration>
|
||||||
<compilerArguments>
|
<compilerArguments>
|
||||||
<target>library</target>
|
<target>library</target>
|
||||||
<!-- mainClass>MyNamespace.MyStaticMainClass</mainClass -->
|
<!-- mainClass>MyNamespace.MyStaticMainClass</mainClass -->
|
||||||
</compilerArguments>
|
</compilerArguments>
|
||||||
</configuration>
|
</configuration>
|
||||||
</execution>
|
</execution>
|
||||||
|
|
||||||
<!-- this configuration is required to tell the compiler what is different about the main compile as apposed to the test compile -->
|
<!-- this configuration is required to tell the compiler what is different about the main compile as apposed to the test compile -->
|
||||||
<execution>
|
<execution>
|
||||||
<id>testCompile</id>
|
<id>testCompile</id>
|
||||||
<phase>test-compile</phase>
|
<phase>test-compile</phase>
|
||||||
<goals>
|
<goals>
|
||||||
<goal>testCompile</goal>
|
<goal>testCompile</goal>
|
||||||
</goals>
|
</goals>
|
||||||
<configuration>
|
<configuration>
|
||||||
<compilerArguments>
|
<compilerArguments>
|
||||||
<!-- the library element is required for test compile -->
|
<!-- the library element is required for test compile -->
|
||||||
<target>library</target>
|
<target>library</target>
|
||||||
<!-- the isTest element is required for the test compile -->
|
<!-- the isTest element is required for the test compile -->
|
||||||
<out>unit-tests.dll</out>
|
<out>unit-tests.dll</out>
|
||||||
</compilerArguments>
|
</compilerArguments>
|
||||||
</configuration>
|
</configuration>
|
||||||
</execution>
|
</execution>
|
||||||
</executions>
|
</executions>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>org.codehaus.plexus</groupId>
|
<groupId>org.codehaus.plexus</groupId>
|
||||||
<artifactId>plexus-compiler-csharp</artifactId>
|
<artifactId>plexus-compiler-csharp</artifactId>
|
||||||
<version>1.6-SNAPSHOT</version>
|
<version>1.6-SNAPSHOT</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
|
||||||
<!-- For Running NUNIT tests -->
|
<!-- For Running NUNIT tests -->
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-nunit-plugin</artifactId>
|
<artifactId>maven-nunit-plugin</artifactId>
|
||||||
<version>1.0.RC6-SNAPSHOT</version>
|
<version>1.0.RC6-SNAPSHOT</version>
|
||||||
<!-- configuration>
|
<!-- configuration>
|
||||||
<configFile>src/main/resources/App.config</configFile>
|
<configFile>src/main/resources/App.config</configFile>
|
||||||
</configuration -->
|
</configuration -->
|
||||||
</plugin>
|
</plugin>
|
||||||
|
|
||||||
<!-- For VS.NET project generation -->
|
<!-- For VS.NET project generation -->
|
||||||
<plugin>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-vstudio-plugin</artifactId>
|
<artifactId>maven-vstudio-plugin</artifactId>
|
||||||
<version>1.0.RC6-SNAPSHOT</version>
|
<version>1.0.RC6-SNAPSHOT</version>
|
||||||
<configuration>
|
<configuration>
|
||||||
<frameworkHome>${dotnet.home}</frameworkHome>
|
<frameworkHome>${dotnet.home}</frameworkHome>
|
||||||
<includes>
|
<includes>
|
||||||
<include>**/*.aspx</include>
|
<include>**/*.aspx</include>
|
||||||
<include>**/*.resx</include>
|
<include>**/*.resx</include>
|
||||||
<include>**/*.cs</include>
|
<include>**/*.cs</include>
|
||||||
</includes>
|
</includes>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
|
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<!-- example of a system dependency -->
|
<!-- example of a system dependency -->
|
||||||
<!-- dependency>
|
<!-- dependency>
|
||||||
<groupId>System</groupId>
|
<groupId>System</groupId>
|
||||||
<artifactId>System</artifactId>
|
<artifactId>System</artifactId>
|
||||||
<version>1.1</version>
|
<version>1.1</version>
|
||||||
<type>dotnet-library</type>
|
<type>dotnet-library</type>
|
||||||
<scope>system</scope>
|
<scope>system</scope>
|
||||||
<systemPath>${dotnet.home}/System.dll</systemPath>
|
<systemPath>${dotnet.home}/System.dll</systemPath>
|
||||||
</dependency -->
|
</dependency -->
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>nunit</groupId>
|
<groupId>nunit</groupId>
|
||||||
<artifactId>nunit-console</artifactId>
|
<artifactId>nunit-console</artifactId>
|
||||||
<version>2.2</version>
|
<version>2.2</version>
|
||||||
<type>dotnet-exe</type>
|
<type>dotnet-exe</type>
|
||||||
<scope>test</scope>
|
<scope>test</scope>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
|
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>incubator-activemq</groupId>
|
<groupId>incubator-activemq</groupId>
|
||||||
<artifactId>activemq</artifactId>
|
<artifactId>activemq-parent</artifactId>
|
||||||
<version>4.0-SNAPSHOT</version>
|
<version>4.0-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
@ -54,4 +54,4 @@
|
||||||
<artifactId>log4j</artifactId>
|
<artifactId>log4j</artifactId>
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
</project>
|
</project>
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
|
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>incubator-activemq</groupId>
|
<groupId>incubator-activemq</groupId>
|
||||||
<artifactId>activemq</artifactId>
|
<artifactId>activemq-parent</artifactId>
|
||||||
<version>4.0-SNAPSHOT</version>
|
<version>4.0-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
@ -106,4 +106,4 @@
|
||||||
</plugins>
|
</plugins>
|
||||||
</build>
|
</build>
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
|
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>incubator-activemq</groupId>
|
<groupId>incubator-activemq</groupId>
|
||||||
<artifactId>activemq</artifactId>
|
<artifactId>activemq-parent</artifactId>
|
||||||
<version>4.0-SNAPSHOT</version>
|
<version>4.0-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
@ -121,4 +121,4 @@
|
||||||
</dependency>
|
</dependency>
|
||||||
</dependencies>
|
</dependencies>
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
|
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>incubator-activemq</groupId>
|
<groupId>incubator-activemq</groupId>
|
||||||
<artifactId>activemq</artifactId>
|
<artifactId>activemq-parent</artifactId>
|
||||||
<version>4.0-SNAPSHOT</version>
|
<version>4.0-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
|
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>incubator-activemq</groupId>
|
<groupId>incubator-activemq</groupId>
|
||||||
<artifactId>activemq</artifactId>
|
<artifactId>activemq-parent</artifactId>
|
||||||
<version>4.0-SNAPSHOT</version>
|
<version>4.0-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
@ -100,4 +100,4 @@
|
||||||
</build>
|
</build>
|
||||||
|
|
||||||
|
|
||||||
</project>
|
</project>
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
|
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>incubator-activemq</groupId>
|
<groupId>incubator-activemq</groupId>
|
||||||
<artifactId>activemq</artifactId>
|
<artifactId>activemq-parent</artifactId>
|
||||||
<version>4.0-SNAPSHOT</version>
|
<version>4.0-SNAPSHOT</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
|
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>incubator-activemq</groupId>
|
<groupId>incubator-activemq</groupId>
|
||||||
<artifactId>activemq</artifactId>
|
<artifactId>activemq-parent</artifactId>
|
||||||
<version>4.0-SNAPSHOT</version>
|
<version>4.0-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
|
@ -25,7 +25,7 @@
|
||||||
|
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>incubator-activemq</groupId>
|
<groupId>incubator-activemq</groupId>
|
||||||
<artifactId>activemq</artifactId>
|
<artifactId>activemq-parent</artifactId>
|
||||||
<version>4.0-SNAPSHOT</version>
|
<version>4.0-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
|
@ -25,12 +25,12 @@
|
||||||
|
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>incubator-activemq</groupId>
|
<groupId>incubator-activemq</groupId>
|
||||||
<artifactId>activemq</artifactId>
|
<artifactId>activemq-parent</artifactId>
|
||||||
<version>4.0-SNAPSHOT</version>
|
<version>4.0-SNAPSHOT</version>
|
||||||
<relativePath>../pom.xml</relativePath>
|
<relativePath>../pom.xml</relativePath>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
<artifactId>activemq-assembly</artifactId>
|
<artifactId>activemq</artifactId>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
<name>ActiveMQ :: Assembly</name>
|
<name>ActiveMQ :: Assembly</name>
|
||||||
<description>Puts together the ActiveMQ distribution</description>
|
<description>Puts together the ActiveMQ distribution</description>
|
||||||
|
@ -69,7 +69,7 @@
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>${pom.groupId}</groupId>
|
<groupId>${pom.groupId}</groupId>
|
||||||
<artifactId>activemq-web</artifactId>
|
<artifactId>activemq-web-demo</artifactId>
|
||||||
<type>war</type>
|
<type>war</type>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
|
@ -77,6 +77,12 @@
|
||||||
<artifactId>activecluster</artifactId>
|
<artifactId>activecluster</artifactId>
|
||||||
<optional>true</optional>
|
<optional>true</optional>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
<dependency>
|
||||||
|
<groupId>${pom.groupId}</groupId>
|
||||||
|
<artifactId>activemq-ra</artifactId>
|
||||||
|
<type>rar</type>
|
||||||
|
<optional>true</optional>
|
||||||
|
</dependency>
|
||||||
|
|
||||||
<!-- commons -->
|
<!-- commons -->
|
||||||
<dependency>
|
<dependency>
|
||||||
|
@ -223,6 +229,22 @@
|
||||||
</includes>
|
</includes>
|
||||||
</configuration>
|
</configuration>
|
||||||
</plugin>
|
</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>
|
<plugin>
|
||||||
<groupId>org.apache.maven.plugins</groupId>
|
<groupId>org.apache.maven.plugins</groupId>
|
||||||
<artifactId>maven-assembly-plugin</artifactId>
|
<artifactId>maven-assembly-plugin</artifactId>
|
||||||
|
@ -242,20 +264,6 @@
|
||||||
<appendAssemblyId>false</appendAssemblyId>
|
<appendAssemblyId>false</appendAssemblyId>
|
||||||
</configuration>
|
</configuration>
|
||||||
</execution>
|
</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>
|
</executions>
|
||||||
</plugin>
|
</plugin>
|
||||||
|
|
||||||
|
|
|
@ -24,6 +24,7 @@
|
||||||
<fileSets>
|
<fileSets>
|
||||||
<fileSet>
|
<fileSet>
|
||||||
<includes>
|
<includes>
|
||||||
|
<include>STATUS*</include>
|
||||||
<include>README*</include>
|
<include>README*</include>
|
||||||
<include>LICENSE*</include>
|
<include>LICENSE*</include>
|
||||||
<include>NOTICE*</include>
|
<include>NOTICE*</include>
|
||||||
|
@ -71,17 +72,19 @@
|
||||||
<unpack>false</unpack>
|
<unpack>false</unpack>
|
||||||
<scope>runtime</scope>
|
<scope>runtime</scope>
|
||||||
<includes>
|
<includes>
|
||||||
<!-- <include>${pom.groupId}:activemq-ra</include> -->
|
<include>incubator-activemq:activemq-ra</include>
|
||||||
<include>incubator-activemq:activemq-optional</include>
|
<include>incubator-activemq:activemq-optional</include>
|
||||||
<include>activecluster:activecluster</include>
|
<include>incubator-activemq:activecluster</include>
|
||||||
<include>commons-beanutils:commons-beanutils</include>
|
<include>commons-beanutils:commons-beanutils</include>
|
||||||
<include>commons-collections:commons-collections</include>
|
<include>commons-collections:commons-collections</include>
|
||||||
<include>commons-httpclient:commons-httpclient</include>
|
<include>commons-httpclient:commons-httpclient</include>
|
||||||
<include>commons-dbcp:commons-dbcp</include>
|
<include>commons-dbcp:commons-dbcp</include>
|
||||||
<include>commons-pool:commons-pool</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>log4j:log4j</include>
|
||||||
<include>mx4j:mx4j-remote</include>
|
<include>mx4j:mx4j-remote</include>
|
||||||
|
<include>mx4j:mx4j-tools</include>
|
||||||
<include>org.apache.derby:derby</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-jacc_1.0_spec</include>
|
||||||
<include>org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec</include>
|
<include>org.apache.geronimo.specs:geronimo-j2ee-connector_1.5_spec</include>
|
||||||
|
@ -123,4 +126,4 @@
|
||||||
</dependencySets>
|
</dependencySets>
|
||||||
-->
|
-->
|
||||||
|
|
||||||
</assembly>
|
</assembly>
|
||||||
|
|
|
@ -19,7 +19,7 @@
|
||||||
|
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>activemq</groupId>
|
<groupId>activemq</groupId>
|
||||||
<artifactId>activemq</artifactId>
|
<artifactId>activemq-parent</artifactId>
|
||||||
<version>4.0-SNAPSHOT</version>
|
<version>4.0-SNAPSHOT</version>
|
||||||
</parent>
|
</parent>
|
||||||
|
|
||||||
|
@ -122,7 +122,7 @@
|
||||||
|
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>activemq</groupId>
|
<groupId>activemq</groupId>
|
||||||
<artifactId>activemq</artifactId>
|
<artifactId>activemq-parent</artifactId>
|
||||||
<version>${version}</version>
|
<version>${version}</version>
|
||||||
</dependency>
|
</dependency>
|
||||||
|
|
||||||
|
|
|
@ -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>
|
|
@ -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 );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
5
pom.xml
5
pom.xml
|
@ -24,7 +24,7 @@
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
|
|
||||||
<groupId>incubator-activemq</groupId>
|
<groupId>incubator-activemq</groupId>
|
||||||
<artifactId>activemq</artifactId>
|
<artifactId>activemq-parent</artifactId>
|
||||||
<version>4.0-SNAPSHOT</version>
|
<version>4.0-SNAPSHOT</version>
|
||||||
<packaging>pom</packaging>
|
<packaging>pom</packaging>
|
||||||
<name>ActiveMQ</name>
|
<name>ActiveMQ</name>
|
||||||
|
@ -120,6 +120,7 @@
|
||||||
</distributionManagement>
|
</distributionManagement>
|
||||||
|
|
||||||
<modules>
|
<modules>
|
||||||
|
<module>activeio</module>
|
||||||
<module>activecluster</module>
|
<module>activecluster</module>
|
||||||
<module>activemq-jaas</module>
|
<module>activemq-jaas</module>
|
||||||
<module>activemq-core</module>
|
<module>activemq-core</module>
|
||||||
|
@ -131,6 +132,7 @@
|
||||||
<module>activemq-gbean</module>
|
<module>activemq-gbean</module>
|
||||||
<module>activemq-gbean-management</module>
|
<module>activemq-gbean-management</module>
|
||||||
<!--module>activemq-systest</module -->
|
<!--module>activemq-systest</module -->
|
||||||
|
<module>maven-bundle-plugin</module>
|
||||||
<module>assembly</module>
|
<module>assembly</module>
|
||||||
|
|
||||||
<!--
|
<!--
|
||||||
|
@ -188,6 +190,7 @@
|
||||||
<groupId>${pom.groupId}</groupId>
|
<groupId>${pom.groupId}</groupId>
|
||||||
<artifactId>activemq-web-demo</artifactId>
|
<artifactId>activemq-web-demo</artifactId>
|
||||||
<version>${pom.version}</version>
|
<version>${pom.version}</version>
|
||||||
|
<type>war</type>
|
||||||
</dependency>
|
</dependency>
|
||||||
<dependency>
|
<dependency>
|
||||||
<groupId>${pom.groupId}</groupId>
|
<groupId>${pom.groupId}</groupId>
|
||||||
|
|
|
@ -20,7 +20,7 @@
|
||||||
<modelVersion>4.0.0</modelVersion>
|
<modelVersion>4.0.0</modelVersion>
|
||||||
<parent>
|
<parent>
|
||||||
<groupId>incubator-activemq</groupId>
|
<groupId>incubator-activemq</groupId>
|
||||||
<artifactId>activemq</artifactId>
|
<artifactId>activemq-parent</artifactId>
|
||||||
<version>4.0-SNAPSHOT</version>
|
<version>4.0-SNAPSHOT</version>
|
||||||
</parent>
|
</parent>
|
||||||
<groupId>org.apache.activemq.sandbox</groupId>
|
<groupId>org.apache.activemq.sandbox</groupId>
|
||||||
|
|
Loading…
Reference in New Issue