Author: foconer
Date: Fri Jun 9 01:18:20 2006
New Revision: 412975
URL: http://svn.apache.org/viewvc?rev=412975&view=rev
Log:
Bug: run.jar is not correctly created.
Fix: added ant plugin to crete the run.jar because the assembly plugin doesn't
correctly create it.
Modified:
incubator/activemq/trunk/assembly/pom.xml
Modified: incubator/activemq/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/activemq/trunk/assembly/pom.xml?rev=412975&r1=412974&r2=412975&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/pom.xml (original)
+++ incubator/activemq/trunk/assembly/pom.xml Fri Jun 9 01:18:20 2006
@@ -231,6 +231,30 @@
<plugins>
<!-- Configure which tests are included/excuded -->
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.1</version>
+ <executions>
+ <execution>
+ <id>run-jar</id>
+ <phase>package</phase>
+ <configuration>
+ <tasks>
+ <jar destfile="target/run.jar" basedir="target/classes">
+ <include
name="org/apache/activemq/console/Main*.class"/>
+ <manifest>
+ <attribute name="Main-Class"
value="org.apache.activemq.console.Main"/>
+ </manifest>
+ </jar>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-surefire-plugin</artifactId>
<configuration>
<forkMode>pertest</forkMode>
@@ -268,7 +292,7 @@
<artifactId>maven-assembly-plugin</artifactId>
<version>2.1</version>
<executions>
- <execution>
+ <!-- execution>
<id>run</id>
<phase>package</phase>
<goals>
@@ -278,14 +302,15 @@
<descriptors>
<descriptor>src/main/descriptors/run-jar.xml</descriptor>
</descriptors>
- <finalName>activemq-${pom.version}</finalName>
+ <finalName>run</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
<archive>
<manifest>
<mainClass>org.apache.activemq.console.Main</mainClass>
</manifest>
</archive>
</configuration>
- </execution>
+ </execution -->
<execution>
<id>bin</id>
<phase>package</phase>
