From 735d2fbd9b1cf73410363d23591d50fe34c61dc4 Mon Sep 17 00:00:00 2001
From: Robert Gemmell <robbie@apache.org>
Date: Fri, 7 Mar 2014 12:13:16 +0000
Subject: QPID-5048: get the tests running again for the perftests module

Patch submitted by Andrew MacBean <andymacbean@gmail.com>

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1575242 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/java/bdbstore/systests/pom.xml    |  4 ++++
 qpid/java/perftests/pom.xml            | 29 +++++++++++++++++++++++++++++
 qpid/java/qpid-systests-parent/pom.xml |  5 ++---
 qpid/java/systests/pom.xml             |  4 ++++
 4 files changed, 39 insertions(+), 3 deletions(-)

(limited to 'qpid/java')

diff --git a/qpid/java/bdbstore/systests/pom.xml b/qpid/java/bdbstore/systests/pom.xml
index e8620d3426..7d4913ebcd 100644
--- a/qpid/java/bdbstore/systests/pom.xml
+++ b/qpid/java/bdbstore/systests/pom.xml
@@ -67,4 +67,8 @@
     </dependency>
   </dependencies>
 
+  <build>
+    <testSourceDirectory>src/main/java</testSourceDirectory>
+  </build>
+
 </project>
diff --git a/qpid/java/perftests/pom.xml b/qpid/java/perftests/pom.xml
index 1751f3f48a..9fc1c95848 100644
--- a/qpid/java/perftests/pom.xml
+++ b/qpid/java/perftests/pom.xml
@@ -29,6 +29,10 @@
   <name>Qpid Performance Tests</name>
   <description>Performance testing configuration, code and tests</description>
 
+  <properties>
+    <test.systest.resource.directory>${basedir}/../systests</test.systest.resource.directory>
+  </properties>
+
   <dependencies>
     <!-- client deps -->
     <dependency>
@@ -86,4 +90,29 @@
     </dependency>
   </dependencies>
 
+  <build>
+    <testResources>
+      <testResource>
+        <directory>src/test/java</directory>
+        <excludes>
+          <exclude>**/*.java</exclude>
+        </excludes>
+      </testResource>
+      <testResource>
+        <directory>src/test/resources</directory>
+      </testResource>
+    </testResources>
+
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-deploy-plugin</artifactId>
+        <!--version specified in parent pluginManagement -->
+        <configuration>
+          <skip>true</skip>
+        </configuration>
+      </plugin>
+    </plugins>
+
+  </build>
 </project>
diff --git a/qpid/java/qpid-systests-parent/pom.xml b/qpid/java/qpid-systests-parent/pom.xml
index 7024bf6426..f550aff884 100644
--- a/qpid/java/qpid-systests-parent/pom.xml
+++ b/qpid/java/qpid-systests-parent/pom.xml
@@ -38,6 +38,7 @@
     <test.log4j.configuration.file>${project.basedir}${file.separator}..${file.separator}test-profiles${file.separator}log4j-test.xml</test.log4j.configuration.file>
     <test.working.directory>${basedir}/..</test.working.directory>
     <test.resource.directory>${basedir}/..</test.resource.directory>
+    <test.systest.resource.directory>${basedir}</test.systest.resource.directory>
   </properties>
 
   <dependencies>
@@ -81,8 +82,6 @@
       </resource>
     </resources>
 
-    <testSourceDirectory>src/main/java</testSourceDirectory>
-
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -128,7 +127,7 @@
               <outputDirectory>${qpid.home}</outputDirectory>
               <resources>
                 <resource>
-                  <directory>${basedir}</directory>
+                  <directory>${test.systest.resource.directory}</directory>
                   <includes>
                     <include>etc/</include>
                   </includes>
diff --git a/qpid/java/systests/pom.xml b/qpid/java/systests/pom.xml
index 319a3da5b2..070e9f9ace 100644
--- a/qpid/java/systests/pom.xml
+++ b/qpid/java/systests/pom.xml
@@ -185,4 +185,8 @@
 
   </dependencies>
 
+  <build>
+    <testSourceDirectory>src/main/java</testSourceDirectory>
+  </build>
+
 </project>
-- 
cgit v1.2.1