Author: aidan Date: Mon Jun 22 14:36:40 2009 New Revision: 787248 URL: http://svn.apache.org/viewvc?rev=787248&view=rev Log: Use DerbyMessageStore for config-systests.xml, ensure it's cleaned up
Modified: 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/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java 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=787248&r1=787247&r2=787248&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker/etc/config-systests.xml (original) +++ qpid/trunk/qpid/java/broker/etc/config-systests.xml Mon Jun 22 14:36:40 2009 @@ -95,7 +95,7 @@ <name>localhost</name> <localhost> <store> - <class>org.apache.qpid.server.store.MemoryMessageStore</class> + <class>org.apache.qpid.server.store.DerbyMessageStore</class> </store> <housekeeping> @@ -109,7 +109,7 @@ <name>development</name> <development> <store> - <class>org.apache.qpid.server.store.MemoryMessageStore</class> + <class>org.apache.qpid.server.store.DerbyMessageStore</class> </store> </development> </virtualhost> @@ -118,7 +118,7 @@ <name>test</name> <test> <store> - <class>org.apache.qpid.server.store.MemoryMessageStore</class> + <class>org.apache.qpid.server.store.DerbyMessageStore</class> </store> </test> </virtualhost> Modified: qpid/trunk/qpid/java/default.testprofile URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/default.testprofile?rev=787248&r1=787247&r2=787248&view=diff ============================================================================== --- qpid/trunk/qpid/java/default.testprofile (original) +++ qpid/trunk/qpid/java/default.testprofile Mon Jun 22 14:36:40 2009 @@ -3,7 +3,7 @@ broker.version=0-8 broker=vm -broker.clean=${project.root}/clean-dir ${build.data} ${project.root}/derbyDB +broker.clean=${project.root}/clean-dir ${build.data} ${project.root}/build/work/derbyDB broker.ready=Listening on TCP port max_prefetch=1000 Modified: qpid/trunk/qpid/java/java.testprofile URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/java.testprofile?rev=787248&r1=787247&r2=787248&view=diff ============================================================================== --- qpid/trunk/qpid/java/java.testprofile (original) +++ qpid/trunk/qpid/java/java.testprofile Mon Jun 22 14:36:40 2009 @@ -1,6 +1,6 @@ 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}/derbyDB +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 Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java?rev=787248&r1=787247&r2=787248&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java (original) +++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java Mon Jun 22 14:36:40 2009 @@ -22,6 +22,8 @@ import javax.jms.Connection; +import org.apache.qpid.util.FileUtils; + public class FailoverBaseCase extends QpidTestCase { @@ -81,6 +83,7 @@ port = FAILING_PORT; } stopBroker(port); + FileUtils.deleteDirectory(System.getProperty("java.io.tmpdir")+"/"+getFailingPort()); super.tearDown(); } --------------------------------------------------------------------- Apache Qpid - AMQP Messaging Implementation Project: http://qpid.apache.org Use/Interact: mailto:commits-subscr...@qpid.apache.org