Author: aidan
Date: Fri Jun 26 12:54:53 2009
New Revision: 788680
URL: http://svn.apache.org/viewvc?rev=788680&view=rev
Log:
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.
Added:
qpid/trunk/qpid/java/broker/etc/config-systests-derby.xml
- copied, changed from r788527,
qpid/trunk/qpid/java/broker/etc/config-systests.xml
qpid/trunk/qpid/java/java-derby.testprofile
- copied, changed from r788527, qpid/trunk/qpid/java/java.testprofile
Modified:
qpid/trunk/qpid/java/ExcludeList
qpid/trunk/qpid/java/broker/etc/config-systests.xml
qpid/trunk/qpid/java/default.testprofile
qpid/trunk/qpid/java/java.testprofile
qpid/trunk/qpid/java/module.xml
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
Modified: qpid/trunk/qpid/java/ExcludeList
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/ExcludeList?rev=788680&r1=788679&r2=788680&view=diff
==============================================================================
--- qpid/trunk/qpid/java/ExcludeList (original)
+++ qpid/trunk/qpid/java/ExcludeList Fri Jun 26 12:54:53 2009
@@ -7,4 +7,3 @@
// exclude until aidan fixes
org.apache.qpid.server.AlertingTest#*
-org.apache.qpid.server.store.PersistentStoreTest#*
Copied: qpid/trunk/qpid/java/broker/etc/config-systests-derby.xml (from
r788527, qpid/trunk/qpid/java/broker/etc/config-systests.xml)
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/etc/config-systests-derby.xml?p2=qpid/trunk/qpid/java/broker/etc/config-systests-derby.xml&p1=qpid/trunk/qpid/java/broker/etc/config-systests.xml&r1=788527&r2=788680&rev=788680&view=diff
==============================================================================
(empty)
Modified: qpid/trunk/qpid/java/broker/etc/config-systests.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/etc/config-systests.xml?rev=788680&r1=788679&r2=788680&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/etc/config-systests.xml (original)
+++ qpid/trunk/qpid/java/broker/etc/config-systests.xml Fri Jun 26 12:54:53 2009
@@ -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>
Modified: qpid/trunk/qpid/java/default.testprofile
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/default.testprofile?rev=788680&r1=788679&r2=788680&view=diff
==============================================================================
--- qpid/trunk/qpid/java/default.testprofile (original)
+++ qpid/trunk/qpid/java/default.testprofile Fri Jun 26 12:54:53 2009
@@ -5,6 +5,7 @@
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.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
Copied: qpid/trunk/qpid/java/java-derby.testprofile (from r788527,
qpid/trunk/qpid/java/java.testprofile)
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/java-derby.testprofile?p2=qpid/trunk/qpid/java/java-derby.testprofile&p1=qpid/trunk/qpid/java/java.testprofile&r1=788527&r2=788680&rev=788680&view=diff
==============================================================================
--- qpid/trunk/qpid/java/java.testprofile (original)
+++ qpid/trunk/qpid/java/java-derby.testprofile Fri Jun 26 12:54:53 2009
@@ -2,5 +2,6 @@
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
+test.excludesfile=${project.root}/ExcludeList ${project.root}/XAExcludeList
${project.root}/08ExcludeList-nonvm
Modified: qpid/trunk/qpid/java/java.testprofile
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/java.testprofile?rev=788680&r1=788679&r2=788680&view=diff
==============================================================================
--- qpid/trunk/qpid/java/java.testprofile (original)
+++ qpid/trunk/qpid/java/java.testprofile Fri Jun 26 12:54:53 2009
@@ -3,4 +3,4 @@
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
Modified: qpid/trunk/qpid/java/module.xml
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/module.xml?rev=788680&r1=788679&r2=788680&view=diff
==============================================================================
--- qpid/trunk/qpid/java/module.xml (original)
+++ qpid/trunk/qpid/java/module.xml Fri Jun 26 12:54:53 2009
@@ -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"/>
Modified:
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java?rev=788680&r1=788679&r2=788680&view=diff
==============================================================================
---
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
(original)
+++
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
Fri Jun 26 12:54:53 2009
@@ -56,7 +56,7 @@
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);
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
