You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2011/09/30 15:38:46 UTC
svn commit: r1177658 - in /qpid/trunk/qpid/java: ./
bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/
systests/etc/ systests/src/main/java/org/apache/qpid/server/logging/
systests/src/main/java/org/apache/qpid/server/security/acl/ systest...
Author: robbie
Date: Fri Sep 30 13:38:45 2011
New Revision: 1177658
URL: http://svn.apache.org/viewvc?rev=1177658&view=rev
Log:
QPID-3402: ensure the test JVMs execute with the working dir set to the qpid/java dir, use relative paths to the broker startup script and config files, update the QBTC configuration override functionality to operate relative to QPID_HOME to avoid setting properties with spaces/parentheses into QPID_OPTS
Enables the java test profiles to cope with spaces/parentheses in the parent directory structure of the checkout, as found in the matrix project workspaces on the ASF Jenkins instances
Modified:
qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java
qpid/trunk/qpid/java/module.xml
qpid/trunk/qpid/java/systests/etc/config-systests-aclv2.xml
qpid/trunk/qpid/java/systests/etc/config-systests-bdb.xml
qpid/trunk/qpid/java/systests/etc/config-systests-derby.xml
qpid/trunk/qpid/java/systests/etc/config-systests-firewall.xml
qpid/trunk/qpid/java/systests/etc/config-systests.xml
qpid/trunk/qpid/java/systests/etc/virtualhosts-systests-aclv2.xml
qpid/trunk/qpid/java/systests/etc/virtualhosts-systests-bdb.xml
qpid/trunk/qpid/java/systests/etc/virtualhosts-systests-derby.xml
qpid/trunk/qpid/java/systests/etc/virtualhosts-systests-firewall.xml
qpid/trunk/qpid/java/systests/etc/virtualhosts-systests.xml
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/BrokerLoggingTest.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/AbstractACLTestCase.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/security/firewall/FirewallConfigTest.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
qpid/trunk/qpid/java/test-profiles/java-bdb-spawn.0-10.testprofile
qpid/trunk/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile
qpid/trunk/qpid/java/test-profiles/java-bdb.0-10.testprofile
qpid/trunk/qpid/java/test-profiles/java-bdb.0-9-1.testprofile
qpid/trunk/qpid/java/test-profiles/java-dby-spawn.0-10.testprofile
qpid/trunk/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile
qpid/trunk/qpid/java/test-profiles/java-dby.0-10.testprofile
qpid/trunk/qpid/java/test-profiles/java-dby.0-9-1.testprofile
qpid/trunk/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile
qpid/trunk/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile
qpid/trunk/qpid/java/test-profiles/java-mms.0-10.testprofile
qpid/trunk/qpid/java/test-profiles/java-mms.0-9-1.testprofile
qpid/trunk/qpid/java/test-profiles/testprofile.defaults
Modified: qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java?rev=1177658&r1=1177657&r2=1177658&view=diff
==============================================================================
--- qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java (original)
+++ qpid/trunk/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java Fri Sep 30 13:38:45 2011
@@ -121,7 +121,7 @@ public class BDBUpgradeTest extends Qpid
upgradeBrokerStore(_fromDir, _toDir);
//override the broker config used and then start the broker with the updated store
- _configFile = new File(QPID_HOME, "etc/config-systests-bdb.xml");
+ _configFile = new File("build/etc/config-systests-bdb.xml");
setConfigurationProperty("management.enabled", "true");
super.setUp();
Modified: qpid/trunk/qpid/java/module.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/module.xml?rev=1177658&r1=1177657&r2=1177658&view=diff
==============================================================================
--- qpid/trunk/qpid/java/module.xml (original)
+++ qpid/trunk/qpid/java/module.xml Fri Sep 30 13:38:45 2011
@@ -334,7 +334,8 @@
<echo message="Using profile:${profile}" level="info"/>
<junit fork="yes" forkmode="once" maxmemory="${test.mem}" reloading="no"
haltonfailure="${haltonfailure}" haltonerror="${haltonerror}"
- failureproperty="test.failures" printsummary="on" timeout="6000000" >
+ failureproperty="test.failures" printsummary="on" timeout="6000000"
+ dir="${project.root}" >
<jvmarg line="${jvm.args}" />
@@ -659,7 +660,8 @@
<mkdir dir="${build.coveragereport}" />
<junit fork="yes" forkmode="once" maxmemory="${test.mem}" reloading="no"
haltonfailure="${haltonfailure}" haltonerror="${haltonerror}"
- failureproperty="test.failures" printsummary="on" timeout="600000" >
+ failureproperty="test.failures" printsummary="on" timeout="600000"
+ dir="${project.root}" >
<sysproperty key="amqj.logging.level" value="${amqj.logging.level}"/>
<sysproperty key="amqj.protocol.logging.level" value="${amqj.protocol.logging.level}"/>
Modified: qpid/trunk/qpid/java/systests/etc/config-systests-aclv2.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/etc/config-systests-aclv2.xml?rev=1177658&r1=1177657&r2=1177658&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/etc/config-systests-aclv2.xml (original)
+++ qpid/trunk/qpid/java/systests/etc/config-systests-aclv2.xml Fri Sep 30 13:38:45 2011
@@ -22,7 +22,7 @@
<configuration>
<system/>
<override>
- <xml fileName="${test.config}" optional="true"/>
+ <xml fileName="${QPID_HOME}/${test.config}" optional="true"/>
<xml fileName="${QPID_HOME}/etc/config-systests-aclv2-settings.xml"/>
<xml fileName="${QPID_HOME}/etc/config-systests-settings.xml"/>
<xml fileName="${QPID_HOME}/etc/config.xml"/>
Modified: qpid/trunk/qpid/java/systests/etc/config-systests-bdb.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/etc/config-systests-bdb.xml?rev=1177658&r1=1177657&r2=1177658&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/etc/config-systests-bdb.xml (original)
+++ qpid/trunk/qpid/java/systests/etc/config-systests-bdb.xml Fri Sep 30 13:38:45 2011
@@ -22,7 +22,7 @@
<configuration>
<system/>
<override>
- <xml fileName="${test.config}" optional="true"/>
+ <xml fileName="${QPID_HOME}/${test.config}" optional="true"/>
<xml fileName="${QPID_HOME}/etc/config-systests-bdb-settings.xml"/>
<xml fileName="${QPID_HOME}/etc/config-systests-settings.xml"/>
<xml fileName="${QPID_HOME}/etc/config.xml"/>
Modified: qpid/trunk/qpid/java/systests/etc/config-systests-derby.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/etc/config-systests-derby.xml?rev=1177658&r1=1177657&r2=1177658&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/etc/config-systests-derby.xml (original)
+++ qpid/trunk/qpid/java/systests/etc/config-systests-derby.xml Fri Sep 30 13:38:45 2011
@@ -22,7 +22,7 @@
<configuration>
<system/>
<override>
- <xml fileName="${test.config}" optional="true"/>
+ <xml fileName="${QPID_HOME}/${test.config}" optional="true"/>
<xml fileName="${QPID_HOME}/etc/config-systests-derby-settings.xml"/>
<xml fileName="${QPID_HOME}/etc/config-systests-settings.xml"/>
<xml fileName="${QPID_HOME}/etc/config.xml"/>
Modified: qpid/trunk/qpid/java/systests/etc/config-systests-firewall.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/etc/config-systests-firewall.xml?rev=1177658&r1=1177657&r2=1177658&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/etc/config-systests-firewall.xml (original)
+++ qpid/trunk/qpid/java/systests/etc/config-systests-firewall.xml Fri Sep 30 13:38:45 2011
@@ -22,7 +22,7 @@
<configuration>
<system/>
<override>
- <xml fileName="${test.config}" optional="true"/>
+ <xml fileName="${QPID_HOME}/${test.config}" optional="true"/>
<xml fileName="${QPID_FIREWALL_CONFIG_SETTINGS}" optional="true"/>
<xml fileName="${QPID_HOME}/etc/config-systests-firewall-settings.xml"/>
<xml fileName="${QPID_HOME}/etc/config-systests-settings.xml"/>
Modified: qpid/trunk/qpid/java/systests/etc/config-systests.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/etc/config-systests.xml?rev=1177658&r1=1177657&r2=1177658&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/etc/config-systests.xml (original)
+++ qpid/trunk/qpid/java/systests/etc/config-systests.xml Fri Sep 30 13:38:45 2011
@@ -22,7 +22,7 @@
<configuration>
<system/>
<override>
- <xml fileName="${test.config}" optional="true"/>
+ <xml fileName="${QPID_HOME}/${test.config}" optional="true"/>
<xml fileName="${QPID_HOME}/etc/config-systests-settings.xml"/>
<xml fileName="${QPID_HOME}/etc/config.xml"/>
</override>
Modified: qpid/trunk/qpid/java/systests/etc/virtualhosts-systests-aclv2.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/etc/virtualhosts-systests-aclv2.xml?rev=1177658&r1=1177657&r2=1177658&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/etc/virtualhosts-systests-aclv2.xml (original)
+++ qpid/trunk/qpid/java/systests/etc/virtualhosts-systests-aclv2.xml Fri Sep 30 13:38:45 2011
@@ -22,7 +22,7 @@
<configuration>
<system/>
<override>
- <xml fileName="${test.virtualhosts}" optional="true"/>
+ <xml fileName="${QPID_HOME}/${test.virtualhosts}" optional="true"/>
<xml fileName="${QPID_HOME}/etc/virtualhosts-systests-aclv2-settings.xml"/>
<xml fileName="${QPID_HOME}/etc/virtualhosts.xml"/>
</override>
Modified: qpid/trunk/qpid/java/systests/etc/virtualhosts-systests-bdb.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/etc/virtualhosts-systests-bdb.xml?rev=1177658&r1=1177657&r2=1177658&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/etc/virtualhosts-systests-bdb.xml (original)
+++ qpid/trunk/qpid/java/systests/etc/virtualhosts-systests-bdb.xml Fri Sep 30 13:38:45 2011
@@ -22,7 +22,7 @@
<configuration>
<system/>
<override>
- <xml fileName="${test.virtualhosts}" optional="true"/>
+ <xml fileName="${QPID_HOME}/${test.virtualhosts}" optional="true"/>
<xml fileName="${QPID_HOME}/etc/virtualhosts-systests-bdb-settings.xml"/>
<xml fileName="${QPID_HOME}/etc/virtualhosts.xml"/>
</override>
Modified: qpid/trunk/qpid/java/systests/etc/virtualhosts-systests-derby.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/etc/virtualhosts-systests-derby.xml?rev=1177658&r1=1177657&r2=1177658&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/etc/virtualhosts-systests-derby.xml (original)
+++ qpid/trunk/qpid/java/systests/etc/virtualhosts-systests-derby.xml Fri Sep 30 13:38:45 2011
@@ -22,7 +22,7 @@
<configuration>
<system/>
<override>
- <xml fileName="${test.virtualhosts}" optional="true"/>
+ <xml fileName="${QPID_HOME}/${test.virtualhosts}" optional="true"/>
<xml fileName="${QPID_HOME}/etc/virtualhosts-systests-derby-settings.xml"/>
<xml fileName="${QPID_HOME}/etc/virtualhosts.xml"/>
</override>
Modified: qpid/trunk/qpid/java/systests/etc/virtualhosts-systests-firewall.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/etc/virtualhosts-systests-firewall.xml?rev=1177658&r1=1177657&r2=1177658&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/etc/virtualhosts-systests-firewall.xml (original)
+++ qpid/trunk/qpid/java/systests/etc/virtualhosts-systests-firewall.xml Fri Sep 30 13:38:45 2011
@@ -22,7 +22,7 @@
<configuration>
<system/>
<override>
- <xml fileName="${test.virtualhosts}" optional="true"/>
+ <xml fileName="${QPID_HOME}/${test.virtualhosts}" optional="true"/>
<xml fileName="${QPID_FIREWALL_VIRTUALHOSTS_SETTINGS}" optional="true"/>
<xml fileName="${QPID_HOME}/etc/virtualhosts.xml"/>
</override>
Modified: qpid/trunk/qpid/java/systests/etc/virtualhosts-systests.xml
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/etc/virtualhosts-systests.xml?rev=1177658&r1=1177657&r2=1177658&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/etc/virtualhosts-systests.xml (original)
+++ qpid/trunk/qpid/java/systests/etc/virtualhosts-systests.xml Fri Sep 30 13:38:45 2011
@@ -22,7 +22,7 @@
<configuration>
<system/>
<override>
- <xml fileName="${test.virtualhosts}" optional="true"/>
+ <xml fileName="${QPID_HOME}/${test.virtualhosts}" optional="true"/>
<xml fileName="${QPID_HOME}/etc/virtualhosts.xml"/>
</override>
</configuration>
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/BrokerLoggingTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/BrokerLoggingTest.java?rev=1177658&r1=1177657&r2=1177658&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/BrokerLoggingTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/BrokerLoggingTest.java Fri Sep 30 13:38:45 2011
@@ -246,7 +246,7 @@ public class BrokerLoggingTest extends A
if (isJavaBroker() && isExternalBroker())
{
// Get custom -l value used during testing for the broker startup
- String customLog4j = _brokerCommand.substring(_brokerCommand.indexOf("-l") + 2);
+ String customLog4j = _brokerCommand.substring(_brokerCommand.indexOf("-l") + 2).trim();
String TESTID = "BRK-1007";
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/AbstractACLTestCase.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/AbstractACLTestCase.java?rev=1177658&r1=1177657&r2=1177658&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/AbstractACLTestCase.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/AbstractACLTestCase.java Fri Sep 30 13:38:45 2011
@@ -83,14 +83,8 @@ public abstract class AbstractACLTestCas
@Override
public void setUp() throws Exception
{
- if (QpidHome == null)
- {
- fail("QPID_HOME not set");
- }
-
// Initialise ACLs.
- _configFile = new File(QpidHome, "etc" + File.separator + getConfig());
-
+ _configFile = new File("build" + File.separator + "etc" + File.separator + getConfig());
// Initialise ACL files
for (String virtualHost : getHostList())
{
@@ -156,7 +150,7 @@ public abstract class AbstractACLTestCas
*/
public void setUpACLFile(String virtualHost) throws IOException, ConfigurationException
{
- String path = QpidHome + File.separator + "etc";
+ String path = "build" + File.separator + "etc";
String className = StringUtils.substringBeforeLast(getClass().getSimpleName().toLowerCase(), "test");
String testName = StringUtils.substringAfter(getName(), "test").toLowerCase();
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/security/firewall/FirewallConfigTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/security/firewall/FirewallConfigTest.java?rev=1177658&r1=1177657&r2=1177658&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/security/firewall/FirewallConfigTest.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/security/firewall/FirewallConfigTest.java Fri Sep 30 13:38:45 2011
@@ -35,16 +35,8 @@ public class FirewallConfigTest extends
@Override
protected void setUp() throws Exception
{
- // do setup
- final String QPID_HOME = System.getProperty("QPID_HOME");
-
- if (QPID_HOME == null)
- {
- fail("QPID_HOME not set");
- }
-
// Setup initial config file.
- _configFile = new File(QPID_HOME, "etc/config-systests-firewall.xml");
+ _configFile = new File("build/etc/config-systests-firewall.xml");
// Setup temporary config file
_tmpConfig = File.createTempFile("config-systests-firewall", ".xml");
@@ -86,7 +78,7 @@ public class FirewallConfigTest extends
public void testVhostAllowBrokerDeny() throws Exception
{
- _configFile = new File(System.getProperty("QPID_HOME"), "etc/config-systests-firewall-2.xml");
+ _configFile = new File("build/etc/config-systests-firewall-2.xml");
super.setUp();
@@ -119,7 +111,7 @@ public class FirewallConfigTest extends
public void testVhostDenyBrokerAllow() throws Exception
{
- _configFile = new File(System.getProperty("QPID_HOME"), "etc/config-systests-firewall-3.xml");
+ _configFile = new File("build/etc/config-systests-firewall-3.xml");
super.setUp();
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java?rev=1177658&r1=1177657&r2=1177658&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java Fri Sep 30 13:38:45 2011
@@ -143,7 +143,7 @@ public class QpidBrokerTestCase extends
protected String _brokerCommand = System.getProperty(BROKER_COMMAND);
private Boolean _brokerCleanBetweenTests = Boolean.getBoolean(BROKER_CLEAN_BETWEEN_TESTS);
private final AmqpProtocolVersion _brokerVersion = AmqpProtocolVersion.valueOf(System.getProperty(BROKER_VERSION, ""));
- protected String _output = System.getProperty(TEST_OUTPUT);
+ protected String _output = System.getProperty(TEST_OUTPUT, System.getProperty("java.io.tmpdir"));
protected Boolean _brokerPersistent = Boolean.getBoolean(BROKER_PERSITENT);
private String _brokerProtocolExcludes = System.getProperty(BROKER_PROTOCOL_EXCLUDES);
@@ -653,21 +653,28 @@ public class QpidBrokerTestCase extends
public String getTestConfigFile()
{
- String path = _output == null ? System.getProperty("java.io.tmpdir") : _output;
- return path + "/" + getTestQueueName() + "-config.xml";
+ return _output + "/" + getTestQueueName() + "-config.xml";
}
public String getTestVirtualhostsFile()
{
- String path = _output == null ? System.getProperty("java.io.tmpdir") : _output;
- return path + "/" + getTestQueueName() + "-virtualhosts.xml";
+ return _output + "/" + getTestQueueName() + "-virtualhosts.xml";
+ }
+
+ private String relativeToQpidHome(String file)
+ {
+ return file.replace(System.getProperty(QPID_HOME,"QPID_HOME") + "/","");
}
protected void saveTestConfiguration() throws ConfigurationException
{
// Specify the test config file
String testConfig = getTestConfigFile();
- setSystemProperty("test.config", testConfig);
+ String relative = relativeToQpidHome(testConfig);
+
+ setSystemProperty("test.config", relative);
+ _logger.info("Set test.config property to: " + relative);
+ _logger.info("Saving test virtualhosts file at: " + testConfig);
// Create the file if configuration does not exist
if (_testConfiguration.isEmpty())
@@ -681,7 +688,11 @@ public class QpidBrokerTestCase extends
{
// Specify the test virtualhosts file
String testVirtualhosts = getTestVirtualhostsFile();
- setSystemProperty("test.virtualhosts", testVirtualhosts);
+ String relative = relativeToQpidHome(testVirtualhosts);
+
+ setSystemProperty("test.virtualhosts", relative);
+ _logger.info("Set test.virtualhosts property to: " + relative);
+ _logger.info("Saving test virtualhosts file at: " + testVirtualhosts);
// Create the file if configuration does not exist
if (_testVirtualhosts.isEmpty())
Modified: qpid/trunk/qpid/java/test-profiles/java-bdb-spawn.0-10.testprofile
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/java-bdb-spawn.0-10.testprofile?rev=1177658&r1=1177657&r2=1177658&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/java-bdb-spawn.0-10.testprofile (original)
+++ qpid/trunk/qpid/java/test-profiles/java-bdb-spawn.0-10.testprofile Fri Sep 30 13:38:45 2011
@@ -19,10 +19,10 @@
broker.language=java
broker.type=spawned
-broker.command=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE -l ${test.profiles}/log4j-test.xml
+broker.command=build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE -l test-profiles/log4j-test.xml
broker.ready=BRK-1004
broker.stopped=Exception
-broker.config=${project.root}/build/etc/config-systests-bdb.xml
+broker.config=build/etc/config-systests-bdb.xml
messagestore.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStore
profile.excludes=JavaExcludes JavaPersistentExcludes Java010Excludes JavaBDBExcludes
broker.clean.between.tests=true
Modified: qpid/trunk/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile?rev=1177658&r1=1177657&r2=1177658&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile (original)
+++ qpid/trunk/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile Fri Sep 30 13:38:45 2011
@@ -19,10 +19,10 @@
broker.language=java
broker.type=spawned
-broker.command=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES -c @CONFIG_FILE -l ${test.profiles}/log4j-test.xml
+broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES -c @CONFIG_FILE -l test-profiles/log4j-test.xml
broker.ready=BRK-1004
broker.stopped=Exception
-broker.config=${project.root}/build/etc/config-systests-bdb.xml
+broker.config=build/etc/config-systests-bdb.xml
messagestore.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStore
profile.excludes=JavaExcludes JavaPersistentExcludes JavaPre010Excludes JavaBDBExcludes
broker.clean.between.tests=true
Modified: qpid/trunk/qpid/java/test-profiles/java-bdb.0-10.testprofile
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/java-bdb.0-10.testprofile?rev=1177658&r1=1177657&r2=1177658&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/java-bdb.0-10.testprofile (original)
+++ qpid/trunk/qpid/java/test-profiles/java-bdb.0-10.testprofile Fri Sep 30 13:38:45 2011
@@ -19,10 +19,11 @@
broker.language=java
broker.type=internal
-broker.command=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE -l ${test.profiles}/log4j-test.xml
+#broker.command only used for the second broker during failover tests in this profile
+broker.command=build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE -l test-profiles/log4j-test.xml
broker.ready=BRK-1004
broker.stopped=Exception
-broker.config=${project.root}/build/etc/config-systests-bdb.xml
+broker.config=build/etc/config-systests-bdb.xml
messagestore.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStore
profile.excludes=JavaExcludes JavaPersistentExcludes Java010Excludes JavaBDBExcludes
broker.clean.between.tests=true
Modified: qpid/trunk/qpid/java/test-profiles/java-bdb.0-9-1.testprofile
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/java-bdb.0-9-1.testprofile?rev=1177658&r1=1177657&r2=1177658&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/java-bdb.0-9-1.testprofile (original)
+++ qpid/trunk/qpid/java/test-profiles/java-bdb.0-9-1.testprofile Fri Sep 30 13:38:45 2011
@@ -19,10 +19,11 @@
broker.language=java
broker.type=internal
-broker.command=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES -c @CONFIG_FILE -l ${test.profiles}/log4j-test.xml
+#broker.command only used for the second broker during failover tests in this profile
+broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES -c @CONFIG_FILE -l test-profiles/log4j-test.xml
broker.ready=BRK-1004
broker.stopped=Exception
-broker.config=${project.root}/build/etc/config-systests-bdb.xml
+broker.config=build/etc/config-systests-bdb.xml
messagestore.class.name=org.apache.qpid.server.store.berkeleydb.BDBMessageStore
profile.excludes=JavaExcludes JavaPersistentExcludes JavaPre010Excludes JavaBDBExcludes
broker.clean.between.tests=true
Modified: qpid/trunk/qpid/java/test-profiles/java-dby-spawn.0-10.testprofile
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/java-dby-spawn.0-10.testprofile?rev=1177658&r1=1177657&r2=1177658&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/java-dby-spawn.0-10.testprofile (original)
+++ qpid/trunk/qpid/java/test-profiles/java-dby-spawn.0-10.testprofile Fri Sep 30 13:38:45 2011
@@ -19,10 +19,10 @@
broker.language=java
broker.version=v0_10
broker.type=spawned
-broker.command=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE -l ${test.profiles}/log4j-test.xml
+broker.command=build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE -l test-profiles/log4j-test.xml
broker.ready=BRK-1004
broker.stopped=Exception
-broker.config=${project.root}/build/etc/config-systests-derby.xml
+broker.config=build/etc/config-systests-derby.xml
messagestore.class.name=org.apache.qpid.server.store.DerbyMessageStore
profile.excludes=JavaPersistentExcludes JavaDerbyExcludes Java010Excludes
broker.clean.between.tests=true
Modified: qpid/trunk/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile?rev=1177658&r1=1177657&r2=1177658&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile (original)
+++ qpid/trunk/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile Fri Sep 30 13:38:45 2011
@@ -19,10 +19,10 @@
broker.version=v0_9_1
broker.language=java
broker.type=spawned
-broker.command=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES -c @CONFIG_FILE -l ${test.profiles}/log4j-test.xml
+broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES -c @CONFIG_FILE -l test-profiles/log4j-test.xml
broker.ready=BRK-1004
broker.stopped=Exception
-broker.config=${project.root}/build/etc/config-systests-derby.xml
+broker.config=build/etc/config-systests-derby.xml
broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT
messagestore.class.name=org.apache.qpid.server.store.DerbyMessageStore
profile.excludes=JavaPersistentExcludes JavaDerbyExcludes JavaPre010Excludes
Modified: qpid/trunk/qpid/java/test-profiles/java-dby.0-10.testprofile
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/java-dby.0-10.testprofile?rev=1177658&r1=1177657&r2=1177658&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/java-dby.0-10.testprofile (original)
+++ qpid/trunk/qpid/java/test-profiles/java-dby.0-10.testprofile Fri Sep 30 13:38:45 2011
@@ -19,10 +19,11 @@
broker.language=java
broker.version=v0_10
broker.type=internal
-broker.command=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE -l ${test.profiles}/log4j-test.xml
+#broker.command only used for the second broker during failover tests in this profile
+broker.command=build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE -l test-profiles/log4j-test.xml
broker.ready=BRK-1004
broker.stopped=Exception
-broker.config=${project.root}/build/etc/config-systests-derby.xml
+broker.config=build/etc/config-systests-derby.xml
messagestore.class.name=org.apache.qpid.server.store.DerbyMessageStore
profile.excludes=JavaPersistentExcludes JavaDerbyExcludes Java010Excludes
broker.clean.between.tests=true
Modified: qpid/trunk/qpid/java/test-profiles/java-dby.0-9-1.testprofile
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/java-dby.0-9-1.testprofile?rev=1177658&r1=1177657&r2=1177658&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/java-dby.0-9-1.testprofile (original)
+++ qpid/trunk/qpid/java/test-profiles/java-dby.0-9-1.testprofile Fri Sep 30 13:38:45 2011
@@ -19,10 +19,11 @@
broker.version=v0_9_1
broker.language=java
broker.type=internal
-broker.command=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES -c @CONFIG_FILE -l ${test.profiles}/log4j-test.xml
+#broker.command only used for the second broker during failover tests in this profile
+broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES -c @CONFIG_FILE -l test-profiles/log4j-test.xml
broker.ready=BRK-1004
broker.stopped=Exception
-broker.config=${project.root}/build/etc/config-systests-derby.xml
+broker.config=build/etc/config-systests-derby.xml
broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT
messagestore.class.name=org.apache.qpid.server.store.DerbyMessageStore
profile.excludes=JavaPersistentExcludes JavaDerbyExcludes JavaPre010Excludes
Modified: qpid/trunk/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile?rev=1177658&r1=1177657&r2=1177658&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile (original)
+++ qpid/trunk/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile Fri Sep 30 13:38:45 2011
@@ -19,7 +19,7 @@
broker.version=v0_10
broker.language=java
broker.type=spawned
-broker.command=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE -l ${test.profiles}/log4j-test.xml
+broker.command=build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE -l test-profiles/log4j-test.xml
broker.ready=BRK-1004
broker.stopped=Exception
#
Modified: qpid/trunk/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile?rev=1177658&r1=1177657&r2=1177658&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile (original)
+++ qpid/trunk/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile Fri Sep 30 13:38:45 2011
@@ -19,7 +19,7 @@
broker.version=v0_9_1
broker.language=java
broker.type=spawned
-broker.command=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES -c @CONFIG_FILE -l ${test.profiles}/log4j-test.xml
+broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES -c @CONFIG_FILE -l test-profiles/log4j-test.xml
broker.ready=BRK-1004
broker.stopped=Exception
broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT
Modified: qpid/trunk/qpid/java/test-profiles/java-mms.0-10.testprofile
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/java-mms.0-10.testprofile?rev=1177658&r1=1177657&r2=1177658&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/java-mms.0-10.testprofile (original)
+++ qpid/trunk/qpid/java/test-profiles/java-mms.0-10.testprofile Fri Sep 30 13:38:45 2011
@@ -19,7 +19,8 @@
broker.language=java
broker.version=v0_10
broker.type=internal
-broker.command=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE -l ${test.profiles}/log4j-test.xml
+#broker.command only used for the second broker during failover tests in this profile
+broker.command=build/bin/qpid-server -p @PORT -m @MPORT -c @CONFIG_FILE -l test-profiles/log4j-test.xml
broker.ready=BRK-1004
broker.stopped=Exception
Modified: qpid/trunk/qpid/java/test-profiles/java-mms.0-9-1.testprofile
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/java-mms.0-9-1.testprofile?rev=1177658&r1=1177657&r2=1177658&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/java-mms.0-9-1.testprofile (original)
+++ qpid/trunk/qpid/java/test-profiles/java-mms.0-9-1.testprofile Fri Sep 30 13:38:45 2011
@@ -20,7 +20,7 @@ broker.language=java
broker.version=v0_9_1
broker.type=internal
#broker.command only used for the second broker during failover tests in this profile
-broker.command=${project.root}/build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES -c @CONFIG_FILE -l ${test.profiles}/log4j-test.xml
+broker.command=build/bin/qpid-server -p @PORT -m @MPORT @EXCLUDES -c @CONFIG_FILE -l test-profiles/log4j-test.xml
broker.ready=BRK-1004
broker.stopped=Exception
broker.protocol.excludes=--exclude-0-10 @PORT --exclude-0-10 @SSL_PORT
Modified: qpid/trunk/qpid/java/test-profiles/testprofile.defaults
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/testprofile.defaults?rev=1177658&r1=1177657&r2=1177658&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/testprofile.defaults (original)
+++ qpid/trunk/qpid/java/test-profiles/testprofile.defaults Fri Sep 30 13:38:45 2011
@@ -20,7 +20,7 @@ java.naming.factory.initial=org.apache.q
java.naming.provider.url=${test.profiles}/test-provider.properties
broker.ready=Listening on TCP
-broker.config=${project.root}/build/etc/config-systests.xml
+broker.config=build/etc/config-systests.xml
messagestore.class.name=org.apache.qpid.server.store.MemoryMessageStore
broker.protocol.excludes=
broker.persistent=false
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org