moved test profiles and related resources into test-profiles subdirectory

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

35 files changed, 38 insertions, 37 deletions

diff --git a/java/common.xml b/java/common.xml
index 874f48a69d..fdac37f846 100644
--- a/java/common.xml
+++ b/java/common.xml
@@ -27,6 +27,7 @@
   <property name="project.namever"       value="${project.name}-${project.version}"/>
 
   <property name="resources"             location="${project.root}/resources"/>
+  <property name="test.profiles"         location="${project.root}/test-profiles"/>
   <property name="build"                 location="${project.root}/build"/>
   <property name="build.scratch"         location="${build}/scratch"/>
   <property name="build.bin"             location="${build}/bin"/>
diff --git a/java/cpp.ssl.testprofile b/java/cpp.ssl.testprofile
deleted file mode 100644
index 6812ebfae4..0000000000
--- a/java/cpp.ssl.testprofile
+++ /dev/null
@@ -1,12 +0,0 @@
-broker.version=0-10
-broker=${project.root}/../cpp/src/qpidd -p @PORT --load-module ${project.root}/../cpp/src/.libs/ssl.so --ssl-cert-name localhost.localdomain --ssl-cert-password-file ${project.root}/test_resources/ssl/pfile --ssl-cert-db ${project.root}/test_resources/ssl/server_db/ --ssl-require-client-authentication --data-dir ${build.data}/@PORT -t --auth no
-test.excludesfile=${project.root}/ExcludeList ${project.root}/010ExcludeList ${project.root}/010ExcludeList-ssl
-test.excludeslist=org.apache.qpid.test.client.failover.FailoverTest#*
-profile.use_ssl=true
-broker.ready= Listening for SSL connections
-
-javax.net.ssl.keyStore=${project.root}/test_resources/ssl/keystore.jks
-javax.net.ssl.keyStorePassword=password
-javax.net.ssl.trustStore=${project.root}/test_resources/ssl/certstore.jks
-javax.net.ssl.trustStorePassword=password
-
diff --git a/java/default-longrunning.testprofile b/java/default-longrunning.testprofile
deleted file mode 100644
index 155e78ad0a..0000000000
--- a/java/default-longrunning.testprofile
+++ /dev/null
@@ -1 +0,0 @@
-test.includesfile=${project.root}/08LongRunningList
diff --git a/java/java-derby.testprofile b/java/java-derby.testprofile
deleted file mode 100644
index bb0dbf3663..0000000000
--- a/java/java-derby.testprofile
+++ /dev/null
@@ -1,7 +0,0 @@
-broker.language=java
-broker=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE -l ${project.root}/log4j-test.xml
-broker.clean=${project.root}/clean-dir ${build.data} ${project.root}/build/work/derbyDB 
-broker.ready=Qpid Broker Ready
-broker.config=${project.root}/build/etc/config-systests-derby.xml
-
-test.excludesfile=${project.root}/ExcludeList ${project.root}/XAExcludeList ${project.root}/08ExcludeList-nonvm 
diff --git a/java/java.testprofile b/java/java.testprofile
deleted file mode 100644
index 9bf824d4cd..0000000000
--- a/java/java.testprofile
+++ /dev/null
@@ -1,6 +0,0 @@
-broker.language=java
-broker=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE -l ${project.root}/log4j-test.xml
-broker.clean=${project.root}/clean-dir ${build.data} ${project.root}/build/work/derbyDB 
-broker.ready=Qpid Broker Ready
-
-test.excludesfile=${project.root}/ExcludeList ${project.root}/XAExcludeList ${project.root}/08ExcludeList-nonvm ${project.root}/08ExcludeList-nopersistence
diff --git a/java/module.xml b/java/module.xml
index edfa217781..f87b841f8e 100644
--- a/java/module.xml
+++ b/java/module.xml
@@ -224,13 +224,13 @@
   <condition property="config" value="${profile}.testprofile" else="default.testprofile">
     <and>
       <isset property="profile"/>
-      <available file="${project.root}/${profile}.testprofile" type="file"/>
+      <available file="${test.profiles}/${profile}.testprofile" type="file"/>
     </and>
   </condition>
 
 
-  <property file="${project.root}/${config}"/>
-  <property file="${project.root}/default.testprofile"/>
+  <property file="${test.profiles}/${config}"/>
+  <property file="${test.profiles}/default.testprofile"/>
 
   <condition property="dontruntest" value="dontruntest" else="runtest">
          <contains substring="${module.name}" string="${exclude.modules}" />
diff --git a/java/010ExcludeList b/java/test-profiles/010ExcludeList
index ca12a4f8a5..ca12a4f8a5 100644
--- a/java/010ExcludeList
+++ b/java/test-profiles/010ExcludeList
diff --git a/java/010ExcludeList-noPrefetch b/java/test-profiles/010ExcludeList-noPrefetch
index dca931b55b..dca931b55b 100644
--- a/java/010ExcludeList-noPrefetch
+++ b/java/test-profiles/010ExcludeList-noPrefetch
diff --git a/java/010ExcludeList-ssl b/java/test-profiles/010ExcludeList-ssl
index bf21ab9cc7..bf21ab9cc7 100644
--- a/java/010ExcludeList-ssl
+++ b/java/test-profiles/010ExcludeList-ssl
diff --git a/java/010ExcludeList-store b/java/test-profiles/010ExcludeList-store
index d4bc8b7b71..d4bc8b7b71 100644
--- a/java/010ExcludeList-store
+++ b/java/test-profiles/010ExcludeList-store
diff --git a/java/08ExcludeList b/java/test-profiles/08ExcludeList
index 0866694854..0866694854 100644
--- a/java/08ExcludeList
+++ b/java/test-profiles/08ExcludeList
diff --git a/java/08ExcludeList-nonvm b/java/test-profiles/08ExcludeList-nonvm
index aaec56d7b8..e697201bfd 100644
--- a/java/08ExcludeList-nonvm
+++ b/java/test-profiles/08ExcludeList-nonvm
@@ -39,3 +39,4 @@ org.apache.qpid.server.persistent.NoLocalAfterRecoveryTest#*
 // QPID-1823: this takes ages to run
 org.apache.qpid.client.SessionCreateTest#*
 
+org.apache.qpid.test.client.RollbackOrderTest#*
diff --git a/java/08ExcludeList-nopersistence b/java/test-profiles/08ExcludeList-nopersistence
index f81e9c213c..f81e9c213c 100644
--- a/java/08ExcludeList-nopersistence
+++ b/java/test-profiles/08ExcludeList-nopersistence
diff --git a/java/ExcludeList b/java/test-profiles/ExcludeList
index a3a61b51db..a3a61b51db 100644
--- a/java/ExcludeList
+++ b/java/test-profiles/ExcludeList
diff --git a/java/XAExcludeList b/java/test-profiles/XAExcludeList
index 1bb26c5f27..1bb26c5f27 100644
--- a/java/XAExcludeList
+++ b/java/test-profiles/XAExcludeList
diff --git a/java/clean-dir b/java/test-profiles/clean-dir
index 4d6141b4ab..4d6141b4ab 100755
--- a/java/clean-dir
+++ b/java/test-profiles/clean-dir
diff --git a/java/cpp.async.testprofile b/java/test-profiles/cpp.async.testprofile
index 746ef2c0ef..1c467a0b79 100644
--- a/java/cpp.async.testprofile
+++ b/java/test-profiles/cpp.async.testprofile
@@ -1,3 +1,3 @@
 broker.version=0-10
 broker=${project.root}/../cpp/src/qpidd -p @PORT --data-dir ${build.data}/@PORT -t --load-module ${project.root}/../../cppStore/cpp/lib/.libs/msgstore.so --auth no
-test.excludesfile=${project.root}/ExcludeList ${project.root}/010ExcludeList-store
+test.excludesfile=${test.profiles}/ExcludeList ${test.profiles}/010ExcludeList-store
diff --git a/java/cpp.cluster.testprofile b/java/test-profiles/cpp.cluster.testprofile
index 765eb714f3..8e8e48e777 100644
--- a/java/cpp.cluster.testprofile
+++ b/java/test-profiles/cpp.cluster.testprofile
@@ -1,6 +1,6 @@
 broker.version=0-10
 broker=${project.root}/../cpp/src/qpidd --load-module ${project.root}/../cpp/src/.libs/cluster.so --cluster-name cpp-java-test-cluster -p @PORT --data-dir ${build.data}/@PORT -t --auth no
-test.excludesfile=${project.root}/ExcludeList ${project.root}/XAExcludeList ${project.root}/010ExcludeList
+test.excludesfile=${test.profiles}/ExcludeList ${test.profiles}/XAExcludeList ${test.profiles}/010ExcludeList
 
 profile.clustered=true
 profile.failoverMsgCount=10
diff --git a/java/cpp.noprefetch.testprofile b/java/test-profiles/cpp.noprefetch.testprofile
index e502f3c950..d4cac445da 100644
--- a/java/cpp.noprefetch.testprofile
+++ b/java/test-profiles/cpp.noprefetch.testprofile
@@ -1,4 +1,4 @@
 broker.version=0-10
 broker=${project.root}/../cpp/src/qpidd -p @PORT --data-dir ${build.data}/@PORT -t --load-module ${project.root}/../../cppStore/cpp/lib/.libs/msgstore.so --auth no
-test.excludesfile=${project.root}/ExcludeList ${project.root}/010ExcludeList-noPrefetch
+test.excludesfile=${test.profiles}/ExcludeList ${test.profiles}/010ExcludeList-noPrefetch
 max_prefetch=0
diff --git a/java/test-profiles/cpp.ssl.testprofile b/java/test-profiles/cpp.ssl.testprofile
new file mode 100644
index 0000000000..9d54f03569
--- /dev/null
+++ b/java/test-profiles/cpp.ssl.testprofile
@@ -0,0 +1,11 @@
+broker.version=0-10
+broker=${project.root}/../cpp/src/qpidd -p @PORT --load-module ${project.root}/../cpp/src/.libs/ssl.so --ssl-cert-name localhost.localdomain --ssl-cert-password-file ${test.profiles}/test_resources/ssl/pfile --ssl-cert-db ${test.profiles}/test_resources/ssl/server_db/ --ssl-require-client-authentication --data-dir ${build.data}/@PORT -t --auth no
+test.excludesfile=${test.profiles}/ExcludeList ${test.profiles}/010ExcludeList ${test.profiles}/010ExcludeList-ssl
+test.excludeslist=org.apache.qpid.test.client.failover.FailoverTest#*
+profile.use_ssl=true
+broker.ready= Listening for SSL connections
+
+javax.net.ssl.keyStore=${test.profiles}/test_resources/ssl/keystore.jks
+javax.net.ssl.keyStorePassword=password
+javax.net.ssl.trustStore=${test.profiles}/test_resources/ssl/certstore.jks
+javax.net.ssl.trustStorePassword=password
diff --git a/java/cpp.testprofile b/java/test-profiles/cpp.testprofile
index af2d0f58e4..a09c097cb7 100644
--- a/java/cpp.testprofile
+++ b/java/test-profiles/cpp.testprofile
@@ -1,3 +1,3 @@
 broker.version=0-10
 broker=${project.root}/../cpp/src/qpidd -p @PORT --data-dir ${build.data}/@PORT -t --auth no
-test.excludesfile=${project.root}/ExcludeList ${project.root}/010ExcludeList
+test.excludesfile=${test.profiles}/ExcludeList ${test.profiles}/010ExcludeList
diff --git a/java/test-profiles/default-longrunning.testprofile b/java/test-profiles/default-longrunning.testprofile
new file mode 100644
index 0000000000..bf24e4f9da
--- /dev/null
+++ b/java/test-profiles/default-longrunning.testprofile
@@ -0,0 +1 @@
+test.includesfile=${test.profiles}/08LongRunningList
diff --git a/java/default.testprofile b/java/test-profiles/default.testprofile
index acbc31dcbe..58e9f90198 100644
--- a/java/default.testprofile
+++ b/java/test-profiles/default.testprofile
@@ -1,9 +1,9 @@
 java.naming.factory.initial=org.apache.qpid.jndi.PropertiesFileInitialContextFactory
-java.naming.provider.url=${project.root}/test-provider.properties
+java.naming.provider.url=${test.profiles}/test-provider.properties
 
 broker.version=0-8
 broker=vm
-broker.clean=${project.root}/clean-dir ${build.data} ${project.root}/build/work/derbyDB
+broker.clean=${test.profiles}/clean-dir ${build.data} ${project.root}/build/work/derbyDB
 broker.ready=Listening on TCP port
 broker.config=${project.root}/build/etc/config-systests.xml
 
@@ -13,11 +13,11 @@ log=debug
 amqj.logging.level=${log}
 amqj.protocol.logging.level=${log}
 root.logging.level=warn
-log4j.configuration=file:///${project.root}/log4j-test.xml
+log4j.configuration=file:///${test.profiles}/log4j-test.xml
 log4j.debug=false
 
 test.excludes=true
-test.excludesfile=${project.root}/ExcludeList ${project.root}/XAExcludeList ${project.root}/08ExcludeList ${project.root}/08ExcludeList-nopersistence
+test.excludesfile=${test.profiles}/ExcludeList ${test.profiles}/XAExcludeList ${test.profiles}/08ExcludeList ${test.profiles}/08ExcludeList-nopersistence
 test.fork=no
 test.mem=512M
 test=*Test
diff --git a/java/test-profiles/java-derby.testprofile b/java/test-profiles/java-derby.testprofile
new file mode 100644
index 0000000000..1786e96712
--- /dev/null
+++ b/java/test-profiles/java-derby.testprofile
@@ -0,0 +1,7 @@
+broker.language=java
+broker=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE -l ${test.profiles}/log4j-test.xml
+broker.clean=${test.profiles}/clean-dir ${build.data} ${project.root}/build/work/derbyDB
+broker.ready=Qpid Broker Ready
+broker.config=${project.root}/build/etc/config-systests-derby.xml
+
+test.excludesfile=${test.profiles}/ExcludeList ${test.profiles}/XAExcludeList ${test.profiles}/08ExcludeList-nonvm 
diff --git a/java/test-profiles/java.testprofile b/java/test-profiles/java.testprofile
new file mode 100644
index 0000000000..d1e4c12bc1
--- /dev/null
+++ b/java/test-profiles/java.testprofile
@@ -0,0 +1,6 @@
+broker.language=java
+broker=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE -l ${test.profiles}/log4j-test.xml
+broker.clean=${test.profiles}/clean-dir ${build.data} ${project.root}/build/work/derbyDB
+broker.ready=Qpid Broker Ready
+
+test.excludesfile=${test.profiles}/ExcludeList ${test.profiles}/XAExcludeList ${test.profiles}/08ExcludeList-nonvm ${test.profiles}/08ExcludeList-nopersistence
diff --git a/java/log4j-test.xml b/java/test-profiles/log4j-test.xml
index 0aaa7d8686..0aaa7d8686 100644
--- a/java/log4j-test.xml
+++ b/java/test-profiles/log4j-test.xml
diff --git a/java/test-provider.properties b/java/test-profiles/test-provider.properties
index 2479b5a5f0..2479b5a5f0 100644
--- a/java/test-provider.properties
+++ b/java/test-profiles/test-provider.properties
diff --git a/java/test_resources/ssl/certstore.jks b/java/test-profiles/test_resources/ssl/certstore.jks
index 57460491fe..57460491fe 100644
--- a/java/test_resources/ssl/certstore.jks
+++ b/java/test-profiles/test_resources/ssl/certstore.jks
diff --git a/java/test_resources/ssl/keystore.jks b/java/test-profiles/test_resources/ssl/keystore.jks
index 8e033ec932..8e033ec932 100644
--- a/java/test_resources/ssl/keystore.jks
+++ b/java/test-profiles/test_resources/ssl/keystore.jks
diff --git a/java/test_resources/ssl/pfile b/java/test-profiles/test_resources/ssl/pfile
index f3097ab130..f3097ab130 100644
--- a/java/test_resources/ssl/pfile
+++ b/java/test-profiles/test_resources/ssl/pfile
diff --git a/java/test_resources/ssl/server_db/cert8.db b/java/test-profiles/test_resources/ssl/server_db/cert8.db
index 3063a1fef3..3063a1fef3 100644
--- a/java/test_resources/ssl/server_db/cert8.db
+++ b/java/test-profiles/test_resources/ssl/server_db/cert8.db
diff --git a/java/test_resources/ssl/server_db/key3.db b/java/test-profiles/test_resources/ssl/server_db/key3.db
index be86b4af4b..be86b4af4b 100644
--- a/java/test_resources/ssl/server_db/key3.db
+++ b/java/test-profiles/test_resources/ssl/server_db/key3.db
diff --git a/java/test_resources/ssl/server_db/secmod.db b/java/test-profiles/test_resources/ssl/server_db/secmod.db
index 9c71db0abe..9c71db0abe 100644
--- a/java/test_resources/ssl/server_db/secmod.db
+++ b/java/test-profiles/test_resources/ssl/server_db/secmod.db
diff --git a/java/test_resources/ssl/server_db/server.crt b/java/test-profiles/test_resources/ssl/server_db/server.crt
index eb9323ff34..eb9323ff34 100644
--- a/java/test_resources/ssl/server_db/server.crt
+++ b/java/test-profiles/test_resources/ssl/server_db/server.crt
diff --git a/java/test_resources/ssl/server_db/server.req b/java/test-profiles/test_resources/ssl/server_db/server.req
index a5a3fb2e35..a5a3fb2e35 100644
--- a/java/test_resources/ssl/server_db/server.req
+++ b/java/test-profiles/test_resources/ssl/server_db/server.req