Author: aidan
Date: Mon Jun 22 14:41:10 2009
New Revision: 787254
URL: http://svn.apache.org/viewvc?rev=787254&view=rev
Log:
QPID-1924: Make DerbyMessageStore honor $QPID_WORK.
DerbyMessageStore: pick up QPID_WORK
FailoverBaseCase: set QPID_WORK for the second broker
QpidTestCase: pass on QPID_WORK
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/FailoverBaseCase.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java?rev=787254&r1=787253&r2=787254&view=diff
==============================================================================
---
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java
(original)
+++
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/store/DerbyMessageStore.java
Mon Jun 22 14:41:10 2009
@@ -155,7 +155,7 @@
QueueRegistry queueRegistry = virtualHost.getQueueRegistry();
//Update to pick up QPID_WORK and use that as the default location not
just derbyDB
- final String databasePath =
config.getStoreConfiguration().getString(ENVIRONMENT_PATH_PROPERTY, "derbyDB");
+ final String databasePath =
config.getStoreConfiguration().getString(ENVIRONMENT_PATH_PROPERTY,
System.getProperty("QPID_WORK")+"/derbyDB");
File environmentPath = new File(databasePath);
if (!environmentPath.exists())
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=787254&r1=787253&r2=787254&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:41:10 2009
@@ -54,6 +54,7 @@
protected void setUp() throws java.lang.Exception
{
super.setUp();
+ System.setProperty("QPID_WORK",
System.getProperty("java.io.tmpdir")+"/"+getFailingPort());
startBroker(getFailingPort());
}
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=787254&r1=787253&r2=787254&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
Mon Jun 22 14:41:10 2009
@@ -387,7 +387,7 @@
//Add the test name to the broker run.
env.put("QPID_PNAME", "-DPNAME=\"" + _testName + "\"");
-
+ env.put("QPID_WORK", System.getProperty("QPID_WORK"));
process = pb.start();
Piper p = new Piper(process.getInputStream(),
@@ -469,6 +469,34 @@
ApplicationRegistry.remove(port);
}
}
+
+ public void nukeBroker() throws Exception
+ {
+ nukeBroker(0);
+ }
+
+ public void nukeBroker(int port) throws Exception
+ {
+ Process proc = _brokers.get(getPort(port));
+ if (proc == null)
+ {
+ stopBroker(port);
+ }
+ else
+ {
+ String command = "pkill -KILL -f "+getBrokerCommand(getPort(port));
+ try
+ {
+ Runtime.getRuntime().exec(command);
+ }
+ catch (Exception e)
+ {
+ // Can't do that, try the old fashioned way
+ _logger.warn("Could not run "+command+", killing with
stopBroker()");
+ stopBroker(port);
+ }
+ }
+ }
protected void setSystemProperty(String property, String value)
{
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:[email protected]
