http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-server/src/main/java/org/apache/activemq/core/config/Configuration.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/Configuration.java b/activemq-server/src/main/java/org/apache/activemq/core/config/Configuration.java index 25df619..8ab206f 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/config/Configuration.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/config/Configuration.java @@ -83,7 +83,7 @@ public interface Configuration extends Serializable /** * Returns whether delivery count is persisted before messages are delivered to the consumers. <br> * Default value is - * {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_PERSIST_DELIVERY_COUNT_BEFORE_DELIVERY}. + * {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_PERSIST_DELIVERY_COUNT_BEFORE_DELIVERY}. */ boolean isPersistDeliveryCountBeforeDelivery(); @@ -95,7 +95,7 @@ public interface Configuration extends Serializable /** * Returns {@code true} if this server is a backup, {@code false} if it is a live server. <br> * If a backup server has been activated, returns {@code false}. <br> - * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_BACKUP}. + * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_BACKUP}. * * @deprecated replaced by {@link org.apache.activemq.core.server.cluster.ha.HAPolicy#isBackup()} */ @@ -112,7 +112,7 @@ public interface Configuration extends Serializable /** * Returns whether this server shares its data store with a corresponding live or backup server. <br> - * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_SHARED_STORE}. + * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_SHARED_STORE}. * * @deprecated replaced by {@link org.apache.activemq.core.server.cluster.ha.HAPolicy#isSharedStore()} */ @@ -129,7 +129,7 @@ public interface Configuration extends Serializable /** * Returns whether this server will use files to configure and deploy its resources. <br> - * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_FILE_DEPLOYMENT_ENABLED}. + * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_FILE_DEPLOYMENT_ENABLED}. */ boolean isFileDeploymentEnabled(); @@ -140,7 +140,7 @@ public interface Configuration extends Serializable /** * Returns whether this server is using persistence and store data. <br> - * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_PERSISTENCE_ENABLED}. + * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_PERSISTENCE_ENABLED}. */ boolean isPersistenceEnabled(); @@ -151,7 +151,7 @@ public interface Configuration extends Serializable /** * Returns the period (in milliseconds) to scan configuration files used by deployment. <br> - * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_FILE_DEPLOYER_SCAN_PERIOD}. + * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_FILE_DEPLOYER_SCAN_PERIOD}. */ long getFileDeployerScanPeriod(); @@ -162,7 +162,7 @@ public interface Configuration extends Serializable /** * Returns the maximum number of threads in the thread pool of this server. <br> - * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_THREAD_POOL_MAX_SIZE}. + * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_THREAD_POOL_MAX_SIZE}. */ int getThreadPoolMaxSize(); @@ -173,7 +173,7 @@ public interface Configuration extends Serializable /** * Returns the maximum number of threads in the <em>scheduled</em> thread pool of this server. <br> - * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE}. + * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE}. */ int getScheduledThreadPoolMaxSize(); @@ -184,7 +184,7 @@ public interface Configuration extends Serializable /** * Returns the interval time (in milliseconds) to invalidate security credentials. <br> - * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_SECURITY_INVALIDATION_INTERVAL}. + * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_SECURITY_INVALIDATION_INTERVAL}. */ long getSecurityInvalidationInterval(); @@ -195,7 +195,7 @@ public interface Configuration extends Serializable /** * Returns whether security is enabled for this server. <br> - * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_SECURITY_ENABLED}. + * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_SECURITY_ENABLED}. */ boolean isSecurityEnabled(); @@ -206,19 +206,19 @@ public interface Configuration extends Serializable /** * Returns whether this server is manageable using JMX or not. <br> - * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_JMX_MANAGEMENT_ENABLED}. + * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_JMX_MANAGEMENT_ENABLED}. */ boolean isJMXManagementEnabled(); /** * Sets whether this server is manageable using JMX or not. <br> - * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_JMX_MANAGEMENT_ENABLED}. + * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_JMX_MANAGEMENT_ENABLED}. */ Configuration setJMXManagementEnabled(boolean enabled); /** * Returns the domain used by JMX MBeans (provided JMX management is enabled). <br> - * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_JMX_DOMAIN}. + * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_JMX_DOMAIN}. */ String getJMXDomain(); @@ -287,7 +287,7 @@ public interface Configuration extends Serializable /** * Returns the connection time to live. <br> * This value overrides the connection time to live <em>sent by the client</em>. <br> - * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_CONNECTION_TTL_OVERRIDE}. + * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_CONNECTION_TTL_OVERRIDE}. */ long getConnectionTTLOverride(); @@ -299,7 +299,7 @@ public interface Configuration extends Serializable /** * Returns whether code coming from connection is executed asynchronously or not. <br> * Default value is - * {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_ASYNC_CONNECTION_EXECUTION_ENABLED}. + * {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_ASYNC_CONNECTION_EXECUTION_ENABLED}. */ boolean isAsyncConnectionExecutionEnabled(); @@ -420,7 +420,7 @@ public interface Configuration extends Serializable /** * Returns the management address of this server. <br> * Clients can send management messages to this address to manage this server. <br> - * Default value is {@link org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_MANAGEMENT_ADDRESS}. + * Default value is {@link org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_MANAGEMENT_ADDRESS}. */ SimpleString getManagementAddress(); @@ -433,7 +433,7 @@ public interface Configuration extends Serializable * Returns the management notification address of this server. <br> * Clients can bind queues to this address to receive management notifications emitted by this * server. <br> - * Default value is {@link org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_MANAGEMENT_NOTIFICATION_ADDRESS}. + * Default value is {@link org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_MANAGEMENT_NOTIFICATION_ADDRESS}. */ SimpleString getManagementNotificationAddress(); @@ -444,7 +444,7 @@ public interface Configuration extends Serializable /** * Returns the cluster user for this server. <br> - * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_CLUSTER_USER}. + * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_CLUSTER_USER}. */ String getClusterUser(); @@ -455,7 +455,7 @@ public interface Configuration extends Serializable /** * Returns the cluster password for this server. <br> - * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_CLUSTER_PASSWORD}. + * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_CLUSTER_PASSWORD}. */ String getClusterPassword(); @@ -490,7 +490,7 @@ public interface Configuration extends Serializable /** * Returns the size of the cache for pre-creating message IDs. <br> - * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_ID_CACHE_SIZE}. + * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_ID_CACHE_SIZE}. */ int getIDCacheSize(); @@ -501,7 +501,7 @@ public interface Configuration extends Serializable /** * Returns whether message ID cache is persisted. <br> - * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_PERSIST_ID_CACHE}. + * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_PERSIST_ID_CACHE}. */ boolean isPersistIDCache(); @@ -514,7 +514,7 @@ public interface Configuration extends Serializable /** * Returns the file system directory used to store bindings. <br> - * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_BINDINGS_DIRECTORY}. + * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_BINDINGS_DIRECTORY}. */ String getBindingsDirectory(); @@ -526,7 +526,7 @@ public interface Configuration extends Serializable /** * The max number of concurrent reads allowed on paging. * <p/> - * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_MAX_CONCURRENT_PAGE_IO}. + * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_MAX_CONCURRENT_PAGE_IO}. */ int getPageMaxConcurrentIO(); @@ -539,7 +539,7 @@ public interface Configuration extends Serializable /** * Returns the file system directory used to store journal log. <br> - * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_JOURNAL_DIR}. + * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_JOURNAL_DIR}. */ String getJournalDirectory(); @@ -562,7 +562,7 @@ public interface Configuration extends Serializable /** * Returns whether the journal is synchronized when receiving transactional data. <br> - * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_JOURNAL_SYNC_TRANSACTIONAL}. + * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_JOURNAL_SYNC_TRANSACTIONAL}. */ boolean isJournalSyncTransactional(); @@ -573,7 +573,7 @@ public interface Configuration extends Serializable /** * Returns whether the journal is synchronized when receiving non-transactional data. <br> - * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_JOURNAL_SYNC_NON_TRANSACTIONAL}. + * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_JOURNAL_SYNC_NON_TRANSACTIONAL}. */ boolean isJournalSyncNonTransactional(); @@ -584,7 +584,7 @@ public interface Configuration extends Serializable /** * Returns the size (in bytes) of each journal files. <br> - * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_JOURNAL_FILE_SIZE}. + * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_JOURNAL_FILE_SIZE}. */ int getJournalFileSize(); @@ -595,7 +595,7 @@ public interface Configuration extends Serializable /** * Returns the minimal number of journal files before compacting. <br> - * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_JOURNAL_COMPACT_MIN_FILES}. + * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_JOURNAL_COMPACT_MIN_FILES}. */ int getJournalCompactMinFiles(); @@ -606,7 +606,7 @@ public interface Configuration extends Serializable /** * Returns the percentage of live data before compacting the journal. <br> - * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_JOURNAL_COMPACT_PERCENTAGE}. + * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_JOURNAL_COMPACT_PERCENTAGE}. */ int getJournalCompactPercentage(); @@ -617,7 +617,7 @@ public interface Configuration extends Serializable /** * Returns the number of journal files to pre-create. <br> - * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_JOURNAL_MIN_FILES}. + * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_JOURNAL_MIN_FILES}. */ int getJournalMinFiles(); @@ -630,7 +630,7 @@ public interface Configuration extends Serializable /** * Returns the maximum number of write requests that can be in the AIO queue at any given time. <br> - * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_JOURNAL_MAX_IO_AIO}. + * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_JOURNAL_MAX_IO_AIO}. */ int getJournalMaxIO_AIO(); @@ -665,7 +665,7 @@ public interface Configuration extends Serializable /** * Returns the maximum number of write requests for NIO journal. <br> - * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_JOURNAL_MAX_IO_NIO}. + * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_JOURNAL_MAX_IO_NIO}. */ int getJournalMaxIO_NIO(); @@ -700,7 +700,7 @@ public interface Configuration extends Serializable /** * Returns whether the bindings directory is created on this server startup. <br> - * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_CREATE_BINDINGS_DIR}. + * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_CREATE_BINDINGS_DIR}. */ boolean isCreateBindingsDir(); @@ -711,7 +711,7 @@ public interface Configuration extends Serializable /** * Returns whether the journal directory is created on this server startup. <br> - * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_CREATE_JOURNAL_DIR}. + * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_CREATE_JOURNAL_DIR}. */ boolean isCreateJournalDir(); @@ -750,7 +750,7 @@ public interface Configuration extends Serializable /** * Returns the file system directory used to store paging files. <br> - * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_PAGING_DIR}. + * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_PAGING_DIR}. */ String getPagingDirectory(); @@ -763,7 +763,7 @@ public interface Configuration extends Serializable /** * Returns the file system directory used to store large messages. <br> - * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_LARGE_MESSAGES_DIR}. + * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_LARGE_MESSAGES_DIR}. */ String getLargeMessagesDirectory(); @@ -776,7 +776,7 @@ public interface Configuration extends Serializable /** * Returns whether wildcard routing is supported by this server. <br> - * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_WILDCARD_ROUTING_ENABLED}. + * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_WILDCARD_ROUTING_ENABLED}. */ boolean isWildcardRoutingEnabled(); @@ -788,7 +788,7 @@ public interface Configuration extends Serializable /** * Returns the timeout (in milliseconds) after which transactions is removed from the resource * manager after it was created. <br> - * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_TRANSACTION_TIMEOUT}. + * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_TRANSACTION_TIMEOUT}. */ long getTransactionTimeout(); @@ -800,7 +800,7 @@ public interface Configuration extends Serializable /** * Returns whether message counter is enabled for this server. <br> - * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_MESSAGE_COUNTER_ENABLED}. + * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_MESSAGE_COUNTER_ENABLED}. */ boolean isMessageCounterEnabled(); @@ -811,7 +811,7 @@ public interface Configuration extends Serializable /** * Returns the sample period (in milliseconds) to take message counter snapshot. <br> - * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_MESSAGE_COUNTER_SAMPLE_PERIOD}. + * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_MESSAGE_COUNTER_SAMPLE_PERIOD}. */ long getMessageCounterSamplePeriod(); @@ -824,7 +824,7 @@ public interface Configuration extends Serializable /** * Returns the maximum number of days kept in memory for message counter. <br> - * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_MESSAGE_COUNTER_MAX_DAY_HISTORY}. + * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_MESSAGE_COUNTER_MAX_DAY_HISTORY}. */ int getMessageCounterMaxDayHistory(); @@ -838,7 +838,7 @@ public interface Configuration extends Serializable /** * Returns the frequency (in milliseconds) to scan transactions to detect which transactions have * timed out. <br> - * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_TRANSACTION_TIMEOUT_SCAN_PERIOD}. + * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_TRANSACTION_TIMEOUT_SCAN_PERIOD}. */ long getTransactionTimeoutScanPeriod(); @@ -851,7 +851,7 @@ public interface Configuration extends Serializable /** * Returns the frequency (in milliseconds) to scan messages to detect which messages have * expired. <br> - * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_MESSAGE_EXPIRY_SCAN_PERIOD}. + * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_MESSAGE_EXPIRY_SCAN_PERIOD}. */ long getMessageExpiryScanPeriod(); @@ -863,7 +863,7 @@ public interface Configuration extends Serializable /** * Returns the priority of the thread used to scan message expiration. <br> - * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_MESSAGE_EXPIRY_THREAD_PRIORITY}. + * Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_MESSAGE_EXPIRY_THREAD_PRIORITY}. */ int getMessageExpiryThreadPriority();
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-server/src/main/java/org/apache/activemq/core/config/DivertConfiguration.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/DivertConfiguration.java b/activemq-server/src/main/java/org/apache/activemq/core/config/DivertConfiguration.java index d337a6d..906589a 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/config/DivertConfiguration.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/config/DivertConfiguration.java @@ -14,7 +14,7 @@ package org.apache.activemq.core.config; import java.io.Serializable; -import org.apache.activemq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; import org.apache.activemq.utils.UUIDGenerator; /** @@ -34,7 +34,7 @@ public class DivertConfiguration implements Serializable private String forwardingAddress = null; - private boolean exclusive = HornetQDefaultConfiguration.isDefaultDivertExclusive(); + private boolean exclusive = ActiveMQDefaultConfiguration.isDefaultDivertExclusive(); private String filterString = null; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-server/src/main/java/org/apache/activemq/core/config/ScaleDownConfiguration.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/ScaleDownConfiguration.java b/activemq-server/src/main/java/org/apache/activemq/core/config/ScaleDownConfiguration.java index 1fc089f..98dc679 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/config/ScaleDownConfiguration.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/config/ScaleDownConfiguration.java @@ -12,7 +12,7 @@ */ package org.apache.activemq.core.config; -import org.apache.activemq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; import java.io.Serializable; import java.util.ArrayList; @@ -28,7 +28,7 @@ public class ScaleDownConfiguration implements Serializable private String clusterName = null; - private boolean enabled = HornetQDefaultConfiguration.isDefaultScaleDownEnabled(); + private boolean enabled = ActiveMQDefaultConfiguration.isDefaultScaleDownEnabled(); public List<String> getConnectors() { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-server/src/main/java/org/apache/activemq/core/config/ha/ColocatedPolicyConfiguration.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/ha/ColocatedPolicyConfiguration.java b/activemq-server/src/main/java/org/apache/activemq/core/config/ha/ColocatedPolicyConfiguration.java index d7d838d..c71dc74 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/config/ha/ColocatedPolicyConfiguration.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/config/ha/ColocatedPolicyConfiguration.java @@ -12,7 +12,7 @@ */ package org.apache.activemq.core.config.ha; -import org.apache.activemq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; import org.apache.activemq.core.config.HAPolicyConfiguration; import java.util.ArrayList; @@ -20,19 +20,19 @@ import java.util.List; public class ColocatedPolicyConfiguration implements HAPolicyConfiguration { - private boolean requestBackup = HornetQDefaultConfiguration.isDefaultHapolicyRequestBackup(); + private boolean requestBackup = ActiveMQDefaultConfiguration.isDefaultHapolicyRequestBackup(); - private int backupRequestRetries = HornetQDefaultConfiguration.getDefaultHapolicyBackupRequestRetries(); + private int backupRequestRetries = ActiveMQDefaultConfiguration.getDefaultHapolicyBackupRequestRetries(); - private long backupRequestRetryInterval = HornetQDefaultConfiguration.getDefaultHapolicyBackupRequestRetryInterval(); + private long backupRequestRetryInterval = ActiveMQDefaultConfiguration.getDefaultHapolicyBackupRequestRetryInterval(); - private int maxBackups = HornetQDefaultConfiguration.getDefaultHapolicyMaxBackups(); + private int maxBackups = ActiveMQDefaultConfiguration.getDefaultHapolicyMaxBackups(); - private int backupPortOffset = HornetQDefaultConfiguration.getDefaultHapolicyBackupPortOffset(); + private int backupPortOffset = ActiveMQDefaultConfiguration.getDefaultHapolicyBackupPortOffset(); private List<String> excludedConnectors = new ArrayList<>(); - private int portOffset = HornetQDefaultConfiguration.getDefaultHapolicyBackupPortOffset(); + private int portOffset = ActiveMQDefaultConfiguration.getDefaultHapolicyBackupPortOffset(); private HAPolicyConfiguration liveConfig; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-server/src/main/java/org/apache/activemq/core/config/ha/ReplicaPolicyConfiguration.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/ha/ReplicaPolicyConfiguration.java b/activemq-server/src/main/java/org/apache/activemq/core/config/ha/ReplicaPolicyConfiguration.java index b27d852..aff113d 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/config/ha/ReplicaPolicyConfiguration.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/config/ha/ReplicaPolicyConfiguration.java @@ -12,7 +12,7 @@ */ package org.apache.activemq.core.config.ha; -import org.apache.activemq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; import org.apache.activemq.core.config.HAPolicyConfiguration; import org.apache.activemq.core.config.ScaleDownConfiguration; @@ -20,11 +20,11 @@ public class ReplicaPolicyConfiguration implements HAPolicyConfiguration { private String clusterName = null; - private int maxSavedReplicatedJournalsSize = HornetQDefaultConfiguration.getDefaultMaxSavedReplicatedJournalsSize(); + private int maxSavedReplicatedJournalsSize = ActiveMQDefaultConfiguration.getDefaultMaxSavedReplicatedJournalsSize(); private String groupName = null; - private boolean restartBackup = HornetQDefaultConfiguration.isDefaultRestartBackup(); + private boolean restartBackup = ActiveMQDefaultConfiguration.isDefaultRestartBackup(); private ScaleDownConfiguration scaleDownConfiguration; @@ -33,7 +33,7 @@ public class ReplicaPolicyConfiguration implements HAPolicyConfiguration * */ private boolean allowFailBack = false; - private long failbackDelay = HornetQDefaultConfiguration.getDefaultFailbackDelay(); + private long failbackDelay = ActiveMQDefaultConfiguration.getDefaultFailbackDelay(); public ReplicaPolicyConfiguration() { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-server/src/main/java/org/apache/activemq/core/config/ha/ReplicatedPolicyConfiguration.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/ha/ReplicatedPolicyConfiguration.java b/activemq-server/src/main/java/org/apache/activemq/core/config/ha/ReplicatedPolicyConfiguration.java index 67ff663..96c1dc9 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/config/ha/ReplicatedPolicyConfiguration.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/config/ha/ReplicatedPolicyConfiguration.java @@ -12,12 +12,12 @@ */ package org.apache.activemq.core.config.ha; -import org.apache.activemq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; import org.apache.activemq.core.config.HAPolicyConfiguration; public class ReplicatedPolicyConfiguration implements HAPolicyConfiguration { - private boolean checkForLiveServer = HornetQDefaultConfiguration.isDefaultCheckForLiveServer(); + private boolean checkForLiveServer = ActiveMQDefaultConfiguration.isDefaultCheckForLiveServer(); private String groupName = null; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-server/src/main/java/org/apache/activemq/core/config/ha/SharedStoreMasterPolicyConfiguration.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/ha/SharedStoreMasterPolicyConfiguration.java b/activemq-server/src/main/java/org/apache/activemq/core/config/ha/SharedStoreMasterPolicyConfiguration.java index a3a9d2f..7d58c8b 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/config/ha/SharedStoreMasterPolicyConfiguration.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/config/ha/SharedStoreMasterPolicyConfiguration.java @@ -12,14 +12,14 @@ */ package org.apache.activemq.core.config.ha; -import org.apache.activemq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; import org.apache.activemq.core.config.HAPolicyConfiguration; public class SharedStoreMasterPolicyConfiguration implements HAPolicyConfiguration { - private long failbackDelay = HornetQDefaultConfiguration.getDefaultFailbackDelay(); + private long failbackDelay = ActiveMQDefaultConfiguration.getDefaultFailbackDelay(); - private boolean failoverOnServerShutdown = HornetQDefaultConfiguration.isDefaultFailoverOnServerShutdown(); + private boolean failoverOnServerShutdown = ActiveMQDefaultConfiguration.isDefaultFailoverOnServerShutdown(); public SharedStoreMasterPolicyConfiguration() { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-server/src/main/java/org/apache/activemq/core/config/ha/SharedStoreSlavePolicyConfiguration.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/ha/SharedStoreSlavePolicyConfiguration.java b/activemq-server/src/main/java/org/apache/activemq/core/config/ha/SharedStoreSlavePolicyConfiguration.java index d3a6377..fa9acb7 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/config/ha/SharedStoreSlavePolicyConfiguration.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/config/ha/SharedStoreSlavePolicyConfiguration.java @@ -12,19 +12,19 @@ */ package org.apache.activemq.core.config.ha; -import org.apache.activemq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; import org.apache.activemq.core.config.HAPolicyConfiguration; import org.apache.activemq.core.config.ScaleDownConfiguration; public class SharedStoreSlavePolicyConfiguration implements HAPolicyConfiguration { - private long failbackDelay = HornetQDefaultConfiguration.getDefaultFailbackDelay(); + private long failbackDelay = ActiveMQDefaultConfiguration.getDefaultFailbackDelay(); - private boolean failoverOnServerShutdown = HornetQDefaultConfiguration.isDefaultFailoverOnServerShutdown(); + private boolean failoverOnServerShutdown = ActiveMQDefaultConfiguration.isDefaultFailoverOnServerShutdown(); - private boolean restartBackup = HornetQDefaultConfiguration.isDefaultRestartBackup(); + private boolean restartBackup = ActiveMQDefaultConfiguration.isDefaultRestartBackup(); - private boolean allowFailBack = HornetQDefaultConfiguration.isDefaultAllowAutoFailback(); + private boolean allowFailBack = ActiveMQDefaultConfiguration.isDefaultAllowAutoFailback(); private ScaleDownConfiguration scaleDownConfiguration; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-server/src/main/java/org/apache/activemq/core/config/impl/ConfigurationImpl.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/impl/ConfigurationImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/config/impl/ConfigurationImpl.java index 96d914a..adb971f 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/config/impl/ConfigurationImpl.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/config/impl/ConfigurationImpl.java @@ -24,7 +24,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.BroadcastGroupConfiguration; import org.apache.activemq.api.core.DiscoveryGroupConfiguration; import org.apache.activemq.api.core.SimpleString; @@ -61,38 +61,38 @@ public class ConfigurationImpl implements Configuration private String name = "ConfigurationImpl::" + System.identityHashCode(this); - protected boolean fileDeploymentEnabled = HornetQDefaultConfiguration.isDefaultFileDeploymentEnabled(); + protected boolean fileDeploymentEnabled = ActiveMQDefaultConfiguration.isDefaultFileDeploymentEnabled(); - private boolean persistenceEnabled = HornetQDefaultConfiguration.isDefaultPersistenceEnabled(); + private boolean persistenceEnabled = ActiveMQDefaultConfiguration.isDefaultPersistenceEnabled(); - protected long fileDeploymentScanPeriod = HornetQDefaultConfiguration.getDefaultFileDeployerScanPeriod(); + protected long fileDeploymentScanPeriod = ActiveMQDefaultConfiguration.getDefaultFileDeployerScanPeriod(); private boolean persistDeliveryCountBeforeDelivery = - HornetQDefaultConfiguration.isDefaultPersistDeliveryCountBeforeDelivery(); + ActiveMQDefaultConfiguration.isDefaultPersistDeliveryCountBeforeDelivery(); - private int scheduledThreadPoolMaxSize = HornetQDefaultConfiguration.getDefaultScheduledThreadPoolMaxSize(); + private int scheduledThreadPoolMaxSize = ActiveMQDefaultConfiguration.getDefaultScheduledThreadPoolMaxSize(); - private int threadPoolMaxSize = HornetQDefaultConfiguration.getDefaultThreadPoolMaxSize(); + private int threadPoolMaxSize = ActiveMQDefaultConfiguration.getDefaultThreadPoolMaxSize(); - private long securityInvalidationInterval = HornetQDefaultConfiguration.getDefaultSecurityInvalidationInterval(); + private long securityInvalidationInterval = ActiveMQDefaultConfiguration.getDefaultSecurityInvalidationInterval(); - private boolean securityEnabled = HornetQDefaultConfiguration.isDefaultSecurityEnabled(); + private boolean securityEnabled = ActiveMQDefaultConfiguration.isDefaultSecurityEnabled(); - protected boolean jmxManagementEnabled = HornetQDefaultConfiguration.isDefaultJmxManagementEnabled(); + protected boolean jmxManagementEnabled = ActiveMQDefaultConfiguration.isDefaultJmxManagementEnabled(); - protected String jmxDomain = HornetQDefaultConfiguration.getDefaultJmxDomain(); + protected String jmxDomain = ActiveMQDefaultConfiguration.getDefaultJmxDomain(); - protected long connectionTTLOverride = HornetQDefaultConfiguration.getDefaultConnectionTtlOverride(); + protected long connectionTTLOverride = ActiveMQDefaultConfiguration.getDefaultConnectionTtlOverride(); - protected boolean asyncConnectionExecutionEnabled = HornetQDefaultConfiguration.isDefaultAsyncConnectionExecutionEnabled(); + protected boolean asyncConnectionExecutionEnabled = ActiveMQDefaultConfiguration.isDefaultAsyncConnectionExecutionEnabled(); - private long messageExpiryScanPeriod = HornetQDefaultConfiguration.getDefaultMessageExpiryScanPeriod(); + private long messageExpiryScanPeriod = ActiveMQDefaultConfiguration.getDefaultMessageExpiryScanPeriod(); - private int messageExpiryThreadPriority = HornetQDefaultConfiguration.getDefaultMessageExpiryThreadPriority(); + private int messageExpiryThreadPriority = ActiveMQDefaultConfiguration.getDefaultMessageExpiryThreadPriority(); - protected int idCacheSize = HornetQDefaultConfiguration.getDefaultIdCacheSize(); + protected int idCacheSize = ActiveMQDefaultConfiguration.getDefaultIdCacheSize(); - private boolean persistIDCache = HornetQDefaultConfiguration.isDefaultPersistIdCache(); + private boolean persistIDCache = ActiveMQDefaultConfiguration.isDefaultPersistIdCache(); private List<String> incomingInterceptorClassNames = new ArrayList<String>(); @@ -116,84 +116,84 @@ public class ConfigurationImpl implements Configuration // Paging related attributes ------------------------------------------------------------ - private String pagingDirectory = HornetQDefaultConfiguration.getDefaultPagingDir(); + private String pagingDirectory = ActiveMQDefaultConfiguration.getDefaultPagingDir(); // File related attributes ----------------------------------------------------------- - private int maxConcurrentPageIO = HornetQDefaultConfiguration.getDefaultMaxConcurrentPageIo(); + private int maxConcurrentPageIO = ActiveMQDefaultConfiguration.getDefaultMaxConcurrentPageIo(); - protected String largeMessagesDirectory = HornetQDefaultConfiguration.getDefaultLargeMessagesDir(); + protected String largeMessagesDirectory = ActiveMQDefaultConfiguration.getDefaultLargeMessagesDir(); - protected String bindingsDirectory = HornetQDefaultConfiguration.getDefaultBindingsDirectory(); + protected String bindingsDirectory = ActiveMQDefaultConfiguration.getDefaultBindingsDirectory(); - protected boolean createBindingsDir = HornetQDefaultConfiguration.isDefaultCreateBindingsDir(); + protected boolean createBindingsDir = ActiveMQDefaultConfiguration.isDefaultCreateBindingsDir(); - protected String journalDirectory = HornetQDefaultConfiguration.getDefaultJournalDir(); + protected String journalDirectory = ActiveMQDefaultConfiguration.getDefaultJournalDir(); - protected boolean createJournalDir = HornetQDefaultConfiguration.isDefaultCreateJournalDir(); + protected boolean createJournalDir = ActiveMQDefaultConfiguration.isDefaultCreateJournalDir(); public JournalType journalType = ConfigurationImpl.DEFAULT_JOURNAL_TYPE; - protected boolean journalSyncTransactional = HornetQDefaultConfiguration.isDefaultJournalSyncTransactional(); + protected boolean journalSyncTransactional = ActiveMQDefaultConfiguration.isDefaultJournalSyncTransactional(); - protected boolean journalSyncNonTransactional = HornetQDefaultConfiguration.isDefaultJournalSyncNonTransactional(); + protected boolean journalSyncNonTransactional = ActiveMQDefaultConfiguration.isDefaultJournalSyncNonTransactional(); - protected int journalCompactMinFiles = HornetQDefaultConfiguration.getDefaultJournalCompactMinFiles(); + protected int journalCompactMinFiles = ActiveMQDefaultConfiguration.getDefaultJournalCompactMinFiles(); - protected int journalCompactPercentage = HornetQDefaultConfiguration.getDefaultJournalCompactPercentage(); + protected int journalCompactPercentage = ActiveMQDefaultConfiguration.getDefaultJournalCompactPercentage(); - protected int journalFileSize = HornetQDefaultConfiguration.getDefaultJournalFileSize(); + protected int journalFileSize = ActiveMQDefaultConfiguration.getDefaultJournalFileSize(); - protected int journalMinFiles = HornetQDefaultConfiguration.getDefaultJournalMinFiles(); + protected int journalMinFiles = ActiveMQDefaultConfiguration.getDefaultJournalMinFiles(); // AIO and NIO need different values for these attributes - protected int journalMaxIO_AIO = HornetQDefaultConfiguration.getDefaultJournalMaxIoAio(); + protected int journalMaxIO_AIO = ActiveMQDefaultConfiguration.getDefaultJournalMaxIoAio(); - protected int journalBufferTimeout_AIO = HornetQDefaultConfiguration.getDefaultJournalBufferTimeoutAio(); + protected int journalBufferTimeout_AIO = ActiveMQDefaultConfiguration.getDefaultJournalBufferTimeoutAio(); - protected int journalBufferSize_AIO = HornetQDefaultConfiguration.getDefaultJournalBufferSizeAio(); + protected int journalBufferSize_AIO = ActiveMQDefaultConfiguration.getDefaultJournalBufferSizeAio(); - protected int journalMaxIO_NIO = HornetQDefaultConfiguration.getDefaultJournalMaxIoNio(); + protected int journalMaxIO_NIO = ActiveMQDefaultConfiguration.getDefaultJournalMaxIoNio(); - protected int journalBufferTimeout_NIO = HornetQDefaultConfiguration.getDefaultJournalBufferTimeoutNio(); + protected int journalBufferTimeout_NIO = ActiveMQDefaultConfiguration.getDefaultJournalBufferTimeoutNio(); - protected int journalBufferSize_NIO = HornetQDefaultConfiguration.getDefaultJournalBufferSizeNio(); + protected int journalBufferSize_NIO = ActiveMQDefaultConfiguration.getDefaultJournalBufferSizeNio(); - protected boolean logJournalWriteRate = HornetQDefaultConfiguration.isDefaultJournalLogWriteRate(); + protected boolean logJournalWriteRate = ActiveMQDefaultConfiguration.isDefaultJournalLogWriteRate(); - protected int journalPerfBlastPages = HornetQDefaultConfiguration.getDefaultJournalPerfBlastPages(); + protected int journalPerfBlastPages = ActiveMQDefaultConfiguration.getDefaultJournalPerfBlastPages(); - protected boolean runSyncSpeedTest = HornetQDefaultConfiguration.isDefaultRunSyncSpeedTest(); + protected boolean runSyncSpeedTest = ActiveMQDefaultConfiguration.isDefaultRunSyncSpeedTest(); - private boolean wildcardRoutingEnabled = HornetQDefaultConfiguration.isDefaultWildcardRoutingEnabled(); + private boolean wildcardRoutingEnabled = ActiveMQDefaultConfiguration.isDefaultWildcardRoutingEnabled(); - private boolean messageCounterEnabled = HornetQDefaultConfiguration.isDefaultMessageCounterEnabled(); + private boolean messageCounterEnabled = ActiveMQDefaultConfiguration.isDefaultMessageCounterEnabled(); - private long messageCounterSamplePeriod = HornetQDefaultConfiguration.getDefaultMessageCounterSamplePeriod(); + private long messageCounterSamplePeriod = ActiveMQDefaultConfiguration.getDefaultMessageCounterSamplePeriod(); - private int messageCounterMaxDayHistory = HornetQDefaultConfiguration.getDefaultMessageCounterMaxDayHistory(); + private int messageCounterMaxDayHistory = ActiveMQDefaultConfiguration.getDefaultMessageCounterMaxDayHistory(); - private long transactionTimeout = HornetQDefaultConfiguration.getDefaultTransactionTimeout(); + private long transactionTimeout = ActiveMQDefaultConfiguration.getDefaultTransactionTimeout(); - private long transactionTimeoutScanPeriod = HornetQDefaultConfiguration.getDefaultTransactionTimeoutScanPeriod(); + private long transactionTimeoutScanPeriod = ActiveMQDefaultConfiguration.getDefaultTransactionTimeoutScanPeriod(); - private SimpleString managementAddress = HornetQDefaultConfiguration.getDefaultManagementAddress(); + private SimpleString managementAddress = ActiveMQDefaultConfiguration.getDefaultManagementAddress(); - private SimpleString managementNotificationAddress = HornetQDefaultConfiguration.getDefaultManagementNotificationAddress(); + private SimpleString managementNotificationAddress = ActiveMQDefaultConfiguration.getDefaultManagementNotificationAddress(); - protected String clusterUser = HornetQDefaultConfiguration.getDefaultClusterUser(); + protected String clusterUser = ActiveMQDefaultConfiguration.getDefaultClusterUser(); - protected String clusterPassword = HornetQDefaultConfiguration.getDefaultClusterPassword(); + protected String clusterPassword = ActiveMQDefaultConfiguration.getDefaultClusterPassword(); - private long serverDumpInterval = HornetQDefaultConfiguration.getDefaultServerDumpInterval(); + private long serverDumpInterval = ActiveMQDefaultConfiguration.getDefaultServerDumpInterval(); - protected boolean failoverOnServerShutdown = HornetQDefaultConfiguration.isDefaultFailoverOnServerShutdown(); + protected boolean failoverOnServerShutdown = ActiveMQDefaultConfiguration.isDefaultFailoverOnServerShutdown(); // percentage of free memory which triggers warning from the memory manager - private int memoryWarningThreshold = HornetQDefaultConfiguration.getDefaultMemoryWarningThreshold(); + private int memoryWarningThreshold = ActiveMQDefaultConfiguration.getDefaultMemoryWarningThreshold(); - private long memoryMeasureInterval = HornetQDefaultConfiguration.getDefaultMemoryMeasureInterval(); + private long memoryMeasureInterval = ActiveMQDefaultConfiguration.getDefaultMemoryMeasureInterval(); protected GroupingHandlerConfiguration groupingHandlerConfiguration; @@ -203,13 +203,13 @@ public class ConfigurationImpl implements Configuration protected List<ConnectorServiceConfiguration> connectorServiceConfigurations = new ArrayList<ConnectorServiceConfiguration>(); - private boolean maskPassword = HornetQDefaultConfiguration.isDefaultMaskPassword(); + private boolean maskPassword = ActiveMQDefaultConfiguration.isDefaultMaskPassword(); private transient String passwordCodec; - private boolean resolveProtocols = HornetQDefaultConfiguration.isDefaultResolveProtocols(); + private boolean resolveProtocols = ActiveMQDefaultConfiguration.isDefaultResolveProtocols(); - private long journalLockAcquisitionTimeout = HornetQDefaultConfiguration.getDefaultJournalLockAcquisitionTimeout(); + private long journalLockAcquisitionTimeout = ActiveMQDefaultConfiguration.getDefaultJournalLockAcquisitionTimeout(); private HAPolicyConfiguration haPolicyConfiguration; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/FileConfigurationParser.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/FileConfigurationParser.java b/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/FileConfigurationParser.java index 8c02868..7b3744d 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/FileConfigurationParser.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/FileConfigurationParser.java @@ -22,7 +22,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.BroadcastEndpointFactoryConfiguration; import org.apache.activemq.api.core.BroadcastGroupConfiguration; import org.apache.activemq.api.core.DiscoveryGroupConfiguration; @@ -790,8 +790,8 @@ public final class FileConfigurationParser extends XMLConfigurationUtil int journalMaxIO = getInteger(e, "journal-max-io", - config.getJournalType() == JournalType.ASYNCIO ? HornetQDefaultConfiguration.getDefaultJournalMaxIoAio() - : HornetQDefaultConfiguration.getDefaultJournalMaxIoNio(), + config.getJournalType() == JournalType.ASYNCIO ? ActiveMQDefaultConfiguration.getDefaultJournalMaxIoAio() + : ActiveMQDefaultConfiguration.getDefaultJournalMaxIoNio(), Validators.GT_ZERO); if (config.getJournalType() == JournalType.ASYNCIO) @@ -819,11 +819,11 @@ public final class FileConfigurationParser extends XMLConfigurationUtil config.setLogJournalWriteRate(getBoolean(e, "log-journal-write-rate", - HornetQDefaultConfiguration.isDefaultJournalLogWriteRate())); + ActiveMQDefaultConfiguration.isDefaultJournalLogWriteRate())); config.setJournalPerfBlastPages(getInteger(e, "perf-blast-pages", - HornetQDefaultConfiguration.getDefaultJournalPerfBlastPages(), + ActiveMQDefaultConfiguration.getDefaultJournalPerfBlastPages(), Validators.MINUS_ONE_OR_GT_ZERO)); config.setRunSyncSpeedTest(getBoolean(e, "run-sync-speed-test", config.isRunSyncSpeedTest())); @@ -1185,11 +1185,11 @@ public final class FileConfigurationParser extends XMLConfigurationUtil if (mainConfig.isMaskPassword()) { - params.put(HornetQDefaultConfiguration.getPropMaskPassword(), mainConfig.isMaskPassword()); + params.put(ActiveMQDefaultConfiguration.getPropMaskPassword(), mainConfig.isMaskPassword()); if (mainConfig.getPasswordCodec() != null) { - params.put(HornetQDefaultConfiguration.getPropPasswordCodec(), mainConfig.getPasswordCodec()); + params.put(ActiveMQDefaultConfiguration.getPropPasswordCodec(), mainConfig.getPasswordCodec()); } } @@ -1482,7 +1482,7 @@ public final class FileConfigurationParser extends XMLConfigurationUtil } long broadcastPeriod = - getLong(e, "broadcast-period", HornetQDefaultConfiguration.getDefaultBroadcastPeriod(), Validators.GT_ZERO); + getLong(e, "broadcast-period", ActiveMQDefaultConfiguration.getDefaultBroadcastPeriod(), Validators.GT_ZERO); String localAddress = getString(e, "local-bind-address", null, Validators.NO_CHECK); @@ -1532,7 +1532,7 @@ public final class FileConfigurationParser extends XMLConfigurationUtil Validators.GT_ZERO); long refreshTimeout = - getLong(e, "refresh-timeout", HornetQDefaultConfiguration.getDefaultBroadcastRefreshTimeout(), + getLong(e, "refresh-timeout", ActiveMQDefaultConfiguration.getDefaultBroadcastRefreshTimeout(), Validators.GT_ZERO); String localBindAddress = getString(e, "local-bind-address", null, Validators.NO_CHECK); @@ -1589,27 +1589,27 @@ public final class FileConfigurationParser extends XMLConfigurationUtil String connectorName = getString(e, "connector-ref", null, Validators.NOT_NULL_OR_EMPTY); boolean duplicateDetection = - getBoolean(e, "use-duplicate-detection", HornetQDefaultConfiguration.isDefaultClusterDuplicateDetection()); + getBoolean(e, "use-duplicate-detection", ActiveMQDefaultConfiguration.isDefaultClusterDuplicateDetection()); boolean forwardWhenNoConsumers = getBoolean(e, "forward-when-no-consumers", - HornetQDefaultConfiguration.isDefaultClusterForwardWhenNoConsumers()); + ActiveMQDefaultConfiguration.isDefaultClusterForwardWhenNoConsumers()); int maxHops = getInteger(e, "max-hops", - HornetQDefaultConfiguration.getDefaultClusterMaxHops(), + ActiveMQDefaultConfiguration.getDefaultClusterMaxHops(), Validators.GE_ZERO); long clientFailureCheckPeriod = - getLong(e, "check-period", HornetQDefaultConfiguration.getDefaultClusterFailureCheckPeriod(), + getLong(e, "check-period", ActiveMQDefaultConfiguration.getDefaultClusterFailureCheckPeriod(), Validators.GT_ZERO); long connectionTTL = - getLong(e, "connection-ttl", HornetQDefaultConfiguration.getDefaultClusterConnectionTtl(), + getLong(e, "connection-ttl", ActiveMQDefaultConfiguration.getDefaultClusterConnectionTtl(), Validators.GT_ZERO); long retryInterval = - getLong(e, "retry-interval", HornetQDefaultConfiguration.getDefaultClusterRetryInterval(), + getLong(e, "retry-interval", ActiveMQDefaultConfiguration.getDefaultClusterRetryInterval(), Validators.GT_ZERO); long callTimeout = getLong(e, "call-timeout", HornetQClient.DEFAULT_CALL_TIMEOUT, Validators.GT_ZERO); @@ -1617,24 +1617,24 @@ public final class FileConfigurationParser extends XMLConfigurationUtil long callFailoverTimeout = getLong(e, "call-failover-timeout", HornetQClient.DEFAULT_CALL_FAILOVER_TIMEOUT, Validators.MINUS_ONE_OR_GT_ZERO); double retryIntervalMultiplier = getDouble(e, "retry-interval-multiplier", - HornetQDefaultConfiguration.getDefaultClusterRetryIntervalMultiplier(), Validators.GT_ZERO); + ActiveMQDefaultConfiguration.getDefaultClusterRetryIntervalMultiplier(), Validators.GT_ZERO); int minLargeMessageSize = getInteger(e, "min-large-message-size", HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, Validators.GT_ZERO); - long maxRetryInterval = getLong(e, "max-retry-interval", HornetQDefaultConfiguration.getDefaultClusterMaxRetryInterval(), Validators.GT_ZERO); + long maxRetryInterval = getLong(e, "max-retry-interval", ActiveMQDefaultConfiguration.getDefaultClusterMaxRetryInterval(), Validators.GT_ZERO); - int initialConnectAttempts = getInteger(e, "initial-connect-attempts", HornetQDefaultConfiguration.getDefaultClusterInitialConnectAttempts(), Validators.MINUS_ONE_OR_GE_ZERO); + int initialConnectAttempts = getInteger(e, "initial-connect-attempts", ActiveMQDefaultConfiguration.getDefaultClusterInitialConnectAttempts(), Validators.MINUS_ONE_OR_GE_ZERO); - int reconnectAttempts = getInteger(e, "reconnect-attempts", HornetQDefaultConfiguration.getDefaultClusterReconnectAttempts(), Validators.MINUS_ONE_OR_GE_ZERO); + int reconnectAttempts = getInteger(e, "reconnect-attempts", ActiveMQDefaultConfiguration.getDefaultClusterReconnectAttempts(), Validators.MINUS_ONE_OR_GE_ZERO); int confirmationWindowSize = - getInteger(e, "confirmation-window-size", HornetQDefaultConfiguration.getDefaultClusterConfirmationWindowSize(), + getInteger(e, "confirmation-window-size", ActiveMQDefaultConfiguration.getDefaultClusterConfirmationWindowSize(), Validators.GT_ZERO); - long clusterNotificationInterval = getLong(e, "notification-interval", HornetQDefaultConfiguration.getDefaultClusterNotificationInterval(), Validators.GT_ZERO); + long clusterNotificationInterval = getLong(e, "notification-interval", ActiveMQDefaultConfiguration.getDefaultClusterNotificationInterval(), Validators.GT_ZERO); - int clusterNotificationAttempts = getInteger(e, "notification-attempts", HornetQDefaultConfiguration.getDefaultClusterNotificationAttempts(), Validators.GT_ZERO); + int clusterNotificationAttempts = getInteger(e, "notification-attempts", ActiveMQDefaultConfiguration.getDefaultClusterNotificationAttempts(), Validators.GT_ZERO); String scaleDownConnector = e.getAttribute("scale-down-connector"); @@ -1704,9 +1704,9 @@ public final class FileConfigurationParser extends XMLConfigurationUtil String name = node.getAttribute("name"); String type = getString(node, "type", null, Validators.NOT_NULL_OR_EMPTY); String address = getString(node, "address", null, Validators.NOT_NULL_OR_EMPTY); - Integer timeout = getInteger(node, "timeout", HornetQDefaultConfiguration.getDefaultGroupingHandlerTimeout(), Validators.GT_ZERO); - Long groupTimeout = getLong(node, "group-timeout", HornetQDefaultConfiguration.getDefaultGroupingHandlerGroupTimeout(), Validators.MINUS_ONE_OR_GT_ZERO); - Long reaperPeriod = getLong(node, "reaper-period", HornetQDefaultConfiguration.getDefaultGroupingHandlerReaperPeriod(), Validators.GT_ZERO); + Integer timeout = getInteger(node, "timeout", ActiveMQDefaultConfiguration.getDefaultGroupingHandlerTimeout(), Validators.GT_ZERO); + Long groupTimeout = getLong(node, "group-timeout", ActiveMQDefaultConfiguration.getDefaultGroupingHandlerGroupTimeout(), Validators.MINUS_ONE_OR_GT_ZERO); + Long reaperPeriod = getLong(node, "reaper-period", ActiveMQDefaultConfiguration.getDefaultGroupingHandlerReaperPeriod(), Validators.GT_ZERO); mainConfiguration.setGroupingHandlerConfiguration(new GroupingHandlerConfiguration() .setName(new SimpleString(name)) .setType( @@ -1731,7 +1731,7 @@ public final class FileConfigurationParser extends XMLConfigurationUtil // Default bridge conf int confirmationWindowSize = - getInteger(brNode, "confirmation-window-size", HornetQDefaultConfiguration.getDefaultBridgeConfirmationWindowSize(), + getInteger(brNode, "confirmation-window-size", ActiveMQDefaultConfiguration.getDefaultBridgeConfirmationWindowSize(), Validators.GT_ZERO); long retryInterval = getLong(brNode, "retry-interval", HornetQClient.DEFAULT_RETRY_INTERVAL, Validators.GT_ZERO); @@ -1753,24 +1753,24 @@ public final class FileConfigurationParser extends XMLConfigurationUtil Validators.GT_ZERO); int initialConnectAttempts = - getInteger(brNode, "initial-connect-attempts", HornetQDefaultConfiguration.getDefaultBridgeInitialConnectAttempts(), + getInteger(brNode, "initial-connect-attempts", ActiveMQDefaultConfiguration.getDefaultBridgeInitialConnectAttempts(), Validators.MINUS_ONE_OR_GE_ZERO); int reconnectAttempts = - getInteger(brNode, "reconnect-attempts", HornetQDefaultConfiguration.getDefaultBridgeReconnectAttempts(), + getInteger(brNode, "reconnect-attempts", ActiveMQDefaultConfiguration.getDefaultBridgeReconnectAttempts(), Validators.MINUS_ONE_OR_GE_ZERO); int reconnectAttemptsSameNode = - getInteger(brNode, "reconnect-attempts-same-node", HornetQDefaultConfiguration.getDefaultBridgeConnectSameNode(), + getInteger(brNode, "reconnect-attempts-same-node", ActiveMQDefaultConfiguration.getDefaultBridgeConnectSameNode(), Validators.MINUS_ONE_OR_GE_ZERO); boolean useDuplicateDetection = getBoolean(brNode, "use-duplicate-detection", - HornetQDefaultConfiguration.isDefaultBridgeDuplicateDetection()); + ActiveMQDefaultConfiguration.isDefaultBridgeDuplicateDetection()); String user = getString(brNode, "user", - HornetQDefaultConfiguration.getDefaultClusterUser(), + ActiveMQDefaultConfiguration.getDefaultClusterUser(), Validators.NO_CHECK); NodeList clusterPassNodes = brNode.getElementsByTagName("password"); @@ -1795,7 +1795,7 @@ public final class FileConfigurationParser extends XMLConfigurationUtil } else { - password = HornetQDefaultConfiguration.getDefaultClusterPassword(); + password = ActiveMQDefaultConfiguration.getDefaultClusterPassword(); } boolean ha = getBoolean(brNode, "ha", false); @@ -1883,7 +1883,7 @@ public final class FileConfigurationParser extends XMLConfigurationUtil String forwardingAddress = getString(e, "forwarding-address", null, Validators.NOT_NULL_OR_EMPTY); - boolean exclusive = getBoolean(e, "exclusive", HornetQDefaultConfiguration.isDefaultDivertExclusive()); + boolean exclusive = getBoolean(e, "exclusive", ActiveMQDefaultConfiguration.isDefaultDivertExclusive()); String transformerClassName = getString(e, "transformer-class-name", null, Validators.NO_CHECK); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-server/src/main/java/org/apache/activemq/core/messagecounter/impl/MessageCounterManagerImpl.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/messagecounter/impl/MessageCounterManagerImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/messagecounter/impl/MessageCounterManagerImpl.java index 2415ff4..67c039c 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/messagecounter/impl/MessageCounterManagerImpl.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/messagecounter/impl/MessageCounterManagerImpl.java @@ -21,7 +21,7 @@ import java.util.concurrent.Future; 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.core.messagecounter.MessageCounter; import org.apache.activemq.core.messagecounter.MessageCounterManager; @@ -39,11 +39,11 @@ import org.apache.activemq.core.messagecounter.MessageCounterManager; public class MessageCounterManagerImpl implements MessageCounterManager { - public static final long DEFAULT_SAMPLE_PERIOD = HornetQDefaultConfiguration.getDefaultMessageCounterSamplePeriod(); + public static final long DEFAULT_SAMPLE_PERIOD = ActiveMQDefaultConfiguration.getDefaultMessageCounterSamplePeriod(); public static final long MIN_SAMPLE_PERIOD = 1000; - public static final int DEFAULT_MAX_DAY_COUNT = HornetQDefaultConfiguration.getDefaultMessageCounterMaxDayHistory(); + public static final int DEFAULT_MAX_DAY_COUNT = ActiveMQDefaultConfiguration.getDefaultMessageCounterMaxDayHistory(); private final Map<String, MessageCounter> messageCounters; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/TransportConstants.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/TransportConstants.java b/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/TransportConstants.java index 597597e..003ee4e 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/TransportConstants.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/TransportConstants.java @@ -16,7 +16,7 @@ import java.util.Collections; import java.util.HashSet; import java.util.Set; -import org.apache.activemq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; /** * A TransportConstants @@ -40,15 +40,15 @@ public final class TransportConstants Set<String> allowableAcceptorKeys = new HashSet<String>(); allowableAcceptorKeys.add(TransportConstants.SERVER_ID_PROP_NAME); allowableAcceptorKeys.add(org.apache.activemq.core.remoting.impl.netty.TransportConstants.CLUSTER_CONNECTION); - allowableAcceptorKeys.add(HornetQDefaultConfiguration.getPropMaskPassword()); - allowableAcceptorKeys.add(HornetQDefaultConfiguration.getPropPasswordCodec()); + allowableAcceptorKeys.add(ActiveMQDefaultConfiguration.getPropMaskPassword()); + allowableAcceptorKeys.add(ActiveMQDefaultConfiguration.getPropPasswordCodec()); ALLOWABLE_ACCEPTOR_KEYS = Collections.unmodifiableSet(allowableAcceptorKeys); Set<String> allowableConnectorKeys = new HashSet<String>(); allowableConnectorKeys.add(TransportConstants.SERVER_ID_PROP_NAME); - allowableConnectorKeys.add(HornetQDefaultConfiguration.getPropMaskPassword()); - allowableConnectorKeys.add(HornetQDefaultConfiguration.getPropPasswordCodec()); + allowableConnectorKeys.add(ActiveMQDefaultConfiguration.getPropMaskPassword()); + allowableConnectorKeys.add(ActiveMQDefaultConfiguration.getPropPasswordCodec()); ALLOWABLE_CONNECTOR_KEYS = Collections.unmodifiableSet(allowableConnectorKeys); } http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyAcceptor.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyAcceptor.java b/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyAcceptor.java index be36072..b490ce1 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyAcceptor.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyAcceptor.java @@ -50,7 +50,7 @@ import io.netty.util.ResourceLeakDetector; import io.netty.util.concurrent.GenericFutureListener; import io.netty.util.concurrent.GlobalEventExecutor; -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; @@ -221,8 +221,8 @@ public class NettyAcceptor implements Acceptor keyStorePassword = ConfigurationHelper.getPasswordProperty(TransportConstants.KEYSTORE_PASSWORD_PROP_NAME, TransportConstants.DEFAULT_KEYSTORE_PASSWORD, configuration, - HornetQDefaultConfiguration.getPropMaskPassword(), - HornetQDefaultConfiguration.getPropMaskPassword()); + ActiveMQDefaultConfiguration.getPropMaskPassword(), + ActiveMQDefaultConfiguration.getPropMaskPassword()); trustStoreProvider = ConfigurationHelper.getStringProperty(TransportConstants.TRUSTSTORE_PROVIDER_PROP_NAME, TransportConstants.DEFAULT_TRUSTSTORE_PROVIDER, @@ -235,8 +235,8 @@ public class NettyAcceptor implements Acceptor trustStorePassword = ConfigurationHelper.getPasswordProperty(TransportConstants.TRUSTSTORE_PASSWORD_PROP_NAME, TransportConstants.DEFAULT_TRUSTSTORE_PASSWORD, configuration, - HornetQDefaultConfiguration.getPropMaskPassword(), - HornetQDefaultConfiguration.getPropMaskPassword()); + ActiveMQDefaultConfiguration.getPropMaskPassword(), + ActiveMQDefaultConfiguration.getPropMaskPassword()); enabledCipherSuites = ConfigurationHelper.getStringProperty(TransportConstants.ENABLED_CIPHER_SUITES_PROP_NAME, TransportConstants.DEFAULT_ENABLED_CIPHER_SUITES, http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/BackupPolicy.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/BackupPolicy.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/BackupPolicy.java index 8e9013f..1f0d779 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/BackupPolicy.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/BackupPolicy.java @@ -12,13 +12,13 @@ */ package org.apache.activemq.core.server.cluster.ha; -import org.apache.activemq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; import org.apache.activemq.core.server.impl.Activation; public abstract class BackupPolicy implements HAPolicy<Activation> { protected ScaleDownPolicy scaleDownPolicy; - protected boolean restartBackup = HornetQDefaultConfiguration.isDefaultRestartBackup(); + protected boolean restartBackup = ActiveMQDefaultConfiguration.isDefaultRestartBackup(); public ScaleDownPolicy getScaleDownPolicy() { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ColocatedPolicy.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ColocatedPolicy.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ColocatedPolicy.java index a781527..bd897a4 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ColocatedPolicy.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ColocatedPolicy.java @@ -12,7 +12,7 @@ */ package org.apache.activemq.core.server.cluster.ha; -import org.apache.activemq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; import org.apache.activemq.core.server.impl.ColocatedActivation; import org.apache.activemq.core.server.impl.HornetQServerImpl; import org.apache.activemq.core.server.impl.LiveActivation; @@ -25,15 +25,15 @@ public class ColocatedPolicy implements HAPolicy<LiveActivation> { /*live stuff*/ - private boolean requestBackup = HornetQDefaultConfiguration.isDefaultHapolicyRequestBackup(); + private boolean requestBackup = ActiveMQDefaultConfiguration.isDefaultHapolicyRequestBackup(); - private int backupRequestRetries = HornetQDefaultConfiguration.getDefaultHapolicyBackupRequestRetries(); + private int backupRequestRetries = ActiveMQDefaultConfiguration.getDefaultHapolicyBackupRequestRetries(); - private long backupRequestRetryInterval = HornetQDefaultConfiguration.getDefaultHapolicyBackupRequestRetryInterval(); + private long backupRequestRetryInterval = ActiveMQDefaultConfiguration.getDefaultHapolicyBackupRequestRetryInterval(); - private int maxBackups = HornetQDefaultConfiguration.getDefaultHapolicyMaxBackups(); + private int maxBackups = ActiveMQDefaultConfiguration.getDefaultHapolicyMaxBackups(); - private int backupPortOffset = HornetQDefaultConfiguration.getDefaultHapolicyBackupPortOffset(); + private int backupPortOffset = ActiveMQDefaultConfiguration.getDefaultHapolicyBackupPortOffset(); /*backup stuff*/ private List<String> excludedConnectors = new ArrayList<>(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ReplicaPolicy.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ReplicaPolicy.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ReplicaPolicy.java index 6b8923a..f0c623d 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ReplicaPolicy.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ReplicaPolicy.java @@ -12,7 +12,7 @@ */ package org.apache.activemq.core.server.cluster.ha; -import org.apache.activemq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; import org.apache.activemq.core.server.impl.Activation; import org.apache.activemq.core.server.impl.HornetQServerImpl; import org.apache.activemq.core.server.impl.SharedNothingBackupActivation; @@ -23,11 +23,11 @@ public class ReplicaPolicy extends BackupPolicy { private String clusterName; - private int maxSavedReplicatedJournalsSize = HornetQDefaultConfiguration.getDefaultMaxSavedReplicatedJournalsSize(); + private int maxSavedReplicatedJournalsSize = ActiveMQDefaultConfiguration.getDefaultMaxSavedReplicatedJournalsSize(); private String groupName = null; - private boolean restartBackup = HornetQDefaultConfiguration.isDefaultRestartBackup(); + private boolean restartBackup = ActiveMQDefaultConfiguration.isDefaultRestartBackup(); private ReplicatedPolicy replicatedPolicy; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ReplicatedPolicy.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ReplicatedPolicy.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ReplicatedPolicy.java index da28fd5..e528d37 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ReplicatedPolicy.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ReplicatedPolicy.java @@ -12,7 +12,7 @@ */ package org.apache.activemq.core.server.cluster.ha; -import org.apache.activemq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; import org.apache.activemq.core.server.impl.HornetQServerImpl; import org.apache.activemq.core.server.impl.LiveActivation; import org.apache.activemq.core.server.impl.SharedNothingLiveActivation; @@ -21,7 +21,7 @@ import java.util.Map; public class ReplicatedPolicy implements HAPolicy<LiveActivation> { - private boolean checkForLiveServer = HornetQDefaultConfiguration.isDefaultCheckForLiveServer(); + private boolean checkForLiveServer = ActiveMQDefaultConfiguration.isDefaultCheckForLiveServer(); private String groupName = null; @@ -31,9 +31,9 @@ public class ReplicatedPolicy implements HAPolicy<LiveActivation> * these are only set by the ReplicaPolicy after failover to decide if the live server can failback, these should not * be exposed in configuration. * */ - private boolean allowAutoFailBack = HornetQDefaultConfiguration.isDefaultAllowAutoFailback(); + private boolean allowAutoFailBack = ActiveMQDefaultConfiguration.isDefaultAllowAutoFailback(); - private long failbackDelay = HornetQDefaultConfiguration.getDefaultFailbackDelay(); + private long failbackDelay = ActiveMQDefaultConfiguration.getDefaultFailbackDelay(); /* * this is used as the policy when the server is started after a failover http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/SharedStoreMasterPolicy.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/SharedStoreMasterPolicy.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/SharedStoreMasterPolicy.java index 2384d91..4f625c3 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/SharedStoreMasterPolicy.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/SharedStoreMasterPolicy.java @@ -12,7 +12,7 @@ */ package org.apache.activemq.core.server.cluster.ha; -import org.apache.activemq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; import org.apache.activemq.core.server.impl.HornetQServerImpl; import org.apache.activemq.core.server.impl.LiveActivation; import org.apache.activemq.core.server.impl.SharedStoreLiveActivation; @@ -21,9 +21,9 @@ import java.util.Map; public class SharedStoreMasterPolicy implements HAPolicy<LiveActivation> { - private long failbackDelay = HornetQDefaultConfiguration.getDefaultFailbackDelay(); + private long failbackDelay = ActiveMQDefaultConfiguration.getDefaultFailbackDelay(); - private boolean failoverOnServerShutdown = HornetQDefaultConfiguration.isDefaultFailoverOnServerShutdown(); + private boolean failoverOnServerShutdown = ActiveMQDefaultConfiguration.isDefaultFailoverOnServerShutdown(); private SharedStoreSlavePolicy sharedStoreSlavePolicy; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/SharedStoreSlavePolicy.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/SharedStoreSlavePolicy.java b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/SharedStoreSlavePolicy.java index 7fdad9d..51ad6e9 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/SharedStoreSlavePolicy.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/SharedStoreSlavePolicy.java @@ -12,7 +12,7 @@ */ package org.apache.activemq.core.server.cluster.ha; -import org.apache.activemq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; import org.apache.activemq.core.server.impl.Activation; import org.apache.activemq.core.server.impl.HornetQServerImpl; import org.apache.activemq.core.server.impl.SharedStoreBackupActivation; @@ -21,11 +21,11 @@ import java.util.Map; public class SharedStoreSlavePolicy extends BackupPolicy { - private long failbackDelay = HornetQDefaultConfiguration.getDefaultFailbackDelay(); + private long failbackDelay = ActiveMQDefaultConfiguration.getDefaultFailbackDelay(); - private boolean failoverOnServerShutdown = HornetQDefaultConfiguration.isDefaultFailoverOnServerShutdown(); + private boolean failoverOnServerShutdown = ActiveMQDefaultConfiguration.isDefaultFailoverOnServerShutdown(); - private boolean allowAutoFailBack = HornetQDefaultConfiguration.isDefaultAllowAutoFailback(); + private boolean allowAutoFailBack = ActiveMQDefaultConfiguration.isDefaultAllowAutoFailback(); //this is how we act once we have failed over private SharedStoreMasterPolicy sharedStoreMasterPolicy; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/GroupingHandlerConfiguration.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/GroupingHandlerConfiguration.java b/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/GroupingHandlerConfiguration.java index c1aae65..2f2696e 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/GroupingHandlerConfiguration.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/GroupingHandlerConfiguration.java @@ -14,7 +14,7 @@ package org.apache.activemq.core.server.group.impl; import java.io.Serializable; -import org.apache.activemq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq.api.config.ActiveMQDefaultConfiguration; import org.apache.activemq.api.core.SimpleString; /** @@ -36,11 +36,11 @@ public final class GroupingHandlerConfiguration implements Serializable private SimpleString address = null; - private long timeout = HornetQDefaultConfiguration.getDefaultGroupingHandlerTimeout(); + private long timeout = ActiveMQDefaultConfiguration.getDefaultGroupingHandlerTimeout(); - private long groupTimeout = HornetQDefaultConfiguration.getDefaultGroupingHandlerGroupTimeout(); + private long groupTimeout = ActiveMQDefaultConfiguration.getDefaultGroupingHandlerGroupTimeout(); - private long reaperPeriod = HornetQDefaultConfiguration.getDefaultGroupingHandlerReaperPeriod(); + private long reaperPeriod = ActiveMQDefaultConfiguration.getDefaultGroupingHandlerReaperPeriod(); public GroupingHandlerConfiguration() { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-server/src/main/java/org/apache/activemq/core/server/impl/HornetQServerImpl.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/HornetQServerImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/HornetQServerImpl.java index 485bb2e..ada5c0e 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/server/impl/HornetQServerImpl.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/server/impl/HornetQServerImpl.java @@ -37,7 +37,7 @@ import java.util.concurrent.ScheduledThreadPoolExecutor; import java.util.concurrent.ThreadFactory; 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.Pair; import org.apache.activemq.api.core.SimpleString; import org.apache.activemq.core.asyncio.impl.AsynchronousFileImpl; @@ -1631,7 +1631,7 @@ public class HornetQServerImpl implements HornetQServer storageManager = createStorageManager(); - if (HornetQDefaultConfiguration.getDefaultClusterUser().equals(configuration.getClusterUser()) && HornetQDefaultConfiguration.getDefaultClusterPassword().equals(configuration.getClusterPassword())) + if (ActiveMQDefaultConfiguration.getDefaultClusterUser().equals(configuration.getClusterUser()) && ActiveMQDefaultConfiguration.getDefaultClusterPassword().equals(configuration.getClusterPassword())) { HornetQServerLogger.LOGGER.clusterSecurityRisk(); }
