Author: foconer
Date: Tue May 2 17:44:41 2006
New Revision: 399101
URL: http://svn.apache.org/viewcvs?rev=399101&view=rev
Log:
Bug: Unable to start the generated distribution due to the created run.jar in
"/bin" dir.
Fix: Added a new assembly execution that will create the run.jar containing
only "org.apache.activemq.console.Main" and setting the manifest main-class
property to the same class.
Modified:
incubator/activemq/trunk/assembly/pom.xml
incubator/activemq/trunk/assembly/src/main/descriptors/bin.xml
incubator/activemq/trunk/assembly/src/main/descriptors/run-jar.xml
Modified: incubator/activemq/trunk/assembly/pom.xml
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/pom.xml?rev=399101&r1=399100&r2=399101&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/pom.xml (original)
+++ incubator/activemq/trunk/assembly/pom.xml Tue May 2 17:44:41 2006
@@ -258,6 +258,25 @@
<version>2.1-SNAPSHOT</version>
<executions>
<execution>
+ <id>run</id>
+ <phase>package</phase>
+ <goals>
+ <goal>assembly</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/descriptors/run-jar.xml</descriptor>
+ </descriptors>
+ <finalName>run</finalName>
+ <appendAssemblyId>false</appendAssemblyId>
+ <archive>
+ <manifest>
+ <mainClass>org.apache.activemq.console.Main</mainClass>
+ </manifest>
+ </archive>
+ </configuration>
+ </execution>
+ <execution>
<id>bin</id>
<phase>package</phase>
<goals>
@@ -265,16 +284,15 @@
</goals>
<configuration>
<descriptors>
- <descriptor>src/main/descriptors/bin.xml</descriptor>
+ <descriptor>src/main/descriptors/bin.xml</descriptor>
</descriptors>
- <finalName>incubator-activemq-${pom.version}</finalName>
+ <finalName>${pom.artifactId}-${pom.version}</finalName>
<appendAssemblyId>false</appendAssemblyId>
</configuration>
</execution>
</executions>
</plugin>
-
</plugins>
</build>
-</project>
+</project>
\ No newline at end of file
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=399101&r1=399100&r2=399101&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/main/descriptors/bin.xml (original)
+++ incubator/activemq/trunk/assembly/src/main/descriptors/bin.xml Tue May 2
17:44:41 2006
@@ -44,19 +44,26 @@
<directory>target</directory>
<outputDirectory>/</outputDirectory>
<includes>
- <include>*.jar</include>
+ <include>${pom.artifactId}-${pom.version}.jar</include>
+ </includes>
+ </fileSet>
+ <fileSet>
+ <directory>target</directory>
+ <outputDirectory>/bin</outputDirectory>
+ <includes>
+ <include>run.jar</include>
</includes>
</fileSet>
</fileSets>
<dependencySets>
- <dependencySet>
+ <!-- dependencySet>
<outputDirectory>/bin</outputDirectory>
<outputFileNameMapping>run.jar</outputFileNameMapping>
<unpack>false</unpack>
<includes>
<include>incubator-activemq:activemq-console</include>
</includes>
- </dependencySet>
+ </dependencySet -->
<dependencySet>
<outputDirectory>/lib</outputDirectory>
<unpack>false</unpack>
@@ -133,4 +140,4 @@
</dependencySets>
-->
-</assembly>
+</assembly>
\ No newline at end of file
Modified: incubator/activemq/trunk/assembly/src/main/descriptors/run-jar.xml
URL:
http://svn.apache.org/viewcvs/incubator/activemq/trunk/assembly/src/main/descriptors/run-jar.xml?rev=399101&r1=399100&r2=399101&view=diff
==============================================================================
--- incubator/activemq/trunk/assembly/src/main/descriptors/run-jar.xml
(original)
+++ incubator/activemq/trunk/assembly/src/main/descriptors/run-jar.xml Tue May
2 17:44:41 2006
@@ -20,7 +20,7 @@
<format>jar</format>
</formats>
<includeBaseDirectory>false</includeBaseDirectory>
- <dependencySets>
+ <!-- dependencySets>
<dependencySet>
<outputDirectory>/</outputDirectory>
<unpack>true</unpack>
@@ -28,5 +28,14 @@
<include>incubator-activemq:activemq-console</include>
</includes>
</dependencySet>
- </dependencySets>
+ </dependencySets -->
+ <fileSets>
+ <fileSet>
+ <directory>target/classes</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>org/apache/activemq/console/Main*.class</include>
+ </includes>
+ </fileSet>
+ </fileSets>
</assembly>
