From 9583b5fc9f3fa23ccbb2bea5d34cbb3c39048fee Mon Sep 17 00:00:00 2001 From: James Strachan Date: Mon, 26 Feb 2007 19:01:22 +0000 Subject: [PATCH] added a helper class so that system properties can be used to overload the default prefix for auto-created data directories. Also patched the test cases to use a relative to target/ directory for easier cleaning git-svn-id: https://svn.apache.org/repos/asf/activemq/trunk@511947 13f79535-47bb-0310-9956-ffa450edef68 --- activemq-core/pom.xml | 8 ++++ .../apache/activemq/broker/BrokerService.java | 4 +- .../DefaultPersistenceAdapterFactory.java | 3 +- .../store/amq/AMQPersistenceAdapter.java | 3 +- .../store/jdbc/DataSourceSupport.java | 3 +- .../store/quick/QuickPersistenceAdapter.java | 3 +- .../org/apache/activemq/util/IOHelper.java | 45 +++++++++++++++++++ .../ft/TransactedTopicMasterSlaveTest.java | 4 +- .../region/cursors/KahaCursorDurableTest.java | 2 +- .../region/cursors/KahaQueueStoreTest.java | 2 +- .../bugs/JmsDurableTopicSlowReceiveTest.java | 2 +- .../kaha/impl/index/hash/HashTest.java | 3 +- .../perf/AMQStoreDurableTopicTest.java | 2 +- .../activemq/perf/AMQStoreQueueTest.java | 2 +- .../perf/JournalKahaDurableTopicTest.java | 2 +- .../activemq/perf/JournalKahaQueueTest.java | 2 +- .../activemq/perf/KahaDurableTopicTest.java | 2 +- .../apache/activemq/perf/KahaQueueTest.java | 2 +- .../perf/QueueConnectionMemoryTest.java | 2 +- .../perf/QuickStoreDurableTopicTest.java | 2 +- .../activemq/perf/QuickStoreQueueTest.java | 2 +- .../activemq/perf/RapidStoreQueueTest.java | 2 +- ...QueueConsumedMessageInTransactionTest.java | 3 +- .../org/apache/activemq/perf/kahaBroker.xml | 2 +- 24 files changed, 84 insertions(+), 23 deletions(-) create mode 100644 activemq-core/src/main/java/org/apache/activemq/util/IOHelper.java diff --git a/activemq-core/pom.xml b/activemq-core/pom.xml index 5e2d2f30c1..8f4ee8d227 100755 --- a/activemq-core/pom.xml +++ b/activemq-core/pom.xml @@ -181,6 +181,14 @@ false true -Xmx512M + + + + org.apache.activemq.default.directory.prefix + target/ + + + **/*Test.* diff --git a/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java b/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java index 12d9649c25..0798e742f0 100644 --- a/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java +++ b/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java @@ -73,6 +73,7 @@ import org.apache.activemq.security.SecurityContext; import org.apache.activemq.store.DefaultPersistenceAdapterFactory; import org.apache.activemq.store.PersistenceAdapter; import org.apache.activemq.store.PersistenceAdapterFactory; +import org.apache.activemq.store.jdbc.DataSourceSupport; import org.apache.activemq.store.memory.MemoryPersistenceAdapter; import org.apache.activemq.thread.TaskRunnerFactory; import org.apache.activemq.transport.TransportFactory; @@ -82,6 +83,7 @@ import org.apache.activemq.util.IOExceptionSupport; import org.apache.activemq.util.JMXSupport; import org.apache.activemq.util.ServiceStopper; import org.apache.activemq.util.URISupport; +import org.apache.activemq.util.IOHelper; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -553,7 +555,7 @@ public class BrokerService implements Service, Serializable { public File getDataDirectory() { if (dataDirectory == null) { - dataDirectory = new File(new File("activemq-data"), getBrokerName() + dataDirectory = new File(new File(IOHelper.getDefaultDataDirectory()), getBrokerName() .replaceAll("[^a-zA-Z0-9\\.\\_\\-]", "_")); } return dataDirectory; diff --git a/activemq-core/src/main/java/org/apache/activemq/store/DefaultPersistenceAdapterFactory.java b/activemq-core/src/main/java/org/apache/activemq/store/DefaultPersistenceAdapterFactory.java index 1920a9358a..a5ac6311d2 100755 --- a/activemq-core/src/main/java/org/apache/activemq/store/DefaultPersistenceAdapterFactory.java +++ b/activemq-core/src/main/java/org/apache/activemq/store/DefaultPersistenceAdapterFactory.java @@ -30,6 +30,7 @@ import org.apache.activemq.store.jdbc.Statements; import org.apache.activemq.store.journal.JournalPersistenceAdapter; import org.apache.activemq.store.kahadaptor.KahaPersistenceAdapter; import org.apache.activemq.thread.TaskRunnerFactory; +import org.apache.activemq.util.IOHelper; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -66,7 +67,7 @@ public class DefaultPersistenceAdapterFactory extends DataSourceSupport implemen // if( useQuickJournal ) { // return new QuickJournalPersistenceAdapter(getJournal(), jdbcPersistenceAdapter, getTaskRunnerFactory()); // } else { - KahaPersistenceAdapter adaptor = new KahaPersistenceAdapter(new File("amqstore")); + KahaPersistenceAdapter adaptor = new KahaPersistenceAdapter(new File(IOHelper.getDefaultStoreDirectory())); return new JournalPersistenceAdapter(getJournal(), jdbcPersistenceAdapter, getTaskRunnerFactory()); //return new JournalPersistenceAdapter(getJournal(), adaptor, getTaskRunnerFactory()); // } diff --git a/activemq-core/src/main/java/org/apache/activemq/store/amq/AMQPersistenceAdapter.java b/activemq-core/src/main/java/org/apache/activemq/store/amq/AMQPersistenceAdapter.java index 1cac7fb721..f797a6f3b9 100644 --- a/activemq-core/src/main/java/org/apache/activemq/store/amq/AMQPersistenceAdapter.java +++ b/activemq-core/src/main/java/org/apache/activemq/store/amq/AMQPersistenceAdapter.java @@ -62,6 +62,7 @@ import org.apache.activemq.thread.TaskRunner; import org.apache.activemq.thread.TaskRunnerFactory; import org.apache.activemq.util.ByteSequence; import org.apache.activemq.util.IOExceptionSupport; +import org.apache.activemq.util.IOHelper; import org.apache.activemq.wireformat.WireFormat; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -105,7 +106,7 @@ public class AMQPersistenceAdapter implements PersistenceAdapter, UsageListener private Runnable periodicCleanupTask; private boolean deleteAllMessages; - private File directory = new File("activemq-data/quick"); + private File directory = new File(IOHelper.getDefaultDataDirectory() + "/quick"); diff --git a/activemq-core/src/main/java/org/apache/activemq/store/jdbc/DataSourceSupport.java b/activemq-core/src/main/java/org/apache/activemq/store/jdbc/DataSourceSupport.java index 1d5b489231..2903bd301b 100644 --- a/activemq-core/src/main/java/org/apache/activemq/store/jdbc/DataSourceSupport.java +++ b/activemq-core/src/main/java/org/apache/activemq/store/jdbc/DataSourceSupport.java @@ -18,6 +18,7 @@ package org.apache.activemq.store.jdbc; import org.apache.derby.jdbc.EmbeddedDataSource; +import org.apache.activemq.util.IOHelper; import javax.sql.DataSource; @@ -32,7 +33,7 @@ import java.io.IOException; */ public class DataSourceSupport { - private String dataDirectory = "activemq-data"; + private String dataDirectory = IOHelper.getDefaultDataDirectory(); private File dataDirectoryFile; private DataSource dataSource; diff --git a/activemq-core/src/main/java/org/apache/activemq/store/quick/QuickPersistenceAdapter.java b/activemq-core/src/main/java/org/apache/activemq/store/quick/QuickPersistenceAdapter.java index fc59bc096f..d90131ae53 100644 --- a/activemq-core/src/main/java/org/apache/activemq/store/quick/QuickPersistenceAdapter.java +++ b/activemq-core/src/main/java/org/apache/activemq/store/quick/QuickPersistenceAdapter.java @@ -61,6 +61,7 @@ import org.apache.activemq.thread.TaskRunner; import org.apache.activemq.thread.TaskRunnerFactory; import org.apache.activemq.util.ByteSequence; import org.apache.activemq.util.IOExceptionSupport; +import org.apache.activemq.util.IOHelper; import org.apache.activemq.wireformat.WireFormat; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -104,7 +105,7 @@ public class QuickPersistenceAdapter implements PersistenceAdapter, UsageListene private Runnable periodicCleanupTask; private boolean deleteAllMessages; - private File directory = new File("activemq-data/quick"); + private File directory = new File(IOHelper.getDefaultDataDirectory() + "/quick"); diff --git a/activemq-core/src/main/java/org/apache/activemq/util/IOHelper.java b/activemq-core/src/main/java/org/apache/activemq/util/IOHelper.java new file mode 100644 index 0000000000..103a01724e --- /dev/null +++ b/activemq-core/src/main/java/org/apache/activemq/util/IOHelper.java @@ -0,0 +1,45 @@ +/** + * + * 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. + */ +package org.apache.activemq.util; + +/** + * @version $Revision$ + */ +public class IOHelper { + + public static String getDefaultDataDirectory() { + return getDefaultDirectoryPrefix() + "activemq-data"; + } + + public static String getDefaultStoreDirectory() { + return getDefaultDirectoryPrefix() + "amqstore"; + } + + /** + * Allows a system property to be used to overload the default data directory + * which can be useful for forcing the test cases to use a target/ prefix + */ + public static String getDefaultDirectoryPrefix() { + try { + return System.getProperty("org.apache.activemq.default.directory.prefix", ""); + } + catch (Exception e) { + return ""; + } + } +} diff --git a/activemq-core/src/test/java/org/apache/activemq/broker/ft/TransactedTopicMasterSlaveTest.java b/activemq-core/src/test/java/org/apache/activemq/broker/ft/TransactedTopicMasterSlaveTest.java index f0d6ce3e4f..92adf84eba 100644 --- a/activemq-core/src/test/java/org/apache/activemq/broker/ft/TransactedTopicMasterSlaveTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/broker/ft/TransactedTopicMasterSlaveTest.java @@ -39,7 +39,7 @@ public class TransactedTopicMasterSlaveTest extends JmsTopicTransactionTest{ // this will create the main (or master broker) broker=createBroker(); broker.start(); - KahaPersistenceAdapter adaptor=new KahaPersistenceAdapter(new File("activemq-data/slave")); + KahaPersistenceAdapter adaptor=new KahaPersistenceAdapter(new File("target/test-amq-data/slave")); slave = new BrokerService(); slave.setBrokerName("slave"); slave.setPersistenceAdapter(adaptor); @@ -66,7 +66,7 @@ public class TransactedTopicMasterSlaveTest extends JmsTopicTransactionTest{ protected BrokerService createBroker() throws Exception,URISyntaxException{ BrokerService broker=new BrokerService(); broker.setBrokerName("master"); - KahaPersistenceAdapter adaptor=new KahaPersistenceAdapter(new File("activemq-data/master")); + KahaPersistenceAdapter adaptor=new KahaPersistenceAdapter(new File("target/test-amq-data/master")); broker.setPersistenceAdapter(adaptor); broker.addConnector("tcp://localhost:62001"); broker.setDeleteAllMessagesOnStartup(true); diff --git a/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/KahaCursorDurableTest.java b/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/KahaCursorDurableTest.java index 745dd4eeda..581a99e5d6 100644 --- a/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/KahaCursorDurableTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/KahaCursorDurableTest.java @@ -32,7 +32,7 @@ public class KahaCursorDurableTest extends CursorDurableTest{ protected void configureBroker(BrokerService answer) throws Exception{ - KahaPersistenceAdapter adaptor = new KahaPersistenceAdapter(new File("activemq-data/durableTest")); + KahaPersistenceAdapter adaptor = new KahaPersistenceAdapter(new File("target/test-amq-data/durableTest")); answer.setPersistenceAdapter(adaptor); answer.addConnector(bindAddress); answer.setDeleteAllMessagesOnStartup(true); diff --git a/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/KahaQueueStoreTest.java b/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/KahaQueueStoreTest.java index aaec3d5a4c..6ef3145164 100644 --- a/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/KahaQueueStoreTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/broker/region/cursors/KahaQueueStoreTest.java @@ -35,7 +35,7 @@ public class KahaQueueStoreTest extends CursorQueueStoreTest{ protected void configureBroker(BrokerService answer) throws Exception{ - KahaPersistenceAdapter adaptor = new KahaPersistenceAdapter(new File("activemq-data/durableTest")); + KahaPersistenceAdapter adaptor = new KahaPersistenceAdapter(new File("target/test-amq-data/durableTest")); answer.setPersistenceAdapter(adaptor); PolicyEntry policy = new PolicyEntry(); policy.setPendingQueuePolicy(new StorePendingQueueMessageStoragePolicy()); diff --git a/activemq-core/src/test/java/org/apache/activemq/bugs/JmsDurableTopicSlowReceiveTest.java b/activemq-core/src/test/java/org/apache/activemq/bugs/JmsDurableTopicSlowReceiveTest.java index 81d9bea8b0..d0ee87d327 100755 --- a/activemq-core/src/test/java/org/apache/activemq/bugs/JmsDurableTopicSlowReceiveTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/bugs/JmsDurableTopicSlowReceiveTest.java @@ -84,7 +84,7 @@ public class JmsDurableTopicSlowReceiveTest extends JmsTopicSendReceiveTest{ } protected void configureBroker(BrokerService answer) throws Exception{ - //KahaPersistenceAdapter adapter=new KahaPersistenceAdapter(new File("activemq-data/durableTest")); + //KahaPersistenceAdapter adapter=new KahaPersistenceAdapter(new File("target/test-amq-data/durableTest")); //JDBCPersistenceAdapter adapter = new JDBCPersistenceAdapter(); // answer.setPersistenceAdapter(adapter); answer.setDeleteAllMessagesOnStartup(true); diff --git a/activemq-core/src/test/java/org/apache/activemq/kaha/impl/index/hash/HashTest.java b/activemq-core/src/test/java/org/apache/activemq/kaha/impl/index/hash/HashTest.java index 331d24a46b..11737e2b6a 100644 --- a/activemq-core/src/test/java/org/apache/activemq/kaha/impl/index/hash/HashTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/kaha/impl/index/hash/HashTest.java @@ -20,6 +20,7 @@ import junit.framework.TestCase; import org.apache.activemq.kaha.Store; import org.apache.activemq.kaha.impl.index.IndexItem; import org.apache.activemq.kaha.impl.index.IndexManager; +import org.apache.activemq.util.IOHelper; /** * Test a HashIndex @@ -39,7 +40,7 @@ public class HashTest extends TestCase{ */ protected void setUp() throws Exception{ super.setUp(); - directory=new File("activemq-data"); + directory=new File(IOHelper.getDefaultDataDirectory()); directory.mkdirs(); indexManager=new IndexManager(directory,"im-hash-test","rw",null); this.hashIndex=new HashIndex(directory,"testHash",indexManager); diff --git a/activemq-core/src/test/java/org/apache/activemq/perf/AMQStoreDurableTopicTest.java b/activemq-core/src/test/java/org/apache/activemq/perf/AMQStoreDurableTopicTest.java index 1cbd65db1d..705ba7794f 100644 --- a/activemq-core/src/test/java/org/apache/activemq/perf/AMQStoreDurableTopicTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/perf/AMQStoreDurableTopicTest.java @@ -26,7 +26,7 @@ public class AMQStoreDurableTopicTest extends SimpleDurableTopicTest{ protected void configureBroker(BrokerService answer) throws Exception{ - File dataFileDir=new File("activemq-data/perfTest/amqdb"); + File dataFileDir=new File("target/test-amq-data/perfTest/amqdb"); AMQPersistenceAdapter adaptor = new AMQPersistenceAdapter(); adaptor.setDirectory(dataFileDir); answer.setPersistenceAdapter(adaptor); diff --git a/activemq-core/src/test/java/org/apache/activemq/perf/AMQStoreQueueTest.java b/activemq-core/src/test/java/org/apache/activemq/perf/AMQStoreQueueTest.java index 6bdf861686..91ea16cf37 100644 --- a/activemq-core/src/test/java/org/apache/activemq/perf/AMQStoreQueueTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/perf/AMQStoreQueueTest.java @@ -29,7 +29,7 @@ public class AMQStoreQueueTest extends SimpleQueueTest{ protected void configureBroker(BrokerService answer) throws Exception{ - File dataFileDir = new File("activemq-data/perfTest/amq"); + File dataFileDir = new File("target/test-amq-data/perfTest/amq"); AMQPersistenceAdapter adaptor = new AMQPersistenceAdapter(); adaptor.setDirectory(dataFileDir); diff --git a/activemq-core/src/test/java/org/apache/activemq/perf/JournalKahaDurableTopicTest.java b/activemq-core/src/test/java/org/apache/activemq/perf/JournalKahaDurableTopicTest.java index f0b459dace..fcb7510ee6 100644 --- a/activemq-core/src/test/java/org/apache/activemq/perf/JournalKahaDurableTopicTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/perf/JournalKahaDurableTopicTest.java @@ -31,7 +31,7 @@ public class JournalKahaDurableTopicTest extends SimpleDurableTopicTest { protected void configureBroker(BrokerService answer) throws Exception{ - File dataFileDir = new File("activemq-data/perfTest"); + File dataFileDir = new File("target/test-amq-data/perfTest"); File journalDir = new File(dataFileDir, "journal").getCanonicalFile(); JournalImpl journal = new JournalImpl(journalDir, 3, 1024*1024*20); diff --git a/activemq-core/src/test/java/org/apache/activemq/perf/JournalKahaQueueTest.java b/activemq-core/src/test/java/org/apache/activemq/perf/JournalKahaQueueTest.java index 3ca103ea0c..72a099731f 100644 --- a/activemq-core/src/test/java/org/apache/activemq/perf/JournalKahaQueueTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/perf/JournalKahaQueueTest.java @@ -31,7 +31,7 @@ public class JournalKahaQueueTest extends SimpleQueueTest{ protected void configureBroker(BrokerService answer) throws Exception{ - File dataFileDir = new File("activemq-data/perfTest"); + File dataFileDir = new File("target/test-amq-data/perfTest"); File journalDir = new File(dataFileDir, "journal").getCanonicalFile(); JournalImpl journal = new JournalImpl(journalDir, 3, 1024*1024*20); diff --git a/activemq-core/src/test/java/org/apache/activemq/perf/KahaDurableTopicTest.java b/activemq-core/src/test/java/org/apache/activemq/perf/KahaDurableTopicTest.java index 99535b2c09..215d7dc523 100644 --- a/activemq-core/src/test/java/org/apache/activemq/perf/KahaDurableTopicTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/perf/KahaDurableTopicTest.java @@ -37,7 +37,7 @@ public class KahaDurableTopicTest extends SimpleDurableTopicTest { */ protected void configureBroker(BrokerService answer) throws Exception{ - KahaPersistenceAdapter adaptor = new KahaPersistenceAdapter(new File("activemq-data/perfTest")); + KahaPersistenceAdapter adaptor = new KahaPersistenceAdapter(new File("target/test-amq-data/perfTest")); answer.setPersistenceAdapter(adaptor); answer.addConnector(bindAddress); answer.setDeleteAllMessagesOnStartup(true); diff --git a/activemq-core/src/test/java/org/apache/activemq/perf/KahaQueueTest.java b/activemq-core/src/test/java/org/apache/activemq/perf/KahaQueueTest.java index b0384bcc48..8ad3ef1299 100644 --- a/activemq-core/src/test/java/org/apache/activemq/perf/KahaQueueTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/perf/KahaQueueTest.java @@ -30,7 +30,7 @@ public class KahaQueueTest extends SimpleQueueTest{ protected void configureBroker(BrokerService answer) throws Exception{ - KahaPersistenceAdapter adaptor = new KahaPersistenceAdapter(new File("activemq-data/perfTest")); + KahaPersistenceAdapter adaptor = new KahaPersistenceAdapter(new File("target/test-amq-data/perfTest")); answer.setPersistenceAdapter(adaptor); answer.addConnector(bindAddress); answer.setDeleteAllMessagesOnStartup(true); diff --git a/activemq-core/src/test/java/org/apache/activemq/perf/QueueConnectionMemoryTest.java b/activemq-core/src/test/java/org/apache/activemq/perf/QueueConnectionMemoryTest.java index 32af521330..7c6fe32d0b 100644 --- a/activemq-core/src/test/java/org/apache/activemq/perf/QueueConnectionMemoryTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/perf/QueueConnectionMemoryTest.java @@ -56,7 +56,7 @@ public class QueueConnectionMemoryTest extends SimpleQueueTest{ } protected void configureBroker(BrokerService answer) throws Exception{ - KahaPersistenceAdapter adaptor = new KahaPersistenceAdapter(new File("activemq-data/perfTest")); + KahaPersistenceAdapter adaptor = new KahaPersistenceAdapter(new File("target/test-amq-data/perfTest")); answer.setPersistenceAdapter(adaptor); answer.addConnector(bindAddress); answer.setDeleteAllMessagesOnStartup(true); diff --git a/activemq-core/src/test/java/org/apache/activemq/perf/QuickStoreDurableTopicTest.java b/activemq-core/src/test/java/org/apache/activemq/perf/QuickStoreDurableTopicTest.java index b9e177ca31..c389e8b850 100644 --- a/activemq-core/src/test/java/org/apache/activemq/perf/QuickStoreDurableTopicTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/perf/QuickStoreDurableTopicTest.java @@ -25,7 +25,7 @@ public class QuickStoreDurableTopicTest extends SimpleDurableTopicTest{ protected void configureBroker(BrokerService answer) throws Exception{ - File dataFileDir=new File("activemq-data/perfTest"); + File dataFileDir=new File("target/test-amq-data/perfTest"); QuickPersistenceAdapter adaptor=new QuickPersistenceAdapter(); adaptor.setDirectory(dataFileDir); answer.setPersistenceAdapter(adaptor); diff --git a/activemq-core/src/test/java/org/apache/activemq/perf/QuickStoreQueueTest.java b/activemq-core/src/test/java/org/apache/activemq/perf/QuickStoreQueueTest.java index 1141893d2a..fe2023f923 100644 --- a/activemq-core/src/test/java/org/apache/activemq/perf/QuickStoreQueueTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/perf/QuickStoreQueueTest.java @@ -29,7 +29,7 @@ public class QuickStoreQueueTest extends SimpleQueueTest{ protected void configureBroker(BrokerService answer) throws Exception{ - File dataFileDir = new File("activemq-data/perfTest"); + File dataFileDir = new File("target/test-amq-data/perfTest"); QuickPersistenceAdapter adaptor = new QuickPersistenceAdapter(); adaptor.setDirectory(dataFileDir); diff --git a/activemq-core/src/test/java/org/apache/activemq/perf/RapidStoreQueueTest.java b/activemq-core/src/test/java/org/apache/activemq/perf/RapidStoreQueueTest.java index 17d9dafd54..33e0574bc8 100644 --- a/activemq-core/src/test/java/org/apache/activemq/perf/RapidStoreQueueTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/perf/RapidStoreQueueTest.java @@ -29,7 +29,7 @@ public class RapidStoreQueueTest extends SimpleQueueTest{ protected void configureBroker(BrokerService answer) throws Exception{ - File dataFileDir = new File("activemq-data/perfTest"); + File dataFileDir = new File("target/test-amq-data/perfTest"); File journalDir = new File(dataFileDir, "journal").getCanonicalFile(); JournalImpl journal = new JournalImpl(journalDir, 3, 1024*1024*20); diff --git a/activemq-core/src/test/java/org/apache/activemq/usecases/PublishOnQueueConsumedMessageInTransactionTest.java b/activemq-core/src/test/java/org/apache/activemq/usecases/PublishOnQueueConsumedMessageInTransactionTest.java index 9e561d3054..1282369b39 100644 --- a/activemq-core/src/test/java/org/apache/activemq/usecases/PublishOnQueueConsumedMessageInTransactionTest.java +++ b/activemq-core/src/test/java/org/apache/activemq/usecases/PublishOnQueueConsumedMessageInTransactionTest.java @@ -19,6 +19,7 @@ package org.apache.activemq.usecases; import junit.framework.TestCase; import org.apache.activemq.ActiveMQConnectionFactory; +import org.apache.activemq.util.IOHelper; import org.apache.activemq.command.ActiveMQQueue; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -45,7 +46,7 @@ public final class PublishOnQueueConsumedMessageInTransactionTest extends TestCa private List messages = createConcurrentList(); private final Object lock = new Object(); private String[] data; - private String DATAFILE_ROOT = "activemq-data"; + private String DATAFILE_ROOT = IOHelper.getDefaultDataDirectory(); private int messageCount = 3; private String url = "vm://localhost"; diff --git a/activemq-core/src/test/resources/org/apache/activemq/perf/kahaBroker.xml b/activemq-core/src/test/resources/org/apache/activemq/perf/kahaBroker.xml index 97e327b830..0aa7300d5a 100644 --- a/activemq-core/src/test/resources/org/apache/activemq/perf/kahaBroker.xml +++ b/activemq-core/src/test/resources/org/apache/activemq/perf/kahaBroker.xml @@ -23,7 +23,7 @@ - +