QPID-3402: ensure the test JVMs execute with the working dir set to the qpid/java dir, use relative paths to the broker startup script and config files, update the QBTC configuration override functionality to operate relative to QPID_HOME to avoid setting properties with spaces/parentheses into QPID_OPTS

Enables the java test profiles to cope with spaces/parentheses in the parent directory structure of the checkout, as found in the matrix project workspaces on the ASF Jenkins instances

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

13 files changed, 26 insertions, 21 deletions

diff --git a/java/test-profiles/java-bdb-spawn.0-10.testprofile b/java/test-profiles/java-bdb-spawn.0-10.testprofile
index 36bf68bdf8..cba348b67f 100644
--- a/java/test-profiles/java-bdb-spawn.0-10.testprofile
+++ b/java/test-profiles/java-bdb-spawn.0-10.testprofile
@@ -19,10 +19,10 @@
 
 broker.language=java
 broker.type=spawned
-broker.command=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE -l ${test.profiles}/log4j-test.xml
+broker.command=build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE -l test-profiles/log4j-test.xml
 broker.ready=BRK-1004
 broker.stopped=Exception
-broker.config=${project.root}/build/etc/config-systests-bdb.xml
+broker.config=build/etc/config-systests-bdb.xml
 messagestore.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStore
 profile.excludes=JavaExcludes JavaPersistentExcludes Java010Excludes JavaBDBExcludes
 broker.clean.between.tests=true
diff --git a/java/test-profiles/java-bdb-spawn.0-9-1.testprofile b/java/test-profiles/java-bdb-spawn.0-9-1.testprofile
index bf19e42b84..b04fea21b6 100644
--- a/java/test-profiles/java-bdb-spawn.0-9-1.testprofile
+++ b/java/test-profiles/java-bdb-spawn.0-9-1.testprofile
@@ -19,10 +19,10 @@
 
 broker.language=java
 broker.type=spawned
-broker.command=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES -c @CONFIG_FILE -l ${test.profiles}/log4j-test.xml
+broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES -c @CONFIG_FILE -l test-profiles/log4j-test.xml
 broker.ready=BRK-1004
 broker.stopped=Exception
-broker.config=${project.root}/build/etc/config-systests-bdb.xml
+broker.config=build/etc/config-systests-bdb.xml
 messagestore.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStore
 profile.excludes=JavaExcludes JavaPersistentExcludes JavaPre010Excludes JavaBDBExcludes
 broker.clean.between.tests=true
diff --git a/java/test-profiles/java-bdb.0-10.testprofile b/java/test-profiles/java-bdb.0-10.testprofile
index 9442624808..3ef93a68cb 100644
--- a/java/test-profiles/java-bdb.0-10.testprofile
+++ b/java/test-profiles/java-bdb.0-10.testprofile
@@ -19,10 +19,11 @@
 
 broker.language=java
 broker.type=internal
-broker.command=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE -l ${test.profiles}/log4j-test.xml
+#broker.command only used for the second broker during failover tests in this profile
+broker.command=build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE -l test-profiles/log4j-test.xml
 broker.ready=BRK-1004
 broker.stopped=Exception
-broker.config=${project.root}/build/etc/config-systests-bdb.xml
+broker.config=build/etc/config-systests-bdb.xml
 messagestore.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStore
 profile.excludes=JavaExcludes JavaPersistentExcludes Java010Excludes JavaBDBExcludes
 broker.clean.between.tests=true
diff --git a/java/test-profiles/java-bdb.0-9-1.testprofile b/java/test-profiles/java-bdb.0-9-1.testprofile
index 3f0b2855ae..101d38f4b9 100644
--- a/java/test-profiles/java-bdb.0-9-1.testprofile
+++ b/java/test-profiles/java-bdb.0-9-1.testprofile
@@ -19,10 +19,11 @@
 
 broker.language=java
 broker.type=internal
-broker.command=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES -c @CONFIG_FILE -l ${test.profiles}/log4j-test.xml
+#broker.command only used for the second broker during failover tests in this profile
+broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES -c @CONFIG_FILE -l test-profiles/log4j-test.xml
 broker.ready=BRK-1004
 broker.stopped=Exception
-broker.config=${project.root}/build/etc/config-systests-bdb.xml
+broker.config=build/etc/config-systests-bdb.xml
 messagestore.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStore
 profile.excludes=JavaExcludes JavaPersistentExcludes JavaPre010Excludes JavaBDBExcludes
 broker.clean.between.tests=true
diff --git a/java/test-profiles/java-dby-spawn.0-10.testprofile b/java/test-profiles/java-dby-spawn.0-10.testprofile
index 0dd864c63d..5bd6f330d5 100644
--- a/java/test-profiles/java-dby-spawn.0-10.testprofile
+++ b/java/test-profiles/java-dby-spawn.0-10.testprofile
@@ -19,10 +19,10 @@
 broker.language=java
 broker.version=v0_10
 broker.type=spawned
-broker.command=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE -l ${test.profiles}/log4j-test.xml
+broker.command=build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE -l test-profiles/log4j-test.xml
 broker.ready=BRK-1004
 broker.stopped=Exception
-broker.config=${project.root}/build/etc/config-systests-derby.xml
+broker.config=build/etc/config-systests-derby.xml
 messagestore.class.name=org.apache.qpid.server.store.DerbyMessageStore
 profile.excludes=JavaPersistentExcludes JavaDerbyExcludes Java010Excludes
 broker.clean.between.tests=true
diff --git a/java/test-profiles/java-dby-spawn.0-9-1.testprofile b/java/test-profiles/java-dby-spawn.0-9-1.testprofile
index 6f10437c54..e7212d30f8 100644
--- a/java/test-profiles/java-dby-spawn.0-9-1.testprofile
+++ b/java/test-profiles/java-dby-spawn.0-9-1.testprofile
@@ -19,10 +19,10 @@
 broker.version=v0_9_1
 broker.language=java
 broker.type=spawned
-broker.command=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES -c @CONFIG_FILE -l ${test.profiles}/log4j-test.xml
+broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES -c @CONFIG_FILE -l test-profiles/log4j-test.xml
 broker.ready=BRK-1004
 broker.stopped=Exception
-broker.config=${project.root}/build/etc/config-systests-derby.xml
+broker.config=build/etc/config-systests-derby.xml
 broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT
 messagestore.class.name=org.apache.qpid.server.store.DerbyMessageStore
 profile.excludes=JavaPersistentExcludes JavaDerbyExcludes JavaPre010Excludes
diff --git a/java/test-profiles/java-dby.0-10.testprofile b/java/test-profiles/java-dby.0-10.testprofile
index 3707bcd650..9c23d18f45 100644
--- a/java/test-profiles/java-dby.0-10.testprofile
+++ b/java/test-profiles/java-dby.0-10.testprofile
@@ -19,10 +19,11 @@
 broker.language=java
 broker.version=v0_10
 broker.type=internal
-broker.command=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE -l ${test.profiles}/log4j-test.xml
+#broker.command only used for the second broker during failover tests in this profile
+broker.command=build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE -l test-profiles/log4j-test.xml
 broker.ready=BRK-1004
 broker.stopped=Exception
-broker.config=${project.root}/build/etc/config-systests-derby.xml
+broker.config=build/etc/config-systests-derby.xml
 messagestore.class.name=org.apache.qpid.server.store.DerbyMessageStore
 profile.excludes=JavaPersistentExcludes JavaDerbyExcludes Java010Excludes
 broker.clean.between.tests=true
diff --git a/java/test-profiles/java-dby.0-9-1.testprofile b/java/test-profiles/java-dby.0-9-1.testprofile
index b41570f46f..83f43d8dbf 100644
--- a/java/test-profiles/java-dby.0-9-1.testprofile
+++ b/java/test-profiles/java-dby.0-9-1.testprofile
@@ -19,10 +19,11 @@
 broker.version=v0_9_1
 broker.language=java
 broker.type=internal
-broker.command=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES -c @CONFIG_FILE -l ${test.profiles}/log4j-test.xml
+#broker.command only used for the second broker during failover tests in this profile
+broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES -c @CONFIG_FILE -l test-profiles/log4j-test.xml
 broker.ready=BRK-1004
 broker.stopped=Exception
-broker.config=${project.root}/build/etc/config-systests-derby.xml
+broker.config=build/etc/config-systests-derby.xml
 broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT
 messagestore.class.name=org.apache.qpid.server.store.DerbyMessageStore
 profile.excludes=JavaPersistentExcludes JavaDerbyExcludes JavaPre010Excludes
diff --git a/java/test-profiles/java-mms-spawn.0-10.testprofile b/java/test-profiles/java-mms-spawn.0-10.testprofile
index 94413c9a40..5e5d2e8a6b 100644
--- a/java/test-profiles/java-mms-spawn.0-10.testprofile
+++ b/java/test-profiles/java-mms-spawn.0-10.testprofile
@@ -19,7 +19,7 @@
 broker.version=v0_10
 broker.language=java
 broker.type=spawned
-broker.command=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE -l ${test.profiles}/log4j-test.xml
+broker.command=build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE -l test-profiles/log4j-test.xml
 broker.ready=BRK-1004
 broker.stopped=Exception
 #
diff --git a/java/test-profiles/java-mms-spawn.0-9-1.testprofile b/java/test-profiles/java-mms-spawn.0-9-1.testprofile
index efb871acfe..05b1f89452 100644
--- a/java/test-profiles/java-mms-spawn.0-9-1.testprofile
+++ b/java/test-profiles/java-mms-spawn.0-9-1.testprofile
@@ -19,7 +19,7 @@
 broker.version=v0_9_1
 broker.language=java
 broker.type=spawned
-broker.command=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES -c @CONFIG_FILE -l ${test.profiles}/log4j-test.xml
+broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES -c @CONFIG_FILE -l test-profiles/log4j-test.xml
 broker.ready=BRK-1004
 broker.stopped=Exception
 broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT
diff --git a/java/test-profiles/java-mms.0-10.testprofile b/java/test-profiles/java-mms.0-10.testprofile
index fd72bf42f3..209d384422 100644
--- a/java/test-profiles/java-mms.0-10.testprofile
+++ b/java/test-profiles/java-mms.0-10.testprofile
@@ -19,7 +19,8 @@
 broker.language=java
 broker.version=v0_10
 broker.type=internal
-broker.command=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE -l ${test.profiles}/log4j-test.xml
+#broker.command only used for the second broker during failover tests in this profile
+broker.command=build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE -l test-profiles/log4j-test.xml
 broker.ready=BRK-1004
 broker.stopped=Exception
 
diff --git a/java/test-profiles/java-mms.0-9-1.testprofile b/java/test-profiles/java-mms.0-9-1.testprofile
index bc2690b32b..37efa097bb 100644
--- a/java/test-profiles/java-mms.0-9-1.testprofile
+++ b/java/test-profiles/java-mms.0-9-1.testprofile
@@ -20,7 +20,7 @@ broker.language=java
 broker.version=v0_9_1
 broker.type=internal
 #broker.command only used for the second broker during failover tests in this profile
-broker.command=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES -c @CONFIG_FILE -l ${test.profiles}/log4j-test.xml
+broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES -c @CONFIG_FILE -l test-profiles/log4j-test.xml
 broker.ready=BRK-1004
 broker.stopped=Exception
 broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT
diff --git a/java/test-profiles/testprofile.defaults b/java/test-profiles/testprofile.defaults
index 4f2313e277..bd2faa7915 100644
--- a/java/test-profiles/testprofile.defaults
+++ b/java/test-profiles/testprofile.defaults
@@ -20,7 +20,7 @@ java.naming.factory.initial=org.apache.qpid.jndi.PropertiesFileInitialContextFac
 java.naming.provider.url=${test.profiles}/test-provider.properties
 
 broker.ready=Listening on TCP
-broker.config=${project.root}/build/etc/config-systests.xml
+broker.config=build/etc/config-systests.xml
 messagestore.class.name=org.apache.qpid.server.store.MemoryMessageStore
 broker.protocol.excludes=
 broker.persistent=false