QPID-4390: Enhance build process to include resources into build artefacts

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/java-broker-config-qpid-4390@1426267 13f79535-47bb-0310-9956-ffa450edef68

4 files changed, 43 insertions, 39 deletions

diff --git a/qpid/java/bdbstore/build.xml b/qpid/java/bdbstore/build.xml
index 8f3123193a..46809f6a90 100644
--- a/qpid/java/bdbstore/build.xml
+++ b/qpid/java/bdbstore/build.xml
@@ -78,19 +78,4 @@ http://www.oracle.com/technetwork/database/berkeleydb/downloads/jeoslicense-0868
 
     <target name="build" depends="check-request-props, bdb-jar-required, module.build" />
 
-    <target name="postbuild" depends="copy-store-to-upgrade" />
-
-    <target name="copy-store-to-upgrade" description="copy the upgrade tool resource folder contents into the build tree">
-      <copy todir="${qpid.home}" failonerror="true">
-        <fileset dir="src/test/resources/upgrade"/>
-      </copy>
-    </target>
-
-    <target name="precompile-tests">
-        <mkdir dir="${module.test.resources}"/>
-        <copy todir="${module.test.resources}">
-            <fileset dir="src/test/resources"/>
-        </copy>
-    </target>
-
 </project>
diff --git a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java
index 3c0f72c302..c7d3c4072c 100644
--- a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java
+++ b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java
@@ -31,6 +31,7 @@ import static org.apache.qpid.server.store.berkeleydb.BDBStoreUpgradeTestPrepare
 import static org.apache.qpid.server.store.berkeleydb.BDBStoreUpgradeTestPreparer.TOPIC_NAME;
 
 import java.io.File;
+import java.io.InputStream;
 
 import javax.jms.Connection;
 import javax.jms.DeliveryMode;
@@ -84,10 +85,11 @@ public class BDBUpgradeTest extends QpidBrokerTestCase
         {
             FileUtils.delete(directory, true);
         }
+        directory.mkdirs();
 
         // copy store files
-        String src = getClass().getClassLoader().getResource("upgrade/bdbstore-v4/test-store").toURI().getPath();
-        FileUtils.copyRecursive(new File(src), new File(_storeLocation));
+        InputStream src = getClass().getClassLoader().getResourceAsStream("upgrade/bdbstore-v4/test-store/00000000.jdb");
+        FileUtils.copy(src, new File(_storeLocation, "00000000.jdb"));
 
         //override the broker config used and then start the broker with the updated store
         _configFile = new File("build/etc/config-systests-bdb.xml");
diff --git a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/AbstractUpgradeTestCase.java b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/AbstractUpgradeTestCase.java
index a9995d8267..b2b28b3c2d 100644
--- a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/AbstractUpgradeTestCase.java
+++ b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/AbstractUpgradeTestCase.java
@@ -27,6 +27,7 @@ import static org.apache.qpid.server.store.berkeleydb.BDBStoreUpgradeTestPrepare
 import static org.apache.qpid.server.store.berkeleydb.BDBStoreUpgradeTestPreparer.QUEUE_WITH_DLQ_NAME;
 
 import java.io.File;
+import java.io.InputStream;
 
 import org.apache.qpid.server.logging.LogSubject;
 import org.apache.qpid.server.logging.subjects.TestBlankSubject;
@@ -111,10 +112,24 @@ public abstract class AbstractUpgradeTestCase extends QpidTestCase
 
     private File copyStore(String storeDirectoryName) throws Exception
     {
-        String src = getClass().getClassLoader().getResource("upgrade/" + storeDirectoryName).toURI().getPath();
         File storeLocation = new File(new File(TMP_FOLDER), "test-store");
         deleteDirectoryIfExists(storeLocation);
-        FileUtils.copyRecursive(new File(src), new File(TMP_FOLDER));
+        storeLocation.mkdirs();
+        int index = 0;
+        String prefix = "0000000";
+        String extension = ".jdb";
+        InputStream is = null;
+        do
+        {
+            String fileName = prefix + index + extension;
+            is = getClass().getClassLoader().getResourceAsStream("upgrade/" + storeDirectoryName + "/test-store/" + fileName);
+            if (is != null)
+            {
+                FileUtils.copy(is, new File(storeLocation, fileName));
+            }
+            index++;
+        }
+        while (is != null);
         return storeLocation;
     }
 
diff --git a/qpid/java/module.xml b/qpid/java/module.xml
index 68b7172f8d..7daf38417c 100644
--- a/qpid/java/module.xml
+++ b/qpid/java/module.xml
@@ -48,16 +48,15 @@
   <property name="module.api"          location="${build.api}/${module}/"/>
   <property name="module.test.api"     location="${build.test.api}/${module}"/>
   <property name="module.test.classes" location="${module.build}/test/classes"/>
-  <property name="module.test.metainf" location="${module.build}/test/META-INF"/>
-  <property name="module.test.resources" location="${module.build}/test/resources"/>
-  <property name="module.test.resources.metainf" location="src/test/resources/META-INF"/>
+  <property name="module.test.resources" location="src/test/resources"/>
   <property name="module.results"      location="${build.results}/${module}"/>
   <property name="module.failed"       location="${module.results}/FAILED"/>
   <property name="module.src"          location="src/main/java"/>
   <property name="module.test.src"     location="src/test/java"/>
   <property name="module.bin"          location="bin"/>
   <property name="module.etc"          location="etc"/>
-  <property name="module.src.resources.metainf" location="src/main/resources/META-INF"/>
+  <property name="module.src.resources" location="src/main/resources"/>
+  <property name="module.src.resources.metainf" location="${module.src.resources}/META-INF"/>
   <property name="module.metainf" location="${module.build}/META-INF"/>
 
   <property name="module.namever"      value="${project.name}-${module.name}-${project.version}"/>
@@ -87,6 +86,8 @@
   <available property="module.test.src.exists" file="${module.test.src}"/>
   <available property="module.etc.exists" file="${module.etc}"/>
   <available property="module.bin.exists" file="${module.bin}"/>
+  <available property="module.src.resources.exists" file="${module.src.resources}"/>
+  <available property="module.test.src.resources.exists" file="${module.test.resources}"/>
   <available property="module.src.resources.metainf.exists" file="${module.src.resources.metainf}"/>
 
   <property name="module.source.jar"
@@ -197,7 +198,6 @@
     <path refid="module.runtime.class.path"/>
     <pathelement path="${module.test.depends.jars.path}"/>
     <path refid="module.test.libs"/>
-    <pathelement path="${module.test.resources}"/>
   </path>
 
   <!-- used to run the tests -->
@@ -206,7 +206,6 @@
     <path refid="module.runtime.class.path"/>
     <pathelement path="${module.test.depends.jars.path}"/>
     <path refid="module.test.libs"/>
-    <pathelement path="${module.test.resources}"/>
   </path>
 
   <property name="javac.deprecation" value="off"/>
@@ -329,10 +328,12 @@
     </copy>
   </target>
 
-  <target name="precompile-tests" if="module.test.src.exists">
-      <mkdir dir="${module.test.resources}"/>
-      <copy todir="${module.test.resources}" failonerror="false">
-          <fileset dir="src/test/resources"/>
+  <target name="precompile-tests" if="module.test.src.exists"/>
+
+  <target name="copy-test-resources" if="module.test.src.resources.exists">
+      <echo message="Copying test resources from ${module.test.resources} to ${module.test.classes}..."/>
+      <copy todir="${module.test.classes}" failonerror="true">
+        <fileset dir="${module.test.resources}"/>
       </copy>
   </target>
 
@@ -503,13 +504,13 @@
 
   <target name="build" depends="jar,jar-tests,jar-sources,libs,copy-bin,copy-etc,postbuild,copy-broker-plugin-jars" description="compile and copy resources into build tree"/>
 
-  <target name="jar.manifest" depends="compile, copy-module-metainf" if="module.manifest">
+  <target name="jar.manifest" depends="compile, copy-resources, copy-module-metainf" if="module.manifest">
     <jar destfile="${module.jar}" basedir="${module.classes}" manifest="${module.manifest}">
        <metainf dir="${module.metainf}" />
     </jar>
   </target>
 
-  <target name="jar.nomanifest" depends="compile, copy-module-metainf" unless="module.manifest">
+  <target name="jar.nomanifest" depends="compile, copy-resources, copy-module-metainf" unless="module.manifest">
     <jar destfile="${module.jar}" basedir="${module.classes}">
        <metainf dir="${module.metainf}" />
     </jar>
@@ -525,6 +526,13 @@
     </copy>
   </target>
 
+  <target name="copy-resources" if="module.src.resources.exists">
+      <echo message="Copying resources from ${module.src.resources} to ${module.classes}..."/>
+      <copy todir="${module.classes}" failonerror="true">
+        <fileset dir="${module.src.resources}" excludes="META-INF/**"/>
+      </copy>
+  </target>
+
   <target name="copy-metainf-resources">
     <copy todir="${module.metainf}" failonerror="true">
         <fileset dir="${project.root}/resources/"/>
@@ -536,14 +544,8 @@
 
   <target name="jar" depends="jar.manifest,jar.nomanifest" description="create jar"/>
 
-  <target name="jar-tests" depends="compile-tests" description="create unit test jar">
-    <mkdir dir="${module.test.metainf}"/>
-    <copy todir="${module.test.metainf}" failonerror="false">
-      <fileset dir="${module.test.resources.metainf}"/>
-    </copy>
-    <jar destfile="${module.test.jar}" basedir="${module.test.classes}">
-      <metainf dir="${module.test.metainf}" />
-    </jar>
+  <target name="jar-tests" depends="compile-tests, copy-test-resources" description="create unit test jar">
+    <jar destfile="${module.test.jar}" basedir="${module.test.classes}"/>
   </target>
 
   <target name="jar-sources" depends="prepare" description="create sources jar">