Return-Path: 
 <activemq-commits-return-2135-apmail-geronimo-activemq-commits-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-activemq-commits-archive@www.apache.org
Received: (qmail 15898 invoked from network); 9 Jun 2006 08:18:42 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199)
  by minotaur.apache.org with SMTP; 9 Jun 2006 08:18:42 -0000
Received: (qmail 24660 invoked by uid 500); 9 Jun 2006 08:18:42 -0000
Delivered-To: apmail-geronimo-activemq-commits-archive@geronimo.apache.org
Received: (qmail 24642 invoked by uid 500); 9 Jun 2006 08:18:42 -0000
Mailing-List: contact activemq-commits-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:activemq-commits-help@geronimo.apache.org>
List-Unsubscribe: <mailto:activemq-commits-unsubscribe@geronimo.apache.org>
List-Post: <mailto:activemq-commits@geronimo.apache.org>
List-Id: <activemq-commits.geronimo.apache.org>
Reply-To: activemq-dev@geronimo.apache.org
Delivered-To: mailing list activemq-commits@geronimo.apache.org
Received: (qmail 24633 invoked by uid 99); 9 Jun 2006 08:18:42 -0000
Received: from asf.osuosl.org (HELO asf.osuosl.org) (140.211.166.49)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Jun 2006 01:18:42 -0700
X-ASF-Spam-Status: No, hits=-9.4 required=10.0
	tests=ALL_TRUSTED,NO_REAL_NAME
X-Spam-Check-By: apache.org
Received-SPF: pass (asf.osuosl.org: local policy)
Received: from [140.211.166.113] (HELO eris.apache.org) (140.211.166.113)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 09 Jun 2006 01:18:41 -0700
Received: by eris.apache.org (Postfix, from userid 65534)
	id 7B9F31A983A; Fri,  9 Jun 2006 01:18:21 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r412975 - /incubator/activemq/trunk/assembly/pom.xml
Date: Fri, 09 Jun 2006 08:18:21 -0000
To: activemq-commits@geronimo.apache.org
From: foconer@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20060609081821.7B9F31A983A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org
X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N

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>