You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2012/12/27 18:39:54 UTC
svn commit: r1426267 - in
/qpid/branches/java-broker-config-qpid-4390/qpid/java: ./ bdbstore/
bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/
bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/
Author: orudyy
Date: Thu Dec 27 17:39:54 2012
New Revision: 1426267
URL: http://svn.apache.org/viewvc?rev=1426267&view=rev
Log:
QPID-4390: Enhance build process to include resources into build artefacts
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/bdbstore/build.xml
qpid/branches/java-broker-config-qpid-4390/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/AbstractUpgradeTestCase.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/module.xml
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/bdbstore/build.xml
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/bdbstore/build.xml?rev=1426267&r1=1426266&r2=1426267&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/bdbstore/build.xml (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/bdbstore/build.xml Thu Dec 27 17:39:54 2012
@@ -78,19 +78,4 @@ http://www.oracle.com/technetwork/databa
<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>
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java?rev=1426267&r1=1426266&r2=1426267&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java Thu Dec 27 17:39:54 2012
@@ -31,6 +31,7 @@ import static org.apache.qpid.server.sto
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 Qpid
{
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");
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/AbstractUpgradeTestCase.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/AbstractUpgradeTestCase.java?rev=1426267&r1=1426266&r2=1426267&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/AbstractUpgradeTestCase.java (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/upgrade/AbstractUpgradeTestCase.java Thu Dec 27 17:39:54 2012
@@ -27,6 +27,7 @@ import static org.apache.qpid.server.sto
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 AbstractUpgradeTes
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;
}
Modified: qpid/branches/java-broker-config-qpid-4390/qpid/java/module.xml
URL: http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/module.xml?rev=1426267&r1=1426266&r2=1426267&view=diff
==============================================================================
--- qpid/branches/java-broker-config-qpid-4390/qpid/java/module.xml (original)
+++ qpid/branches/java-broker-config-qpid-4390/qpid/java/module.xml Thu Dec 27 17:39:54 2012
@@ -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">
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org