http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-server/src/test/java/org/apache/activemq/core/config/impl/ConfigurationImplTest.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/ConfigurationImplTest.java b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/ConfigurationImplTest.java index 8cffc7a..ddd7c18 100644 --- a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/ConfigurationImplTest.java +++ b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/ConfigurationImplTest.java @@ -11,6 +11,7 @@ * permissions and limitations under the License. */ package org.apache.activemq.core.config.impl; +import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; import org.apache.activemq.core.config.ha.LiveOnlyPolicyConfiguration; import org.junit.Before; @@ -23,7 +24,6 @@ import java.io.ObjectOutputStream; import org.junit.Assert; -import org.apache.activemq.api.config.HornetQDefaultConfiguration; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.core.config.Configuration; import org.apache.activemq.core.journal.impl.JournalConstants; @@ -45,63 +45,63 @@ public class ConfigurationImplTest extends UnitTestCase @Test public void testDefaults() { - Assert.assertEquals(HornetQDefaultConfiguration.getDefaultScheduledThreadPoolMaxSize(), + Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultScheduledThreadPoolMaxSize(), conf.getScheduledThreadPoolMaxSize()); - Assert.assertEquals(HornetQDefaultConfiguration.getDefaultSecurityInvalidationInterval(), + Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultSecurityInvalidationInterval(), conf.getSecurityInvalidationInterval()); - Assert.assertEquals(HornetQDefaultConfiguration.isDefaultSecurityEnabled(), conf.isSecurityEnabled()); - Assert.assertEquals(HornetQDefaultConfiguration.getDefaultBindingsDirectory(), conf.getBindingsDirectory()); - Assert.assertEquals(HornetQDefaultConfiguration.isDefaultCreateBindingsDir(), conf.isCreateBindingsDir()); - Assert.assertEquals(HornetQDefaultConfiguration.getDefaultJournalDir(), conf.getJournalDirectory()); - Assert.assertEquals(HornetQDefaultConfiguration.isDefaultCreateJournalDir(), conf.isCreateJournalDir()); + Assert.assertEquals(ActiveMQDefaultConfiguration.isDefaultSecurityEnabled(), conf.isSecurityEnabled()); + Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultBindingsDirectory(), conf.getBindingsDirectory()); + Assert.assertEquals(ActiveMQDefaultConfiguration.isDefaultCreateBindingsDir(), conf.isCreateBindingsDir()); + Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultJournalDir(), conf.getJournalDirectory()); + Assert.assertEquals(ActiveMQDefaultConfiguration.isDefaultCreateJournalDir(), conf.isCreateJournalDir()); Assert.assertEquals(ConfigurationImpl.DEFAULT_JOURNAL_TYPE, conf.getJournalType()); - Assert.assertEquals(HornetQDefaultConfiguration.isDefaultJournalSyncTransactional(), conf.isJournalSyncTransactional()); - Assert.assertEquals(HornetQDefaultConfiguration.isDefaultJournalSyncNonTransactional(), + Assert.assertEquals(ActiveMQDefaultConfiguration.isDefaultJournalSyncTransactional(), conf.isJournalSyncTransactional()); + Assert.assertEquals(ActiveMQDefaultConfiguration.isDefaultJournalSyncNonTransactional(), conf.isJournalSyncNonTransactional()); - Assert.assertEquals(HornetQDefaultConfiguration.getDefaultJournalFileSize(), conf.getJournalFileSize()); - Assert.assertEquals(HornetQDefaultConfiguration.getDefaultJournalMinFiles(), conf.getJournalMinFiles()); - Assert.assertEquals(HornetQDefaultConfiguration.getDefaultJournalMaxIoAio(), conf.getJournalMaxIO_AIO()); - Assert.assertEquals(HornetQDefaultConfiguration.getDefaultJournalMaxIoNio(), conf.getJournalMaxIO_NIO()); - Assert.assertEquals(HornetQDefaultConfiguration.isDefaultWildcardRoutingEnabled(), conf.isWildcardRoutingEnabled()); - Assert.assertEquals(HornetQDefaultConfiguration.getDefaultTransactionTimeout(), conf.getTransactionTimeout()); - Assert.assertEquals(HornetQDefaultConfiguration.getDefaultMessageExpiryScanPeriod(), conf.getMessageExpiryScanPeriod()); // OK - Assert.assertEquals(HornetQDefaultConfiguration.getDefaultMessageExpiryThreadPriority(), + Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultJournalFileSize(), conf.getJournalFileSize()); + Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultJournalMinFiles(), conf.getJournalMinFiles()); + Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultJournalMaxIoAio(), conf.getJournalMaxIO_AIO()); + Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultJournalMaxIoNio(), conf.getJournalMaxIO_NIO()); + Assert.assertEquals(ActiveMQDefaultConfiguration.isDefaultWildcardRoutingEnabled(), conf.isWildcardRoutingEnabled()); + Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultTransactionTimeout(), conf.getTransactionTimeout()); + Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultMessageExpiryScanPeriod(), conf.getMessageExpiryScanPeriod()); // OK + Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultMessageExpiryThreadPriority(), conf.getMessageExpiryThreadPriority()); // OK - Assert.assertEquals(HornetQDefaultConfiguration.getDefaultTransactionTimeoutScanPeriod(), + Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultTransactionTimeoutScanPeriod(), conf.getTransactionTimeoutScanPeriod()); // OK - Assert.assertEquals(HornetQDefaultConfiguration.getDefaultManagementAddress(), conf.getManagementAddress()); // OK - Assert.assertEquals(HornetQDefaultConfiguration.getDefaultManagementNotificationAddress(), + Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultManagementAddress(), conf.getManagementAddress()); // OK + Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultManagementNotificationAddress(), conf.getManagementNotificationAddress()); // OK - Assert.assertEquals(HornetQDefaultConfiguration.getDefaultClusterUser(), conf.getClusterUser()); // OK - Assert.assertEquals(HornetQDefaultConfiguration.getDefaultClusterPassword(), conf.getClusterPassword()); // OK - Assert.assertEquals(HornetQDefaultConfiguration.isDefaultPersistenceEnabled(), conf.isPersistenceEnabled()); - Assert.assertEquals(HornetQDefaultConfiguration.isDefaultFileDeploymentEnabled(), conf.isFileDeploymentEnabled()); - Assert.assertEquals(HornetQDefaultConfiguration.isDefaultPersistDeliveryCountBeforeDelivery(), + Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultClusterUser(), conf.getClusterUser()); // OK + Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultClusterPassword(), conf.getClusterPassword()); // OK + Assert.assertEquals(ActiveMQDefaultConfiguration.isDefaultPersistenceEnabled(), conf.isPersistenceEnabled()); + Assert.assertEquals(ActiveMQDefaultConfiguration.isDefaultFileDeploymentEnabled(), conf.isFileDeploymentEnabled()); + Assert.assertEquals(ActiveMQDefaultConfiguration.isDefaultPersistDeliveryCountBeforeDelivery(), conf.isPersistDeliveryCountBeforeDelivery()); - Assert.assertEquals(HornetQDefaultConfiguration.getDefaultFileDeployerScanPeriod(), conf.getFileDeployerScanPeriod()); - Assert.assertEquals(HornetQDefaultConfiguration.getDefaultThreadPoolMaxSize(), conf.getThreadPoolMaxSize()); - Assert.assertEquals(HornetQDefaultConfiguration.isDefaultJmxManagementEnabled(), conf.isJMXManagementEnabled()); - Assert.assertEquals(HornetQDefaultConfiguration.getDefaultConnectionTtlOverride(), conf.getConnectionTTLOverride()); - Assert.assertEquals(HornetQDefaultConfiguration.isDefaultAsyncConnectionExecutionEnabled(), + Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultFileDeployerScanPeriod(), conf.getFileDeployerScanPeriod()); + Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultThreadPoolMaxSize(), conf.getThreadPoolMaxSize()); + Assert.assertEquals(ActiveMQDefaultConfiguration.isDefaultJmxManagementEnabled(), conf.isJMXManagementEnabled()); + Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultConnectionTtlOverride(), conf.getConnectionTTLOverride()); + Assert.assertEquals(ActiveMQDefaultConfiguration.isDefaultAsyncConnectionExecutionEnabled(), conf.isAsyncConnectionExecutionEnabled()); - Assert.assertEquals(HornetQDefaultConfiguration.getDefaultPagingDir(), conf.getPagingDirectory()); - Assert.assertEquals(HornetQDefaultConfiguration.getDefaultLargeMessagesDir(), conf.getLargeMessagesDirectory()); - Assert.assertEquals(HornetQDefaultConfiguration.getDefaultJournalCompactPercentage(), conf.getJournalCompactPercentage()); + Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultPagingDir(), conf.getPagingDirectory()); + Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultLargeMessagesDir(), conf.getLargeMessagesDirectory()); + Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultJournalCompactPercentage(), conf.getJournalCompactPercentage()); Assert.assertEquals(JournalConstants.DEFAULT_JOURNAL_BUFFER_TIMEOUT_AIO, conf.getJournalBufferTimeout_AIO()); Assert.assertEquals(JournalConstants.DEFAULT_JOURNAL_BUFFER_TIMEOUT_NIO, conf.getJournalBufferTimeout_NIO()); Assert.assertEquals(JournalConstants.DEFAULT_JOURNAL_BUFFER_SIZE_AIO, conf.getJournalBufferSize_AIO()); Assert.assertEquals(JournalConstants.DEFAULT_JOURNAL_BUFFER_SIZE_NIO, conf.getJournalBufferSize_NIO()); - Assert.assertEquals(HornetQDefaultConfiguration.isDefaultJournalLogWriteRate(), conf.isLogJournalWriteRate()); - Assert.assertEquals(HornetQDefaultConfiguration.getDefaultJournalPerfBlastPages(), conf.getJournalPerfBlastPages()); - Assert.assertEquals(HornetQDefaultConfiguration.isDefaultMessageCounterEnabled(), conf.isMessageCounterEnabled()); - Assert.assertEquals(HornetQDefaultConfiguration.getDefaultMessageCounterMaxDayHistory(), + Assert.assertEquals(ActiveMQDefaultConfiguration.isDefaultJournalLogWriteRate(), conf.isLogJournalWriteRate()); + Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultJournalPerfBlastPages(), conf.getJournalPerfBlastPages()); + Assert.assertEquals(ActiveMQDefaultConfiguration.isDefaultMessageCounterEnabled(), conf.isMessageCounterEnabled()); + Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultMessageCounterMaxDayHistory(), conf.getMessageCounterMaxDayHistory()); - Assert.assertEquals(HornetQDefaultConfiguration.getDefaultMessageCounterSamplePeriod(), conf.getMessageCounterSamplePeriod()); - Assert.assertEquals(HornetQDefaultConfiguration.getDefaultIdCacheSize(), conf.getIDCacheSize()); - Assert.assertEquals(HornetQDefaultConfiguration.isDefaultPersistIdCache(), conf.isPersistIDCache()); - Assert.assertEquals(HornetQDefaultConfiguration.getDefaultServerDumpInterval(), conf.getServerDumpInterval()); - Assert.assertEquals(HornetQDefaultConfiguration.getDefaultMemoryWarningThreshold(), conf.getMemoryWarningThreshold()); - Assert.assertEquals(HornetQDefaultConfiguration.getDefaultMemoryMeasureInterval(), conf.getMemoryMeasureInterval()); + Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultMessageCounterSamplePeriod(), conf.getMessageCounterSamplePeriod()); + Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultIdCacheSize(), conf.getIDCacheSize()); + Assert.assertEquals(ActiveMQDefaultConfiguration.isDefaultPersistIdCache(), conf.isPersistIDCache()); + Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultServerDumpInterval(), conf.getServerDumpInterval()); + Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultMemoryWarningThreshold(), conf.getMemoryWarningThreshold()); + Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultMemoryMeasureInterval(), conf.getMemoryMeasureInterval()); } @Test
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-server/src/test/java/org/apache/activemq/core/config/impl/DefaultsFileConfigurationTest.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/DefaultsFileConfigurationTest.java b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/DefaultsFileConfigurationTest.java index ed6e70c..ae1e46a 100644 --- a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/DefaultsFileConfigurationTest.java +++ b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/DefaultsFileConfigurationTest.java @@ -12,6 +12,7 @@ */ package org.apache.activemq.core.config.impl; +import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; import org.apache.activemq.core.config.ha.LiveOnlyPolicyConfiguration; import org.junit.Test; @@ -19,7 +20,6 @@ import java.util.Collections; import org.junit.Assert; -import org.apache.activemq.api.config.HornetQDefaultConfiguration; import org.apache.activemq.core.config.Configuration; import org.apache.activemq.core.journal.impl.JournalConstants; @@ -38,23 +38,23 @@ public class DefaultsFileConfigurationTest extends ConfigurationImplTest public void testDefaults() { - Assert.assertEquals(HornetQDefaultConfiguration.getDefaultScheduledThreadPoolMaxSize(), + Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultScheduledThreadPoolMaxSize(), conf.getScheduledThreadPoolMaxSize()); - Assert.assertEquals(HornetQDefaultConfiguration.getDefaultThreadPoolMaxSize(), conf.getThreadPoolMaxSize()); + Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultThreadPoolMaxSize(), conf.getThreadPoolMaxSize()); - Assert.assertEquals(HornetQDefaultConfiguration.getDefaultSecurityInvalidationInterval(), + Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultSecurityInvalidationInterval(), conf.getSecurityInvalidationInterval()); - Assert.assertEquals(HornetQDefaultConfiguration.isDefaultSecurityEnabled(), conf.isSecurityEnabled()); + Assert.assertEquals(ActiveMQDefaultConfiguration.isDefaultSecurityEnabled(), conf.isSecurityEnabled()); - Assert.assertEquals(HornetQDefaultConfiguration.isDefaultJmxManagementEnabled(), conf.isJMXManagementEnabled()); + Assert.assertEquals(ActiveMQDefaultConfiguration.isDefaultJmxManagementEnabled(), conf.isJMXManagementEnabled()); - Assert.assertEquals(HornetQDefaultConfiguration.getDefaultJmxDomain(), conf.getJMXDomain()); + Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultJmxDomain(), conf.getJMXDomain()); Assert.assertEquals(0, conf.getIncomingInterceptorClassNames().size()); - Assert.assertEquals(HornetQDefaultConfiguration.getDefaultConnectionTtlOverride(), conf.getConnectionTTLOverride()); + Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultConnectionTtlOverride(), conf.getConnectionTTLOverride()); Assert.assertEquals(0, conf.getAcceptorConfigurations().size()); @@ -72,70 +72,70 @@ public class DefaultsFileConfigurationTest extends ConfigurationImplTest Assert.assertEquals(Collections.emptyList(), conf.getQueueConfigurations()); - Assert.assertEquals(HornetQDefaultConfiguration.getDefaultManagementAddress(), conf.getManagementAddress()); + Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultManagementAddress(), conf.getManagementAddress()); - Assert.assertEquals(HornetQDefaultConfiguration.getDefaultManagementNotificationAddress(), + Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultManagementNotificationAddress(), conf.getManagementNotificationAddress()); - Assert.assertEquals(HornetQDefaultConfiguration.getDefaultClusterUser(), conf.getClusterUser()); + Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultClusterUser(), conf.getClusterUser()); - Assert.assertEquals(HornetQDefaultConfiguration.getDefaultClusterPassword(), conf.getClusterPassword()); + Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultClusterPassword(), conf.getClusterPassword()); - Assert.assertEquals(HornetQDefaultConfiguration.getDefaultIdCacheSize(), conf.getIDCacheSize()); + Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultIdCacheSize(), conf.getIDCacheSize()); - Assert.assertEquals(HornetQDefaultConfiguration.isDefaultPersistIdCache(), conf.isPersistIDCache()); + Assert.assertEquals(ActiveMQDefaultConfiguration.isDefaultPersistIdCache(), conf.isPersistIDCache()); - Assert.assertEquals(HornetQDefaultConfiguration.getDefaultBindingsDirectory(), conf.getBindingsDirectory()); + Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultBindingsDirectory(), conf.getBindingsDirectory()); - Assert.assertEquals(HornetQDefaultConfiguration.getDefaultJournalDir(), conf.getJournalDirectory()); + Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultJournalDir(), conf.getJournalDirectory()); Assert.assertEquals(getDefaultJournalType(), conf.getJournalType()); - Assert.assertEquals(HornetQDefaultConfiguration.isDefaultJournalSyncTransactional(), conf.isJournalSyncTransactional()); + Assert.assertEquals(ActiveMQDefaultConfiguration.isDefaultJournalSyncTransactional(), conf.isJournalSyncTransactional()); - Assert.assertEquals(HornetQDefaultConfiguration.isDefaultJournalSyncNonTransactional(), + Assert.assertEquals(ActiveMQDefaultConfiguration.isDefaultJournalSyncNonTransactional(), conf.isJournalSyncNonTransactional()); - Assert.assertEquals(HornetQDefaultConfiguration.getDefaultJournalFileSize(), conf.getJournalFileSize()); + Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultJournalFileSize(), conf.getJournalFileSize()); - Assert.assertEquals(HornetQDefaultConfiguration.getDefaultJournalCompactMinFiles(), conf.getJournalCompactMinFiles()); + Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultJournalCompactMinFiles(), conf.getJournalCompactMinFiles()); - Assert.assertEquals(HornetQDefaultConfiguration.getDefaultJournalCompactPercentage(), conf.getJournalCompactPercentage()); + Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultJournalCompactPercentage(), conf.getJournalCompactPercentage()); - Assert.assertEquals(HornetQDefaultConfiguration.getDefaultJournalMinFiles(), conf.getJournalMinFiles()); + Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultJournalMinFiles(), conf.getJournalMinFiles()); - Assert.assertEquals(HornetQDefaultConfiguration.getDefaultJournalMaxIoAio(), conf.getJournalMaxIO_AIO()); + Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultJournalMaxIoAio(), conf.getJournalMaxIO_AIO()); Assert.assertEquals(JournalConstants.DEFAULT_JOURNAL_BUFFER_TIMEOUT_AIO, conf.getJournalBufferTimeout_AIO()); Assert.assertEquals(JournalConstants.DEFAULT_JOURNAL_BUFFER_SIZE_AIO, conf.getJournalBufferSize_AIO()); - Assert.assertEquals(HornetQDefaultConfiguration.getDefaultJournalMaxIoNio(), conf.getJournalMaxIO_NIO()); + Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultJournalMaxIoNio(), conf.getJournalMaxIO_NIO()); Assert.assertEquals(JournalConstants.DEFAULT_JOURNAL_BUFFER_TIMEOUT_NIO, conf.getJournalBufferTimeout_NIO()); Assert.assertEquals(JournalConstants.DEFAULT_JOURNAL_BUFFER_SIZE_NIO, conf.getJournalBufferSize_NIO()); - Assert.assertEquals(HornetQDefaultConfiguration.isDefaultCreateBindingsDir(), conf.isCreateBindingsDir()); + Assert.assertEquals(ActiveMQDefaultConfiguration.isDefaultCreateBindingsDir(), conf.isCreateBindingsDir()); - Assert.assertEquals(HornetQDefaultConfiguration.isDefaultCreateJournalDir(), conf.isCreateJournalDir()); + Assert.assertEquals(ActiveMQDefaultConfiguration.isDefaultCreateJournalDir(), conf.isCreateJournalDir()); - Assert.assertEquals(HornetQDefaultConfiguration.getDefaultPagingDir(), conf.getPagingDirectory()); + Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultPagingDir(), conf.getPagingDirectory()); - Assert.assertEquals(HornetQDefaultConfiguration.getDefaultLargeMessagesDir(), conf.getLargeMessagesDirectory()); + Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultLargeMessagesDir(), conf.getLargeMessagesDirectory()); - Assert.assertEquals(HornetQDefaultConfiguration.isDefaultWildcardRoutingEnabled(), conf.isWildcardRoutingEnabled()); + Assert.assertEquals(ActiveMQDefaultConfiguration.isDefaultWildcardRoutingEnabled(), conf.isWildcardRoutingEnabled()); - Assert.assertEquals(HornetQDefaultConfiguration.getDefaultTransactionTimeout(), conf.getTransactionTimeout()); + Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultTransactionTimeout(), conf.getTransactionTimeout()); - Assert.assertEquals(HornetQDefaultConfiguration.isDefaultMessageCounterEnabled(), conf.isMessageCounterEnabled()); + Assert.assertEquals(ActiveMQDefaultConfiguration.isDefaultMessageCounterEnabled(), conf.isMessageCounterEnabled()); - Assert.assertEquals(HornetQDefaultConfiguration.getDefaultTransactionTimeoutScanPeriod(), + Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultTransactionTimeoutScanPeriod(), conf.getTransactionTimeoutScanPeriod()); - Assert.assertEquals(HornetQDefaultConfiguration.getDefaultMessageExpiryScanPeriod(), conf.getMessageExpiryScanPeriod()); + Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultMessageExpiryScanPeriod(), conf.getMessageExpiryScanPeriod()); - Assert.assertEquals(HornetQDefaultConfiguration.getDefaultMessageExpiryThreadPriority(), + Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultMessageExpiryThreadPriority(), conf.getMessageExpiryThreadPriority()); Assert.assertTrue(conf.getHAPolicyConfiguration() instanceof LiveOnlyPolicyConfiguration); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-server/src/test/java/org/apache/activemq/core/config/impl/FileConfigurationParserTest.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/FileConfigurationParserTest.java b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/FileConfigurationParserTest.java index 1d567dd..7d98ad8 100644 --- a/activemq-server/src/test/java/org/apache/activemq/core/config/impl/FileConfigurationParserTest.java +++ b/activemq-server/src/test/java/org/apache/activemq/core/config/impl/FileConfigurationParserTest.java @@ -17,7 +17,7 @@ import java.nio.charset.StandardCharsets; import java.util.HashMap; import java.util.Map; -import org.apache.activemq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; import org.apache.activemq.core.config.Configuration; import org.apache.activemq.core.deployers.impl.FileConfigurationParser; import org.apache.activemq.tests.util.UnitTestCase; @@ -82,7 +82,7 @@ public class FileConfigurationParserTest extends UnitTestCase String clusterPassword = config.getClusterPassword(); - assertEquals(HornetQDefaultConfiguration.getDefaultClusterPassword(), clusterPassword); + assertEquals(ActiveMQDefaultConfiguration.getDefaultClusterPassword(), clusterPassword); //if we add cluster-password, it should be default plain text String clusterPasswordPart = "<cluster-password>helloworld</cluster-password>"; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/JournalCrashTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/JournalCrashTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/JournalCrashTest.java index 89e62f4..4080873 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/JournalCrashTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/JournalCrashTest.java @@ -15,7 +15,7 @@ package org.apache.activemq.tests.integration.client; import java.util.ArrayList; import java.util.Arrays; -import org.apache.activemq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.client.ClientConsumer; import org.apache.activemq.api.core.client.ClientMessage; @@ -60,9 +60,9 @@ public class JournalCrashTest extends ServiceTestBase protected void startServer() throws Exception { Configuration config = createDefaultConfig() - .setJournalFileSize(HornetQDefaultConfiguration.getDefaultJournalFileSize()) - .setJournalCompactMinFiles(HornetQDefaultConfiguration.getDefaultJournalCompactMinFiles()) - .setJournalCompactPercentage(HornetQDefaultConfiguration.getDefaultJournalCompactPercentage()) + .setJournalFileSize(ActiveMQDefaultConfiguration.getDefaultJournalFileSize()) + .setJournalCompactMinFiles(ActiveMQDefaultConfiguration.getDefaultJournalCompactMinFiles()) + .setJournalCompactPercentage(ActiveMQDefaultConfiguration.getDefaultJournalCompactPercentage()) .setJournalMinFiles(2); server = super.createServer(true, config); @@ -222,7 +222,7 @@ public class JournalCrashTest extends ServiceTestBase private void printJournal() throws Exception { NIOSequentialFileFactory factory = new NIOSequentialFileFactory(getJournalDir()); - JournalImpl journal = new JournalImpl(HornetQDefaultConfiguration.getDefaultJournalFileSize(), + JournalImpl journal = new JournalImpl(ActiveMQDefaultConfiguration.getDefaultJournalFileSize(), 2, 0, 0, http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SlowConsumerTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SlowConsumerTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SlowConsumerTest.java index bfcdad1..bf85791 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SlowConsumerTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SlowConsumerTest.java @@ -18,7 +18,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; -import org.apache.activemq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.api.core.ActiveMQExceptionType; import org.apache.activemq.api.core.ActiveMQObjectClosedException; @@ -155,7 +155,7 @@ public class SlowConsumerTest extends ServiceTestBase SimpleString notifQueue = RandomUtil.randomSimpleString(); - session.createQueue(HornetQDefaultConfiguration.getDefaultManagementNotificationAddress(), notifQueue, null, false); + session.createQueue(ActiveMQDefaultConfiguration.getDefaultManagementNotificationAddress(), notifQueue, null, false); ClientConsumer notifConsumer = session.createConsumer(notifQueue.toString(), ManagementHelper.HDR_NOTIFICATION_TYPE + "='" + CoreNotificationType.CONSUMER_SLOW + "'"); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusterTestBase.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusterTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusterTestBase.java index cb2f243..0ea4c13 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusterTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusterTestBase.java @@ -27,7 +27,7 @@ import java.util.Set; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.activemq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.api.core.BroadcastGroupConfiguration; import org.apache.activemq.api.core.DiscoveryGroupConfiguration; @@ -866,7 +866,7 @@ public abstract class ClusterTestBase extends ServiceTestBase protected void setUpGroupHandler(final GroupingHandlerConfiguration.TYPE type, final int node, final int timeout) { - setUpGroupHandler(type, node, timeout, -1, HornetQDefaultConfiguration.getDefaultGroupingHandlerReaperPeriod()); + setUpGroupHandler(type, node, timeout, -1, ActiveMQDefaultConfiguration.getDefaultGroupingHandlerReaperPeriod()); } protected void setUpGroupHandler(final GroupingHandlerConfiguration.TYPE type, final int node, final int timeout, final long groupTimeout, http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/AutomaticColocatedQuorumVoteTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/AutomaticColocatedQuorumVoteTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/AutomaticColocatedQuorumVoteTest.java index 190dbaa..eef65d0 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/AutomaticColocatedQuorumVoteTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/AutomaticColocatedQuorumVoteTest.java @@ -21,7 +21,7 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.activemq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; import org.apache.activemq.api.core.TransportConfiguration; import org.apache.activemq.api.core.client.ClientSessionFactory; import org.apache.activemq.api.core.client.HornetQClient; @@ -310,10 +310,10 @@ public class AutomaticColocatedQuorumVoteTest extends ServiceTestBase .clearAcceptorConfigurations() .addAcceptorConfiguration(liveAcceptor) .addConnectorConfiguration(liveConnector.getName(), liveConnector) - .setJournalDirectory(HornetQDefaultConfiguration.getDefaultJournalDir() + identity) - .setBindingsDirectory(HornetQDefaultConfiguration.getDefaultBindingsDirectory() + identity) - .setLargeMessagesDirectory(HornetQDefaultConfiguration.getDefaultLargeMessagesDir() + identity) - .setPagingDirectory(HornetQDefaultConfiguration.getDefaultPagingDir() + identity) + .setJournalDirectory(ActiveMQDefaultConfiguration.getDefaultJournalDir() + identity) + .setBindingsDirectory(ActiveMQDefaultConfiguration.getDefaultBindingsDirectory() + identity) + .setLargeMessagesDirectory(ActiveMQDefaultConfiguration.getDefaultLargeMessagesDir() + identity) + .setPagingDirectory(ActiveMQDefaultConfiguration.getDefaultPagingDir() + identity) .addQueueConfiguration(new CoreQueueConfiguration() .setAddress("jms.queue.testQueue") .setName("jms.queue.testQueue")); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/MultipleLivesMultipleBackupsFailoverTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/MultipleLivesMultipleBackupsFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/MultipleLivesMultipleBackupsFailoverTest.java index 1ebbb12..20e114d 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/MultipleLivesMultipleBackupsFailoverTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/MultipleLivesMultipleBackupsFailoverTest.java @@ -17,7 +17,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.activemq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; import org.apache.activemq.api.core.TransportConfiguration; import org.apache.activemq.api.core.client.ClientSession; import org.apache.activemq.api.core.client.ServerLocator; @@ -160,10 +160,10 @@ public class MultipleLivesMultipleBackupsFailoverTest extends MultipleBackupsFai .addAcceptorConfiguration(createTransportConfiguration(isNetty(), true, generateParams(nodeid, isNetty()))) .setSecurityEnabled(false) .setHAPolicyConfiguration(sharedStore ? new SharedStoreSlavePolicyConfiguration() : new ReplicaPolicyConfiguration()) - .setBindingsDirectory(HornetQDefaultConfiguration.getDefaultBindingsDirectory() + "_" + liveNode) - .setJournalDirectory(HornetQDefaultConfiguration.getDefaultJournalDir() + "_" + liveNode) - .setPagingDirectory(HornetQDefaultConfiguration.getDefaultPagingDir() + "_" + liveNode) - .setLargeMessagesDirectory(HornetQDefaultConfiguration.getDefaultLargeMessagesDir() + "_" + liveNode); + .setBindingsDirectory(ActiveMQDefaultConfiguration.getDefaultBindingsDirectory() + "_" + liveNode) + .setJournalDirectory(ActiveMQDefaultConfiguration.getDefaultJournalDir() + "_" + liveNode) + .setPagingDirectory(ActiveMQDefaultConfiguration.getDefaultPagingDir() + "_" + liveNode) + .setLargeMessagesDirectory(ActiveMQDefaultConfiguration.getDefaultLargeMessagesDir() + "_" + liveNode); for (int node : otherBackupNodes) { @@ -195,10 +195,10 @@ public class MultipleLivesMultipleBackupsFailoverTest extends MultipleBackupsFai .addAcceptorConfiguration(createTransportConfiguration(isNetty(), true, generateParams(liveNode, isNetty()))) .setSecurityEnabled(false) .setHAPolicyConfiguration(sharedStore ? new SharedStoreMasterPolicyConfiguration() : new ReplicatedPolicyConfiguration()) - .setBindingsDirectory(HornetQDefaultConfiguration.getDefaultBindingsDirectory() + "_" + liveNode) - .setJournalDirectory(HornetQDefaultConfiguration.getDefaultJournalDir() + "_" + liveNode) - .setPagingDirectory(HornetQDefaultConfiguration.getDefaultPagingDir() + "_" + liveNode) - .setLargeMessagesDirectory(HornetQDefaultConfiguration.getDefaultLargeMessagesDir() + "_" + liveNode) + .setBindingsDirectory(ActiveMQDefaultConfiguration.getDefaultBindingsDirectory() + "_" + liveNode) + .setJournalDirectory(ActiveMQDefaultConfiguration.getDefaultJournalDir() + "_" + liveNode) + .setPagingDirectory(ActiveMQDefaultConfiguration.getDefaultPagingDir() + "_" + liveNode) + .setLargeMessagesDirectory(ActiveMQDefaultConfiguration.getDefaultLargeMessagesDir() + "_" + liveNode) .addConnectorConfiguration(liveConnector.getName(), liveConnector); List<String> pairs = new ArrayList<String>(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/SingleLiveMultipleBackupsFailoverTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/SingleLiveMultipleBackupsFailoverTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/SingleLiveMultipleBackupsFailoverTest.java index 30e3d94..c67bc4f 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/SingleLiveMultipleBackupsFailoverTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/SingleLiveMultipleBackupsFailoverTest.java @@ -17,7 +17,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.activemq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; import org.apache.activemq.api.core.TransportConfiguration; import org.apache.activemq.api.core.client.ClientSession; import org.apache.activemq.core.client.impl.ClientSessionFactoryInternal; @@ -138,10 +138,10 @@ public class SingleLiveMultipleBackupsFailoverTest extends MultipleBackupsFailov .setSecurityEnabled(false) .setHAPolicyConfiguration(sharedStore ? new SharedStoreSlavePolicyConfiguration() : new ReplicatedPolicyConfiguration()) .addConnectorConfiguration(backupConnector.getName(), backupConnector) - .setBindingsDirectory(HornetQDefaultConfiguration.getDefaultBindingsDirectory() + "_" + liveNode) - .setJournalDirectory(HornetQDefaultConfiguration.getDefaultJournalDir() + "_" + liveNode) - .setPagingDirectory(HornetQDefaultConfiguration.getDefaultPagingDir() + "_" + liveNode) - .setLargeMessagesDirectory(HornetQDefaultConfiguration.getDefaultLargeMessagesDir() + "_" + liveNode); + .setBindingsDirectory(ActiveMQDefaultConfiguration.getDefaultBindingsDirectory() + "_" + liveNode) + .setJournalDirectory(ActiveMQDefaultConfiguration.getDefaultJournalDir() + "_" + liveNode) + .setPagingDirectory(ActiveMQDefaultConfiguration.getDefaultPagingDir() + "_" + liveNode) + .setLargeMessagesDirectory(ActiveMQDefaultConfiguration.getDefaultLargeMessagesDir() + "_" + liveNode); List<String> staticConnectors = new ArrayList<String>(); @@ -167,10 +167,10 @@ public class SingleLiveMultipleBackupsFailoverTest extends MultipleBackupsFailov .setHAPolicyConfiguration(sharedStore ? new SharedStoreMasterPolicyConfiguration() : new ReplicatedPolicyConfiguration()) .addClusterConfiguration(basicClusterConnectionConfig(liveConnector.getName())) .addConnectorConfiguration(liveConnector.getName(), liveConnector) - .setBindingsDirectory(HornetQDefaultConfiguration.getDefaultBindingsDirectory() + "_" + liveNode) - .setJournalDirectory(HornetQDefaultConfiguration.getDefaultJournalDir() + "_" + liveNode) - .setPagingDirectory(HornetQDefaultConfiguration.getDefaultPagingDir() + "_" + liveNode) - .setLargeMessagesDirectory(HornetQDefaultConfiguration.getDefaultLargeMessagesDir() + "_" + liveNode); + .setBindingsDirectory(ActiveMQDefaultConfiguration.getDefaultBindingsDirectory() + "_" + liveNode) + .setJournalDirectory(ActiveMQDefaultConfiguration.getDefaultJournalDir() + "_" + liveNode) + .setPagingDirectory(ActiveMQDefaultConfiguration.getDefaultPagingDir() + "_" + liveNode) + .setLargeMessagesDirectory(ActiveMQDefaultConfiguration.getDefaultLargeMessagesDir() + "_" + liveNode); servers.put(liveNode, new SameProcessHornetQServer(createInVMFailoverServer(true, config0, nodeManager, liveNode))); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSServerControlTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSServerControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSServerControlTest.java index 2017487..c67bb07 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSServerControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSServerControlTest.java @@ -34,7 +34,7 @@ import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.apache.activemq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; import org.apache.activemq.api.core.ActiveMQObjectClosedException; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.TransportConfiguration; @@ -874,7 +874,7 @@ public class JMSServerControlTest extends ManagementTestBase control.destroyConnectionFactory("test"); - ObjectNameBuilder nameBuilder = ObjectNameBuilder.create(HornetQDefaultConfiguration.getDefaultJmxDomain()); + ObjectNameBuilder nameBuilder = ObjectNameBuilder.create(ActiveMQDefaultConfiguration.getDefaultJmxDomain()); assertFalse(mbeanServer.isRegistered(nameBuilder.getConnectionFactoryObjectName("test"))); stopServer(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/AddressControlTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/AddressControlTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/AddressControlTest.java index 1be5728..2aa2d24 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/AddressControlTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/AddressControlTest.java @@ -15,7 +15,7 @@ package org.apache.activemq.tests.integration.management; import java.util.HashSet; import java.util.Set; -import org.apache.activemq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.TransportConfiguration; import org.apache.activemq.api.core.client.ClientMessage; @@ -279,7 +279,7 @@ public class AddressControlTest extends ManagementTestBase session.createQueue(address, address, true); AddressControl addressControl = createManagementControl(address); - Assert.assertEquals(HornetQDefaultConfiguration.getDefaultJournalFileSize(), addressControl.getNumberOfBytesPerPage()); + Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultJournalFileSize(), addressControl.getNumberOfBytesPerPage()); session.close(); server.stop(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/CoreMessagingProxy.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/CoreMessagingProxy.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/CoreMessagingProxy.java index 6a6d2a2..4d65c0c 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/CoreMessagingProxy.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/CoreMessagingProxy.java @@ -12,7 +12,7 @@ */ package org.apache.activemq.tests.integration.management; -import org.apache.activemq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; import org.apache.activemq.api.core.client.ClientMessage; import org.apache.activemq.api.core.client.ClientRequestor; import org.apache.activemq.api.core.client.ClientSession; @@ -48,7 +48,7 @@ public class CoreMessagingProxy this.resourceName = resourceName; - requestor = new ClientRequestor(session, HornetQDefaultConfiguration.getDefaultManagementAddress()); + requestor = new ClientRequestor(session, ActiveMQDefaultConfiguration.getDefaultManagementAddress()); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/JMXDomainTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/JMXDomainTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/JMXDomainTest.java index 98f25a7..6debefe 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/JMXDomainTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/JMXDomainTest.java @@ -15,7 +15,7 @@ package org.apache.activemq.tests.integration.management; import java.util.HashMap; import java.util.Map; -import org.apache.activemq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; import org.apache.activemq.api.core.TransportConfiguration; import org.apache.activemq.api.core.management.ObjectNameBuilder; import org.apache.activemq.core.config.Configuration; @@ -42,7 +42,7 @@ public class JMXDomainTest extends ManagementTestBase Configuration config_0 = createDefaultConfig() .setJMXManagementEnabled(true); - String jmxDomain_1 = HornetQDefaultConfiguration.getDefaultJmxDomain() + ".1"; + String jmxDomain_1 = ActiveMQDefaultConfiguration.getDefaultJmxDomain() + ".1"; Map<String, Object> params = new HashMap<String, Object>(); params.put(TransportConstants.SERVER_ID_PROP_NAME, 1); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ManagementWithStompTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ManagementWithStompTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ManagementWithStompTest.java index b46a580..379122f 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ManagementWithStompTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ManagementWithStompTest.java @@ -11,6 +11,7 @@ * permissions and limitations under the License. */ package org.apache.activemq.tests.integration.management; +import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; import org.apache.activemq.core.protocol.stomp.StompProtocolManagerFactory; import org.junit.Before; import org.junit.After; @@ -28,7 +29,6 @@ import java.util.Map; import org.junit.Assert; -import org.apache.activemq.api.config.HornetQDefaultConfiguration; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.TransportConfiguration; import org.apache.activemq.api.core.client.ClientSession; @@ -90,7 +90,7 @@ public class ManagementWithStompTest extends ManagementTestBase sendFrame(frame); // retrieve the address of the queue - frame = "\nSEND\n" + "destination:" + HornetQDefaultConfiguration.getDefaultManagementAddress() + "\n" + + frame = "\nSEND\n" + "destination:" + ActiveMQDefaultConfiguration.getDefaultManagementAddress() + "\n" + "reply-to:" + address + "\n" + "_HQ_ResourceName:" + ResourceNames.CORE_QUEUE + queue + "\n" + "_HQ_Attribute: Address\n\n" + @@ -133,7 +133,7 @@ public class ManagementWithStompTest extends ManagementTestBase sendFrame(frame); // count number of message with filter "color = 'blue'" - frame = "\nSEND\n" + "destination:" + HornetQDefaultConfiguration.getDefaultManagementAddress() + "\n" + + frame = "\nSEND\n" + "destination:" + ActiveMQDefaultConfiguration.getDefaultManagementAddress() + "\n" + "reply-to:" + address + "\n" + "_HQ_ResourceName:" + ResourceNames.CORE_QUEUE + queue + "\n" + "_HQ_OperationName: countMessages\n\n" + http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/NotificationTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/NotificationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/NotificationTest.java index a4ade5b..f854779 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/NotificationTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/NotificationTest.java @@ -12,7 +12,7 @@ */ package org.apache.activemq.tests.integration.management; -import org.apache.activemq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.TransportConfiguration; @@ -265,7 +265,7 @@ public class NotificationTest extends UnitTestCase notifQueue = RandomUtil.randomSimpleString(); - session.createQueue(HornetQDefaultConfiguration.getDefaultManagementNotificationAddress(), notifQueue, null, false); + session.createQueue(ActiveMQDefaultConfiguration.getDefaultManagementNotificationAddress(), notifQueue, null, false); notifConsumer = session.createConsumer(notifQueue); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityManagementTestBase.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityManagementTestBase.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityManagementTestBase.java index 0e18293..3469d68 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityManagementTestBase.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityManagementTestBase.java @@ -11,12 +11,12 @@ * permissions and limitations under the License. */ package org.apache.activemq.tests.integration.management; +import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; import org.junit.Before; import org.junit.After; import org.junit.Assert; -import org.apache.activemq.api.config.HornetQDefaultConfiguration; import org.apache.activemq.api.core.TransportConfiguration; import org.apache.activemq.api.core.client.ClientMessage; import org.apache.activemq.api.core.client.ClientRequestor; @@ -96,7 +96,7 @@ public abstract class SecurityManagementTestBase extends UnitTestCase session.start(); - ClientRequestor requestor = new ClientRequestor(session, HornetQDefaultConfiguration.getDefaultManagementAddress()); + ClientRequestor requestor = new ClientRequestor(session, ActiveMQDefaultConfiguration.getDefaultManagementAddress()); ClientMessage mngmntMessage = session.createMessage(false); ManagementHelper.putAttribute(mngmntMessage, ResourceNames.CORE_SERVER, "started"); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java index db8f855..49a8de5 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java @@ -12,11 +12,11 @@ */ package org.apache.activemq.tests.integration.management; +import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; import org.junit.Test; import java.util.Set; -import org.apache.activemq.api.config.HornetQDefaultConfiguration; import org.apache.activemq.api.core.TransportConfiguration; import org.apache.activemq.core.config.Configuration; import org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory; @@ -60,7 +60,7 @@ public class SecurityManagementWithConfiguredAdminUserTest extends SecurityManag @Test public void testSendManagementMessageWithClusterAdminUser() throws Exception { - doSendManagementMessage(HornetQDefaultConfiguration.getDefaultClusterUser(), CLUSTER_PASSWORD, true); + doSendManagementMessage(ActiveMQDefaultConfiguration.getDefaultClusterUser(), CLUSTER_PASSWORD, true); } @Test @@ -102,9 +102,9 @@ public class SecurityManagementWithConfiguredAdminUserTest extends SecurityManag securityManager.addRole(validAdminUser, "guest"); securityManager.addRole(invalidAdminUser, "guest"); - Set<Role> adminRole = securityRepository.getMatch(HornetQDefaultConfiguration.getDefaultManagementAddress().toString()); + Set<Role> adminRole = securityRepository.getMatch(ActiveMQDefaultConfiguration.getDefaultManagementAddress().toString()); adminRole.add(new Role("admin", true, true, true, true, true, true, true)); - securityRepository.addMatch(HornetQDefaultConfiguration.getDefaultManagementAddress().toString(), adminRole); + securityRepository.addMatch(ActiveMQDefaultConfiguration.getDefaultManagementAddress().toString(), adminRole); Set<Role> guestRole = securityRepository.getMatch("*"); guestRole.add(new Role("guest", true, true, true, true, true, true, false)); securityRepository.addMatch("*", guestRole); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityManagementWithDefaultConfigurationTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityManagementWithDefaultConfigurationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityManagementWithDefaultConfigurationTest.java index 663584c..279268a 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityManagementWithDefaultConfigurationTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityManagementWithDefaultConfigurationTest.java @@ -12,9 +12,9 @@ */ package org.apache.activemq.tests.integration.management; +import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; import org.junit.Test; -import org.apache.activemq.api.config.HornetQDefaultConfiguration; import org.apache.activemq.api.core.TransportConfiguration; import org.apache.activemq.core.config.Configuration; import org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory; @@ -32,8 +32,8 @@ public class SecurityManagementWithDefaultConfigurationTest extends SecurityMana @Test public void testSendManagementMessageWithDefaultClusterAdminUser() throws Exception { - doSendManagementMessage(HornetQDefaultConfiguration.getDefaultClusterUser(), - HornetQDefaultConfiguration.getDefaultClusterPassword(), + doSendManagementMessage(ActiveMQDefaultConfiguration.getDefaultClusterUser(), + ActiveMQDefaultConfiguration.getDefaultClusterPassword(), true); } @@ -57,7 +57,7 @@ public class SecurityManagementWithDefaultConfigurationTest extends SecurityMana protected HornetQServer setupAndStartHornetQServer() throws Exception { Configuration conf = createBasicConfig() - .setClusterPassword(HornetQDefaultConfiguration.getDefaultClusterPassword()) + .setClusterPassword(ActiveMQDefaultConfiguration.getDefaultClusterPassword()) .setSecurityEnabled(true) .addAcceptorConfiguration(new TransportConfiguration(InVMAcceptorFactory.class.getName())); HornetQServer server = addServer(HornetQServers.newHornetQServer(conf, false)); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityManagementWithModifiedConfigurationTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityManagementWithModifiedConfigurationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityManagementWithModifiedConfigurationTest.java index 34756b7..409d4a2 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityManagementWithModifiedConfigurationTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityManagementWithModifiedConfigurationTest.java @@ -12,9 +12,9 @@ */ package org.apache.activemq.tests.integration.management; +import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; import org.junit.Test; -import org.apache.activemq.api.config.HornetQDefaultConfiguration; import org.apache.activemq.api.core.TransportConfiguration; import org.apache.activemq.core.config.impl.ConfigurationImpl; import org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory; @@ -44,14 +44,14 @@ public class SecurityManagementWithModifiedConfigurationTest extends SecurityMan @Test public void testSendManagementMessageWithModifiedClusterAdminUser() throws Exception { - doSendManagementMessage(HornetQDefaultConfiguration.getDefaultClusterUser(), configuredClusterPassword, true); + doSendManagementMessage(ActiveMQDefaultConfiguration.getDefaultClusterUser(), configuredClusterPassword, true); } @Test public void testSendManagementMessageWithDefaultClusterAdminUser() throws Exception { - doSendManagementMessage(HornetQDefaultConfiguration.getDefaultClusterUser(), - HornetQDefaultConfiguration.getDefaultClusterPassword(), + doSendManagementMessage(ActiveMQDefaultConfiguration.getDefaultClusterUser(), + ActiveMQDefaultConfiguration.getDefaultClusterPassword(), false); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityNotificationTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityNotificationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityNotificationTest.java index f87780e..d04c1b1 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityNotificationTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityNotificationTest.java @@ -25,7 +25,7 @@ import java.util.Set; import org.junit.Assert; -import org.apache.activemq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.TransportConfiguration; import org.apache.activemq.api.core.client.ClientConsumer; @@ -166,7 +166,7 @@ public class SecurityNotificationTest extends UnitTestCase Role role = new Role("notif", true, true, true, true, true, true, true); Set<Role> roles = new HashSet<Role>(); roles.add(role); - server.getSecurityRepository().addMatch(HornetQDefaultConfiguration.getDefaultManagementNotificationAddress().toString(), + server.getSecurityRepository().addMatch(ActiveMQDefaultConfiguration.getDefaultManagementNotificationAddress().toString(), roles); securityManager.addRole("admin", "notif"); @@ -176,7 +176,7 @@ public class SecurityNotificationTest extends UnitTestCase adminSession = sf.createSession("admin", "admin", false, true, true, false, 1); adminSession.start(); - adminSession.createTemporaryQueue(HornetQDefaultConfiguration.getDefaultManagementNotificationAddress(), notifQueue); + adminSession.createTemporaryQueue(ActiveMQDefaultConfiguration.getDefaultManagementNotificationAddress(), notifQueue); notifConsumer = adminSession.createConsumer(notifQueue); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/replication/ReplicationTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/replication/ReplicationTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/replication/ReplicationTest.java index fa54304..7c3420f 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/replication/ReplicationTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/replication/ReplicationTest.java @@ -26,7 +26,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.activemq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; import org.apache.activemq.api.core.ActiveMQBuffer; import org.apache.activemq.api.core.ActiveMQBuffers; import org.apache.activemq.api.core.ActiveMQException; @@ -123,10 +123,10 @@ public final class ReplicationTest extends ServiceTestBase Configuration backupConfig = createDefaultConfig() .setHAPolicyConfiguration(new SharedStoreSlavePolicyConfiguration()) - .setBindingsDirectory(HornetQDefaultConfiguration.getDefaultBindingsDirectory() + suffix) - .setJournalDirectory(HornetQDefaultConfiguration.getDefaultJournalDir() + suffix) - .setPagingDirectory(HornetQDefaultConfiguration.getDefaultPagingDir() + suffix) - .setLargeMessagesDirectory(HornetQDefaultConfiguration.getDefaultLargeMessagesDir() + suffix) + .setBindingsDirectory(ActiveMQDefaultConfiguration.getDefaultBindingsDirectory() + suffix) + .setJournalDirectory(ActiveMQDefaultConfiguration.getDefaultJournalDir() + suffix) + .setPagingDirectory(ActiveMQDefaultConfiguration.getDefaultPagingDir() + suffix) + .setLargeMessagesDirectory(ActiveMQDefaultConfiguration.getDefaultLargeMessagesDir() + suffix) .setIncomingInterceptorClassNames(interceptors.length > 0 ? Arrays.asList(interceptors) : new ArrayList<String>()); ReplicatedBackupUtils.configureReplicationPair(backupConfig, backupConnector, backupAcceptor, liveConfig, liveConnector); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/ScaleDown3NodeTest.java ---------------------------------------------------------------------- diff --git a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/ScaleDown3NodeTest.java b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/ScaleDown3NodeTest.java index 54e5980..97380f2 100644 --- a/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/ScaleDown3NodeTest.java +++ b/tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/ScaleDown3NodeTest.java @@ -12,7 +12,7 @@ */ package org.apache.activemq.tests.integration.server; -import org.apache.activemq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; import org.apache.activemq.api.core.Message; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.client.ClientMessage; @@ -91,7 +91,7 @@ public class ScaleDown3NodeTest extends ClusterTestBase @Test public void testBasicScaleDownWithDefaultReconnectAttempts() throws Exception { - testBasicScaleDownInternal(HornetQDefaultConfiguration.getDefaultBridgeReconnectAttempts(), false); + testBasicScaleDownInternal(ActiveMQDefaultConfiguration.getDefaultBridgeReconnectAttempts(), false); } @Test @@ -103,7 +103,7 @@ public class ScaleDown3NodeTest extends ClusterTestBase @Test public void testBasicScaleDownWithDefaultReconnectAttemptsAndLargeMessages() throws Exception { - testBasicScaleDownInternal(HornetQDefaultConfiguration.getDefaultBridgeReconnectAttempts(), true); + testBasicScaleDownInternal(ActiveMQDefaultConfiguration.getDefaultBridgeReconnectAttempts(), true); } private void testBasicScaleDownInternal(int reconnectAttempts, boolean large) throws Exception http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/tests/joram-tests/src/test/java/org/apache/activemq/jms/HornetQAdmin.java ---------------------------------------------------------------------- diff --git a/tests/joram-tests/src/test/java/org/apache/activemq/jms/HornetQAdmin.java b/tests/joram-tests/src/test/java/org/apache/activemq/jms/HornetQAdmin.java index fa06938..3a9eda6 100644 --- a/tests/joram-tests/src/test/java/org/apache/activemq/jms/HornetQAdmin.java +++ b/tests/joram-tests/src/test/java/org/apache/activemq/jms/HornetQAdmin.java @@ -20,7 +20,7 @@ import java.io.InputStreamReader; import java.io.OutputStreamWriter; import java.util.Hashtable; -import org.apache.activemq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; import org.apache.activemq.api.core.TransportConfiguration; import org.apache.activemq.api.core.client.ClientMessage; import org.apache.activemq.api.core.client.ClientRequestor; @@ -85,14 +85,14 @@ public class HornetQAdmin implements Admin { serverLocator = HornetQClient.createServerLocatorWithoutHA(new TransportConfiguration(NettyConnectorFactory.class.getName())); sf = serverLocator.createSessionFactory(); - clientSession = sf.createSession(HornetQDefaultConfiguration.getDefaultClusterUser(), - HornetQDefaultConfiguration.getDefaultClusterPassword(), + clientSession = sf.createSession(ActiveMQDefaultConfiguration.getDefaultClusterUser(), + ActiveMQDefaultConfiguration.getDefaultClusterPassword(), false, true, true, false, 1); - requestor = new ClientRequestor(clientSession, HornetQDefaultConfiguration.getDefaultManagementAddress()); + requestor = new ClientRequestor(clientSession, ActiveMQDefaultConfiguration.getDefaultManagementAddress()); clientSession.start(); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/CompactingStressTest.java ---------------------------------------------------------------------- diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/CompactingStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/CompactingStressTest.java index cb12424..e04b233 100644 --- a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/CompactingStressTest.java +++ b/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/CompactingStressTest.java @@ -12,6 +12,7 @@ */ package org.apache.activemq.tests.stress.journal; +import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; import org.junit.Test; import java.util.concurrent.CountDownLatch; @@ -19,7 +20,6 @@ import java.util.concurrent.atomic.AtomicInteger; import org.junit.Assert; -import org.apache.activemq.api.config.HornetQDefaultConfiguration; import org.apache.activemq.api.core.Message; import org.apache.activemq.api.core.client.ClientConsumer; import org.apache.activemq.api.core.client.ClientMessage; @@ -417,7 +417,7 @@ public class CompactingStressTest extends ServiceTestBase { Configuration config = createDefaultConfig() .setJournalSyncNonTransactional(false) - .setJournalFileSize(HornetQDefaultConfiguration.getDefaultJournalFileSize()) + .setJournalFileSize(ActiveMQDefaultConfiguration.getDefaultJournalFileSize()) .setJournalType(journalType) .setJournalCompactMinFiles(10) .setJournalCompactPercentage(50); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/JournalCleanupCompactStressTest.java ---------------------------------------------------------------------- diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/JournalCleanupCompactStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/JournalCleanupCompactStressTest.java index 9d1ac43..5053a02 100644 --- a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/JournalCleanupCompactStressTest.java +++ b/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/JournalCleanupCompactStressTest.java @@ -28,7 +28,7 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; -import org.apache.activemq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; import org.apache.activemq.core.asyncio.impl.AsynchronousFileImpl; import org.apache.activemq.core.journal.IOAsyncTask; import org.apache.activemq.core.journal.PreparedTransactionInfo; @@ -117,18 +117,18 @@ public class JournalCleanupCompactStressTest extends ServiceTestBase if (AsynchronousFileImpl.isLoaded()) { factory = new AIOSequentialFileFactory(dir.getPath()); - maxAIO = HornetQDefaultConfiguration.getDefaultJournalMaxIoAio(); + maxAIO = ActiveMQDefaultConfiguration.getDefaultJournalMaxIoAio(); } else { factory = new NIOSequentialFileFactory(dir.getPath(), true); - maxAIO = HornetQDefaultConfiguration.getDefaultJournalMaxIoNio(); + maxAIO = ActiveMQDefaultConfiguration.getDefaultJournalMaxIoNio(); } journal = new JournalImpl(50 * 1024, 20, 50, - HornetQDefaultConfiguration.getDefaultJournalCompactPercentage(), + ActiveMQDefaultConfiguration.getDefaultJournalCompactPercentage(), factory, "hornetq-data", "hq", http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/LargeJournalStressTest.java ---------------------------------------------------------------------- diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/LargeJournalStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/LargeJournalStressTest.java index 152cfc7..6a7a92d 100644 --- a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/LargeJournalStressTest.java +++ b/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/LargeJournalStressTest.java @@ -15,7 +15,7 @@ package org.apache.activemq.tests.stress.journal; import java.util.concurrent.CountDownLatch; import java.util.concurrent.atomic.AtomicInteger; -import org.apache.activemq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; import org.apache.activemq.api.core.client.ClientConsumer; import org.apache.activemq.api.core.client.ClientMessage; import org.apache.activemq.api.core.client.ClientProducer; @@ -278,7 +278,7 @@ public class LargeJournalStressTest extends ServiceTestBase { Configuration config = createDefaultConfig() .setJournalSyncNonTransactional(false) - .setJournalFileSize(HornetQDefaultConfiguration.getDefaultJournalFileSize()) + .setJournalFileSize(ActiveMQDefaultConfiguration.getDefaultJournalFileSize()) .setJournalType(journalType) .setJournalCompactMinFiles(0) .setJournalCompactPercentage(50); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/MultiThreadConsumerStressTest.java ---------------------------------------------------------------------- diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/MultiThreadConsumerStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/MultiThreadConsumerStressTest.java index fe6049c..32e3912 100644 --- a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/MultiThreadConsumerStressTest.java +++ b/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/MultiThreadConsumerStressTest.java @@ -15,7 +15,7 @@ package org.apache.activemq.tests.stress.journal; import java.util.ArrayList; import java.util.concurrent.CountDownLatch; -import org.apache.activemq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.client.ClientConsumer; import org.apache.activemq.api.core.client.ClientMessage; @@ -155,8 +155,8 @@ public class MultiThreadConsumerStressTest extends ServiceTestBase { Configuration config = createDefaultConfig(true) .setJournalType(journalType) - .setJournalFileSize(HornetQDefaultConfiguration.getDefaultJournalFileSize()) - .setJournalMinFiles(HornetQDefaultConfiguration.getDefaultJournalMinFiles()) + .setJournalFileSize(ActiveMQDefaultConfiguration.getDefaultJournalFileSize()) + .setJournalMinFiles(ActiveMQDefaultConfiguration.getDefaultJournalMinFiles()) .setJournalCompactMinFiles(2) .setJournalCompactPercentage(50); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/NIOMultiThreadCompactorStressTest.java ---------------------------------------------------------------------- diff --git a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/NIOMultiThreadCompactorStressTest.java b/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/NIOMultiThreadCompactorStressTest.java index d1adb29..988845f 100644 --- a/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/NIOMultiThreadCompactorStressTest.java +++ b/tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/NIOMultiThreadCompactorStressTest.java @@ -18,7 +18,7 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.CountDownLatch; -import org.apache.activemq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.api.core.client.ClientConsumer; @@ -93,7 +93,7 @@ public class NIOMultiThreadCompactorStressTest extends ServiceTestBase stopServer(); NIOSequentialFileFactory factory = new NIOSequentialFileFactory(getJournalDir()); - JournalImpl journal = new JournalImpl(HornetQDefaultConfiguration.getDefaultJournalFileSize(), + JournalImpl journal = new JournalImpl(ActiveMQDefaultConfiguration.getDefaultJournalFileSize(), 2, 0, 0, @@ -348,13 +348,13 @@ public class NIOMultiThreadCompactorStressTest extends ServiceTestBase if (server == null) { Configuration config = createDefaultConfig(true) - .setJournalFileSize(HornetQDefaultConfiguration.getDefaultJournalFileSize()) + .setJournalFileSize(ActiveMQDefaultConfiguration.getDefaultJournalFileSize()) .setJournalType(journalType) .setJMXManagementEnabled(false) - .setJournalFileSize(HornetQDefaultConfiguration.getDefaultJournalFileSize()) - .setJournalMinFiles(HornetQDefaultConfiguration.getDefaultJournalMinFiles()) - .setJournalCompactMinFiles(HornetQDefaultConfiguration.getDefaultJournalCompactMinFiles()) - .setJournalCompactPercentage(HornetQDefaultConfiguration.getDefaultJournalCompactPercentage()) + .setJournalFileSize(ActiveMQDefaultConfiguration.getDefaultJournalFileSize()) + .setJournalMinFiles(ActiveMQDefaultConfiguration.getDefaultJournalMinFiles()) + .setJournalCompactMinFiles(ActiveMQDefaultConfiguration.getDefaultJournalCompactMinFiles()) + .setJournalCompactPercentage(ActiveMQDefaultConfiguration.getDefaultJournalCompactPercentage()) // This test is supposed to not sync.. All the ACKs are async, and it was supposed to not sync .setJournalSyncNonTransactional(false); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java index 1261f8d..0284c15 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java @@ -19,7 +19,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; -import org.apache.activemq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; import org.apache.activemq.api.core.Pair; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.core.config.Configuration; @@ -95,7 +95,7 @@ public class DuplicateDetectionUnitTest extends ServiceTestBase PostOffice postOffice = new FakePostOffice(); - ScheduledExecutorService scheduledThreadPool = Executors.newScheduledThreadPool(HornetQDefaultConfiguration.getDefaultScheduledThreadPoolMaxSize()); + ScheduledExecutorService scheduledThreadPool = Executors.newScheduledThreadPool(ActiveMQDefaultConfiguration.getDefaultScheduledThreadPoolMaxSize()); journal = new JournalStorageManager(configuration, factory, null); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java index b9df0a7..522e8a1 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java @@ -16,7 +16,7 @@ import java.util.HashMap; import java.util.Map; import java.util.concurrent.Executors; -import org.apache.activemq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; import org.apache.activemq.api.core.ActiveMQBuffer; import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.core.remoting.impl.netty.NettyAcceptor; @@ -79,7 +79,7 @@ public class NettyAcceptorFactoryTest extends UnitTestCase handler, listener, Executors.newCachedThreadPool(), - Executors.newScheduledThreadPool(HornetQDefaultConfiguration.getDefaultScheduledThreadPoolMaxSize()), + Executors.newScheduledThreadPool(ActiveMQDefaultConfiguration.getDefaultScheduledThreadPoolMaxSize()), null); Assert.assertTrue(acceptor instanceof NettyAcceptor); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java ---------------------------------------------------------------------- diff --git a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java index 0b3214e..15df3db 100644 --- a/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java +++ b/tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java @@ -18,7 +18,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import org.apache.activemq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; import org.apache.activemq.api.core.ActiveMQBuffer; import org.apache.activemq.api.core.ActiveMQException; import org.apache.activemq.core.remoting.impl.netty.NettyAcceptor; @@ -98,7 +98,7 @@ public class NettyAcceptorTest extends UnitTestCase { } }; - pool2 = Executors.newScheduledThreadPool(HornetQDefaultConfiguration.getDefaultScheduledThreadPoolMaxSize()); + pool2 = Executors.newScheduledThreadPool(ActiveMQDefaultConfiguration.getDefaultScheduledThreadPoolMaxSize()); NettyAcceptor acceptor = new NettyAcceptor("netty", null, params,
