http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/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 ce4f4bb..25df619 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 @@ -10,21 +10,21 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.config; +package org.apache.activemq.core.config; import java.io.Serializable; import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.activemq6.api.core.BroadcastGroupConfiguration; -import org.apache.activemq6.api.core.DiscoveryGroupConfiguration; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.core.security.Role; -import org.apache.activemq6.core.server.JournalType; -import org.apache.activemq6.core.server.group.impl.GroupingHandlerConfiguration; -import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq.api.core.BroadcastGroupConfiguration; +import org.apache.activemq.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.core.security.Role; +import org.apache.activemq.core.server.JournalType; +import org.apache.activemq.core.server.group.impl.GroupingHandlerConfiguration; +import org.apache.activemq.core.settings.impl.AddressSettings; /** * A Configuration is used to configure HornetQ servers. @@ -48,7 +48,7 @@ public interface Configuration extends Serializable * * @return the name of the group * - * @deprecated replaced by {@link org.apache.activemq6.core.server.cluster.ha.HAPolicy#getBackupGroupName()} + * @deprecated replaced by {@link org.apache.activemq.core.server.cluster.ha.HAPolicy#getBackupGroupName()} */ @Deprecated String getBackupGroupName(); @@ -58,7 +58,7 @@ public interface Configuration extends Serializable * * @param nodeGroupName the node group name * - * @deprecated replaced by {@link org.apache.activemq6.core.server.cluster.ha.HAPolicy} + * @deprecated replaced by {@link org.apache.activemq.core.server.cluster.ha.HAPolicy} */ @Deprecated Configuration setBackupGroupName(String nodeGroupName); @@ -75,7 +75,7 @@ public interface Configuration extends Serializable * * @return {@code true} if the backup will stop when the live server restarts * - * @deprecated you should replace by using the correct{@link org.apache.activemq6.core.server.cluster.ha.HAPolicy} + * @deprecated you should replace by using the correct{@link org.apache.activemq.core.server.cluster.ha.HAPolicy} */ @Deprecated boolean isAllowFailBack(); @@ -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.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_PERSIST_DELIVERY_COUNT_BEFORE_DELIVERY}. + * {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_PERSIST_DELIVERY_COUNT_BEFORE_DELIVERY}. */ boolean isPersistDeliveryCountBeforeDelivery(); @@ -95,9 +95,9 @@ 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.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_BACKUP}. + * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_BACKUP}. * - * @deprecated replaced by {@link org.apache.activemq6.core.server.cluster.ha.HAPolicy#isBackup()} + * @deprecated replaced by {@link org.apache.activemq.core.server.cluster.ha.HAPolicy#isBackup()} */ @Deprecated boolean isBackup(); @@ -105,16 +105,16 @@ public interface Configuration extends Serializable /** * Formerly set whether this server is a backup or not. * - * @deprecated you should replace by using the correct{@link org.apache.activemq6.core.server.cluster.ha.HAPolicy} + * @deprecated you should replace by using the correct{@link org.apache.activemq.core.server.cluster.ha.HAPolicy} */ @Deprecated Configuration setBackup(boolean backup); /** * Returns whether this server shares its data store with a corresponding live or backup server. <br> - * Default value is {@value org.apache.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_SHARED_STORE}. + * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_SHARED_STORE}. * - * @deprecated replaced by {@link org.apache.activemq6.core.server.cluster.ha.HAPolicy#isSharedStore()} + * @deprecated replaced by {@link org.apache.activemq.core.server.cluster.ha.HAPolicy#isSharedStore()} */ @Deprecated boolean isSharedStore(); @@ -122,14 +122,14 @@ public interface Configuration extends Serializable /** * Formerly set whether this server shares its data store with a backup or live server. * - * @deprecated you should replace by using the correct{@link org.apache.activemq6.core.server.cluster.ha.HAPolicy} + * @deprecated you should replace by using the correct{@link org.apache.activemq.core.server.cluster.ha.HAPolicy} */ @Deprecated Configuration setSharedStore(boolean sharedStore); /** * Returns whether this server will use files to configure and deploy its resources. <br> - * Default value is {@value org.apache.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_FILE_DEPLOYMENT_ENABLED}. + * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#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.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_PERSISTENCE_ENABLED}. + * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#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.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_FILE_DEPLOYER_SCAN_PERIOD}. + * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#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.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_THREAD_POOL_MAX_SIZE}. + * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#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.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE}. + * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#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.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_SECURITY_INVALIDATION_INTERVAL}. + * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#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.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_SECURITY_ENABLED}. + * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#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.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_JMX_MANAGEMENT_ENABLED}. + * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_JMX_MANAGEMENT_ENABLED}. */ boolean isJMXManagementEnabled(); /** * Sets whether this server is manageable using JMX or not. <br> - * Default value is {@value org.apache.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_JMX_MANAGEMENT_ENABLED}. + * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#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.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_JMX_DOMAIN}. + * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_JMX_DOMAIN}. */ String getJMXDomain(); @@ -257,7 +257,7 @@ public interface Configuration extends Serializable * Sets the list of interceptors classes used by this server for incoming messages (i.e. those * being delivered to the server from clients). Invoking this method is the same as invoking * <code>setIncomingInterceptorClassNames(List)</code> <br /> - * Classes must implement {@link org.apache.activemq6.api.core.Interceptor}. + * Classes must implement {@link org.apache.activemq.api.core.Interceptor}. * <p/> * Deprecated but not immediately deleted, as embedded users may be using this file. * @@ -272,7 +272,7 @@ public interface Configuration extends Serializable * Sets the list of interceptors classes used by this server for incoming messages (i.e. those being delivered to * the server from clients). * <br /> - * Classes must implement {@link org.apache.activemq6.api.core.Interceptor}. + * Classes must implement {@link org.apache.activemq.api.core.Interceptor}. */ Configuration setIncomingInterceptorClassNames(List<String> interceptors); @@ -280,14 +280,14 @@ public interface Configuration extends Serializable * Sets the list of interceptors classes used by this server for outgoing messages (i.e. those being delivered to * clients from the server). * <br /> - * Classes must implement {@link org.apache.activemq6.api.core.Interceptor}. + * Classes must implement {@link org.apache.activemq.api.core.Interceptor}. */ Configuration setOutgoingInterceptorClassNames(List<String> interceptors); /** * 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.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_CONNECTION_TTL_OVERRIDE}. + * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#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.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_ASYNC_CONNECTION_EXECUTION_ENABLED}. + * {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#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.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_MANAGEMENT_ADDRESS}. + * Default value is {@link org.apache.activemq.api.config.HornetQDefaultConfiguration#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.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_MANAGEMENT_NOTIFICATION_ADDRESS}. + * Default value is {@link org.apache.activemq.api.config.HornetQDefaultConfiguration#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.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_CLUSTER_USER}. + * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#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.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_CLUSTER_PASSWORD}. + * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_CLUSTER_PASSWORD}. */ String getClusterPassword(); @@ -465,7 +465,7 @@ public interface Configuration extends Serializable * @return true if clients should failover * @see #setFailoverOnServerShutdown(boolean) * - * @deprecated you should replace by using the correct{@link org.apache.activemq6.core.server.cluster.ha.HAPolicy} + * @deprecated you should replace by using the correct{@link org.apache.activemq.core.server.cluster.ha.HAPolicy} */ @Deprecated boolean isFailoverOnServerShutdown(); @@ -474,11 +474,11 @@ public interface Configuration extends Serializable * Sets whether to allow clients to failover on server shutdown. * <p/> * When a live server is restarted after failover the backup will shutdown if - * {@link org.apache.activemq6.core.server.cluster.ha.HAPolicy#isAllowAutoFailBack()} is true. This is not regarded as a normal shutdown. In this + * {@link org.apache.activemq.core.server.cluster.ha.HAPolicy#isAllowAutoFailBack()} is true. This is not regarded as a normal shutdown. In this * case {@code failoverOnServerShutdown} is ignored, and the server will behave as if it was set * to {@code true}. * - * @deprecated you should replace by using the correct {@link org.apache.activemq6.core.server.cluster.ha.HAPolicy} + * @deprecated you should replace by using the correct {@link org.apache.activemq.core.server.cluster.ha.HAPolicy} */ @Deprecated Configuration setFailoverOnServerShutdown(boolean failoverOnServerShutdown); @@ -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.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_ID_CACHE_SIZE}. + * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#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.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_PERSIST_ID_CACHE}. + * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#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.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_BINDINGS_DIRECTORY}. + * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#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.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_MAX_CONCURRENT_PAGE_IO}. + * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#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.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_JOURNAL_DIR}. + * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#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.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_JOURNAL_SYNC_TRANSACTIONAL}. + * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#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.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_JOURNAL_SYNC_NON_TRANSACTIONAL}. + * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#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.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_JOURNAL_FILE_SIZE}. + * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#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.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_JOURNAL_COMPACT_MIN_FILES}. + * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#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.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_JOURNAL_COMPACT_PERCENTAGE}. + * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#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.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_JOURNAL_MIN_FILES}. + * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#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.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_JOURNAL_MAX_IO_AIO}. + * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_JOURNAL_MAX_IO_AIO}. */ int getJournalMaxIO_AIO(); @@ -642,7 +642,7 @@ public interface Configuration extends Serializable /** * Returns the timeout (in nanoseconds) used to flush buffers in the AIO queue. * <br> - * Default value is {@value org.apache.activemq6.core.journal.impl.JournalConstants#DEFAULT_JOURNAL_BUFFER_TIMEOUT_AIO}. + * Default value is {@value org.apache.activemq.core.journal.impl.JournalConstants#DEFAULT_JOURNAL_BUFFER_TIMEOUT_AIO}. */ int getJournalBufferTimeout_AIO(); @@ -654,7 +654,7 @@ public interface Configuration extends Serializable /** * Returns the buffer size (in bytes) for AIO. * <br> - * Default value is {@value org.apache.activemq6.core.journal.impl.JournalConstants#DEFAULT_JOURNAL_BUFFER_SIZE_AIO}. + * Default value is {@value org.apache.activemq.core.journal.impl.JournalConstants#DEFAULT_JOURNAL_BUFFER_SIZE_AIO}. */ int getJournalBufferSize_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.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_JOURNAL_MAX_IO_NIO}. + * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_JOURNAL_MAX_IO_NIO}. */ int getJournalMaxIO_NIO(); @@ -677,7 +677,7 @@ public interface Configuration extends Serializable /** * Returns the timeout (in nanoseconds) used to flush buffers in the NIO. * <br> - * Default value is {@value org.apache.activemq6.core.journal.impl.JournalConstants#DEFAULT_JOURNAL_BUFFER_TIMEOUT_NIO}. + * Default value is {@value org.apache.activemq.core.journal.impl.JournalConstants#DEFAULT_JOURNAL_BUFFER_TIMEOUT_NIO}. */ int getJournalBufferTimeout_NIO(); @@ -689,7 +689,7 @@ public interface Configuration extends Serializable /** * Returns the buffer size (in bytes) for NIO. * <br> - * Default value is {@value org.apache.activemq6.core.journal.impl.JournalConstants#DEFAULT_JOURNAL_BUFFER_SIZE_NIO}. + * Default value is {@value org.apache.activemq.core.journal.impl.JournalConstants#DEFAULT_JOURNAL_BUFFER_SIZE_NIO}. */ int getJournalBufferSize_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.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_CREATE_BINDINGS_DIR}. + * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#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.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_CREATE_JOURNAL_DIR}. + * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#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.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_PAGING_DIR}. + * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#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.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_LARGE_MESSAGES_DIR}. + * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#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.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_WILDCARD_ROUTING_ENABLED}. + * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#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.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_TRANSACTION_TIMEOUT}. + * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#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.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_MESSAGE_COUNTER_ENABLED}. + * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#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.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_MESSAGE_COUNTER_SAMPLE_PERIOD}. + * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#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.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_MESSAGE_COUNTER_MAX_DAY_HISTORY}. + * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#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.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_TRANSACTION_TIMEOUT_SCAN_PERIOD}. + * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#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.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_MESSAGE_EXPIRY_SCAN_PERIOD}. + * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#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.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_MESSAGE_EXPIRY_THREAD_PRIORITY}. + * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_MESSAGE_EXPIRY_THREAD_PRIORITY}. */ int getMessageExpiryThreadPriority(); @@ -907,7 +907,7 @@ public interface Configuration extends Serializable /** * Returns the delay to wait before fail-back occurs on restart. * - * @deprecated replaced by {@link org.apache.activemq6.core.server.cluster.ha.BackupPolicy#getFailbackDelay()} + * @deprecated replaced by {@link org.apache.activemq.core.server.cluster.ha.BackupPolicy#getFailbackDelay()} */ @Deprecated long getFailbackDelay(); @@ -915,7 +915,7 @@ public interface Configuration extends Serializable /** * Sets the fail-back delay. * - * @deprecated replaced by {@link org.apache.activemq6.core.server.cluster.ha.BackupPolicy#setFailbackDelay(long)} + * @deprecated replaced by {@link org.apache.activemq.core.server.cluster.ha.BackupPolicy#setFailbackDelay(long)} */ @Deprecated Configuration setFailbackDelay(long delay); @@ -974,7 +974,7 @@ public interface Configuration extends Serializable * * @param clusterName * - * @deprecated you should replace by using the correct{@link org.apache.activemq6.core.server.cluster.ha.HAPolicy} + * @deprecated you should replace by using the correct{@link org.apache.activemq.core.server.cluster.ha.HAPolicy} */ @Deprecated @@ -984,7 +984,7 @@ public interface Configuration extends Serializable * @return name of the cluster configuration to use * @see #setReplicationClustername(String) * - * @deprecated you should replace by using the correct{@link org.apache.activemq6.core.server.cluster.ha.HAPolicy} + * @deprecated you should replace by using the correct{@link org.apache.activemq.core.server.cluster.ha.HAPolicy} */ @Deprecated String getReplicationClustername(); @@ -998,7 +998,7 @@ public interface Configuration extends Serializable /* * @see #setResolveProtocols() * @return whether HornetQ should resolve and use any Protocols available on the classpath - * Default value is {@value org.apache.activemq6.api.config.HornetQDefaultConfiguration#DEFAULT_RESOLVE_PROTOCOLS}. + * Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_RESOLVE_PROTOCOLS}. * */ boolean isResolveProtocols(); @@ -1010,7 +1010,7 @@ public interface Configuration extends Serializable * * @param maxSavedReplicatedJournalsSize * - * @deprecated you should replace by using the correct{@link org.apache.activemq6.core.server.cluster.ha.HAPolicy} + * @deprecated you should replace by using the correct{@link org.apache.activemq.core.server.cluster.ha.HAPolicy} */ @Deprecated Configuration setMaxSavedReplicatedJournalSize(int maxSavedReplicatedJournalsSize); @@ -1019,7 +1019,7 @@ public interface Configuration extends Serializable * @return the number of backup journals to keep after failback has occurred * @see #setMaxSavedReplicatedJournalSize(int) * - * @deprecated you should replace by using the correct{@link org.apache.activemq6.core.server.cluster.ha.HAPolicy} + * @deprecated you should replace by using the correct{@link org.apache.activemq.core.server.cluster.ha.HAPolicy} */ @Deprecated int getMaxSavedReplicatedJournalsSize();
http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/config/ConfigurationUtils.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/ConfigurationUtils.java b/activemq-server/src/main/java/org/apache/activemq/core/config/ConfigurationUtils.java index 497b70d..10eeedf 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/config/ConfigurationUtils.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/config/ConfigurationUtils.java @@ -10,25 +10,25 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.config; +package org.apache.activemq.core.config; -import org.apache.activemq6.api.core.HornetQIllegalStateException; -import org.apache.activemq6.core.config.ha.ColocatedPolicyConfiguration; -import org.apache.activemq6.core.config.ha.LiveOnlyPolicyConfiguration; -import org.apache.activemq6.core.config.ha.ReplicaPolicyConfiguration; -import org.apache.activemq6.core.config.ha.ReplicatedPolicyConfiguration; -import org.apache.activemq6.core.config.ha.SharedStoreMasterPolicyConfiguration; -import org.apache.activemq6.core.config.ha.SharedStoreSlavePolicyConfiguration; -import org.apache.activemq6.core.server.HornetQMessageBundle; -import org.apache.activemq6.core.server.cluster.ha.BackupPolicy; -import org.apache.activemq6.core.server.cluster.ha.ColocatedPolicy; -import org.apache.activemq6.core.server.cluster.ha.HAPolicy; -import org.apache.activemq6.core.server.cluster.ha.LiveOnlyPolicy; -import org.apache.activemq6.core.server.cluster.ha.ReplicaPolicy; -import org.apache.activemq6.core.server.cluster.ha.ReplicatedPolicy; -import org.apache.activemq6.core.server.cluster.ha.ScaleDownPolicy; -import org.apache.activemq6.core.server.cluster.ha.SharedStoreMasterPolicy; -import org.apache.activemq6.core.server.cluster.ha.SharedStoreSlavePolicy; +import org.apache.activemq.api.core.HornetQIllegalStateException; +import org.apache.activemq.core.config.ha.ColocatedPolicyConfiguration; +import org.apache.activemq.core.config.ha.LiveOnlyPolicyConfiguration; +import org.apache.activemq.core.config.ha.ReplicaPolicyConfiguration; +import org.apache.activemq.core.config.ha.ReplicatedPolicyConfiguration; +import org.apache.activemq.core.config.ha.SharedStoreMasterPolicyConfiguration; +import org.apache.activemq.core.config.ha.SharedStoreSlavePolicyConfiguration; +import org.apache.activemq.core.server.HornetQMessageBundle; +import org.apache.activemq.core.server.cluster.ha.BackupPolicy; +import org.apache.activemq.core.server.cluster.ha.ColocatedPolicy; +import org.apache.activemq.core.server.cluster.ha.HAPolicy; +import org.apache.activemq.core.server.cluster.ha.LiveOnlyPolicy; +import org.apache.activemq.core.server.cluster.ha.ReplicaPolicy; +import org.apache.activemq.core.server.cluster.ha.ReplicatedPolicy; +import org.apache.activemq.core.server.cluster.ha.ScaleDownPolicy; +import org.apache.activemq.core.server.cluster.ha.SharedStoreMasterPolicy; +import org.apache.activemq.core.server.cluster.ha.SharedStoreSlavePolicy; public final class ConfigurationUtils { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/config/ConnectorServiceConfiguration.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/ConnectorServiceConfiguration.java b/activemq-server/src/main/java/org/apache/activemq/core/config/ConnectorServiceConfiguration.java index 737cf9b..0f800dd 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/config/ConnectorServiceConfiguration.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/config/ConnectorServiceConfiguration.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.config; +package org.apache.activemq.core.config; import java.io.Serializable; import java.util.Map; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/config/CoreQueueConfiguration.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/CoreQueueConfiguration.java b/activemq-server/src/main/java/org/apache/activemq/core/config/CoreQueueConfiguration.java index 3925d0f..f5b8f04 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/config/CoreQueueConfiguration.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/config/CoreQueueConfiguration.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.config; +package org.apache.activemq.core.config; import java.io.Serializable; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/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 f61be7a..d337a6d 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 @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.config; +package org.apache.activemq.core.config; import java.io.Serializable; -import org.apache.activemq6.api.config.HornetQDefaultConfiguration; -import org.apache.activemq6.utils.UUIDGenerator; +import org.apache.activemq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq.utils.UUIDGenerator; /** * A DivertConfiguration http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/config/HAPolicyConfiguration.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/HAPolicyConfiguration.java b/activemq-server/src/main/java/org/apache/activemq/core/config/HAPolicyConfiguration.java index c283690..e5fb930 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/config/HAPolicyConfiguration.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/config/HAPolicyConfiguration.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.config; +package org.apache.activemq.core.config; import java.io.Serializable; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/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 8409475..1fc089f 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 @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.config; +package org.apache.activemq.core.config; -import org.apache.activemq6.api.config.HornetQDefaultConfiguration; +import org.apache.activemq.api.config.HornetQDefaultConfiguration; import java.io.Serializable; import java.util.ArrayList; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/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 ed4d94c..d7d838d 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 @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.config.ha; +package org.apache.activemq.core.config.ha; -import org.apache.activemq6.api.config.HornetQDefaultConfiguration; -import org.apache.activemq6.core.config.HAPolicyConfiguration; +import org.apache.activemq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq.core.config.HAPolicyConfiguration; import java.util.ArrayList; import java.util.List; http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/config/ha/LiveOnlyPolicyConfiguration.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/ha/LiveOnlyPolicyConfiguration.java b/activemq-server/src/main/java/org/apache/activemq/core/config/ha/LiveOnlyPolicyConfiguration.java index 1922e0e..8a30221 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/config/ha/LiveOnlyPolicyConfiguration.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/config/ha/LiveOnlyPolicyConfiguration.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.config.ha; +package org.apache.activemq.core.config.ha; -import org.apache.activemq6.core.config.HAPolicyConfiguration; -import org.apache.activemq6.core.config.ScaleDownConfiguration; +import org.apache.activemq.core.config.HAPolicyConfiguration; +import org.apache.activemq.core.config.ScaleDownConfiguration; public class LiveOnlyPolicyConfiguration implements HAPolicyConfiguration { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/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 70be0a4..b27d852 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 @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.config.ha; +package org.apache.activemq.core.config.ha; -import org.apache.activemq6.api.config.HornetQDefaultConfiguration; -import org.apache.activemq6.core.config.HAPolicyConfiguration; -import org.apache.activemq6.core.config.ScaleDownConfiguration; +import org.apache.activemq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq.core.config.HAPolicyConfiguration; +import org.apache.activemq.core.config.ScaleDownConfiguration; public class ReplicaPolicyConfiguration implements HAPolicyConfiguration { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/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 f9a188b..67ff663 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 @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.config.ha; +package org.apache.activemq.core.config.ha; -import org.apache.activemq6.api.config.HornetQDefaultConfiguration; -import org.apache.activemq6.core.config.HAPolicyConfiguration; +import org.apache.activemq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq.core.config.HAPolicyConfiguration; public class ReplicatedPolicyConfiguration implements HAPolicyConfiguration { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/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 76ea2a1..a3a9d2f 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 @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.config.ha; +package org.apache.activemq.core.config.ha; -import org.apache.activemq6.api.config.HornetQDefaultConfiguration; -import org.apache.activemq6.core.config.HAPolicyConfiguration; +import org.apache.activemq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq.core.config.HAPolicyConfiguration; public class SharedStoreMasterPolicyConfiguration implements HAPolicyConfiguration { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/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 cfd9618..d3a6377 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 @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.config.ha; +package org.apache.activemq.core.config.ha; -import org.apache.activemq6.api.config.HornetQDefaultConfiguration; -import org.apache.activemq6.core.config.HAPolicyConfiguration; -import org.apache.activemq6.core.config.ScaleDownConfiguration; +import org.apache.activemq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq.core.config.HAPolicyConfiguration; +import org.apache.activemq.core.config.ScaleDownConfiguration; public class SharedStoreSlavePolicyConfiguration implements HAPolicyConfiguration { http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/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 ac72db5..96d914a 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 @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.config.impl; +package org.apache.activemq.core.config.impl; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -24,26 +24,26 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.activemq6.api.config.HornetQDefaultConfiguration; -import org.apache.activemq6.api.core.BroadcastGroupConfiguration; -import org.apache.activemq6.api.core.DiscoveryGroupConfiguration; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.core.config.BridgeConfiguration; -import org.apache.activemq6.core.config.ClusterConnectionConfiguration; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.config.ConnectorServiceConfiguration; -import org.apache.activemq6.core.config.CoreQueueConfiguration; -import org.apache.activemq6.core.config.DivertConfiguration; -import org.apache.activemq6.core.config.HAPolicyConfiguration; -import org.apache.activemq6.core.config.ha.ReplicaPolicyConfiguration; -import org.apache.activemq6.core.config.ha.ReplicatedPolicyConfiguration; -import org.apache.activemq6.core.config.ha.SharedStoreMasterPolicyConfiguration; -import org.apache.activemq6.core.config.ha.SharedStoreSlavePolicyConfiguration; -import org.apache.activemq6.core.security.Role; -import org.apache.activemq6.core.server.JournalType; -import org.apache.activemq6.core.server.group.impl.GroupingHandlerConfiguration; -import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq.api.core.BroadcastGroupConfiguration; +import org.apache.activemq.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.core.config.BridgeConfiguration; +import org.apache.activemq.core.config.ClusterConnectionConfiguration; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.config.ConnectorServiceConfiguration; +import org.apache.activemq.core.config.CoreQueueConfiguration; +import org.apache.activemq.core.config.DivertConfiguration; +import org.apache.activemq.core.config.HAPolicyConfiguration; +import org.apache.activemq.core.config.ha.ReplicaPolicyConfiguration; +import org.apache.activemq.core.config.ha.ReplicatedPolicyConfiguration; +import org.apache.activemq.core.config.ha.SharedStoreMasterPolicyConfiguration; +import org.apache.activemq.core.config.ha.SharedStoreSlavePolicyConfiguration; +import org.apache.activemq.core.security.Role; +import org.apache.activemq.core.server.JournalType; +import org.apache.activemq.core.server.group.impl.GroupingHandlerConfiguration; +import org.apache.activemq.core.settings.impl.AddressSettings; /** * @author <a href="mailto:[email protected]>Andy Taylor</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/config/impl/FileConfiguration.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/impl/FileConfiguration.java b/activemq-server/src/main/java/org/apache/activemq/core/config/impl/FileConfiguration.java index a1a3084..a355114 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/config/impl/FileConfiguration.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/config/impl/FileConfiguration.java @@ -10,15 +10,15 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.config.impl; +package org.apache.activemq.core.config.impl; import java.io.InputStreamReader; import java.io.Reader; import java.net.URL; -import org.apache.activemq6.core.deployers.impl.FileConfigurationParser; -import org.apache.activemq6.core.server.HornetQServerLogger; -import org.apache.activemq6.utils.XMLUtil; +import org.apache.activemq.core.deployers.impl.FileConfigurationParser; +import org.apache.activemq.core.server.HornetQServerLogger; +import org.apache.activemq.utils.XMLUtil; import org.w3c.dom.Element; /** @@ -70,9 +70,9 @@ public final class FileConfiguration extends ConfigurationImpl HornetQServerLogger.LOGGER.debug("Loading server configuration from " + url); Reader reader = new InputStreamReader(url.openStream()); - String xml = org.apache.activemq6.utils.XMLUtil.readerToString(reader); + String xml = org.apache.activemq.utils.XMLUtil.readerToString(reader); xml = XMLUtil.replaceSystemProps(xml); - Element e = org.apache.activemq6.utils.XMLUtil.stringToElement(xml); + Element e = org.apache.activemq.utils.XMLUtil.stringToElement(xml); FileConfigurationParser parser = new FileConfigurationParser(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/config/impl/Validators.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/impl/Validators.java b/activemq-server/src/main/java/org/apache/activemq/core/config/impl/Validators.java index b6afc19..9a760b4 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/config/impl/Validators.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/config/impl/Validators.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.config.impl; +package org.apache.activemq.core.config.impl; -import org.apache.activemq6.core.server.HornetQMessageBundle; -import org.apache.activemq6.core.server.JournalType; -import org.apache.activemq6.core.settings.impl.AddressFullMessagePolicy; -import org.apache.activemq6.core.settings.impl.SlowConsumerPolicy; +import org.apache.activemq.core.server.HornetQMessageBundle; +import org.apache.activemq.core.server.JournalType; +import org.apache.activemq.core.settings.impl.AddressFullMessagePolicy; +import org.apache.activemq.core.settings.impl.SlowConsumerPolicy; /** * A Validators. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/deployers/Deployer.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/deployers/Deployer.java b/activemq-server/src/main/java/org/apache/activemq/core/deployers/Deployer.java index cbdfd18..3b585af 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/deployers/Deployer.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/deployers/Deployer.java @@ -10,11 +10,11 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.deployers; +package org.apache.activemq.core.deployers; import java.net.URI; -import org.apache.activemq6.core.server.HornetQComponent; +import org.apache.activemq.core.server.HornetQComponent; /** * abstract class that helps with deployment of messaging components. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/deployers/DeploymentManager.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/deployers/DeploymentManager.java b/activemq-server/src/main/java/org/apache/activemq/core/deployers/DeploymentManager.java index 3b7d7ff..d39d2e4 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/deployers/DeploymentManager.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/deployers/DeploymentManager.java @@ -10,9 +10,9 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.deployers; +package org.apache.activemq.core.deployers; -import org.apache.activemq6.core.server.HornetQComponent; +import org.apache.activemq.core.server.HornetQComponent; /** * This class manages any configuration files available. It will notify any deployers registered with it on changes. http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/AddressSettingsDeployer.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/AddressSettingsDeployer.java b/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/AddressSettingsDeployer.java index b14964a..8ea5e3f 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/AddressSettingsDeployer.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/AddressSettingsDeployer.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.deployers.impl; +package org.apache.activemq.core.deployers.impl; -import org.apache.activemq6.api.core.Pair; -import org.apache.activemq6.core.deployers.DeploymentManager; -import org.apache.activemq6.core.settings.HierarchicalRepository; -import org.apache.activemq6.core.settings.impl.AddressSettings; +import org.apache.activemq.api.core.Pair; +import org.apache.activemq.core.deployers.DeploymentManager; +import org.apache.activemq.core.settings.HierarchicalRepository; +import org.apache.activemq.core.settings.impl.AddressSettings; import org.w3c.dom.Node; /** @@ -50,7 +50,7 @@ public class AddressSettingsDeployer extends XmlDeployer @Override public void validate(final Node rootNode) throws Exception { - org.apache.activemq6.utils.XMLUtil.validate(rootNode, "schema/hornetq-configuration.xsd"); + org.apache.activemq.utils.XMLUtil.validate(rootNode, "schema/hornetq-configuration.xsd"); } /** http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/BasicUserCredentialsDeployer.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/BasicUserCredentialsDeployer.java b/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/BasicUserCredentialsDeployer.java index fd3c6b3..3acc995 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/BasicUserCredentialsDeployer.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/BasicUserCredentialsDeployer.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.deployers.impl; +package org.apache.activemq.core.deployers.impl; -import org.apache.activemq6.core.deployers.DeploymentManager; -import org.apache.activemq6.spi.core.security.HornetQSecurityManager; -import org.apache.activemq6.utils.PasswordMaskingUtil; -import org.apache.activemq6.utils.SensitiveDataCodec; +import org.apache.activemq.core.deployers.DeploymentManager; +import org.apache.activemq.spi.core.security.HornetQSecurityManager; +import org.apache.activemq.utils.PasswordMaskingUtil; +import org.apache.activemq.utils.SensitiveDataCodec; import org.w3c.dom.Node; import org.w3c.dom.NodeList; @@ -63,7 +63,7 @@ public class BasicUserCredentialsDeployer extends XmlDeployer @Override public void validate(final Node rootNode) throws Exception { - org.apache.activemq6.utils.XMLUtil.validate(rootNode, "schema/hornetq-users.xsd"); + org.apache.activemq.utils.XMLUtil.validate(rootNode, "schema/hornetq-users.xsd"); } @Override http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/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 a3e6358..8c02868 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 @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.deployers.impl; +package org.apache.activemq.core.deployers.impl; import java.io.InputStream; import java.io.InputStreamReader; @@ -22,47 +22,47 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.activemq6.api.config.HornetQDefaultConfiguration; -import org.apache.activemq6.api.core.BroadcastEndpointFactoryConfiguration; -import org.apache.activemq6.api.core.BroadcastGroupConfiguration; -import org.apache.activemq6.api.core.DiscoveryGroupConfiguration; -import org.apache.activemq6.api.core.JGroupsBroadcastGroupConfiguration; -import org.apache.activemq6.api.core.Pair; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.UDPBroadcastGroupConfiguration; -import org.apache.activemq6.api.core.client.HornetQClient; -import org.apache.activemq6.core.config.BridgeConfiguration; -import org.apache.activemq6.core.config.ClusterConnectionConfiguration; -import org.apache.activemq6.core.config.Configuration; -import org.apache.activemq6.core.config.ConnectorServiceConfiguration; -import org.apache.activemq6.core.config.CoreQueueConfiguration; -import org.apache.activemq6.core.config.DivertConfiguration; -import org.apache.activemq6.core.config.HAPolicyConfiguration; -import org.apache.activemq6.core.config.ScaleDownConfiguration; -import org.apache.activemq6.core.config.ha.ColocatedPolicyConfiguration; -import org.apache.activemq6.core.config.ha.LiveOnlyPolicyConfiguration; -import org.apache.activemq6.core.config.ha.ReplicaPolicyConfiguration; -import org.apache.activemq6.core.config.ha.ReplicatedPolicyConfiguration; -import org.apache.activemq6.core.config.ha.SharedStoreMasterPolicyConfiguration; -import org.apache.activemq6.core.config.ha.SharedStoreSlavePolicyConfiguration; -import org.apache.activemq6.core.config.impl.ConfigurationImpl; -import org.apache.activemq6.core.config.impl.FileConfiguration; -import org.apache.activemq6.core.config.impl.Validators; -import org.apache.activemq6.core.journal.impl.AIOSequentialFileFactory; -import org.apache.activemq6.core.journal.impl.JournalConstants; -import org.apache.activemq6.core.security.Role; -import org.apache.activemq6.core.server.HornetQServerLogger; -import org.apache.activemq6.core.server.JournalType; -import org.apache.activemq6.core.server.group.impl.GroupingHandlerConfiguration; -import org.apache.activemq6.core.settings.impl.AddressFullMessagePolicy; -import org.apache.activemq6.core.settings.impl.AddressSettings; -import org.apache.activemq6.core.settings.impl.SlowConsumerPolicy; -import org.apache.activemq6.utils.DefaultSensitiveStringCodec; -import org.apache.activemq6.utils.PasswordMaskingUtil; -import org.apache.activemq6.utils.SensitiveDataCodec; -import org.apache.activemq6.utils.XMLConfigurationUtil; -import org.apache.activemq6.utils.XMLUtil; +import org.apache.activemq.api.config.HornetQDefaultConfiguration; +import org.apache.activemq.api.core.BroadcastEndpointFactoryConfiguration; +import org.apache.activemq.api.core.BroadcastGroupConfiguration; +import org.apache.activemq.api.core.DiscoveryGroupConfiguration; +import org.apache.activemq.api.core.JGroupsBroadcastGroupConfiguration; +import org.apache.activemq.api.core.Pair; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.core.UDPBroadcastGroupConfiguration; +import org.apache.activemq.api.core.client.HornetQClient; +import org.apache.activemq.core.config.BridgeConfiguration; +import org.apache.activemq.core.config.ClusterConnectionConfiguration; +import org.apache.activemq.core.config.Configuration; +import org.apache.activemq.core.config.ConnectorServiceConfiguration; +import org.apache.activemq.core.config.CoreQueueConfiguration; +import org.apache.activemq.core.config.DivertConfiguration; +import org.apache.activemq.core.config.HAPolicyConfiguration; +import org.apache.activemq.core.config.ScaleDownConfiguration; +import org.apache.activemq.core.config.ha.ColocatedPolicyConfiguration; +import org.apache.activemq.core.config.ha.LiveOnlyPolicyConfiguration; +import org.apache.activemq.core.config.ha.ReplicaPolicyConfiguration; +import org.apache.activemq.core.config.ha.ReplicatedPolicyConfiguration; +import org.apache.activemq.core.config.ha.SharedStoreMasterPolicyConfiguration; +import org.apache.activemq.core.config.ha.SharedStoreSlavePolicyConfiguration; +import org.apache.activemq.core.config.impl.ConfigurationImpl; +import org.apache.activemq.core.config.impl.FileConfiguration; +import org.apache.activemq.core.config.impl.Validators; +import org.apache.activemq.core.journal.impl.AIOSequentialFileFactory; +import org.apache.activemq.core.journal.impl.JournalConstants; +import org.apache.activemq.core.security.Role; +import org.apache.activemq.core.server.HornetQServerLogger; +import org.apache.activemq.core.server.JournalType; +import org.apache.activemq.core.server.group.impl.GroupingHandlerConfiguration; +import org.apache.activemq.core.settings.impl.AddressFullMessagePolicy; +import org.apache.activemq.core.settings.impl.AddressSettings; +import org.apache.activemq.core.settings.impl.SlowConsumerPolicy; +import org.apache.activemq.utils.DefaultSensitiveStringCodec; +import org.apache.activemq.utils.PasswordMaskingUtil; +import org.apache.activemq.utils.SensitiveDataCodec; +import org.apache.activemq.utils.XMLConfigurationUtil; +import org.apache.activemq.utils.XMLUtil; import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; @@ -172,9 +172,9 @@ public final class FileConfigurationParser extends XMLConfigurationUtil { Reader reader = new InputStreamReader(input); - String xml = org.apache.activemq6.utils.XMLUtil.readerToString(reader); + String xml = org.apache.activemq.utils.XMLUtil.readerToString(reader); xml = XMLUtil.replaceSystemProps(xml); - Element e = org.apache.activemq6.utils.XMLUtil.stringToElement(xml); + Element e = org.apache.activemq.utils.XMLUtil.stringToElement(xml); Configuration config = new ConfigurationImpl(); http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/FileDeploymentManager.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/FileDeploymentManager.java b/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/FileDeploymentManager.java index f6e5898..84121ae 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/FileDeploymentManager.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/FileDeploymentManager.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.deployers.impl; +package org.apache.activemq.core.deployers.impl; import java.io.File; import java.io.IOException; @@ -30,10 +30,10 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; -import org.apache.activemq6.api.core.Pair; -import org.apache.activemq6.core.deployers.Deployer; -import org.apache.activemq6.core.deployers.DeploymentManager; -import org.apache.activemq6.core.server.HornetQServerLogger; +import org.apache.activemq.api.core.Pair; +import org.apache.activemq.core.deployers.Deployer; +import org.apache.activemq.core.deployers.DeploymentManager; +import org.apache.activemq.core.server.HornetQServerLogger; /** * @author <a href="[email protected]">Andy Taylor</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/QueueDeployer.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/QueueDeployer.java b/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/QueueDeployer.java index 13e1df8..9005085 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/QueueDeployer.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/QueueDeployer.java @@ -10,12 +10,12 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.deployers.impl; +package org.apache.activemq.core.deployers.impl; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.config.CoreQueueConfiguration; -import org.apache.activemq6.core.deployers.DeploymentManager; -import org.apache.activemq6.core.server.HornetQServer; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.config.CoreQueueConfiguration; +import org.apache.activemq.core.deployers.DeploymentManager; +import org.apache.activemq.core.server.HornetQServer; import org.w3c.dom.Node; /** @@ -52,7 +52,7 @@ public class QueueDeployer extends XmlDeployer @Override public void validate(final Node rootNode) throws Exception { - org.apache.activemq6.utils.XMLUtil.validate(rootNode, "schema/hornetq-configuration.xsd"); + org.apache.activemq.utils.XMLUtil.validate(rootNode, "schema/hornetq-configuration.xsd"); } /** http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/SecurityDeployer.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/SecurityDeployer.java b/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/SecurityDeployer.java index 9a741e0..6c1fb70 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/SecurityDeployer.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/SecurityDeployer.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.deployers.impl; +package org.apache.activemq.core.deployers.impl; import java.util.Set; -import org.apache.activemq6.api.core.Pair; -import org.apache.activemq6.core.deployers.DeploymentManager; -import org.apache.activemq6.core.security.Role; -import org.apache.activemq6.core.settings.HierarchicalRepository; +import org.apache.activemq.api.core.Pair; +import org.apache.activemq.core.deployers.DeploymentManager; +import org.apache.activemq.core.security.Role; +import org.apache.activemq.core.settings.HierarchicalRepository; import org.w3c.dom.Node; /** @@ -60,7 +60,7 @@ public class SecurityDeployer extends XmlDeployer @Override public void validate(final Node rootNode) throws Exception { - org.apache.activemq6.utils.XMLUtil.validate(rootNode, "schema/hornetq-configuration.xsd"); + org.apache.activemq.utils.XMLUtil.validate(rootNode, "schema/hornetq-configuration.xsd"); } /** http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/XmlDeployer.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/XmlDeployer.java b/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/XmlDeployer.java index 7a61f37..a05dcca 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/XmlDeployer.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/XmlDeployer.java @@ -10,7 +10,7 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.deployers.impl; +package org.apache.activemq.core.deployers.impl; import java.io.InputStreamReader; import java.io.Reader; @@ -22,11 +22,11 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.core.deployers.Deployer; -import org.apache.activemq6.core.deployers.DeploymentManager; -import org.apache.activemq6.core.server.HornetQServerLogger; -import org.apache.activemq6.utils.XMLUtil; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.core.deployers.Deployer; +import org.apache.activemq.core.deployers.DeploymentManager; +import org.apache.activemq.core.server.HornetQServerLogger; +import org.apache.activemq.utils.XMLUtil; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; @@ -286,9 +286,9 @@ public abstract class XmlDeployer implements Deployer protected Element getRootElement(final URI url) throws Exception { Reader reader = new InputStreamReader(url.toURL().openStream()); - String xml = org.apache.activemq6.utils.XMLUtil.readerToString(reader); - xml = org.apache.activemq6.utils.XMLUtil.replaceSystemProps(xml); - return org.apache.activemq6.utils.XMLUtil.stringToElement(xml); + String xml = org.apache.activemq.utils.XMLUtil.readerToString(reader); + xml = org.apache.activemq.utils.XMLUtil.replaceSystemProps(xml); + return org.apache.activemq.utils.XMLUtil.stringToElement(xml); } private boolean hasNodeChanged(final URI url, final Node child, final String name) http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/filter/Filter.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/filter/Filter.java b/activemq-server/src/main/java/org/apache/activemq/core/filter/Filter.java index 05f051d..08bd199 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/filter/Filter.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/filter/Filter.java @@ -10,10 +10,10 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.filter; +package org.apache.activemq.core.filter; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.server.ServerMessage; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.server.ServerMessage; /** * http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/filter/impl/FilterImpl.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/filter/impl/FilterImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/filter/impl/FilterImpl.java index b35a6cc..cf14c7b 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/filter/impl/FilterImpl.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/filter/impl/FilterImpl.java @@ -10,19 +10,19 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.filter.impl; - -import org.apache.activemq6.selector.filter.BooleanExpression; -import org.apache.activemq6.selector.filter.FilterException; -import org.apache.activemq6.selector.filter.Filterable; -import org.apache.activemq6.selector.SelectorParser; -import org.apache.activemq6.api.core.FilterConstants; -import org.apache.activemq6.api.core.HornetQException; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.core.filter.Filter; -import org.apache.activemq6.core.server.HornetQMessageBundle; -import org.apache.activemq6.core.server.HornetQServerLogger; -import org.apache.activemq6.core.server.ServerMessage; +package org.apache.activemq.core.filter.impl; + +import org.apache.activemq.selector.filter.BooleanExpression; +import org.apache.activemq.selector.filter.FilterException; +import org.apache.activemq.selector.filter.Filterable; +import org.apache.activemq.selector.SelectorParser; +import org.apache.activemq.api.core.FilterConstants; +import org.apache.activemq.api.core.HornetQException; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.core.filter.Filter; +import org.apache.activemq.core.server.HornetQMessageBundle; +import org.apache.activemq.core.server.HornetQServerLogger; +import org.apache.activemq.core.server.ServerMessage; /** * This class implements a HornetQ filter http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/management/impl/AbstractControl.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/management/impl/AbstractControl.java b/activemq-server/src/main/java/org/apache/activemq/core/management/impl/AbstractControl.java index f6838ae..22b864c 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/management/impl/AbstractControl.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/management/impl/AbstractControl.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.management.impl; +package org.apache.activemq.core.management.impl; import javax.management.MBeanInfo; import javax.management.MBeanOperationInfo; import javax.management.NotCompliantMBeanException; import javax.management.StandardMBean; -import org.apache.activemq6.core.persistence.StorageManager; +import org.apache.activemq.core.persistence.StorageManager; /** * A AbstractControl http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/management/impl/AcceptorControlImpl.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/management/impl/AcceptorControlImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/management/impl/AcceptorControlImpl.java index 76ee168..b7bf658 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/management/impl/AcceptorControlImpl.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/management/impl/AcceptorControlImpl.java @@ -10,16 +10,16 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.management.impl; +package org.apache.activemq.core.management.impl; import java.util.Map; import javax.management.MBeanOperationInfo; -import org.apache.activemq6.api.core.TransportConfiguration; -import org.apache.activemq6.api.core.management.AcceptorControl; -import org.apache.activemq6.core.persistence.StorageManager; -import org.apache.activemq6.spi.core.remoting.Acceptor; +import org.apache.activemq.api.core.TransportConfiguration; +import org.apache.activemq.api.core.management.AcceptorControl; +import org.apache.activemq.core.persistence.StorageManager; +import org.apache.activemq.spi.core.remoting.Acceptor; /** * A AcceptorControl http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/management/impl/AddressControlImpl.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/management/impl/AddressControlImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/management/impl/AddressControlImpl.java index fcbcdcb..cf85468 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/management/impl/AddressControlImpl.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/management/impl/AddressControlImpl.java @@ -10,27 +10,27 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.management.impl; +package org.apache.activemq.core.management.impl; import javax.management.MBeanOperationInfo; import java.util.ArrayList; import java.util.List; import java.util.Set; -import org.apache.activemq6.api.core.SimpleString; -import org.apache.activemq6.api.core.management.AddressControl; -import org.apache.activemq6.core.paging.PagingManager; -import org.apache.activemq6.core.paging.PagingStore; -import org.apache.activemq6.core.persistence.StorageManager; -import org.apache.activemq6.core.postoffice.Binding; -import org.apache.activemq6.core.postoffice.Bindings; -import org.apache.activemq6.core.postoffice.PostOffice; -import org.apache.activemq6.core.postoffice.QueueBinding; -import org.apache.activemq6.core.security.CheckType; -import org.apache.activemq6.core.security.Role; -import org.apache.activemq6.core.settings.HierarchicalRepository; -import org.apache.activemq6.utils.json.JSONArray; -import org.apache.activemq6.utils.json.JSONObject; +import org.apache.activemq.api.core.SimpleString; +import org.apache.activemq.api.core.management.AddressControl; +import org.apache.activemq.core.paging.PagingManager; +import org.apache.activemq.core.paging.PagingStore; +import org.apache.activemq.core.persistence.StorageManager; +import org.apache.activemq.core.postoffice.Binding; +import org.apache.activemq.core.postoffice.Bindings; +import org.apache.activemq.core.postoffice.PostOffice; +import org.apache.activemq.core.postoffice.QueueBinding; +import org.apache.activemq.core.security.CheckType; +import org.apache.activemq.core.security.Role; +import org.apache.activemq.core.settings.HierarchicalRepository; +import org.apache.activemq.utils.json.JSONArray; +import org.apache.activemq.utils.json.JSONObject; /** * @author <a href="mailto:[email protected]";>Jeff Mesnil</a> http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/management/impl/BridgeControlImpl.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/management/impl/BridgeControlImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/management/impl/BridgeControlImpl.java index d75dd7b..5ccb913 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/management/impl/BridgeControlImpl.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/management/impl/BridgeControlImpl.java @@ -10,14 +10,14 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.management.impl; +package org.apache.activemq.core.management.impl; import javax.management.MBeanOperationInfo; -import org.apache.activemq6.api.core.management.BridgeControl; -import org.apache.activemq6.core.config.BridgeConfiguration; -import org.apache.activemq6.core.persistence.StorageManager; -import org.apache.activemq6.core.server.cluster.Bridge; +import org.apache.activemq.api.core.management.BridgeControl; +import org.apache.activemq.core.config.BridgeConfiguration; +import org.apache.activemq.core.persistence.StorageManager; +import org.apache.activemq.core.server.cluster.Bridge; /** * A BridgeControl http://git-wip-us.apache.org/repos/asf/activemq-6/blob/9a587c56/activemq-server/src/main/java/org/apache/activemq/core/management/impl/BroadcastGroupControlImpl.java ---------------------------------------------------------------------- diff --git a/activemq-server/src/main/java/org/apache/activemq/core/management/impl/BroadcastGroupControlImpl.java b/activemq-server/src/main/java/org/apache/activemq/core/management/impl/BroadcastGroupControlImpl.java index 3871856..c9cc7e3 100644 --- a/activemq-server/src/main/java/org/apache/activemq/core/management/impl/BroadcastGroupControlImpl.java +++ b/activemq-server/src/main/java/org/apache/activemq/core/management/impl/BroadcastGroupControlImpl.java @@ -10,16 +10,16 @@ * implied. See the License for the specific language governing * permissions and limitations under the License. */ -package org.apache.activemq6.core.management.impl; +package org.apache.activemq.core.management.impl; import javax.management.MBeanOperationInfo; -import org.apache.activemq6.api.core.BroadcastGroupConfiguration; -import org.apache.activemq6.api.core.UDPBroadcastGroupConfiguration; -import org.apache.activemq6.api.core.management.BroadcastGroupControl; -import org.apache.activemq6.core.persistence.StorageManager; -import org.apache.activemq6.core.server.cluster.BroadcastGroup; -import org.apache.activemq6.utils.json.JSONArray; +import org.apache.activemq.api.core.BroadcastGroupConfiguration; +import org.apache.activemq.api.core.UDPBroadcastGroupConfiguration; +import org.apache.activemq.api.core.management.BroadcastGroupControl; +import org.apache.activemq.core.persistence.StorageManager; +import org.apache.activemq.core.server.cluster.BroadcastGroup; +import org.apache.activemq.utils.json.JSONArray; /** * A BroadcastGroupControl
