Put the default test profile back to using MemoryMessageStore for now, add java-derby and config-systests-derby.xml for testing purpouses. Allow the config file to be specified in the test profile, default to config-systests.xml.

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

8 files changed, 153 insertions, 7 deletions

diff --git a/java/ExcludeList b/java/ExcludeList
index 04a69412fa..b3784b9b03 100644
--- a/java/ExcludeList
+++ b/java/ExcludeList
@@ -7,4 +7,3 @@ org.apache.qpid.server.queue.QueueCreateTest#testCreateFlowToDiskInvalidSize
 
 // exclude until aidan fixes
 org.apache.qpid.server.AlertingTest#*
-org.apache.qpid.server.store.PersistentStoreTest#*
diff --git a/java/broker/etc/config-systests-derby.xml b/java/broker/etc/config-systests-derby.xml
new file mode 100644
index 0000000000..ade832eda1
--- /dev/null
+++ b/java/broker/etc/config-systests-derby.xml
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ -
+ - 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.
+ -
+ -->
+<broker>
+    <prefix>${QPID_HOME}</prefix>
+    <work>${QPID_WORK}</work>
+    <conf>${prefix}/etc</conf>
+    <connector>
+        <!-- Uncomment out this block and edit the keystorePath and keystorePassword
+             to enable SSL support
+        <ssl>
+            <enabled>true</enabled>
+            <sslOnly>true</sslOnly>
+            <keystorePath>/path/to/keystore.ks</keystorePath>
+            <keystorePassword>keystorepass</keystorePassword>
+        </ssl>-->
+        <qpidnio>false</qpidnio>
+        <protectio>
+            <enabled>false</enabled>
+        </protectio>
+        <transport>nio</transport>
+        <port>5672</port>
+        <sslport>8672</sslport>
+        <socketReceiveBuffer>32768</socketReceiveBuffer>
+        <socketSendBuffer>32768</socketSendBuffer>
+    </connector>
+    <management>
+        <enabled>false</enabled>
+        <jmxport>8999</jmxport>
+        <ssl>
+            <enabled>false</enabled>
+            <!-- Update below path to your keystore location, eg ${conf}/qpid.keystore  -->
+            <keyStorePath>${prefix}/../test_resources/ssl/keystore.jks</keyStorePath>
+            <keyStorePassword>password</keyStorePassword>
+        </ssl>
+    </management>
+    <advanced>
+        <filterchain enableExecutorPool="true"/>
+        <enablePooledAllocator>false</enablePooledAllocator>
+        <enableDirectBuffers>false</enableDirectBuffers>
+        <framesize>65535</framesize>
+        <compressBufferOnQueue>false</compressBufferOnQueue>
+        <enableJMSXUserID>false</enableJMSXUserID>
+    </advanced>
+
+    <security>
+        <principal-databases>
+            <!-- Example use of Base64 encoded MD5 hashes for authentication via CRAM-MD5-Hashed -->
+            <principal-database>
+                <name>passwordfile</name>
+                <class>org.apache.qpid.server.security.auth.database.PlainPasswordFilePrincipalDatabase</class>
+                <attributes>
+                    <attribute>
+                        <name>passwordFile</name>
+                        <value>${conf}/passwd</value>
+                    </attribute>
+                </attributes>
+            </principal-database>
+        </principal-databases>
+
+        <access>
+            <class>org.apache.qpid.server.security.access.plugins.AllowAll</class>
+        </access>
+        
+        <msg-auth>false</msg-auth>
+        
+        <jmx>
+            <access>${conf}/jmxremote.access</access>
+            <principal-database>passwordfile</principal-database>
+        </jmx>
+    </security>
+
+    <virtualhosts>
+        <directory>${conf}/virtualhosts</directory>
+
+        <virtualhost>
+            <name>localhost</name>
+            <localhost>
+                <store>
+                    <class>org.apache.qpid.server.store.DerbyMessageStore</class>
+                </store>
+
+                <housekeeping>
+                    <expiredMessageCheckPeriod>20000</expiredMessageCheckPeriod>
+                </housekeeping>
+
+            </localhost>
+        </virtualhost>
+
+        <virtualhost>
+            <name>development</name>
+            <development>
+                <store>
+                    <class>org.apache.qpid.server.store.DerbyMessageStore</class>
+                </store>
+            </development>
+        </virtualhost>
+
+        <virtualhost>
+            <name>test</name>
+            <test>
+                <store>
+                    <class>org.apache.qpid.server.store.DerbyMessageStore</class>
+                </store>
+            </test>
+        </virtualhost>
+
+    </virtualhosts>
+    <heartbeat>
+        <delay>0</delay>
+        <timeoutFactor>2.0</timeoutFactor>
+    </heartbeat>
+    <queue>
+        <auto_register>true</auto_register>
+    </queue>
+
+    <virtualhosts>${conf}/virtualhosts-systests.xml</virtualhosts>
+</broker>
+
+
diff --git a/java/broker/etc/config-systests.xml b/java/broker/etc/config-systests.xml
index ade832eda1..6aac952fe9 100644
--- a/java/broker/etc/config-systests.xml
+++ b/java/broker/etc/config-systests.xml
@@ -95,7 +95,7 @@
             <name>localhost</name>
             <localhost>
                 <store>
-                    <class>org.apache.qpid.server.store.DerbyMessageStore</class>
+                    <class>org.apache.qpid.server.store.MemoryMessageStore</class>
                 </store>
 
                 <housekeeping>
@@ -109,7 +109,7 @@
             <name>development</name>
             <development>
                 <store>
-                    <class>org.apache.qpid.server.store.DerbyMessageStore</class>
+                    <class>org.apache.qpid.server.store.MemoryMessageStore</class>
                 </store>
             </development>
         </virtualhost>
@@ -118,7 +118,7 @@
             <name>test</name>
             <test>
                 <store>
-                    <class>org.apache.qpid.server.store.DerbyMessageStore</class>
+                    <class>org.apache.qpid.server.store.MemoryMessageStore</class>
                 </store>
             </test>
         </virtualhost>
diff --git a/java/default.testprofile b/java/default.testprofile
index 4045e28c7f..acbc31dcbe 100644
--- a/java/default.testprofile
+++ b/java/default.testprofile
@@ -5,6 +5,7 @@ broker.version=0-8
 broker=vm
 broker.clean=${project.root}/clean-dir ${build.data} ${project.root}/build/work/derbyDB
 broker.ready=Listening on TCP port
+broker.config=${project.root}/build/etc/config-systests.xml
 
 max_prefetch=1000
 
@@ -16,7 +17,7 @@ log4j.configuration=file:///${project.root}/log4j-test.xml
 log4j.debug=false
 
 test.excludes=true
-test.excludesfile=${project.root}/ExcludeList ${project.root}/XAExcludeList ${project.root}/08ExcludeList
+test.excludesfile=${project.root}/ExcludeList ${project.root}/XAExcludeList ${project.root}/08ExcludeList ${project.root}/08ExcludeList-nopersistence
 test.fork=no
 test.mem=512M
 test=*Test
diff --git a/java/java-derby.testprofile b/java/java-derby.testprofile
new file mode 100644
index 0000000000..bb0dbf3663
--- /dev/null
+++ b/java/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 ${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
index 592623f066..9bf824d4cd 100644
--- a/java/java.testprofile
+++ b/java/java.testprofile
@@ -3,4 +3,4 @@ broker=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE
 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
+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 6ff2e01e83..42da1fe7ed 100644
--- a/java/module.xml
+++ b/java/module.xml
@@ -236,6 +236,7 @@
       <sysproperty key="broker.clean" value="${broker.clean}"/>
       <sysproperty key="broker.version" value="${broker.version}"/>
       <sysproperty key="broker.ready" value="${broker.ready}" />
+      <sysproperty key="broker.config" value="${broker.config}" />
       <sysproperty key="test.output" value="${module.results}"/>
       <syspropertyset>
         <propertyref prefix="test"/>
diff --git a/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java b/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
index 2d19bb6e49..72d0e2c5fc 100644
--- a/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
+++ b/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
@@ -56,7 +56,7 @@ import org.slf4j.LoggerFactory;
 public class QpidTestCase extends TestCase
 {
     protected final String QpidHome = System.getProperty("QPID_HOME");
-    protected File _configFile = new File(QpidHome, "etc/config-systests.xml");
+    protected File _configFile = new File(System.getProperty("broker.config"));
 
     private static final Logger _logger = LoggerFactory.getLogger(QpidTestCase.class);