From 746558917ae7d16873aa364ab4b4de491b7419fb Mon Sep 17 00:00:00 2001
From: Rupert Smith <rupertlssmith@apache.org>
Date: Thu, 2 Aug 2007 10:08:13 +0000
Subject: Changes to POM for repacking as manifest jar, rather than uber jar.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2@562066 13f79535-47bb-0310-9956-ffa450edef68
---
 java/perftests/jar-with-dependencies.xml | 20 ++++++++++++++++++--
 java/perftests/pom.xml                   |  4 ++--
 2 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/java/perftests/jar-with-dependencies.xml b/java/perftests/jar-with-dependencies.xml
index 959473f535..5813b6334b 100644
--- a/java/perftests/jar-with-dependencies.xml
+++ b/java/perftests/jar-with-dependencies.xml
@@ -44,6 +44,22 @@
             <outputDirectory></outputDirectory>
         </fileSet>
 
+    <!-- Include all the test scripts, both generated and hand-written. -->
+    <fileSet>
+      <directory>target</directory>
+      <outputDirectory></outputDirectory>
+      <includes>
+          <include>*.sh</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>etc/scripts</directory>
+      <outputDirectory></outputDirectory>
+      <includes>
+          <include>*.sh</include>
+      </includes>
+    </fileSet>
+
         <!-- Include the build artifact. -->
         <fileSet>
             <directory>target</directory>
@@ -53,12 +69,12 @@
             </includes>
         </fileSet>
 
-        <!-- Include the classpath only jar. -->
+        <!-- Include the manifest with classpath jar. -->
         <fileSet>
             <directory>target</directory>
             <outputDirectory></outputDirectory>
             <includes>
-                <include>qpid-perftests-1.0-incubating-M2-SNAPSHOT-tests.jar</include>
+                <include>qpid-perftests-${qpid.version}.jar</include>
             </includes>
         </fileSet>
         
diff --git a/java/perftests/pom.xml b/java/perftests/pom.xml
index 41bd6c1a84..69dfc58882 100644
--- a/java/perftests/pom.xml
+++ b/java/perftests/pom.xml
@@ -142,7 +142,7 @@
 
                 <configuration>
                     <scriptOutDirectory>target</scriptOutDirectory>
-                    <testJar>${project.build.finalName}-all-test-deps.jar</testJar>
+                    <testJar>${project.build.finalName}.jar</testJar>
                     <systemproperties>
                         <property>
                             <name>-Xms</name>
@@ -382,7 +382,7 @@
                             </archive>
                         </configuration>      
                         <goals>
-                            <goal>test-jar</goal>
+                            <goal>jar</goal>
                         </goals>
                     </execution>
                 </executions>          
-- 
cgit v1.2.1