Repository: qpid-broker-j
Updated Branches:
  refs/heads/master c82574b9a -> 54bc670f0


QPID-8158: [Broker-J] [System Tests] Clean-up maven building scripts


Project: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/commit/54bc670f
Tree: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/tree/54bc670f
Diff: http://git-wip-us.apache.org/repos/asf/qpid-broker-j/diff/54bc670f

Branch: refs/heads/master
Commit: 54bc670f0dfa01980f823dbe009f70d1c15b0bd7
Parents: c82574b
Author: Alex Rudyy <oru...@apache.org>
Authored: Thu Apr 12 16:08:33 2018 +0100
Committer: Alex Rudyy <oru...@apache.org>
Committed: Thu Apr 12 16:08:33 2018 +0100

----------------------------------------------------------------------
 bdbstore/systests/pom.xml                       |  53 -------
 broker-plugins/amqp-0-8-protocol/pom.xml        |   4 -
 broker-plugins/logging-logback/pom.xml          |   4 -
 pom.xml                                         | 149 +------------------
 qpid-perftests-systests/pom.xml                 |   4 -
 .../systest/disttest/endtoend/EndToEndTest.java |  27 +++-
 qpid-systests-parent/pom.xml                    |  11 --
 test-profiles/CPPExcludes                       | 112 --------------
 test-profiles/CPPNoPrefetchExcludes             |  19 ---
 test-profiles/CPPPrefetchExcludes               |  22 ---
 test-profiles/CPPTransientExcludes              |  19 ---
 test-profiles/Excludes                          |  18 ---
 test-profiles/ExternalBrokerTests               |  19 ---
 test-profiles/IBMJDKExcludes                    |  19 ---
 test-profiles/Java010Excludes                   |  30 ----
 test-profiles/Java10BrokenTestsExcludes         |  25 ----
 test-profiles/Java10Excludes                    |  31 ----
 test-profiles/Java10UninvestigatedTestsExcludes |  26 ----
 test-profiles/JavaBDBExcludes                   |  19 ---
 test-profiles/JavaDerbyExcludes                 |  23 ---
 test-profiles/JavaExcludes                      |  21 ---
 test-profiles/JavaJsonExcludes                  |  21 ---
 test-profiles/JavaPersistentExcludes            |  19 ---
 test-profiles/JavaPre010Excludes                |  37 -----
 test-profiles/JavaTransientExcludes             |  24 ---
 test-profiles/cpp.async.excludes                |  19 ---
 test-profiles/cpp.excludes                      |  27 ----
 test-profiles/cpp.ssl.excludes                  |  20 ---
 28 files changed, 21 insertions(+), 801 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/54bc670f/bdbstore/systests/pom.xml
----------------------------------------------------------------------
diff --git a/bdbstore/systests/pom.xml b/bdbstore/systests/pom.xml
index 4c52564..9a7c050 100644
--- a/bdbstore/systests/pom.xml
+++ b/bdbstore/systests/pom.xml
@@ -29,12 +29,6 @@
   <name>Apache Qpid Broker-J BDB Store System Tests</name>
   <description>BDB message store system tests</description>
 
-  <properties>
-    <test.working.directory>${basedir}/../..</test.working.directory>
-    <test.resource.directory>${basedir}/../..</test.resource.directory>
-    
<test.systest.resource.directory>${basedir}/../../systests</test.systest.resource.directory>
-  </properties>
-
   <dependencies>
 
     <dependency>
@@ -98,53 +92,6 @@
           </systemPropertyVariables>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-resources-plugin</artifactId>
-        <!--version specified in parent pluginManagement -->
-        <executions>
-          <!-- copy the bdbstore bin contents to where the tests expect them 
-->
-          <execution>
-            <id>copy-bdbstore-bin-resources</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>copy-resources</goal>
-            </goals>
-            <configuration>
-              <outputDirectory>${qpid.home}</outputDirectory>
-              <resources>
-                <resource>
-                  <directory>${basedir}/..</directory>
-                  <includes>
-                    <include>bin/</include>
-                  </includes>
-                </resource>
-              </resources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>
-      <plugin>
-      <groupId>org.apache.maven.plugins</groupId>
-      <artifactId>maven-antrun-plugin</artifactId>
-        <executions>
-          <!-- fix the fact that the maven-resources-plugin copy-resources 
doesn't maintain file permissions in unix -->
-          <execution>
-            <id>fix-bdb-script-permissions</id>
-            <phase>package</phase>
-            <configuration>
-              <target>
-                <chmod perm="755">
-                  <fileset dir="${qpid.home}">
-                    <include name="bin/**" />
-                  </fileset>
-                </chmod>
-              </target>
-            </configuration>
-            <goals><goal>run</goal></goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
 

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/54bc670f/broker-plugins/amqp-0-8-protocol/pom.xml
----------------------------------------------------------------------
diff --git a/broker-plugins/amqp-0-8-protocol/pom.xml 
b/broker-plugins/amqp-0-8-protocol/pom.xml
index b392064..335068e 100644
--- a/broker-plugins/amqp-0-8-protocol/pom.xml
+++ b/broker-plugins/amqp-0-8-protocol/pom.xml
@@ -29,10 +29,6 @@
   <name>Apache Qpid Broker-J AMQP 0-8 Protocol Plug-in</name>
   <description>AMQP 0-8, 0-9 and 0-9-1 protocol broker plug-in</description>
 
-  <properties>
-    <qpid.home>${basedir}/../</qpid.home> <!-- override for broker tests -->
-  </properties>
-
   <dependencies>
     <dependency>
       <groupId>org.apache.qpid</groupId>

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/54bc670f/broker-plugins/logging-logback/pom.xml
----------------------------------------------------------------------
diff --git a/broker-plugins/logging-logback/pom.xml 
b/broker-plugins/logging-logback/pom.xml
index 225a50a..7b84d7b 100644
--- a/broker-plugins/logging-logback/pom.xml
+++ b/broker-plugins/logging-logback/pom.xml
@@ -29,10 +29,6 @@
   <name>Apache Qpid Broker-J LogBack Logging Plug-in</name>
   <description>LogBack Logging broker plug-in</description>
 
-  <properties>
-    <qpid.home>${basedir}/../</qpid.home> <!-- override to allow the test 
exclusions to be found -->
-  </properties>
-
   <dependencies>
     <dependency>
       <groupId>org.apache.qpid</groupId>

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/54bc670f/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index a60b7e4..93930d3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -80,6 +80,7 @@
     <minimum-java-version>1.8.0</minimum-java-version>
     <java.source>1.8</java.source>
     <java.target>1.8</java.target>
+    <skipTests>false</skipTests>
 
     <!-- enforcer plugin config properties -->
     
<supported-test-profiles-regex>(java-mms.0-9|java-mms.0-9-1|java-mms.0-10|java-mms.1-0|java-bdb.0-9|java-bdb.0-9-1|java-bdb.0-10|java-bdb.1-0|java-dby.0-9|java-dby.0-9-1|java-dby.0-10|java-dby.1-0|java-dby-mem.0-9|java-dby-mem.0-9-1|java-dby-mem.0-10|cpp|java-json.0-9-1|java-json.0-10|java-json.1-0)</supported-test-profiles-regex>
@@ -87,27 +88,11 @@
     <!-- surefire forked jvm arguments -->
     <argLine>-Xmx512m</argLine>
 
-    <!-- test profile properties and defaults-->
-    <qpid.home>${basedir}</qpid.home> <!-- override for broker tests -->
     <!-- Directory used for per test log file output -->
     
<test.output.dir>${basedir}${file.separator}target${file.separator}surefire-reports${file.separator}${profile}</test.output.dir>
 
     <profile>java-mms.1-0</profile>
-    <profile.broker.language>java</profile.broker.language>
-    <profile.broker.type>internal</profile.broker.type>
-    <profile.broker.stopped>Exception</profile.broker.stopped>
-    <profile.broker.ready>BRK-1004</profile.broker.ready>
-    <profile.broker.amqpTcpPortRegEx>BRK-1002 : Starting : Listening on TCP 
port (\d+)</profile.broker.amqpTcpPortRegEx>
-    <profile.broker.amqpTlsPortRegEx>BRK-1002 : Starting : Listening on SSL 
port (\d+)</profile.broker.amqpTlsPortRegEx>
-    <profile.broker.httpTcpPortRegEx>MNG-1002 : Starting : HTTP : Listening on 
TCP port (\d+)</profile.broker.httpTcpPortRegEx>
-    <profile.broker.httpTlsPortRegEx>MNG-1002 : Starting : HTTP : Listening on 
SSL port (\d+)</profile.broker.httpTlsPortRegEx>
-    
<profile.broker.command>"${qpid.home}${file.separator}bin${file.separator}qpid-server"
 -sp "${at.sign}STORE_PATH" -st ${at.sign}STORE_TYPE -prop 
test.port=${at.sign}PORT -prop 
"qpid.work_dir=${at.sign}QPID_WORK"</profile.broker.command>
-    
<profile.broker.command.windows>"${qpid.home}${file.separator}bin${file.separator}qpid-server.bat"
 -sp "${at.sign}STORE_PATH" -st ${at.sign}STORE_TYPE -prop 
test.port=${at.sign}PORT -prop 
"qpid.work_dir=${at.sign}QPID_WORK"</profile.broker.command.windows>
-    <profile.test.excludes>Excludes JavaExcludes ${profile}.excludes 
${profile.specific.excludes}</profile.test.excludes>
-    <profile.specific.excludes>JavaTransientExcludes 
Java010Excludes</profile.specific.excludes>
     <profile.broker.version>1.0</profile.broker.version>
-    
<profile.test.amqp_port_protocols>["AMQP_0_8","AMQP_0_9","AMQP_0_9_1","AMQP_0_10"]</profile.test.amqp_port_protocols>
-    <profile.broker.persistent>false</profile.broker.persistent>
     <profile.virtualhostnode.type>Memory</profile.virtualhostnode.type>
     
<profile.broker.clean.between.tests>true</profile.broker.clean.between.tests>
     <profile.test_receive_timeout>1000</profile.test_receive_timeout>
@@ -772,14 +757,7 @@
               <target>
                 <echo>Qpid Test Profile Properties</echo>
                 <echo>[profile] ${profile}</echo>
-                <echo>[profile.broker.language] 
${profile.broker.language}</echo>
-                <echo>[profile.broker.type] ${profile.broker.type}</echo>
-                <echo>[profile.broker.command] ${profile.broker.command}</echo>
-                <echo>[profile.specific.excludes] 
${profile.specific.excludes}</echo>
-                <echo>[profile.test.excludes] ${profile.test.excludes}</echo>
                 <echo>[profile.broker.version] ${profile.broker.version}</echo>
-                <echo>[profile.test.amqp_port_protocols] 
${profile.test.amqp_port_protocols}</echo>
-                <echo>[profile.broker.persistent] 
${profile.broker.persistent}</echo>
                 <echo>[profile.virtualhostnode.type] 
${profile.virtualhostnode.type}</echo>
                 <echo>[profile.virtualhostnode.context.blueprint] 
${profile.virtualhostnode.context.blueprint}</echo>
                 <echo>[profile.test_receive_timeout] 
${profile.test_receive_timeout}</echo>
@@ -799,34 +777,17 @@
           <reportsDirectory>${test.output.dir}</reportsDirectory>
           <systemPropertyVariables>
             <!-- Defaults -->
-            <QPID_HOME>${qpid.home}</QPID_HOME>
-            
<broker.config>${qpid.home}${file.separator}etc${file.separator}config-systests.json</broker.config>
             <qpid.dest_syntax>BURL</qpid.dest_syntax>
+
             <test.port>0</test.port>
             <test.hport>0</test.hport>
             <test.port.ssl>0</test.port.ssl>
             <test.port.alt>0</test.port.alt>
             <test.port.alt.ssl>0</test.port.alt.ssl>
-            <test.exclude>true</test.exclude>
-            <test.mem>512M</test.mem>
-            <profile.clustered>false</profile.clustered>
 
             <!-- Profile Based Values -->
             <profile>${profile}</profile>
-            <broker.language>${profile.broker.language}</broker.language>
-            <broker.type>${profile.broker.type}</broker.type>
-            <broker.stopped>${profile.broker.stopped}</broker.stopped>
-            <broker.ready>${profile.broker.ready}</broker.ready>
-            
<broker.amqpTcpPortRegEx>${profile.broker.amqpTcpPortRegEx}</broker.amqpTcpPortRegEx>
-            
<broker.httpTcpPortRegEx>${profile.broker.httpTcpPortRegEx}</broker.httpTcpPortRegEx>
-            
<broker.amqpTlsPortRegEx>${profile.broker.amqpTlsPortRegEx}</broker.amqpTlsPortRegEx>
-            
<broker.httpTlsPortRegEx>${profile.broker.httpTlsPortRegEx}</broker.httpTlsPortRegEx>
-            <broker.command>${profile.broker.command}</broker.command>
-            
<broker.command.windows>${profile.broker.command.windows}</broker.command.windows>
-            <test.excludes>${profile.test.excludes}</test.excludes>
             <broker.version>${profile.broker.version}</broker.version>
-            
<test.amqp_port_protocols>${profile.test.amqp_port_protocols}</test.amqp_port_protocols>
-            <broker.persistent>${profile.broker.persistent}</broker.persistent>
             
<virtualhostnode.type>${profile.virtualhostnode.type}</virtualhostnode.type>
             
<virtualhostnode.context.blueprint>${profile.virtualhostnode.context.blueprint}</virtualhostnode.context.blueprint>
             
<broker.clean.between.tests>${profile.broker.clean.between.tests}</broker.clean.between.tests>
@@ -1030,10 +991,7 @@
       </activation>
       <properties>
         <profile>java-mms.0-10</profile>
-        <profile.specific.excludes>JavaTransientExcludes 
Java010Excludes</profile.specific.excludes>
         <profile.broker.version>0-10</profile.broker.version>
-        
<profile.test.amqp_port_protocols>["AMQP_0_8","AMQP_0_9","AMQP_0_9_1","AMQP_0_10"]</profile.test.amqp_port_protocols>
-        <profile.broker.persistent>false</profile.broker.persistent>
         <profile.virtualhostnode.type>Memory</profile.virtualhostnode.type>
         
<profile.virtualhostnode.context.blueprint>{"type":"ProvidedStore","globalAddressDomains":"${dollar.sign}{qpid.globalAddressDomains}"}</profile.virtualhostnode.context.blueprint>
         
<profile.qpid.tests.mms.messagestore.persistence>true</profile.qpid.tests.mms.messagestore.persistence>
@@ -1050,10 +1008,7 @@
       </activation>
       <properties>
         <profile>java-mms.0-9-1</profile>
-        <profile.specific.excludes>JavaTransientExcludes XAExcludes 
JavaPre010Excludes</profile.specific.excludes>
         <profile.broker.version>0-9-1</profile.broker.version>
-        
<profile.test.amqp_port_protocols>["AMQP_0_8","AMQP_0_9","AMQP_0_9_1"]</profile.test.amqp_port_protocols>
-        <profile.broker.persistent>false</profile.broker.persistent>
         <profile.virtualhostnode.type>Memory</profile.virtualhostnode.type>
         
<profile.virtualhostnode.context.blueprint>{"type":"ProvidedStore","globalAddressDomains":"${dollar.sign}{qpid.globalAddressDomains}"}</profile.virtualhostnode.context.blueprint>
         
<profile.qpid.tests.mms.messagestore.persistence>true</profile.qpid.tests.mms.messagestore.persistence>
@@ -1070,10 +1025,7 @@
       </activation>
       <properties>
         <profile>java-mms.0-9</profile>
-        <profile.specific.excludes>JavaTransientExcludes XAExcludes 
JavaPre010Excludes</profile.specific.excludes>
         <profile.broker.version>0-9</profile.broker.version>
-        
<profile.test.amqp_port_protocols>["AMQP_0_8","AMQP_0_9"]</profile.test.amqp_port_protocols>
-        <profile.broker.persistent>false</profile.broker.persistent>
         <profile.virtualhostnode.type>Memory</profile.virtualhostnode.type>
         
<profile.virtualhostnode.context.blueprint>{"type":"ProvidedStore","globalAddressDomains":"${dollar.sign}{qpid.globalAddressDomains}"}</profile.virtualhostnode.context.blueprint>
         
<profile.qpid.tests.mms.messagestore.persistence>true</profile.qpid.tests.mms.messagestore.persistence>
@@ -1090,10 +1042,7 @@
       </activation>
       <properties>
         <profile>java-bdb.0-10</profile>
-        <profile.specific.excludes>JavaPersistentExcludes Java010Excludes 
JavaBDBExcludes</profile.specific.excludes>
         <profile.broker.version>0-10</profile.broker.version>
-        
<profile.test.amqp_port_protocols>["AMQP_0_8","AMQP_0_9","AMQP_0_9_1","AMQP_0_10"]</profile.test.amqp_port_protocols>
-        <profile.broker.persistent>true</profile.broker.persistent>
         <profile.virtualhostnode.type>BDB</profile.virtualhostnode.type>
         
<profile.virtualhostnode.context.blueprint>{"type":"ProvidedStore","globalAddressDomains":"${dollar.sign}{qpid.globalAddressDomains}"}</profile.virtualhostnode.context.blueprint>
       </properties>
@@ -1109,10 +1058,7 @@
       </activation>
       <properties>
         <profile>java-bdb.0-9-1</profile>
-        <profile.specific.excludes>JavaPersistentExcludes XAExcludes 
JavaPre010Excludes JavaBDBExcludes</profile.specific.excludes>
         <profile.broker.version>0-9-1</profile.broker.version>
-        
<profile.test.amqp_port_protocols>["AMQP_0_8","AMQP_0_9","AMQP_0_9_1"]</profile.test.amqp_port_protocols>
-        <profile.broker.persistent>true</profile.broker.persistent>
         <profile.virtualhostnode.type>BDB</profile.virtualhostnode.type>
         
<profile.virtualhostnode.context.blueprint>{"type":"ProvidedStore","globalAddressDomains":"${dollar.sign}{qpid.globalAddressDomains}"}</profile.virtualhostnode.context.blueprint>
       </properties>
@@ -1128,10 +1074,7 @@
       </activation>
       <properties>
         <profile>java-bdb.0-9</profile>
-        <profile.specific.excludes>JavaPersistentExcludes XAExcludes 
JavaPre010Excludes JavaBDBExcludes</profile.specific.excludes>
         <profile.broker.version>0-9</profile.broker.version>
-        
<profile.test.amqp_port_protocols>["AMQP_0_8","AMQP_0_9"]</profile.test.amqp_port_protocols>
-        <profile.broker.persistent>true</profile.broker.persistent>
         <profile.virtualhostnode.type>BDB</profile.virtualhostnode.type>
         
<profile.virtualhostnode.context.blueprint>{"type":"ProvidedStore","globalAddressDomains":"${dollar.sign}{qpid.globalAddressDomains}"}</profile.virtualhostnode.context.blueprint>
       </properties>
@@ -1147,10 +1090,7 @@
       </activation>
       <properties>
         <profile>java-dby-mem.0-10</profile>
-        <profile.specific.excludes>JavaPersistentExcludes JavaDerbyExcludes 
Java010Excludes</profile.specific.excludes>
         <profile.broker.version>0-10</profile.broker.version>
-        
<profile.test.amqp_port_protocols>["AMQP_0_8","AMQP_0_9","AMQP_0_9_1","AMQP_0_10"]</profile.test.amqp_port_protocols>
-        <profile.broker.persistent>true</profile.broker.persistent>
         <profile.virtualhostnode.type>DERBY</profile.virtualhostnode.type>
         
<profile.virtualhostnode.context.blueprint>{"type":"ProvidedStore","globalAddressDomains":"${dollar.sign}{qpid.globalAddressDomains}"}</profile.virtualhostnode.context.blueprint>
       </properties>
@@ -1166,10 +1106,7 @@
       </activation>
       <properties>
         <profile>java-dby-mem.0-9-1</profile>
-        <profile.specific.excludes>JavaPersistentExcludes JavaDerbyExcludes 
XAExcludes JavaPre010Excludes</profile.specific.excludes>
         <profile.broker.version>0-9-1</profile.broker.version>
-        
<profile.test.amqp_port_protocols>["AMQP_0_8","AMQP_0_9","AMQP_0_9_1"]</profile.test.amqp_port_protocols>
-        <profile.broker.persistent>true</profile.broker.persistent>
         <profile.virtualhostnode.type>DERBY</profile.virtualhostnode.type>
         
<profile.virtualhostnode.context.blueprint>{"type":"ProvidedStore","globalAddressDomains":"${dollar.sign}{qpid.globalAddressDomains}"}</profile.virtualhostnode.context.blueprint>
       </properties>
@@ -1185,10 +1122,7 @@
       </activation>
       <properties>
         <profile>java-dby-mem.0-9</profile>
-        <profile.specific.excludes>JavaPersistentExcludes JavaDerbyExcludes 
XAExcludes JavaPre010Excludes</profile.specific.excludes>
         <profile.broker.version>0-9</profile.broker.version>
-        
<profile.test.amqp_port_protocols>["AMQP_0_8","AMQP_0_9"]</profile.test.amqp_port_protocols>
-        <profile.broker.persistent>true</profile.broker.persistent>
         <profile.virtualhostnode.type>DERBY</profile.virtualhostnode.type>
         
<profile.virtualhostnode.context.blueprint>{"type":"ProvidedStore","globalAddressDomains":"${dollar.sign}{qpid.globalAddressDomains}"}</profile.virtualhostnode.context.blueprint>
       </properties>
@@ -1204,10 +1138,7 @@
       </activation>
       <properties>
         <profile>java-dby.0-10</profile>
-        <profile.specific.excludes>JavaPersistentExcludes JavaDerbyExcludes 
Java010Excludes</profile.specific.excludes>
         <profile.broker.version>0-10</profile.broker.version>
-        
<profile.test.amqp_port_protocols>["AMQP_0_8","AMQP_0_9","AMQP_0_9_1","AMQP_0_10"]</profile.test.amqp_port_protocols>
-        <profile.broker.persistent>true</profile.broker.persistent>
         <profile.virtualhostnode.type>DERBY</profile.virtualhostnode.type>
         
<profile.virtualhostnode.context.blueprint>{"type":"ProvidedStore","globalAddressDomains":"${dollar.sign}{qpid.globalAddressDomains}"}</profile.virtualhostnode.context.blueprint>
         <profile.test_receive_timeout>2000</profile.test_receive_timeout>
@@ -1224,10 +1155,7 @@
       </activation>
       <properties>
         <profile>java-dby.0-9-1</profile>
-        <profile.specific.excludes>JavaPersistentExcludes JavaDerbyExcludes 
XAExcludes JavaPre010Excludes</profile.specific.excludes>
         <profile.broker.version>0-9-1</profile.broker.version>
-        
<profile.test.amqp_port_protocols>["AMQP_0_8","AMQP_0_9","AMQP_0_9_1"]</profile.test.amqp_port_protocols>
-        <profile.broker.persistent>true</profile.broker.persistent>
         <profile.virtualhostnode.type>DERBY</profile.virtualhostnode.type>
         
<profile.virtualhostnode.context.blueprint>{"type":"ProvidedStore","globalAddressDomains":"${dollar.sign}{qpid.globalAddressDomains}"}</profile.virtualhostnode.context.blueprint>
         <profile.test_receive_timeout>2000</profile.test_receive_timeout>
@@ -1244,11 +1172,8 @@
       </activation>
       <properties>
         <profile>java-dby.0-9</profile>
-        <profile.specific.excludes>JavaPersistentExcludes JavaDerbyExcludes 
XAExcludes JavaPre010Excludes</profile.specific.excludes>
         <profile.broker.version>0-9</profile.broker.version>
         
<profile.test.amqp_port_protocols>["AMQP_0_8","AMQP_0_9"]</profile.test.amqp_port_protocols>
-        <profile.broker.persistent>true</profile.broker.persistent>
-        <profile.virtualhostnode.type>DERBY</profile.virtualhostnode.type>
         
<profile.virtualhostnode.context.blueprint>{"type":"ProvidedStore","globalAddressDomains":"${dollar.sign}{qpid.globalAddressDomains}"}</profile.virtualhostnode.context.blueprint>
         <profile.test_receive_timeout>2000</profile.test_receive_timeout>
       </properties>
@@ -1265,10 +1190,7 @@
       </activation>
       <properties>
         <profile>java-mms.1-0</profile>
-        <profile.specific.excludes>JavaTransientExcludes Java10Excludes 
Java10BrokenTestsExcludes 
Java10UninvestigatedTestsExcludes</profile.specific.excludes>
         <profile.broker.version>1.0</profile.broker.version>
-        
<profile.test.amqp_port_protocols>["AMQP_0_8","AMQP_0_9","AMQP_0_9_1","AMQP_0_10","AMQP_1_0"]</profile.test.amqp_port_protocols>
-        <profile.broker.persistent>false</profile.broker.persistent>
         <profile.virtualhostnode.type>Memory</profile.virtualhostnode.type>
         
<profile.virtualhostnode.context.blueprint>{"type":"ProvidedStore","globalAddressDomains":"${dollar.sign}{qpid.globalAddressDomains}"}</profile.virtualhostnode.context.blueprint>
         
<profile.qpid.tests.mms.messagestore.persistence>true</profile.qpid.tests.mms.messagestore.persistence>
@@ -1285,10 +1207,7 @@
       </activation>
       <properties>
         <profile>java-bdb.1-0</profile>
-        <profile.specific.excludes>JavaPersistentExcludes JavaBDBExcludes 
Java10Excludes Java10BrokenTestsExcludes 
Java10UninvestigatedTestsExcludes</profile.specific.excludes>
         <profile.broker.version>1.0</profile.broker.version>
-        
<profile.test.amqp_port_protocols>["AMQP_1_0"]</profile.test.amqp_port_protocols>
-        <profile.broker.persistent>true</profile.broker.persistent>
         <profile.virtualhostnode.type>BDB</profile.virtualhostnode.type>
         
<profile.virtualhostnode.context.blueprint>{"type":"ProvidedStore","globalAddressDomains":"${dollar.sign}{qpid.globalAddressDomains}"}</profile.virtualhostnode.context.blueprint>
       </properties>
@@ -1304,11 +1223,8 @@
       </activation>
       <properties>
         <profile>java-dby.1-0</profile>
-        <profile.specific.excludes>JavaPersistentExcludes JavaDerbyExcludes 
Java10Excludes Java10BrokenTestsExcludes 
Java10UninvestigatedTestsExcludes</profile.specific.excludes>
         <profile.broker.version>1.0</profile.broker.version>
         
<profile.test.amqp_port_protocols>["AMQP_1_0"]</profile.test.amqp_port_protocols>
-        <profile.broker.persistent>true</profile.broker.persistent>
-        <profile.virtualhostnode.type>DERBY</profile.virtualhostnode.type>
         
<profile.virtualhostnode.context.blueprint>{"type":"ProvidedStore","globalAddressDomains":"${dollar.sign}{qpid.globalAddressDomains}"}</profile.virtualhostnode.context.blueprint>
       </properties>
     </profile>
@@ -1328,10 +1244,7 @@
       </activation>
       <properties>
         <profile>java-json.1-0</profile>
-        <profile.specific.excludes>JavaPersistentExcludes JavaJsonExcludes 
Java10Excludes Java10BrokenTestsExcludes 
Java10UninvestigatedTestsExcludes</profile.specific.excludes>
         <profile.broker.version>1.0</profile.broker.version>
-        
<profile.test.amqp_port_protocols>["AMQP_1_0"]</profile.test.amqp_port_protocols>
-        <profile.broker.persistent>true</profile.broker.persistent>
         <profile.virtualhostnode.type>JSON</profile.virtualhostnode.type>
         
<profile.virtualhostnode.context.blueprint>{"type":"BDB","globalAddressDomains":"${dollar.sign}{qpid.globalAddressDomains}"}</profile.virtualhostnode.context.blueprint>
       </properties>
@@ -1346,10 +1259,7 @@
       </activation>
       <properties>
         <profile>java-json.0-9-1</profile>
-        <profile.specific.excludes>JavaPersistentExcludes JavaJsonExcludes 
XAExcludes JavaPre010Excludes</profile.specific.excludes>
         <profile.broker.version>0-9-1</profile.broker.version>
-        
<profile.test.amqp_port_protocols>["AMQP_0_8","AMQP_0_9","AMQP_0_9_1"]</profile.test.amqp_port_protocols>
-        <profile.broker.persistent>true</profile.broker.persistent>
         <profile.virtualhostnode.type>JSON</profile.virtualhostnode.type>
         
<profile.virtualhostnode.context.blueprint>{"type":"BDB","globalAddressDomains":"${dollar.sign}{qpid.globalAddressDomains}"}</profile.virtualhostnode.context.blueprint>
       </properties>
@@ -1365,67 +1275,12 @@
       </activation>
       <properties>
         <profile>java-json.0-10</profile>
-        <profile.specific.excludes>JavaPersistentExcludes JavaJsonExcludes 
XAExcludes Java010Excludes</profile.specific.excludes>
         <profile.broker.version>0-10</profile.broker.version>
-        
<profile.test.amqp_port_protocols>["AMQP_0_8","AMQP_0_9","AMQP_0_9_1","AMQP_0_10"]</profile.test.amqp_port_protocols>
-        <profile.broker.persistent>true</profile.broker.persistent>
         <profile.virtualhostnode.type>JSON</profile.virtualhostnode.type>
         
<profile.virtualhostnode.context.blueprint>{"type":"BDB","globalAddressDomains":"${dollar.sign}{qpid.globalAddressDomains}"}</profile.virtualhostnode.context.blueprint>
       </properties>
     </profile>
 
-    <profile>
-      <id>cpp</id>
-      <activation>
-        <property>
-          <name>profile</name>
-          <value>cpp</value>
-        </property>
-      </activation>
-      <properties>
-        <profile>cpp</profile>
-        <profile.broker.language>cpp</profile.broker.language>
-        <profile.broker.type>spawned</profile.broker.type>
-        <profile.broker.stopped>Exception constructed</profile.broker.stopped>
-        <profile.broker.ready>Listening on TCP</profile.broker.ready>
-        <profile.broker.amqpTcpPortRegEx>Listening on TCP/TCP6 port 
(\d+)</profile.broker.amqpTcpPortRegEx>
-        <profile.broker.amqpTlsPortRegEx>Listening for SSL connections on 
TCP/TCP6 port (\d+)</profile.broker.amqpTlsPortRegEx>
-        <profile.broker.httpTcpPortRegEx>x^</profile.broker.httpTcpPortRegEx>
-        <profile.broker.httpTlsPortRegEx>x^</profile.broker.httpTlsPortRegEx>
-        <profile.broker.command>"${cpp-broker-dir}/qpidd" -p ${at.sign}PORT 
--data-dir "${at.sign}QPID_WORK" -t --auth no 
--no-module-dir</profile.broker.command>
-        <profile.broker.command.windows />
-        <profile.test.excludes>Excludes CPPExcludes ${profile}.excludes 
${profile.specific.excludes} cpp.excludes</profile.test.excludes>
-        <profile.specific.excludes>CPPPrefetchExcludes 
CPPTransientExcludes</profile.specific.excludes>
-        <profile.broker.version>0-10</profile.broker.version>
-        <profile.broker.persistent>false</profile.broker.persistent>
-      </properties>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-enforcer-plugin</artifactId>
-            <executions>
-              <execution>
-                <id>enforce-cpp-broker-dir-defined</id>
-                <goals>
-                  <goal>enforce</goal>
-                </goals>
-                <configuration>
-                  <rules>
-                    <requireProperty>
-                      <property>cpp-broker-dir</property>
-                      <message>You must set a the CPP broker directory 
property for this profile. (e.g. -Dcpp-broker-dir=/somedir/cpp/src)</message>
-                    </requireProperty>
-                  </rules>
-                  <fail>true</fail>
-                </configuration>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
-
     <!-- Profile to update the Apache parent pom profile of the same name to 
prevent source assembly at java build level.-->
     <profile>
       <id>apache-release</id>

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/54bc670f/qpid-perftests-systests/pom.xml
----------------------------------------------------------------------
diff --git a/qpid-perftests-systests/pom.xml b/qpid-perftests-systests/pom.xml
index 570292d..afccd22 100644
--- a/qpid-perftests-systests/pom.xml
+++ b/qpid-perftests-systests/pom.xml
@@ -29,10 +29,6 @@
   <name>Apache Qpid Broker-J Performance Test System Tests</name>
   <description>System testing using the performance testing 
module</description>
 
-  <properties>
-    
<test.systest.resource.directory>${basedir}/../systests</test.systest.resource.directory>
-  </properties>
-
   <dependencies>
     <dependency>
       <groupId>org.apache.qpid</groupId>

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/54bc670f/qpid-perftests-systests/src/test/java/org/apache/qpid/systest/disttest/endtoend/EndToEndTest.java
----------------------------------------------------------------------
diff --git 
a/qpid-perftests-systests/src/test/java/org/apache/qpid/systest/disttest/endtoend/EndToEndTest.java
 
b/qpid-perftests-systests/src/test/java/org/apache/qpid/systest/disttest/endtoend/EndToEndTest.java
index ceeb585..3935815 100644
--- 
a/qpid-perftests-systests/src/test/java/org/apache/qpid/systest/disttest/endtoend/EndToEndTest.java
+++ 
b/qpid-perftests-systests/src/test/java/org/apache/qpid/systest/disttest/endtoend/EndToEndTest.java
@@ -30,6 +30,7 @@ import static 
org.apache.qpid.disttest.ControllerRunner.TEST_CONFIG_PROP;
 import static org.apache.qpid.tests.http.HttpTestBase.DEFAULT_BROKER_CONFIG;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.notNullValue;
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.fail;
 import static org.junit.Assume.assumeThat;
@@ -38,6 +39,8 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
+import java.net.URISyntaxException;
+import java.net.URL;
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.Arrays;
@@ -66,10 +69,10 @@ import org.apache.qpid.util.FileUtils;
 @ConfigItem(name = "qpid.initialConfigurationLocation", value = 
DEFAULT_BROKER_CONFIG )
 public class EndToEndTest extends HttpTestBase
 {
-    private static final String TEST_CONFIG_ITERATIONS = 
"qpid-perftests-systests/src/test/resources/org/apache/qpid/systest/disttest/endtoend/iterations.json";
-    private static final String TEST_CONFIG_MANYPARTICIPANTS = 
"qpid-perftests-systests/src/test/resources/org/apache/qpid/systest/disttest/endtoend/manyparticipants.json";
-    private static final String TEST_CONFIG_HILLCLIMBING = 
"qpid-perftests-systests/src/test/resources/org/apache/qpid/systest/disttest/endtoend/hillclimbing.js";
-    private static final String TEST_CONFIG_ERROR = 
"qpid-perftests-systests/src/test/resources/org/apache/qpid/systest/disttest/endtoend/error.json";
+    private static final String TEST_CONFIG_ITERATIONS = 
"/org/apache/qpid/systest/disttest/endtoend/iterations.json";
+    private static final String TEST_CONFIG_MANYPARTICIPANTS = 
"/org/apache/qpid/systest/disttest/endtoend/manyparticipants.json";
+    private static final String TEST_CONFIG_HILLCLIMBING = 
"/org/apache/qpid/systest/disttest/endtoend/hillclimbing.js";
+    private static final String TEST_CONFIG_ERROR = 
"/org/apache/qpid/systest/disttest/endtoend/error.json";
 
     private static final int NUMBER_OF_HEADERS = 1;
     private static final int NUMBER_OF_SUMMARIES = 3;
@@ -120,7 +123,7 @@ public class EndToEndTest extends HttpTestBase
     public void testIterations() throws Exception
     {
         Map<String, String> arguments = new HashMap<>();
-        arguments.put(TEST_CONFIG_PROP, TEST_CONFIG_ITERATIONS);
+        arguments.put(TEST_CONFIG_PROP, 
getTestConfigurationPath(TEST_CONFIG_ITERATIONS));
         arguments.put(JNDI_CONFIG_PROP, _jndiConfigFile.getAbsolutePath());
         arguments.put(OUTPUT_DIR_PROP, _outputDir.getAbsolutePath());
         arguments.put(HILL_CLIMB, "false");
@@ -147,7 +150,7 @@ public class EndToEndTest extends HttpTestBase
     public void testManyParticipants() throws Exception
     {
         Map<String, String> arguments = new HashMap<>();
-        arguments.put(TEST_CONFIG_PROP, TEST_CONFIG_MANYPARTICIPANTS);
+        arguments.put(TEST_CONFIG_PROP, 
getTestConfigurationPath(TEST_CONFIG_MANYPARTICIPANTS));
         arguments.put(JNDI_CONFIG_PROP, _jndiConfigFile.getAbsolutePath());
         arguments.put(OUTPUT_DIR_PROP, _outputDir.getAbsolutePath());
         arguments.put(HILL_CLIMB, "false");
@@ -206,7 +209,7 @@ public class EndToEndTest extends HttpTestBase
     public void testHillClimbing() throws Exception
     {
         Map<String, String> arguments = new HashMap<>();
-        arguments.put(TEST_CONFIG_PROP, TEST_CONFIG_HILLCLIMBING);
+        arguments.put(TEST_CONFIG_PROP, 
getTestConfigurationPath(TEST_CONFIG_HILLCLIMBING));
         arguments.put(JNDI_CONFIG_PROP, _jndiConfigFile.getAbsolutePath());
         arguments.put(OUTPUT_DIR_PROP, _outputDir.getAbsolutePath());
         arguments.put(HILL_CLIMB, "true");
@@ -247,7 +250,7 @@ public class EndToEndTest extends HttpTestBase
     public void testTestScriptCausesError() throws Exception
     {
         Map<String, String> arguments = new HashMap<>();
-        arguments.put(TEST_CONFIG_PROP, TEST_CONFIG_ERROR);
+        arguments.put(TEST_CONFIG_PROP, 
getTestConfigurationPath(TEST_CONFIG_ERROR));
         arguments.put(JNDI_CONFIG_PROP, _jndiConfigFile.getAbsolutePath());
         arguments.put(OUTPUT_DIR_PROP, _outputDir.getAbsolutePath());
 
@@ -262,6 +265,14 @@ public class EndToEndTest extends HttpTestBase
         }
     }
 
+    public String getTestConfigurationPath(String resource) throws 
URISyntaxException
+    {
+        URL url = getClass().getResource(resource);
+        assertThat(String.format("Configuration at '%s' is not found", 
resource), url, is(notNullValue()));
+        return new File(url.toURI()).getAbsolutePath();
+    }
+
+
     private void runController(Map<String, String> args) throws Exception
     {
         String[] argsAsArray = new String[args.size()];

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/54bc670f/qpid-systests-parent/pom.xml
----------------------------------------------------------------------
diff --git a/qpid-systests-parent/pom.xml b/qpid-systests-parent/pom.xml
index 2bc41b0..4dade4a 100644
--- a/qpid-systests-parent/pom.xml
+++ b/qpid-systests-parent/pom.xml
@@ -31,13 +31,6 @@
   <description>Parent POM for Qpid system testing modules</description>
 
   <properties>
-    
<broker.home.dir>target${file.separator}qpid-broker${file.separator}${project.version}</broker.home.dir>
-    <!-- test properties -->
-    <qpid.home>${basedir}${file.separator}${broker.home.dir}</qpid.home>
-
-    <test.working.directory>${basedir}/..</test.working.directory>
-    <test.resource.directory>${basedir}/..</test.resource.directory>
-    
<test.systest.resource.directory>${basedir}</test.systest.resource.directory>
     <skip.systests>${skipTests}</skip.systests>
   </properties>
 
@@ -76,13 +69,9 @@
         <artifactId>maven-surefire-plugin</artifactId>
         <!--version specified in parent pluginManagement -->
         <configuration>
-          <workingDirectory>${test.working.directory}</workingDirectory>
           <!-- Skip the default test phase, bind to the
                integration-test phase below instead -->
           <skip>true</skip>
-          <systemPropertyVariables>
-            <test.output.dir>${test.output.dir}</test.output.dir>
-          </systemPropertyVariables>
           <skipTests>${skip.systests}</skipTests>
         </configuration>
         <executions>

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/54bc670f/test-profiles/CPPExcludes
----------------------------------------------------------------------
diff --git a/test-profiles/CPPExcludes b/test-profiles/CPPExcludes
deleted file mode 100755
index ba9a39e..0000000
--- a/test-profiles/CPPExcludes
+++ /dev/null
@@ -1,112 +0,0 @@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-
-// the 0-10 c++ broker does not implement the extended LVQ semantics which the 
Qpid Broker-J does
-org.apache.qpid.server.queue.ConflationQueueTest#*
-
-// InVM Broker tests
-org.apache.qpid.test.client.timeouts.SyncWaitDelayTest#*
-
-// QPID-1262, QPID-1119 : This test fails occasionally due to potential 
protocol issue.
-org.apache.qpid.test.client.timeouts.SyncWaitTimeoutDelayTest#*
-
-// QPID-1727 , QPID-1726 :c++ broker does not support flow to disk on 
transient queues. Also it requries a persistent store impl. for Apache
-org.apache.qpid.test.client.QueueBrowsingFlowToDiskTest#*
-
-// This test currently does not pick up the runtime location of the nonVm 
queueBacking store.
-org.apache.qpid.test.unit.close.FlowToDiskBackingQueueDeleteTest#*
-
-// QPID-1730: the C++ server has a totally different logging mechanism. We 
should split this file differently
-org.apache.qpid.server.AlertingTest#*
-
-// CPP Broker does not follow the same Logging convention as the Qpid Broker-J
-org.apache.qpid.server.BrokerStartupTest#*
-org.apache.qpid.server.logging.*
-org.apache.qpid.server.logging.messages.*
-org.apache.qpid.server.logging.subjects.*
-org.apache.qpid.server.logging.actors.*
-
-// REST management is used in this test for validation
-org.apache.qpid.server.queue.LiveQueueOperationsTest#*
-
-// QPID-2118 : JMS client for AMQP 0-10 has different error handling then 0-8 
code path
-org.apache.qpid.test.client.message.SelectorTest#testRuntimeSelectorError
-
-//QPID-3986 : Flow control invoked on total store disk usage
-org.apache.qpid.server.store.StoreOverfullTest#*
-
-// Excluded because plugins from Qpid Broker-J are not used in CPP broker
-org.apache.qpid.server.virtualhost.plugin.*
-org.apache.qpid.info.test.*
-org.apache.qpid.server.security.access.*
-org.apache.qpid.server.security.access.plugins.*
-org.apache.qpid.server.security.auth.manager.*
-org.apache.qpid.server.security.acl.*
-org.apache.qpid.server.configuration.*
-org.apache.qpid.server.configuration.plugins.*
-org.apache.qpid.server.security.firewall.FirewallConfigTest#*
-org.apache.qpid.server.security.firewall.FirewallConfigurationTest#*
-org.apache.qpid.server.plugins.PluginTest#*
-
-// Qpid Broker-J only
-org.apache.qpid.server.SupportedProtocolVersionsTest#*
-org.apache.qpid.server.stats.StatisticsReportingTest#*
-
-// passwd script is a Qpid Broker-J specific command line tool
-org.apache.qpid.scripts.QpidPasswdTest#*
-
-// QPID-3936: Exclude Performance Test Framework tests
-org.apache.qpid.systest.disttest.*
-org.apache.qpid.disttest.*
-org.apache.qpid.systest.disttest.endtoend.*
-
-// Exclude REST API tests for Qpid Broker-J
-org.apache.qpid.systest.rest.*
-org.apache.qpid.systest.rest.acl.*
-
-
-
-org.apache.qpid.server.protocol.v0_8.*
-
-//Qpid Broker-J BDB System Tests
-org.apache.qpid.server.store.berkeleydb.*
-org.apache.qpid.server.store.berkeleydb.replication.*
-org.apache.qpid.server.virtualhostnode.berkeleydb.*
-
-// Qpid Broker-J Derby Tests
-org.apache.qpid.server.store.derby.*
-
-# QPID-7156: Test requires a Broker with a virtualhost
-org.apache.qpid.systests.jms_1_1.connection.BrokerClosesClientConnectionTest#testClientCloseOnVirtualHostStop
-
-#The C++ broker does not implement AMQP management
-org.apache.qpid.systest.management.amqp.*
-
-# Exclude the JMS 2.0 test suite
-org.apache.qpid.systests.jms_2_0.*
-
-# Exclude the AMQP 1.0 protocol test suite
-org.apache.qpid.tests.protocol.v1_0.*
-
-# Tests require AMQP management
-org.apache.qpid.server.queue.QueueDepthWithSelectorTest#test
-org.apache.qpid.test.unit.message.UTF8Test#*
-
-
-

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/54bc670f/test-profiles/CPPNoPrefetchExcludes
----------------------------------------------------------------------
diff --git a/test-profiles/CPPNoPrefetchExcludes 
b/test-profiles/CPPNoPrefetchExcludes
deleted file mode 100644
index 969b927..0000000
--- a/test-profiles/CPPNoPrefetchExcludes
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/54bc670f/test-profiles/CPPPrefetchExcludes
----------------------------------------------------------------------
diff --git a/test-profiles/CPPPrefetchExcludes 
b/test-profiles/CPPPrefetchExcludes
deleted file mode 100644
index ca127ed..0000000
--- a/test-profiles/CPPPrefetchExcludes
+++ /dev/null
@@ -1,22 +0,0 @@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-
-// those tests should be run with prefetch off
-org.apache.qpid.client.SynchReceiveTest#testTwoConsumersInterleaved
-org.apache.qpid.client.SynchReceiveTest#testIdleSecondConsumer

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/54bc670f/test-profiles/CPPTransientExcludes
----------------------------------------------------------------------
diff --git a/test-profiles/CPPTransientExcludes 
b/test-profiles/CPPTransientExcludes
deleted file mode 100644
index 969b927..0000000
--- a/test-profiles/CPPTransientExcludes
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/54bc670f/test-profiles/Excludes
----------------------------------------------------------------------
diff --git a/test-profiles/Excludes b/test-profiles/Excludes
deleted file mode 100644
index 4a2bdfc..0000000
--- a/test-profiles/Excludes
+++ /dev/null
@@ -1,18 +0,0 @@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/54bc670f/test-profiles/ExternalBrokerTests
----------------------------------------------------------------------
diff --git a/test-profiles/ExternalBrokerTests 
b/test-profiles/ExternalBrokerTests
deleted file mode 100644
index 969b927..0000000
--- a/test-profiles/ExternalBrokerTests
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/54bc670f/test-profiles/IBMJDKExcludes
----------------------------------------------------------------------
diff --git a/test-profiles/IBMJDKExcludes b/test-profiles/IBMJDKExcludes
deleted file mode 100644
index 969b927..0000000
--- a/test-profiles/IBMJDKExcludes
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/54bc670f/test-profiles/Java010Excludes
----------------------------------------------------------------------
diff --git a/test-profiles/Java010Excludes b/test-profiles/Java010Excludes
deleted file mode 100755
index aff6fb5..0000000
--- a/test-profiles/Java010Excludes
+++ /dev/null
@@ -1,30 +0,0 @@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-
-// QPID-3432: These tests test the behaviour of 0-8..-0-9-1 specific system 
property (amqj.default_syncwrite_timeout)
-org.apache.qpid.test.client.timeouts.SyncWaitTimeoutDelayTest#*
-org.apache.qpid.test.client.timeouts.SyncWaitDelayTest#*
-
-
-# Exclude the JMS 2.0 test suite
-org.apache.qpid.systests.jms_2_0.*
-
-// Exclude 1.0 protocol tests
-org.apache.qpid.tests.protocol.v1_0.*
-

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/54bc670f/test-profiles/Java10BrokenTestsExcludes
----------------------------------------------------------------------
diff --git a/test-profiles/Java10BrokenTestsExcludes 
b/test-profiles/Java10BrokenTestsExcludes
deleted file mode 100644
index 501ff3b..0000000
--- a/test-profiles/Java10BrokenTestsExcludes
+++ /dev/null
@@ -1,25 +0,0 @@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-
-//-----------------------------------------------------
-// Tests which fail, indicating a potential issue or a missing feature
-//-----------------------------------------------------
-
-
-

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/54bc670f/test-profiles/Java10Excludes
----------------------------------------------------------------------
diff --git a/test-profiles/Java10Excludes b/test-profiles/Java10Excludes
deleted file mode 100644
index 72d3d31..0000000
--- a/test-profiles/Java10Excludes
+++ /dev/null
@@ -1,31 +0,0 @@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-
-// Tests the interaction between the Broker's supported protocols and what the 
0-x client agrees to
-org.apache.qpid.server.SupportedProtocolVersionsTest#*
-
-// These tests assume names of queues backing durable subscriptions
-org.apache.qpid.server.store.berkeleydb.BDBUpgradeTest#testConsumptionOfUpgradedMessages
-org.apache.qpid.server.store.berkeleydb.BDBUpgradeTest#testDurableSubscriptionWithoutSelector
-org.apache.qpid.server.store.berkeleydb.BDBUpgradeTest#testSelectorDurability
-
-// this test makes assumptions about the way the client uses sessions.
-org.apache.qpid.systest.rest.SessionRestTest#*
-
-

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/54bc670f/test-profiles/Java10UninvestigatedTestsExcludes
----------------------------------------------------------------------
diff --git a/test-profiles/Java10UninvestigatedTestsExcludes 
b/test-profiles/Java10UninvestigatedTestsExcludes
deleted file mode 100644
index d436d43..0000000
--- a/test-profiles/Java10UninvestigatedTestsExcludes
+++ /dev/null
@@ -1,26 +0,0 @@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-
-// This file should eventually be removed as all the systests are moved to 
either
-// working, defined as broken, or excluded as they test version specific 
functionality
-
-
-
-
-

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/54bc670f/test-profiles/JavaBDBExcludes
----------------------------------------------------------------------
diff --git a/test-profiles/JavaBDBExcludes b/test-profiles/JavaBDBExcludes
deleted file mode 100644
index 969b927..0000000
--- a/test-profiles/JavaBDBExcludes
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/54bc670f/test-profiles/JavaDerbyExcludes
----------------------------------------------------------------------
diff --git a/test-profiles/JavaDerbyExcludes b/test-profiles/JavaDerbyExcludes
deleted file mode 100644
index 9411d0f..0000000
--- a/test-profiles/JavaDerbyExcludes
+++ /dev/null
@@ -1,23 +0,0 @@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-
-org.apache.qpid.server.store.berkeleydb.*
-org.apache.qpid.server.store.berkeleydb.replication.*
-org.apache.qpid.server.virtualhostnode.berkeleydb.*
-

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/54bc670f/test-profiles/JavaExcludes
----------------------------------------------------------------------
diff --git a/test-profiles/JavaExcludes b/test-profiles/JavaExcludes
deleted file mode 100644
index ba4eaf1..0000000
--- a/test-profiles/JavaExcludes
+++ /dev/null
@@ -1,21 +0,0 @@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-
-// Test runs for 2 minutes testing that subtraction works
-org.apache.qpid.server.util.SerialTest#testCorollary1
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/54bc670f/test-profiles/JavaJsonExcludes
----------------------------------------------------------------------
diff --git a/test-profiles/JavaJsonExcludes b/test-profiles/JavaJsonExcludes
deleted file mode 100644
index 9fbd871..0000000
--- a/test-profiles/JavaJsonExcludes
+++ /dev/null
@@ -1,21 +0,0 @@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-
-org.apache.qpid.server.store.berkeleydb.*
-org.apache.qpid.server.store.berkeleydb.replication.*

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/54bc670f/test-profiles/JavaPersistentExcludes
----------------------------------------------------------------------
diff --git a/test-profiles/JavaPersistentExcludes 
b/test-profiles/JavaPersistentExcludes
deleted file mode 100644
index 969b927..0000000
--- a/test-profiles/JavaPersistentExcludes
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/54bc670f/test-profiles/JavaPre010Excludes
----------------------------------------------------------------------
diff --git a/test-profiles/JavaPre010Excludes b/test-profiles/JavaPre010Excludes
deleted file mode 100644
index 61616c6..0000000
--- a/test-profiles/JavaPre010Excludes
+++ /dev/null
@@ -1,37 +0,0 @@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-
-//======================================================================
-//Exclude the following from brokers using the 0-8/0-9/0-9-1 protocols
-//======================================================================
-
-// Those tests are written against the 0.10 path
-org.apache.qpid.client.SynchReceiveTest#testReceiveNoWait
-
-# Exclude the JMS 2.0 test suite
-org.apache.qpid.systests.jms_2_0.*
-
-// Exclude 1.0 protocol tests
-org.apache.qpid.tests.protocol.v1_0.*
-
-// Test requires ability to address the $management node.  Fails for 0-9 only 
as client erroneously tries to declare an exchange
-// Already fixed for next Qpid Client AMQP 0-x release (6.3.x)
-org.apache.qpid.server.stats.StatisticsReportingTest#testBrokerStatistics
-org.apache.qpid.server.stats.StatisticsReportingTest#testVirtualHostConnectionStatistics
-

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/54bc670f/test-profiles/JavaTransientExcludes
----------------------------------------------------------------------
diff --git a/test-profiles/JavaTransientExcludes 
b/test-profiles/JavaTransientExcludes
deleted file mode 100644
index 436053a..0000000
--- a/test-profiles/JavaTransientExcludes
+++ /dev/null
@@ -1,24 +0,0 @@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-
-org.apache.qpid.server.store.berkeleydb.*
-org.apache.qpid.server.store.berkeleydb.replication.*
-org.apache.qpid.server.store.berkeleydb.upgrade.*
-org.apache.qpid.server.virtualhostnode.berkeleydb.*
-

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/54bc670f/test-profiles/cpp.async.excludes
----------------------------------------------------------------------
diff --git a/test-profiles/cpp.async.excludes b/test-profiles/cpp.async.excludes
deleted file mode 100644
index 969b927..0000000
--- a/test-profiles/cpp.async.excludes
+++ /dev/null
@@ -1,19 +0,0 @@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/54bc670f/test-profiles/cpp.excludes
----------------------------------------------------------------------
diff --git a/test-profiles/cpp.excludes b/test-profiles/cpp.excludes
deleted file mode 100644
index 0c6c80e..0000000
--- a/test-profiles/cpp.excludes
+++ /dev/null
@@ -1,27 +0,0 @@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-
-//======================================================================
-//Exclude the following tests when running all cpp test profilies
-//======================================================================
-
-
-//BDB System Tests
-org.apache.qpid.server.store.berkeleydb.*
-

http://git-wip-us.apache.org/repos/asf/qpid-broker-j/blob/54bc670f/test-profiles/cpp.ssl.excludes
----------------------------------------------------------------------
diff --git a/test-profiles/cpp.ssl.excludes b/test-profiles/cpp.ssl.excludes
deleted file mode 100644
index bfb2d30..0000000
--- a/test-profiles/cpp.ssl.excludes
+++ /dev/null
@@ -1,20 +0,0 @@
-//
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you under the Apache License, Version 2.0 (the
-// "License"); you may not use this file except in compliance
-// with the License.  You may obtain a copy of the License at
-//
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing,
-// software distributed under the License is distributed on an
-// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-// KIND, either express or implied.  See the License for the
-// specific language governing permissions and limitations
-// under the License.
-//
-
-


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org

Reply via email to