QPID-382

Fixed the perftests distribution error by creating the test-jar in perftests module

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@509635 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 52 insertions, 36 deletions

diff --git a/java/perftests/distribution/pom.xml b/java/perftests/distribution/pom.xml
index 010f19c9f0..981ead5cf0 100644
--- a/java/perftests/distribution/pom.xml
+++ b/java/perftests/distribution/pom.xml
@@ -44,22 +44,28 @@
         <dependency>
             <groupId>org.apache.qpid</groupId>
             <artifactId>qpid-perftests</artifactId>
-			<type>jar</type>
-			<version>${pom.version}</version>
+            <type>jar</type>
+            <version>${pom.version}</version>
         </dependency>
-		        <dependency>
+        <dependency>
             <groupId>org.apache.qpid</groupId>
             <artifactId>qpid-perftests</artifactId>
-			<type>test-jar</type>
-			<version>${pom.version}</version>
+            <type>test-jar</type>
+            <version>${pom.version}</version>
         </dependency>
-	<dependency>
-		<groupId>uk.co.thebadgerset</groupId>
-                <artifactId>junit-toolkit</artifactId>
-		<version>0.4</version>
-		<scope>runtime</scope>
+        <dependency>
+            <groupId>uk.co.thebadgerset</groupId>
+            <artifactId>junit-toolkit</artifactId>
+            <version>0.6-SNAPSHOT</version>
+            <scope>runtime</scope>
+            </dependency>
+        <dependency>
+            <groupId>uk.co.thebadgerset</groupId>
+            <artifactId>junit-toolkit-maven-plugin</artifactId>
+            <version>0.5</version>
+            <scope>runtime</scope>
         </dependency>
-	</dependencies>
+    </dependencies>
 
     <build>
         <pluginManagement>
diff --git a/java/perftests/pom.xml b/java/perftests/pom.xml
index 2fbee8959c..a25b2db9c1 100644
--- a/java/perftests/pom.xml
+++ b/java/perftests/pom.xml
@@ -44,7 +44,7 @@
         <pluginRepository>
           <id>junit-toolkit-plugin.snapshots</id>
           <name>JUnit Toolkit SNAPSHOT Repository</name>
-	  <url>http://junit-toolkit.svn.sourceforge.net/svnroot/junit-toolkit/snapshots/</url>
+      <url>http://junit-toolkit.svn.sourceforge.net/svnroot/junit-toolkit/snapshots/</url>
           <snapshots>
             <enabled>true</enabled>
           </snapshots>
@@ -86,6 +86,18 @@
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>test-jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
 
             <!-- The JUnit Toolkit maven2 plugin is in the process of being added to the maven repository.
 
@@ -148,33 +160,31 @@
                   <Ping-Tx>-n Ping-Tx -s [100] -o . -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf transacted=true</Ping-Tx>
                   <Ping-Size>-n Ping-Size -s [100] -o . -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf messagesize=512</Ping-Size>
                   <Ping-Concurrent>-n Ping-Concurrent -s [100] -c [4] -o . -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf</Ping-Concurrent>
-                  <Ping-Many-Queues>
-		      -n Ping-Many-Queues -s [100] -o . -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf destinationcount=4
-		  </Ping-Many-Queues>
+                  <Ping-Many-Queues>-n Ping-Many-Queues -s [100] -o . -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf destinationscount=4</Ping-Many-Queues>
                   <Ping-Duration>-n Ping-Duration -s [100] -d10S -o . -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf</Ping-Duration>
                   <Ping-Rate>-n Ping-Rate -s [100] -d10S -o . -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf rate=500</Ping-Rate>
-		  <Ping-PubSub>-n Ping-PubSub -s [100] -o . -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true</Ping-PubSub>
-		  <Ping-Many-Topics>
-		      -n Ping-Many-Topics -s [100] -o . -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true destinationcount=4
-		  </Ping-Many-Topics>
-                  <Ping-Persistent>
-		      -n Ping-Persistent -s [100] -o . -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true
-		  </Ping-Persistent>
+                  <Ping-PubSub>-n Ping-PubSub -s [100] -o . -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true</Ping-PubSub>
+                  <Ping-Many-Topics>
+                      -n Ping-Many-Topics -s [100] -o . -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf pubsub=true destinationscount=4
+                  </Ping-Many-Topics>
+                          <Ping-Persistent>
+                      -n Ping-Persistent -s [100] -o . -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf persistent=true
+                  </Ping-Persistent>
                   <Ping-Batch-Logging>
-		      -n Ping-Batch-Logging -s [100] -o . -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf BatchSize=10
-		  </Ping-Batch-Logging>
-		  <Ping-Failover-Before-Send> 
-		      -n Ping-Failover-Before-Send -s [100] -o . -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf CommitBatchSize=10 FailBeforeSend=true
-		  </Ping-Failover-Before-Send>
-		  <Ping-Failover-After-Send>
-		      -n Ping-Failover-After-Send -s [100] -o . -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf CommitBatchSize=10 FailAfterSend=true
-		  </Ping-Failover-After-Send>
-		  <Ping-Failover-Before-Commit>
-		      -n Ping-Failover-Before-Commit -s [100] -o . -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf CommitBatchSize=10 FailBeforeCommit=true
-		  </Ping-Failover-Before-Commit>
-		  <Ping-Failover-After-Commit>
-		      -n Ping-Failover-After-Commit -s [100] -o . -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf CommitBatchSize=10 FailAfterCommit=true
-		  </Ping-Failover-After-Commit>
+                      -n Ping-Batch-Logging -s [100] -o . -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf BatchSize=10
+                  </Ping-Batch-Logging>
+                  <Ping-Failover-Before-Send> 
+                      -n Ping-Failover-Before-Send -s [100] -o . -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf CommitBatchSize=10 FailBeforeSend=true
+                  </Ping-Failover-Before-Send>
+                  <Ping-Failover-After-Send>
+                      -n Ping-Failover-After-Send -s [100] -o . -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf CommitBatchSize=10 FailAfterSend=true
+                  </Ping-Failover-After-Send>
+                  <Ping-Failover-Before-Commit>
+                      -n Ping-Failover-Before-Commit -s [100] -o . -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf CommitBatchSize=10 FailBeforeCommit=true
+                  </Ping-Failover-Before-Commit>
+                  <Ping-Failover-After-Commit>
+                      -n Ping-Failover-After-Commit -s [100] -o . -t testAsyncPingOk org.apache.qpid.ping.PingAsyncTestPerf CommitBatchSize=10 FailAfterCommit=true
+                  </Ping-Failover-After-Commit>
 
                 </commands>
               </configuration>