diff options
| author | Keith Wall <kwall@apache.org> | 2014-01-17 13:05:23 +0000 |
|---|---|---|
| committer | Keith Wall <kwall@apache.org> | 2014-01-17 13:05:23 +0000 |
| commit | ee76ebefc53d00751fa0c2a404c083dc63f516db (patch) | |
| tree | 7d80d6b2942fb5e6f779bc244bd3cc64006929f4 /qpid/java/bdbstore/systests | |
| parent | cdf9dd41327c461b5c5264566992bc4e312cc97f (diff) | |
| download | qpid-python-ee76ebefc53d00751fa0c2a404c083dc63f516db.tar.gz | |
QPID-5065: modifications to get more tests running on windows (both ant and maven).
Also
- Fixed the jca/rar pom module name, it should be qpid-ra not qpid-rar.
- Added project details such as Website, Mailing List, SCM.
Patch submitted by Andrew MacBean <andymacbean@gmail.com>
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1559096 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/bdbstore/systests')
| -rw-r--r-- | qpid/java/bdbstore/systests/pom.xml | 6 | ||||
| -rw-r--r-- | qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBBackupTest.java | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/qpid/java/bdbstore/systests/pom.xml b/qpid/java/bdbstore/systests/pom.xml index 5660b47085..9c4aaa1e21 100644 --- a/qpid/java/bdbstore/systests/pom.xml +++ b/qpid/java/bdbstore/systests/pom.xml @@ -27,10 +27,10 @@ <artifactId>qpid-bdbstore-systests</artifactId> <properties> - <broker.home.dir>target/qpid-broker/${project.version}</broker.home.dir> + <broker.home.dir>target${file.separator}qpid-broker${file.separator}${project.version}</broker.home.dir> <!-- test properties --> - <qpid.home>${basedir}/${broker.home.dir}</qpid.home> - <qpid.home.qbtc.output>${qpid.home}/qbtc-output</qpid.home.qbtc.output> + <qpid.home>${basedir}${file.separator}${broker.home.dir}</qpid.home> + <qpid.home.qbtc.output>${qpid.home}${file.separator}qbtc-output</qpid.home.qbtc.output> </properties> <dependencies> diff --git a/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBBackupTest.java b/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBBackupTest.java index 73eaf363ad..1b9fa0be9c 100644 --- a/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBBackupTest.java +++ b/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBBackupTest.java @@ -34,6 +34,7 @@ import org.apache.log4j.Logger; import org.apache.qpid.test.utils.Piper; import org.apache.qpid.test.utils.QpidBrokerTestCase; import org.apache.qpid.util.FileUtils; +import org.apache.qpid.util.SystemUtils; /** * Tests the BDB backup script can successfully perform a backup and that @@ -134,7 +135,7 @@ public class BDBBackupTest extends QpidBrokerTestCase private void invokeBdbBackup(final File backupFromDir, final File backupToDir) throws Exception { - if (IS_OS_WINDOWS) + if (SystemUtils.isWindows()) { BDBBackup.main(new String[]{"-todir", backupToDir.getAbsolutePath(), "-fromdir", backupFromDir.getAbsolutePath()}); } |