From 5fd6125b23c8b3836e3ba17c271fb5c4abf741a3 Mon Sep 17 00:00:00 2001
From: "Frederick G. Oconer" <foconer@apache.org>
Date: Wed, 3 May 2006 00:44:41 +0000
Subject: [PATCH] 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.

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@399101 13f79535-47bb-0310-9956-ffa450edef68
---
 assembly/pom.xml                          | 26 +++++++++++++++++++----
 assembly/src/main/descriptors/bin.xml     | 15 +++++++++----
 assembly/src/main/descriptors/run-jar.xml | 13 ++++++++++--
 3 files changed, 44 insertions(+), 10 deletions(-)

diff --git a/assembly/pom.xml b/assembly/pom.xml
index 701fc7305d..c8a0579c25 100755
--- a/assembly/pom.xml
+++ b/assembly/pom.xml
@@ -257,6 +257,25 @@
         <artifactId>maven-assembly-plugin</artifactId>
         <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>
@@ -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
diff --git a/assembly/src/main/descriptors/bin.xml b/assembly/src/main/descriptors/bin.xml
index 022b6c3f1d..0fcde738cb 100644
--- a/assembly/src/main/descriptors/bin.xml
+++ b/assembly/src/main/descriptors/bin.xml
@@ -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
diff --git a/assembly/src/main/descriptors/run-jar.xml b/assembly/src/main/descriptors/run-jar.xml
index 9926ec0ebe..5526730f2b 100644
--- a/assembly/src/main/descriptors/run-jar.xml
+++ b/assembly/src/main/descriptors/run-jar.xml
@@ -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>
\ No newline at end of file