activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From martyntay...@apache.org
Subject [15/17] activemq-6 git commit: ACTIVEMQ6-4 - refactor default configuration
Date Tue, 18 Nov 2014 12:34:30 GMT
ACTIVEMQ6-4 - refactor default configuration

https://issues.apache.org/jira/browse/ACTIVEMQ6-4

Remove the auto generation of the default config and rename to ActiveMQ


Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/d0d686b5
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/d0d686b5
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/d0d686b5

Branch: refs/heads/master
Commit: d0d686b527ba045fc46662f8907ff1d0537160d6
Parents: f9bdb25
Author: Andy Taylor <andytaylor@apache.org>
Authored: Mon Nov 17 11:00:52 2014 +0000
Committer: Andy Taylor <andytaylor@apache.org>
Committed: Tue Nov 18 11:27:10 2014 +0000

----------------------------------------------------------------------
 activemq-core-client/pom.xml                    |   61 -
 .../config/ActiveMQDefaultConfiguration.java    | 1125 ++++++++++++++++++
 .../api/core/BroadcastGroupConfiguration.java   |    4 +-
 .../activemq/api/core/client/HornetQClient.java |   10 +-
 .../api/core/management/ObjectNameBuilder.java  |    6 +-
 .../remoting/impl/netty/NettyConnector.java     |   10 +-
 .../remoting/impl/netty/TransportConstants.java |   10 +-
 .../resources/HornetQDefaultConfiguration.txt   |  116 --
 .../src/main/resources/hqDefaults.xsl           |  128 --
 .../config/impl/JMSConfigurationImpl.java       |    4 +-
 .../server/impl/JMSServerConfigParserImpl.java  |    6 +-
 .../core/config/BridgeConfiguration.java        |   14 +-
 .../config/ClusterConnectionConfiguration.java  |   32 +-
 .../activemq/core/config/Configuration.java     |   88 +-
 .../core/config/DivertConfiguration.java        |    4 +-
 .../core/config/ScaleDownConfiguration.java     |    4 +-
 .../config/ha/ColocatedPolicyConfiguration.java |   14 +-
 .../config/ha/ReplicaPolicyConfiguration.java   |    8 +-
 .../ha/ReplicatedPolicyConfiguration.java       |    4 +-
 .../SharedStoreMasterPolicyConfiguration.java   |    6 +-
 .../ha/SharedStoreSlavePolicyConfiguration.java |   10 +-
 .../core/config/impl/ConfigurationImpl.java     |  112 +-
 .../deployers/impl/FileConfigurationParser.java |   66 +-
 .../impl/MessageCounterManagerImpl.java         |    6 +-
 .../remoting/impl/invm/TransportConstants.java  |   10 +-
 .../core/remoting/impl/netty/NettyAcceptor.java |   10 +-
 .../core/server/cluster/ha/BackupPolicy.java    |    4 +-
 .../core/server/cluster/ha/ColocatedPolicy.java |   12 +-
 .../core/server/cluster/ha/ReplicaPolicy.java   |    6 +-
 .../server/cluster/ha/ReplicatedPolicy.java     |    8 +-
 .../cluster/ha/SharedStoreMasterPolicy.java     |    6 +-
 .../cluster/ha/SharedStoreSlavePolicy.java      |    8 +-
 .../impl/GroupingHandlerConfiguration.java      |    8 +-
 .../core/server/impl/HornetQServerImpl.java     |    4 +-
 .../core/config/impl/ConfigurationImplTest.java |   88 +-
 .../impl/DefaultsFileConfigurationTest.java     |   68 +-
 .../impl/FileConfigurationParserTest.java       |    4 +-
 .../integration/client/JournalCrashTest.java    |   10 +-
 .../integration/client/SlowConsumerTest.java    |    4 +-
 .../cluster/distribution/ClusterTestBase.java   |    4 +-
 .../AutomaticColocatedQuorumVoteTest.java       |   10 +-
 ...ultipleLivesMultipleBackupsFailoverTest.java |   18 +-
 .../SingleLiveMultipleBackupsFailoverTest.java  |   18 +-
 .../server/management/JMSServerControlTest.java |    4 +-
 .../management/AddressControlTest.java          |    4 +-
 .../management/CoreMessagingProxy.java          |    4 +-
 .../integration/management/JMXDomainTest.java   |    4 +-
 .../management/ManagementWithStompTest.java     |    6 +-
 .../management/NotificationTest.java            |    4 +-
 .../management/SecurityManagementTestBase.java  |    4 +-
 ...tyManagementWithConfiguredAdminUserTest.java |    8 +-
 ...yManagementWithDefaultConfigurationTest.java |    8 +-
 ...ManagementWithModifiedConfigurationTest.java |    8 +-
 .../management/SecurityNotificationTest.java    |    6 +-
 .../replication/ReplicationTest.java            |   10 +-
 .../integration/server/ScaleDown3NodeTest.java  |    6 +-
 .../org/apache/activemq/jms/HornetQAdmin.java   |    8 +-
 .../stress/journal/CompactingStressTest.java    |    4 +-
 .../JournalCleanupCompactStressTest.java        |    8 +-
 .../stress/journal/LargeJournalStressTest.java  |    4 +-
 .../journal/MultiThreadConsumerStressTest.java  |    6 +-
 .../NIOMultiThreadCompactorStressTest.java      |   14 +-
 .../impl/DuplicateDetectionUnitTest.java        |    4 +-
 .../impl/netty/NettyAcceptorFactoryTest.java    |    4 +-
 .../remoting/impl/netty/NettyAcceptorTest.java  |    4 +-
 65 files changed, 1550 insertions(+), 730 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-core-client/pom.xml
----------------------------------------------------------------------
diff --git a/activemq-core-client/pom.xml b/activemq-core-client/pom.xml
index 8b29615..c362506 100644
--- a/activemq-core-client/pom.xml
+++ b/activemq-core-client/pom.xml
@@ -98,67 +98,6 @@
       </resources>
       <plugins>
          <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>build-helper-maven-plugin</artifactId>
-            <executions>
-               <!-- Adds a directory to the list of source folders to be used in this project. This is
-                    here to let Maven know about:
-                    target/generated-sources/xslt/org.apache.activemq/api/config/HornetQDefaultConfiguration.java
-                    which is generated by ./src/main/resources/hqDefaults.xsl using the HornetQ
-                    configuration schema. -->
-               <execution>
-                  <id>add-source</id>
-                  <phase>generate-sources</phase>
-                  <goals>
-                     <goal>add-source</goal>
-                  </goals>
-                  <configuration>
-                     <sources>
-                        <source>./target/generated-sources/xslt</source>
-                     </sources>
-                  </configuration>
-               </execution>
-            </executions>
-         </plugin>
-         <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>xml-maven-plugin</artifactId>
-            <executions>
-               <execution>
-                  <goals>
-                     <goal>transform</goal>
-                  </goals>
-               </execution>
-            </executions>
-            <configuration>
-               <transformerFactory>net.sf.saxon.TransformerFactoryImpl</transformerFactory>
-               <transformationSets>
-                  <transformationSet>
-                     <!-- Generates target/generated-sources/xslt/.../HornetQDefaultConfiguration.java
-                          using this XSLT `./src/main/resources/hqDefaults.xsl`. -->
-                     <dir>../activemq-server/src/main/resources/schema</dir>
-                     <outputDir>${project.build.directory}/generated-sources/xslt</outputDir>
-                     <stylesheet>./src/main/resources/hqDefaults.xsl</stylesheet>
-                     <includes>
-                        <include>hornetq-configuration.xsd</include>
-                     </includes>
-                     <fileMappers>
-                        <fileMapper implementation="org.codehaus.plexus.components.io.filemappers.MergeFileMapper">
-                           <targetName>./org/apache/activemq/api/config/HornetQDefaultConfiguration.java</targetName>
-                        </fileMapper>
-                     </fileMappers>
-                  </transformationSet>
-               </transformationSets>
-            </configuration>
-            <dependencies>
-               <dependency>
-                  <groupId>net.sf.saxon</groupId>
-                  <artifactId>saxon</artifactId>
-                  <version>8.7</version>
-               </dependency>
-            </dependencies>
-         </plugin>
-         <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-jar-plugin</artifactId>
             <executions>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-core-client/src/main/java/org/apache/activemq/api/config/ActiveMQDefaultConfiguration.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/config/ActiveMQDefaultConfiguration.java b/activemq-core-client/src/main/java/org/apache/activemq/api/config/ActiveMQDefaultConfiguration.java
new file mode 100644
index 0000000..59aa7a5
--- /dev/null
+++ b/activemq-core-client/src/main/java/org/apache/activemq/api/config/ActiveMQDefaultConfiguration.java
@@ -0,0 +1,1125 @@
+/*
+ * Copyright 2005-2014 Red Hat, Inc.
+ * Red Hat licenses this file to you under the Apache License, version
+ * 2.0 (the "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ * implied.  See the License for the specific language governing
+ * permissions and limitations under the License.
+ */
+package org.apache.activemq.api.config;
+
+import org.apache.activemq.api.core.SimpleString;
+import org.apache.activemq.core.journal.impl.JournalConstants;
+
+/**
+ * Default values of ActiveMQ configuration parameters.
+ */
+public final class ActiveMQDefaultConfiguration
+{
+   /*
+    * <p> In order to avoid compile time in-lining of constants, all access is done through methods
+    * and all fields are PRIVATE STATIC but not FINAL. This is done following the recommendation at
+    * <a href="http://docs.oracle.com/javase/specs/jls/se7/html/jls-13.html#jls-13.4.9">13.4.9.
+    * final Fields and Constants</a>
+    * @see http://docs.oracle.com/javase/specs/jls/se7/html/jls-13.html#jls-13.4.9
+    */
+
+   private ActiveMQDefaultConfiguration()
+   {
+      // Utility class
+   }
+
+   public static long getDefaultClientFailureCheckPeriod()
+   {
+      return DEFAULT_CLIENT_FAILURE_CHECK_PERIOD;
+   }
+
+   public static long getDefaultFileDeployerScanPeriod()
+   {
+      return DEFAULT_FILE_DEPLOYER_SCAN_PERIOD;
+   }
+
+   public static int getDefaultJournalMaxIoAio()
+   {
+      return DEFAULT_JOURNAL_MAX_IO_AIO;
+   }
+
+   public static int getDefaultJournalBufferTimeoutAio()
+   {
+      return DEFAULT_JOURNAL_BUFFER_TIMEOUT_AIO;
+   }
+
+   public static int getDefaultJournalBufferSizeAio()
+   {
+      return DEFAULT_JOURNAL_BUFFER_SIZE_AIO;
+   }
+
+   public static int getDefaultJournalMaxIoNio()
+   {
+      return DEFAULT_JOURNAL_MAX_IO_NIO;
+   }
+
+   public static int getDefaultJournalBufferTimeoutNio()
+   {
+      return DEFAULT_JOURNAL_BUFFER_TIMEOUT_NIO;
+   }
+
+   public static int getDefaultJournalBufferSizeNio()
+   {
+      return DEFAULT_JOURNAL_BUFFER_SIZE_NIO;
+   }
+
+   public static String getPropMaskPassword()
+   {
+      return PROP_MASK_PASSWORD;
+   }
+
+   public static String getPropPasswordCodec()
+   {
+      return PROP_PASSWORD_CODEC;
+   }
+
+   /**
+    * what kind of HA Policy should we use
+    */
+   public static String getDefaultHapolicyType()
+   {
+      return DEFAULT_HAPOLICY_TYPE;
+   }
+
+   /**
+    * The backup strategy to use if we are a backup or for any colocated backups.
+    */
+   public static String getDefaultHapolicyBackupStrategy()
+   {
+      return DEFAULT_HAPOLICY_BACKUP_STRATEGY;
+   }
+
+   //shared by client and core/server
+   // XXX not on schema?
+   private static long DEFAULT_CLIENT_FAILURE_CHECK_PERIOD = 30000;
+
+   // XXX not on schema?
+   private static long DEFAULT_FILE_DEPLOYER_SCAN_PERIOD = 5000;
+
+   // These defaults are applied depending on whether the journal type
+   // is NIO or AIO.
+   private static int DEFAULT_JOURNAL_MAX_IO_AIO = 500;
+   private static int DEFAULT_JOURNAL_BUFFER_TIMEOUT_AIO = JournalConstants.DEFAULT_JOURNAL_BUFFER_TIMEOUT_AIO;
+   private static int DEFAULT_JOURNAL_BUFFER_SIZE_AIO = JournalConstants.DEFAULT_JOURNAL_BUFFER_SIZE_AIO;
+   private static int DEFAULT_JOURNAL_MAX_IO_NIO = 1;
+   private static int DEFAULT_JOURNAL_BUFFER_TIMEOUT_NIO = JournalConstants.DEFAULT_JOURNAL_BUFFER_TIMEOUT_NIO;
+   private static int DEFAULT_JOURNAL_BUFFER_SIZE_NIO = JournalConstants.DEFAULT_JOURNAL_BUFFER_SIZE_NIO;
+
+   // XXX not on schema.
+   //properties passed to acceptor/connectors.
+   private static String PROP_MASK_PASSWORD = "activemq.usemaskedpassword";
+   private static String PROP_PASSWORD_CODEC = "activemq.passwordcodec";
+
+
+   // what kind of HA Policy should we use
+   private static String DEFAULT_HAPOLICY_TYPE = "NONE";
+
+   // The backup strategy to use if we are a backup or for any colocated backups.
+   private static String DEFAULT_HAPOLICY_BACKUP_STRATEGY = "FULL";
+
+   // -------------------------------------------------------------------
+   // Following fields are generated from the activemq-schema.xsd annotations
+   // -------------------------------------------------------------------
+
+   // If true then the ActiveMQ Server will make use of any Protocol Managers that are in available on the classpath. If false then only the core protocol will be available, unless in Embedded mode where users can inject their own Protocol Managers.
+   private static boolean DEFAULT_RESOLVE_PROTOCOLS = true;
+
+   // true means that the server will load configuration from the configuration files
+   private static boolean DEFAULT_FILE_DEPLOYMENT_ENABLED = false;
+
+   // true means that the server will use the file based journal for persistence.
+   private static boolean DEFAULT_PERSISTENCE_ENABLED = true;
+
+   // Maximum number of threads to use for the scheduled thread pool
+   private static int DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE = 5;
+
+   // Maximum number of threads to use for the thread pool. -1 means 'no limits'.
+   private static int DEFAULT_THREAD_POOL_MAX_SIZE = 30;
+
+   // true means that security is enabled
+   private static boolean DEFAULT_SECURITY_ENABLED = true;
+
+   // how long (in ms) to wait before invalidating the security cache
+   private static long DEFAULT_SECURITY_INVALIDATION_INTERVAL = 10000;
+
+   // how long (in ms) to wait to acquire a file lock on the journal
+   private static long DEFAULT_JOURNAL_LOCK_ACQUISITION_TIMEOUT = -1;
+
+   // true means that the server supports wild card routing
+   private static boolean DEFAULT_WILDCARD_ROUTING_ENABLED = true;
+
+   // the name of the management address to send management messages to. It is prefixed with "jms.queue" so that JMS clients can send messages to it.
+   private static SimpleString DEFAULT_MANAGEMENT_ADDRESS = new SimpleString("jms.queue.activemq.management");
+
+   // the name of the address that consumers bind to receive management notifications
+   private static SimpleString DEFAULT_MANAGEMENT_NOTIFICATION_ADDRESS = new SimpleString("activemq.notifications");
+
+   // Cluster username. It applies to all cluster configurations.
+   private static String DEFAULT_CLUSTER_USER = "ACTIVEMQ.CLUSTER.ADMIN.USER";
+
+   // Cluster password. It applies to all cluster configurations.
+   private static String DEFAULT_CLUSTER_PASSWORD = "CHANGE ME!!";
+
+   // This option controls whether passwords in server configuration need be masked. If set to "true" the passwords are masked.
+   private static boolean DEFAULT_MASK_PASSWORD = false;
+
+   // true means that the management API is available via JMX
+   private static boolean DEFAULT_JMX_MANAGEMENT_ENABLED = true;
+
+   // the JMX domain used to registered ActiveMQ MBeans in the MBeanServer
+   private static String DEFAULT_JMX_DOMAIN = "org.apache.activemq";
+
+   // true means that message counters are enabled
+   private static boolean DEFAULT_MESSAGE_COUNTER_ENABLED = false;
+
+   // the sample period (in ms) to use for message counters
+   private static long DEFAULT_MESSAGE_COUNTER_SAMPLE_PERIOD = 10000;
+
+   // how many days to keep message counter history
+   private static int DEFAULT_MESSAGE_COUNTER_MAX_DAY_HISTORY = 10;
+
+   // if set, this will override how long (in ms) to keep a connection alive without receiving a ping. -1 disables this setting.
+   private static long DEFAULT_CONNECTION_TTL_OVERRIDE = -1;
+
+   // should certain incoming packets on the server be handed off to a thread from the thread pool for processing or should they be handled on the remoting thread?
+   private static boolean DEFAULT_ASYNC_CONNECTION_EXECUTION_ENABLED = true;
+
+   // how long (in ms) before a transaction can be removed from the resource manager after create time
+   private static long DEFAULT_TRANSACTION_TIMEOUT = 300000;
+
+   // how often (in ms) to scan for timeout transactions
+   private static long DEFAULT_TRANSACTION_TIMEOUT_SCAN_PERIOD = 1000;
+
+   // how often (in ms) to scan for expired messages
+   private static long DEFAULT_MESSAGE_EXPIRY_SCAN_PERIOD = 30000;
+
+   // the priority of the thread expiring messages
+   private static int DEFAULT_MESSAGE_EXPIRY_THREAD_PRIORITY = 3;
+
+   // the size of the cache for pre-creating message ID's
+   private static int DEFAULT_ID_CACHE_SIZE = 20000;
+
+   // true means that ID's are persisted to the journal
+   private static boolean DEFAULT_PERSIST_ID_CACHE = true;
+
+   // DEPRECATED. This option is deprecated, but it will still be honored if <ha-policy> is not also used. It indicates whether this server is a backup server
+   private static boolean DEFAULT_BACKUP = false;
+
+   // DEPRECATED. This option is deprecated, but it will still be honored if <ha-policy> is not also used. 'shared-store' applies to live and backup pairs, and it indicates if the live/backup pair share storage or if the data is replicated among them.
+   private static boolean DEFAULT_SHARED_STORE = false;
+
+   // True means that the delivery count is persisted before delivery. False means that this only happens after a message has been cancelled.
+   private static boolean DEFAULT_PERSIST_DELIVERY_COUNT_BEFORE_DELIVERY = false;
+
+   // the directory to store paged messages in
+   private static String DEFAULT_PAGING_DIR = "data/paging";
+
+   // the directory to store the persisted bindings to
+   private static String DEFAULT_BINDINGS_DIRECTORY = "data/bindings";
+
+   // true means that the server will create the bindings directory on start up
+   private static boolean DEFAULT_CREATE_BINDINGS_DIR = true;
+
+   // The max number of concurrent reads allowed on paging
+   private static int DEFAULT_MAX_CONCURRENT_PAGE_IO = 5;
+
+   // the directory to store the journal files in
+   private static String DEFAULT_JOURNAL_DIR = "data/journal";
+
+   // true means that the journal directory will be created
+   private static boolean DEFAULT_CREATE_JOURNAL_DIR = true;
+
+   // if true wait for transaction data to be synchronized to the journal before returning response to client
+   private static boolean DEFAULT_JOURNAL_SYNC_TRANSACTIONAL = true;
+
+   // if true wait for non transaction data to be synced to the journal before returning response to client.
+   private static boolean DEFAULT_JOURNAL_SYNC_NON_TRANSACTIONAL = true;
+
+   // Whether to log messages about the journal write rate
+   private static boolean DEFAULT_JOURNAL_LOG_WRITE_RATE = false;
+
+   // the size (in bytes) of each journal file
+   private static int DEFAULT_JOURNAL_FILE_SIZE = 10485760;
+
+   // how many journal files to pre-create
+   private static int DEFAULT_JOURNAL_MIN_FILES = 2;
+
+   // The percentage of live data on which we consider compacting the journal
+   private static int DEFAULT_JOURNAL_COMPACT_PERCENTAGE = 30;
+
+   // The minimal number of data files before we can start compacting
+   private static int DEFAULT_JOURNAL_COMPACT_MIN_FILES = 10;
+
+   // XXX Only meant to be used by project developers
+   private static int DEFAULT_JOURNAL_PERF_BLAST_PAGES = -1;
+
+   // XXX Only meant to be used by project developers
+   private static boolean DEFAULT_RUN_SYNC_SPEED_TEST = false;
+
+   // Interval to log server specific information (e.g. memory usage etc)
+   private static long DEFAULT_SERVER_DUMP_INTERVAL = -1;
+
+   // Percentage of available memory which will trigger a warning log
+   private static int DEFAULT_MEMORY_WARNING_THRESHOLD = 25;
+
+   // frequency to sample JVM memory in ms (or -1 to disable memory sampling)
+   private static long DEFAULT_MEMORY_MEASURE_INTERVAL = -1;
+
+   // the directory to store large messages
+   private static String DEFAULT_LARGE_MESSAGES_DIR = "data/largemessages";
+
+   // period in milliseconds between consecutive broadcasts
+   private static long DEFAULT_BROADCAST_PERIOD = 2000;
+
+   // Period the discovery group waits after receiving the last broadcast from a particular server before removing that servers connector pair entry from its list.
+   private static int DEFAULT_BROADCAST_REFRESH_TIMEOUT = 10000;
+
+   // how long to keep a connection alive in the absence of any data arriving from the client. This should be greater than the ping period.
+   private static long DEFAULT_CONNECTION_TTL = 60000;
+
+   // multiplier to apply to successive retry intervals
+   private static double DEFAULT_RETRY_INTERVAL_MULTIPLIER = 1;
+
+   // Limit to the retry-interval growth (due to retry-interval-multiplier)
+   private static long DEFAULT_MAX_RETRY_INTERVAL = 2000;
+
+   // maximum number of initial connection attempts, -1 means 'no limits'
+   private static int DEFAULT_BRIDGE_INITIAL_CONNECT_ATTEMPTS = -1;
+
+   // maximum number of retry attempts, -1 means 'no limits'
+   private static int DEFAULT_BRIDGE_RECONNECT_ATTEMPTS = -1;
+
+   // should duplicate detection headers be inserted in forwarded messages?
+   private static boolean DEFAULT_BRIDGE_DUPLICATE_DETECTION = true;
+
+   // Once the bridge has received this many bytes, it sends a confirmation
+   private static int DEFAULT_BRIDGE_CONFIRMATION_WINDOW_SIZE = 1048576;
+
+   // Upon reconnection this configures the number of time the same node on the topology will be retried before reseting the server locator and using the initial connectors
+   private static int DEFAULT_BRIDGE_CONNECT_SAME_NODE = 10;
+
+   // The period (in milliseconds) used to check if the cluster connection has failed to receive pings from another server
+   private static long DEFAULT_CLUSTER_FAILURE_CHECK_PERIOD = 30000;
+
+   // how long to keep a connection alive in the absence of any data arriving from the client
+   private static long DEFAULT_CLUSTER_CONNECTION_TTL = 60000;
+
+   // How long to wait for a reply
+   private static long DEFAULT_CLUSTER_CALL_TIMEOUT = 30000;
+
+   // period (in ms) between successive retries
+   private static long DEFAULT_CLUSTER_RETRY_INTERVAL = 500;
+
+   // multiplier to apply to the retry-interval
+   private static double DEFAULT_CLUSTER_RETRY_INTERVAL_MULTIPLIER = 1;
+
+   // Maximum value for retry-interval
+   private static long DEFAULT_CLUSTER_MAX_RETRY_INTERVAL = 2000;
+
+   // How many attempts should be made to connect initially
+   private static int DEFAULT_CLUSTER_INITIAL_CONNECT_ATTEMPTS = -1;
+
+   // How many attempts should be made to reconnect after failure
+   private static int DEFAULT_CLUSTER_RECONNECT_ATTEMPTS = -1;
+
+   // should duplicate detection headers be inserted in forwarded messages?
+   private static boolean DEFAULT_CLUSTER_DUPLICATE_DETECTION = true;
+
+   // should messages be load balanced if there are no matching consumers on target?
+   private static boolean DEFAULT_CLUSTER_FORWARD_WHEN_NO_CONSUMERS = false;
+
+   // maximum number of hops cluster topology is propagated
+   private static int DEFAULT_CLUSTER_MAX_HOPS = 1;
+
+   // The size (in bytes) of the window used for confirming data from the server connected to.
+   private static int DEFAULT_CLUSTER_CONFIRMATION_WINDOW_SIZE = 1048576;
+
+   // How long to wait for a reply if in the middle of a fail-over. -1 means wait forever.
+   private static long DEFAULT_CLUSTER_CALL_FAILOVER_TIMEOUT = -1;
+
+   // how often the cluster connection will notify the cluster of its existence right after joining the cluster
+   private static long DEFAULT_CLUSTER_NOTIFICATION_INTERVAL = 1000;
+
+   // how many times this cluster connection will notify the cluster of its existence right after joining the cluster
+   private static int DEFAULT_CLUSTER_NOTIFICATION_ATTEMPTS = 2;
+
+   // whether this is an exclusive divert
+   private static boolean DEFAULT_DIVERT_EXCLUSIVE = false;
+
+   // If true then the server will request a backup on another node
+   private static boolean DEFAULT_HAPOLICY_REQUEST_BACKUP = false;
+
+   // How many times the live server will try to request a backup, -1 means for ever.
+   private static int DEFAULT_HAPOLICY_BACKUP_REQUEST_RETRIES = -1;
+
+   // How long to wait for retries between attempts to request a backup server.
+   private static long DEFAULT_HAPOLICY_BACKUP_REQUEST_RETRY_INTERVAL = 5000;
+
+   // Whether or not this live server will accept backup requests from other live servers.
+   private static int DEFAULT_HAPOLICY_MAX_BACKUPS = 1;
+
+   // The offset to use for the Connectors and Acceptors when creating a new backup server.
+   private static int DEFAULT_HAPOLICY_BACKUP_PORT_OFFSET = 100;
+
+   // Whether to check the cluster for a (live) server using our own server ID when starting up. This option is only necessary for performing 'fail-back' on replicating servers. Strictly speaking this setting only applies to live servers and not to backups.
+   private static boolean DEFAULT_CHECK_FOR_LIVE_SERVER = false;
+
+   // This specifies how many times a replicated backup server can restart after moving its files on start. Once there are this number of backup journal files the server will stop permanently after if fails back.
+   private static int DEFAULT_MAX_SAVED_REPLICATED_JOURNALS_SIZE = 2;
+
+   // Will this server, if a backup, restart once it has been stopped because of failback or scaling down.
+   private static boolean DEFAULT_RESTART_BACKUP = false;
+
+   // Whether a server will automatically stop when a another places a request to take over its place. The use case is when a regular server stops and its backup takes over its duties, later the main server restarts and requests the server (the former backup) to stop operating.
+   private static boolean DEFAULT_ALLOW_AUTO_FAILBACK = true;
+
+   // if we have to start as a replicated server this is the delay to wait before fail-back occurs
+   private static long DEFAULT_FAILBACK_DELAY = 5000;
+
+   // Will this backup server come live on a normal server shutdown
+   private static boolean DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN = false;
+
+   // its possible that you only want a server to partake in scale down as a receiver, via a group. In this case set scale-down to false
+   private static boolean DEFAULT_SCALE_DOWN_ENABLED = true;
+
+   // How long to wait for a decision
+   private static int DEFAULT_GROUPING_HANDLER_TIMEOUT = 5000;
+
+   // How long a group binding will be used, -1 means for ever. Bindings are removed after this wait elapses. On the remote node this is used to determine how often you should re-query the main coordinator in order to update the last time used accordingly.
+   private static int DEFAULT_GROUPING_HANDLER_GROUP_TIMEOUT = -1;
+
+   // How often the reaper will be run to check for timed out group bindings. Only valid for LOCAL handlers
+   private static long DEFAULT_GROUPING_HANDLER_REAPER_PERIOD = 30000;
+
+
+   /**
+    * If true then the ActiveMQ Server will make use of any Protocol Managers that are in available on the classpath. If false then only the core protocol will be available, unless in Embedded mode where users can inject their own Protocol Managers.
+    */
+   public static boolean isDefaultResolveProtocols()
+   {
+      return DEFAULT_RESOLVE_PROTOCOLS;
+   }
+
+   /**
+    * true means that the server will load configuration from the configuration files
+    */
+   public static boolean isDefaultFileDeploymentEnabled()
+   {
+      return DEFAULT_FILE_DEPLOYMENT_ENABLED;
+   }
+
+   /**
+    * true means that the server will use the file based journal for persistence.
+    */
+   public static boolean isDefaultPersistenceEnabled()
+   {
+      return DEFAULT_PERSISTENCE_ENABLED;
+   }
+
+   /**
+    * Maximum number of threads to use for the scheduled thread pool
+    */
+   public static int getDefaultScheduledThreadPoolMaxSize()
+   {
+      return DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE;
+   }
+
+   /**
+    * Maximum number of threads to use for the thread pool. -1 means 'no limits'.
+    */
+   public static int getDefaultThreadPoolMaxSize()
+   {
+      return DEFAULT_THREAD_POOL_MAX_SIZE;
+   }
+
+   /**
+    * true means that security is enabled
+    */
+   public static boolean isDefaultSecurityEnabled()
+   {
+      return DEFAULT_SECURITY_ENABLED;
+   }
+
+   /**
+    * how long (in ms) to wait before invalidating the security cache
+    */
+   public static long getDefaultSecurityInvalidationInterval()
+   {
+      return DEFAULT_SECURITY_INVALIDATION_INTERVAL;
+   }
+
+   /**
+    * how long (in ms) to wait to acquire a file lock on the journal
+    */
+   public static long getDefaultJournalLockAcquisitionTimeout()
+   {
+      return DEFAULT_JOURNAL_LOCK_ACQUISITION_TIMEOUT;
+   }
+
+   /**
+    * true means that the server supports wild card routing
+    */
+   public static boolean isDefaultWildcardRoutingEnabled()
+   {
+      return DEFAULT_WILDCARD_ROUTING_ENABLED;
+   }
+
+   /**
+    * the name of the management address to send management messages to. It is prefixed with "jms.queue" so that JMS clients can send messages to it.
+    */
+   public static SimpleString getDefaultManagementAddress()
+   {
+      return DEFAULT_MANAGEMENT_ADDRESS;
+   }
+
+   /**
+    * the name of the address that consumers bind to receive management notifications
+    */
+   public static SimpleString getDefaultManagementNotificationAddress()
+   {
+      return DEFAULT_MANAGEMENT_NOTIFICATION_ADDRESS;
+   }
+
+   /**
+    * Cluster username. It applies to all cluster configurations.
+    */
+   public static String getDefaultClusterUser()
+   {
+      return DEFAULT_CLUSTER_USER;
+   }
+
+   /**
+    * Cluster password. It applies to all cluster configurations.
+    */
+   public static String getDefaultClusterPassword()
+   {
+      return DEFAULT_CLUSTER_PASSWORD;
+   }
+
+   /**
+    * This option controls whether passwords in server configuration need be masked. If set to "true" the passwords are masked.
+    */
+   public static boolean isDefaultMaskPassword()
+   {
+      return DEFAULT_MASK_PASSWORD;
+   }
+
+   /**
+    * true means that the management API is available via JMX
+    */
+   public static boolean isDefaultJmxManagementEnabled()
+   {
+      return DEFAULT_JMX_MANAGEMENT_ENABLED;
+   }
+
+   /**
+    * the JMX domain used to registered ActiveMQ MBeans in the MBeanServer
+    */
+   public static String getDefaultJmxDomain()
+   {
+      return DEFAULT_JMX_DOMAIN;
+   }
+
+   /**
+    * true means that message counters are enabled
+    */
+   public static boolean isDefaultMessageCounterEnabled()
+   {
+      return DEFAULT_MESSAGE_COUNTER_ENABLED;
+   }
+
+   /**
+    * the sample period (in ms) to use for message counters
+    */
+   public static long getDefaultMessageCounterSamplePeriod()
+   {
+      return DEFAULT_MESSAGE_COUNTER_SAMPLE_PERIOD;
+   }
+
+   /**
+    * how many days to keep message counter history
+    */
+   public static int getDefaultMessageCounterMaxDayHistory()
+   {
+      return DEFAULT_MESSAGE_COUNTER_MAX_DAY_HISTORY;
+   }
+
+   /**
+    * if set, this will override how long (in ms) to keep a connection alive without receiving a ping. -1 disables this setting.
+    */
+   public static long getDefaultConnectionTtlOverride()
+   {
+      return DEFAULT_CONNECTION_TTL_OVERRIDE;
+   }
+
+   /**
+    * should certain incoming packets on the server be handed off to a thread from the thread pool for processing or should they be handled on the remoting thread?
+    */
+   public static boolean isDefaultAsyncConnectionExecutionEnabled()
+   {
+      return DEFAULT_ASYNC_CONNECTION_EXECUTION_ENABLED;
+   }
+
+   /**
+    * how long (in ms) before a transaction can be removed from the resource manager after create time
+    */
+   public static long getDefaultTransactionTimeout()
+   {
+      return DEFAULT_TRANSACTION_TIMEOUT;
+   }
+
+   /**
+    * how often (in ms) to scan for timeout transactions
+    */
+   public static long getDefaultTransactionTimeoutScanPeriod()
+   {
+      return DEFAULT_TRANSACTION_TIMEOUT_SCAN_PERIOD;
+   }
+
+   /**
+    * how often (in ms) to scan for expired messages
+    */
+   public static long getDefaultMessageExpiryScanPeriod()
+   {
+      return DEFAULT_MESSAGE_EXPIRY_SCAN_PERIOD;
+   }
+
+   /**
+    * the priority of the thread expiring messages
+    */
+   public static int getDefaultMessageExpiryThreadPriority()
+   {
+      return DEFAULT_MESSAGE_EXPIRY_THREAD_PRIORITY;
+   }
+
+   /**
+    * the size of the cache for pre-creating message ID's
+    */
+   public static int getDefaultIdCacheSize()
+   {
+      return DEFAULT_ID_CACHE_SIZE;
+   }
+
+   /**
+    * true means that ID's are persisted to the journal
+    */
+   public static boolean isDefaultPersistIdCache()
+   {
+      return DEFAULT_PERSIST_ID_CACHE;
+   }
+
+   /**
+    * DEPRECATED. This option is deprecated, but it will still be honored if <ha-policy> is not also used. It indicates whether this server is a backup server
+    */
+   public static boolean isDefaultBackup()
+   {
+      return DEFAULT_BACKUP;
+   }
+
+   /**
+    * DEPRECATED. This option is deprecated, but it will still be honored if <ha-policy> is not also used. 'shared-store' applies to live and backup pairs, and it indicates if the live/backup pair share storage or if the data is replicated among them.
+    */
+   public static boolean isDefaultSharedStore()
+   {
+      return DEFAULT_SHARED_STORE;
+   }
+
+   /**
+    * True means that the delivery count is persisted before delivery. False means that this only happens after a message has been cancelled.
+    */
+   public static boolean isDefaultPersistDeliveryCountBeforeDelivery()
+   {
+      return DEFAULT_PERSIST_DELIVERY_COUNT_BEFORE_DELIVERY;
+   }
+
+   /**
+    * the directory to store paged messages in
+    */
+   public static String getDefaultPagingDir()
+   {
+      return DEFAULT_PAGING_DIR;
+   }
+
+   /**
+    * the directory to store the persisted bindings to
+    */
+   public static String getDefaultBindingsDirectory()
+   {
+      return DEFAULT_BINDINGS_DIRECTORY;
+   }
+
+   /**
+    * true means that the server will create the bindings directory on start up
+    */
+   public static boolean isDefaultCreateBindingsDir()
+   {
+      return DEFAULT_CREATE_BINDINGS_DIR;
+   }
+
+   /**
+    * The max number of concurrent reads allowed on paging
+    */
+   public static int getDefaultMaxConcurrentPageIo()
+   {
+      return DEFAULT_MAX_CONCURRENT_PAGE_IO;
+   }
+
+   /**
+    * the directory to store the journal files in
+    */
+   public static String getDefaultJournalDir()
+   {
+      return DEFAULT_JOURNAL_DIR;
+   }
+
+   /**
+    * true means that the journal directory will be created
+    */
+   public static boolean isDefaultCreateJournalDir()
+   {
+      return DEFAULT_CREATE_JOURNAL_DIR;
+   }
+
+   /**
+    * if true wait for transaction data to be synchronized to the journal before returning response to client
+    */
+   public static boolean isDefaultJournalSyncTransactional()
+   {
+      return DEFAULT_JOURNAL_SYNC_TRANSACTIONAL;
+   }
+
+   /**
+    * if true wait for non transaction data to be synced to the journal before returning response to client.
+    */
+   public static boolean isDefaultJournalSyncNonTransactional()
+   {
+      return DEFAULT_JOURNAL_SYNC_NON_TRANSACTIONAL;
+   }
+
+   /**
+    * Whether to log messages about the journal write rate
+    */
+   public static boolean isDefaultJournalLogWriteRate()
+   {
+      return DEFAULT_JOURNAL_LOG_WRITE_RATE;
+   }
+
+   /**
+    * the size (in bytes) of each journal file
+    */
+   public static int getDefaultJournalFileSize()
+   {
+      return DEFAULT_JOURNAL_FILE_SIZE;
+   }
+
+   /**
+    * how many journal files to pre-create
+    */
+   public static int getDefaultJournalMinFiles()
+   {
+      return DEFAULT_JOURNAL_MIN_FILES;
+   }
+
+   /**
+    * The percentage of live data on which we consider compacting the journal
+    */
+   public static int getDefaultJournalCompactPercentage()
+   {
+      return DEFAULT_JOURNAL_COMPACT_PERCENTAGE;
+   }
+
+   /**
+    * The minimal number of data files before we can start compacting
+    */
+   public static int getDefaultJournalCompactMinFiles()
+   {
+      return DEFAULT_JOURNAL_COMPACT_MIN_FILES;
+   }
+
+   /**
+    * XXX Only meant to be used by project developers
+    */
+   public static int getDefaultJournalPerfBlastPages()
+   {
+      return DEFAULT_JOURNAL_PERF_BLAST_PAGES;
+   }
+
+   /**
+    * XXX Only meant to be used by project developers
+    */
+   public static boolean isDefaultRunSyncSpeedTest()
+   {
+      return DEFAULT_RUN_SYNC_SPEED_TEST;
+   }
+
+   /**
+    * Interval to log server specific information (e.g. memory usage etc)
+    */
+   public static long getDefaultServerDumpInterval()
+   {
+      return DEFAULT_SERVER_DUMP_INTERVAL;
+   }
+
+   /**
+    * Percentage of available memory which will trigger a warning log
+    */
+   public static int getDefaultMemoryWarningThreshold()
+   {
+      return DEFAULT_MEMORY_WARNING_THRESHOLD;
+   }
+
+   /**
+    * frequency to sample JVM memory in ms (or -1 to disable memory sampling)
+    */
+   public static long getDefaultMemoryMeasureInterval()
+   {
+      return DEFAULT_MEMORY_MEASURE_INTERVAL;
+   }
+
+   /**
+    * the directory to store large messages
+    */
+   public static String getDefaultLargeMessagesDir()
+   {
+      return DEFAULT_LARGE_MESSAGES_DIR;
+   }
+
+   /**
+    * period in milliseconds between consecutive broadcasts
+    */
+   public static long getDefaultBroadcastPeriod()
+   {
+      return DEFAULT_BROADCAST_PERIOD;
+   }
+
+   /**
+    * Period the discovery group waits after receiving the last broadcast from a particular server before removing that servers connector pair entry from its list.
+    */
+   public static int getDefaultBroadcastRefreshTimeout()
+   {
+      return DEFAULT_BROADCAST_REFRESH_TIMEOUT;
+   }
+
+   /**
+    * how long to keep a connection alive in the absence of any data arriving from the client. This should be greater than the ping period.
+    */
+   public static long getDefaultConnectionTtl()
+   {
+      return DEFAULT_CONNECTION_TTL;
+   }
+
+   /**
+    * multiplier to apply to successive retry intervals
+    */
+   public static double getDefaultRetryIntervalMultiplier()
+   {
+      return DEFAULT_RETRY_INTERVAL_MULTIPLIER;
+   }
+
+   /**
+    * Limit to the retry-interval growth (due to retry-interval-multiplier)
+    */
+   public static long getDefaultMaxRetryInterval()
+   {
+      return DEFAULT_MAX_RETRY_INTERVAL;
+   }
+
+   /**
+    * maximum number of initial connection attempts, -1 means 'no limits'
+    */
+   public static int getDefaultBridgeInitialConnectAttempts()
+   {
+      return DEFAULT_BRIDGE_INITIAL_CONNECT_ATTEMPTS;
+   }
+
+   /**
+    * maximum number of retry attempts, -1 means 'no limits'
+    */
+   public static int getDefaultBridgeReconnectAttempts()
+   {
+      return DEFAULT_BRIDGE_RECONNECT_ATTEMPTS;
+   }
+
+   /**
+    * should duplicate detection headers be inserted in forwarded messages?
+    */
+   public static boolean isDefaultBridgeDuplicateDetection()
+   {
+      return DEFAULT_BRIDGE_DUPLICATE_DETECTION;
+   }
+
+   /**
+    * Once the bridge has received this many bytes, it sends a confirmation
+    */
+   public static int getDefaultBridgeConfirmationWindowSize()
+   {
+      return DEFAULT_BRIDGE_CONFIRMATION_WINDOW_SIZE;
+   }
+
+   /**
+    * Upon reconnection this configures the number of time the same node on the topology will be retried before reseting the server locator and using the initial connectors
+    */
+   public static int getDefaultBridgeConnectSameNode()
+   {
+      return DEFAULT_BRIDGE_CONNECT_SAME_NODE;
+   }
+
+   /**
+    * The period (in milliseconds) used to check if the cluster connection has failed to receive pings from another server
+    */
+   public static long getDefaultClusterFailureCheckPeriod()
+   {
+      return DEFAULT_CLUSTER_FAILURE_CHECK_PERIOD;
+   }
+
+   /**
+    * how long to keep a connection alive in the absence of any data arriving from the client
+    */
+   public static long getDefaultClusterConnectionTtl()
+   {
+      return DEFAULT_CLUSTER_CONNECTION_TTL;
+   }
+
+   /**
+    * How long to wait for a reply
+    */
+   public static long getDefaultClusterCallTimeout()
+   {
+      return DEFAULT_CLUSTER_CALL_TIMEOUT;
+   }
+
+   /**
+    * period (in ms) between successive retries
+    */
+   public static long getDefaultClusterRetryInterval()
+   {
+      return DEFAULT_CLUSTER_RETRY_INTERVAL;
+   }
+
+   /**
+    * multiplier to apply to the retry-interval
+    */
+   public static double getDefaultClusterRetryIntervalMultiplier()
+   {
+      return DEFAULT_CLUSTER_RETRY_INTERVAL_MULTIPLIER;
+   }
+
+   /**
+    * Maximum value for retry-interval
+    */
+   public static long getDefaultClusterMaxRetryInterval()
+   {
+      return DEFAULT_CLUSTER_MAX_RETRY_INTERVAL;
+   }
+
+   /**
+    * How many attempts should be made to connect initially
+    */
+   public static int getDefaultClusterInitialConnectAttempts()
+   {
+      return DEFAULT_CLUSTER_INITIAL_CONNECT_ATTEMPTS;
+   }
+
+   /**
+    * How many attempts should be made to reconnect after failure
+    */
+   public static int getDefaultClusterReconnectAttempts()
+   {
+      return DEFAULT_CLUSTER_RECONNECT_ATTEMPTS;
+   }
+
+   /**
+    * should duplicate detection headers be inserted in forwarded messages?
+    */
+   public static boolean isDefaultClusterDuplicateDetection()
+   {
+      return DEFAULT_CLUSTER_DUPLICATE_DETECTION;
+   }
+
+   /**
+    * should messages be load balanced if there are no matching consumers on target?
+    */
+   public static boolean isDefaultClusterForwardWhenNoConsumers()
+   {
+      return DEFAULT_CLUSTER_FORWARD_WHEN_NO_CONSUMERS;
+   }
+
+   /**
+    * maximum number of hops cluster topology is propagated
+    */
+   public static int getDefaultClusterMaxHops()
+   {
+      return DEFAULT_CLUSTER_MAX_HOPS;
+   }
+
+   /**
+    * The size (in bytes) of the window used for confirming data from the server connected to.
+    */
+   public static int getDefaultClusterConfirmationWindowSize()
+   {
+      return DEFAULT_CLUSTER_CONFIRMATION_WINDOW_SIZE;
+   }
+
+   /**
+    * How long to wait for a reply if in the middle of a fail-over. -1 means wait forever.
+    */
+   public static long getDefaultClusterCallFailoverTimeout()
+   {
+      return DEFAULT_CLUSTER_CALL_FAILOVER_TIMEOUT;
+   }
+
+   /**
+    * how often the cluster connection will notify the cluster of its existence right after joining the cluster
+    */
+   public static long getDefaultClusterNotificationInterval()
+   {
+      return DEFAULT_CLUSTER_NOTIFICATION_INTERVAL;
+   }
+
+   /**
+    * how many times this cluster connection will notify the cluster of its existence right after joining the cluster
+    */
+   public static int getDefaultClusterNotificationAttempts()
+   {
+      return DEFAULT_CLUSTER_NOTIFICATION_ATTEMPTS;
+   }
+
+   /**
+    * whether this is an exclusive divert
+    */
+   public static boolean isDefaultDivertExclusive()
+   {
+      return DEFAULT_DIVERT_EXCLUSIVE;
+   }
+
+   /**
+    * If true then the server will request a backup on another node
+    */
+   public static boolean isDefaultHapolicyRequestBackup()
+   {
+      return DEFAULT_HAPOLICY_REQUEST_BACKUP;
+   }
+
+   /**
+    * How many times the live server will try to request a backup, -1 means for ever.
+    */
+   public static int getDefaultHapolicyBackupRequestRetries()
+   {
+      return DEFAULT_HAPOLICY_BACKUP_REQUEST_RETRIES;
+   }
+
+   /**
+    * How long to wait for retries between attempts to request a backup server.
+    */
+   public static long getDefaultHapolicyBackupRequestRetryInterval()
+   {
+      return DEFAULT_HAPOLICY_BACKUP_REQUEST_RETRY_INTERVAL;
+   }
+
+   /**
+    * Whether or not this live server will accept backup requests from other live servers.
+    */
+   public static int getDefaultHapolicyMaxBackups()
+   {
+      return DEFAULT_HAPOLICY_MAX_BACKUPS;
+   }
+
+   /**
+    * The offset to use for the Connectors and Acceptors when creating a new backup server.
+    */
+   public static int getDefaultHapolicyBackupPortOffset()
+   {
+      return DEFAULT_HAPOLICY_BACKUP_PORT_OFFSET;
+   }
+
+   /**
+    * Whether to check the cluster for a (live) server using our own server ID when starting up. This option is only necessary for performing 'fail-back' on replicating servers. Strictly speaking this setting only applies to live servers and not to backups.
+    */
+   public static boolean isDefaultCheckForLiveServer()
+   {
+      return DEFAULT_CHECK_FOR_LIVE_SERVER;
+   }
+
+   /**
+    * This specifies how many times a replicated backup server can restart after moving its files on start. Once there are this number of backup journal files the server will stop permanently after if fails back.
+    */
+   public static int getDefaultMaxSavedReplicatedJournalsSize()
+   {
+      return DEFAULT_MAX_SAVED_REPLICATED_JOURNALS_SIZE;
+   }
+
+   /**
+    * Will this server, if a backup, restart once it has been stopped because of failback or scaling down.
+    */
+   public static boolean isDefaultRestartBackup()
+   {
+      return DEFAULT_RESTART_BACKUP;
+   }
+
+   /**
+    * Whether a server will automatically stop when a another places a request to take over its place. The use case is when a regular server stops and its backup takes over its duties, later the main server restarts and requests the server (the former backup) to stop operating.
+    */
+   public static boolean isDefaultAllowAutoFailback()
+   {
+      return DEFAULT_ALLOW_AUTO_FAILBACK;
+   }
+
+   /**
+    * if we have to start as a replicated server this is the delay to wait before fail-back occurs
+    */
+   public static long getDefaultFailbackDelay()
+   {
+      return DEFAULT_FAILBACK_DELAY;
+   }
+
+   /**
+    * Will this backup server come live on a normal server shutdown
+    */
+   public static boolean isDefaultFailoverOnServerShutdown()
+   {
+      return DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN;
+   }
+
+   /**
+    * its possible that you only want a server to partake in scale down as a receiver, via a group. In this case set scale-down to false
+    */
+   public static boolean isDefaultScaleDownEnabled()
+   {
+      return DEFAULT_SCALE_DOWN_ENABLED;
+   }
+
+   /**
+    * How long to wait for a decision
+    */
+   public static int getDefaultGroupingHandlerTimeout()
+   {
+      return DEFAULT_GROUPING_HANDLER_TIMEOUT;
+   }
+
+   /**
+    * How long a group binding will be used, -1 means for ever. Bindings are removed after this wait elapses. On the remote node this is used to determine how often you should re-query the main coordinator in order to update the last time used accordingly.
+    */
+   public static int getDefaultGroupingHandlerGroupTimeout()
+   {
+      return DEFAULT_GROUPING_HANDLER_GROUP_TIMEOUT;
+   }
+
+   /**
+    * How often the reaper will be run to check for timed out group bindings. Only valid for LOCAL handlers
+    */
+   public static long getDefaultGroupingHandlerReaperPeriod()
+   {
+      return DEFAULT_GROUPING_HANDLER_REAPER_PERIOD;
+   }
+
+}

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-core-client/src/main/java/org/apache/activemq/api/core/BroadcastGroupConfiguration.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/BroadcastGroupConfiguration.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/BroadcastGroupConfiguration.java
index 97f4faf..7df97be 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/BroadcastGroupConfiguration.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/BroadcastGroupConfiguration.java
@@ -15,7 +15,7 @@ package org.apache.activemq.api.core;
 import java.io.Serializable;
 import java.util.List;
 
-import org.apache.activemq.api.config.HornetQDefaultConfiguration;
+import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
 
 
 /**
@@ -32,7 +32,7 @@ public final class BroadcastGroupConfiguration implements Serializable
 
    private String name = null;
 
-   private long broadcastPeriod = HornetQDefaultConfiguration.getDefaultBroadcastPeriod();
+   private long broadcastPeriod = ActiveMQDefaultConfiguration.getDefaultBroadcastPeriod();
 
    private BroadcastEndpointFactoryConfiguration endpointFactoryConfiguration = null;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/HornetQClient.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/HornetQClient.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/HornetQClient.java
index edafea2..1eef77f 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/HornetQClient.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/client/HornetQClient.java
@@ -12,7 +12,7 @@
  */
 package org.apache.activemq.api.core.client;
 
-import org.apache.activemq.api.config.HornetQDefaultConfiguration;
+import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
 import org.apache.activemq.api.core.DiscoveryGroupConfiguration;
 import org.apache.activemq.api.core.TransportConfiguration;
 import org.apache.activemq.api.core.client.loadbalance.RoundRobinConnectionLoadBalancingPolicy;
@@ -30,13 +30,13 @@ public final class HornetQClient
 {
    public static final String DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME = RoundRobinConnectionLoadBalancingPolicy.class.getCanonicalName();
 
-   public static final long DEFAULT_CLIENT_FAILURE_CHECK_PERIOD = HornetQDefaultConfiguration.getDefaultClientFailureCheckPeriod();
+   public static final long DEFAULT_CLIENT_FAILURE_CHECK_PERIOD = ActiveMQDefaultConfiguration.getDefaultClientFailureCheckPeriod();
 
    public static final long DEFAULT_CLIENT_FAILURE_CHECK_PERIOD_INVM = -1;
 
    // 1 minute - this should be higher than ping period
 
-   public static final long DEFAULT_CONNECTION_TTL = HornetQDefaultConfiguration.getDefaultConnectionTtl();
+   public static final long DEFAULT_CONNECTION_TTL = ActiveMQDefaultConfiguration.getDefaultConnectionTtl();
 
    public static final long DEFAULT_CONNECTION_TTL_INVM = -1;
 
@@ -80,9 +80,9 @@ public final class HornetQClient
 
    public static final long DEFAULT_RETRY_INTERVAL = 2000;
 
-   public static final double DEFAULT_RETRY_INTERVAL_MULTIPLIER = HornetQDefaultConfiguration.getDefaultRetryIntervalMultiplier();
+   public static final double DEFAULT_RETRY_INTERVAL_MULTIPLIER = ActiveMQDefaultConfiguration.getDefaultRetryIntervalMultiplier();
 
-   public static final long DEFAULT_MAX_RETRY_INTERVAL = HornetQDefaultConfiguration.getDefaultMaxRetryInterval();
+   public static final long DEFAULT_MAX_RETRY_INTERVAL = ActiveMQDefaultConfiguration.getDefaultMaxRetryInterval();
 
    public static final int DEFAULT_RECONNECT_ATTEMPTS = 0;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ObjectNameBuilder.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ObjectNameBuilder.java b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ObjectNameBuilder.java
index 26cca91..0f53d16 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ObjectNameBuilder.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ObjectNameBuilder.java
@@ -14,7 +14,7 @@ package org.apache.activemq.api.core.management;
 
 import javax.management.ObjectName;
 
-import org.apache.activemq.api.config.HornetQDefaultConfiguration;
+import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
 import org.apache.activemq.api.core.SimpleString;
 
 /**
@@ -29,7 +29,7 @@ public final class ObjectNameBuilder
    /**
     * Default JMX domain for HornetQ resources.
     */
-   public static final ObjectNameBuilder DEFAULT = new ObjectNameBuilder(HornetQDefaultConfiguration.getDefaultJmxDomain());
+   public static final ObjectNameBuilder DEFAULT = new ObjectNameBuilder(ActiveMQDefaultConfiguration.getDefaultJmxDomain());
 
    static final String JMS_MODULE = "JMS";
 
@@ -45,7 +45,7 @@ public final class ObjectNameBuilder
    {
       if (domain == null)
       {
-         return new ObjectNameBuilder(HornetQDefaultConfiguration.getDefaultJmxDomain());
+         return new ObjectNameBuilder(ActiveMQDefaultConfiguration.getDefaultJmxDomain());
       }
       else
       {

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyConnector.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyConnector.java b/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyConnector.java
index 76ab107..f6defe9 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyConnector.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyConnector.java
@@ -95,8 +95,8 @@ import io.netty.util.AttributeKey;
 import io.netty.util.ResourceLeakDetector;
 import io.netty.util.concurrent.Future;
 import io.netty.util.concurrent.GlobalEventExecutor;
-import org.apache.activemq.api.config.HornetQDefaultConfiguration;
 import org.apache.activemq.api.core.ActiveMQException;
+import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
 import org.apache.activemq.core.client.HornetQClientLogger;
 import org.apache.activemq.core.client.HornetQClientMessageBundle;
 import org.apache.activemq.core.client.impl.ClientSessionFactoryImpl;
@@ -354,8 +354,8 @@ public class NettyConnector extends AbstractConnector
          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,
@@ -368,8 +368,8 @@ public class NettyConnector extends AbstractConnector
          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-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/TransportConstants.java
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/TransportConstants.java b/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/TransportConstants.java
index c81db4d..172ce8c 100644
--- a/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/TransportConstants.java
+++ b/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/TransportConstants.java
@@ -17,7 +17,7 @@ import java.util.HashSet;
 import java.util.Set;
 
 import io.netty.util.Version;
-import org.apache.activemq.api.config.HornetQDefaultConfiguration;
+import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
 
 /**
  * A TransportConstants
@@ -225,8 +225,8 @@ public class TransportConstants
       allowableAcceptorKeys.add(TransportConstants.STOMP_MIN_LARGE_MESSAGE_SIZE);
       allowableAcceptorKeys.add(TransportConstants.CONNECTION_TTL);
       allowableAcceptorKeys.add(TransportConstants.STOMP_ENABLE_MESSAGE_ID);
-      allowableAcceptorKeys.add(HornetQDefaultConfiguration.getPropMaskPassword());
-      allowableAcceptorKeys.add(HornetQDefaultConfiguration.getPropPasswordCodec());
+      allowableAcceptorKeys.add(ActiveMQDefaultConfiguration.getPropMaskPassword());
+      allowableAcceptorKeys.add(ActiveMQDefaultConfiguration.getPropPasswordCodec());
 
       ALLOWABLE_ACCEPTOR_KEYS = Collections.unmodifiableSet(allowableAcceptorKeys);
 
@@ -259,8 +259,8 @@ public class TransportConstants
       allowableConnectorKeys.add(TransportConstants.TCP_RECEIVEBUFFER_SIZE_PROPNAME);
       allowableConnectorKeys.add(TransportConstants.NIO_REMOTING_THREADS_PROPNAME);
       allowableConnectorKeys.add(TransportConstants.BATCH_DELAY);
-      allowableConnectorKeys.add(HornetQDefaultConfiguration.getPropMaskPassword());
-      allowableConnectorKeys.add(HornetQDefaultConfiguration.getPropPasswordCodec());
+      allowableConnectorKeys.add(ActiveMQDefaultConfiguration.getPropMaskPassword());
+      allowableConnectorKeys.add(ActiveMQDefaultConfiguration.getPropPasswordCodec());
       allowableConnectorKeys.add(TransportConstants.NETTY_CONNECT_TIMEOUT);
 
       ALLOWABLE_CONNECTOR_KEYS = Collections.unmodifiableSet(allowableConnectorKeys);

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-core-client/src/main/resources/HornetQDefaultConfiguration.txt
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/resources/HornetQDefaultConfiguration.txt b/activemq-core-client/src/main/resources/HornetQDefaultConfiguration.txt
deleted file mode 100644
index c31a87e..0000000
--- a/activemq-core-client/src/main/resources/HornetQDefaultConfiguration.txt
+++ /dev/null
@@ -1,116 +0,0 @@
-package org.apache.activemq.api.config;
-
-import org.apache.activemq.api.core.SimpleString;
-import org.apache.activemq.core.journal.impl.JournalConstants;
-
-/**
- * Default values of HornetQ configuration parameters.
- */
-public final class HornetQDefaultConfiguration
-{
-   /*
-    * <p> In order to avoid compile time in-lining of constants, all access is done through methods
-    * and all fields are PRIVATE STATIC but not FINAL. This is done following the recommendation at
-    * <a href="http://docs.oracle.com/javase/specs/jls/se7/html/jls-13.html#jls-13.4.9">13.4.9.
-    * final Fields and Constants</a>
-    * @see http://docs.oracle.com/javase/specs/jls/se7/html/jls-13.html#jls-13.4.9
-    */
-
-   private HornetQDefaultConfiguration()
-   {
-      // Utility class
-   }
-
-   public static long getDefaultClientFailureCheckPeriod()
-   {
-      return DEFAULT_CLIENT_FAILURE_CHECK_PERIOD;
-   }
-
-   public static long getDefaultFileDeployerScanPeriod()
-   {
-      return DEFAULT_FILE_DEPLOYER_SCAN_PERIOD;
-   }
-
-   public static int getDefaultJournalMaxIoAio()
-   {
-      return DEFAULT_JOURNAL_MAX_IO_AIO;
-   }
-
-   public static int getDefaultJournalBufferTimeoutAio()
-   {
-      return DEFAULT_JOURNAL_BUFFER_TIMEOUT_AIO;
-   }
-
-   public static int getDefaultJournalBufferSizeAio()
-   {
-      return DEFAULT_JOURNAL_BUFFER_SIZE_AIO;
-   }
-
-   public static int getDefaultJournalMaxIoNio()
-   {
-      return DEFAULT_JOURNAL_MAX_IO_NIO;
-   }
-
-   public static int getDefaultJournalBufferTimeoutNio()
-   {
-      return DEFAULT_JOURNAL_BUFFER_TIMEOUT_NIO;
-   }
-
-   public static int getDefaultJournalBufferSizeNio()
-   {
-      return DEFAULT_JOURNAL_BUFFER_SIZE_NIO;
-   }
-
-   public static String getPropMaskPassword()
-   {
-      return PROP_MASK_PASSWORD;
-   }
-
-   public static String getPropPasswordCodec()
-   {
-      return PROP_PASSWORD_CODEC;
-   }
-
-   /**
-    * what kind of HA Policy should we use
-    */
-   public static String getDefaultHapolicyType()
-   {
-     return DEFAULT_HAPOLICY_TYPE;
-   }
-
-   /**
-    * The backup strategy to use if we are a backup or for any colocated backups.
-    */
-   public static String getDefaultHapolicyBackupStrategy()
-   {
-     return DEFAULT_HAPOLICY_BACKUP_STRATEGY;
-   }
-
-   //shared by client and core/server
-   // XXX not on schema?
-   private static long DEFAULT_CLIENT_FAILURE_CHECK_PERIOD = 30000;
-
-   // XXX not on schema?
-   private static long DEFAULT_FILE_DEPLOYER_SCAN_PERIOD = 5000;
-
-   // These defaults are applied depending on whether the journal type
-   // is NIO or AIO.
-   private static int DEFAULT_JOURNAL_MAX_IO_AIO = 500;
-   private static int DEFAULT_JOURNAL_BUFFER_TIMEOUT_AIO = JournalConstants.DEFAULT_JOURNAL_BUFFER_TIMEOUT_AIO;
-   private static int DEFAULT_JOURNAL_BUFFER_SIZE_AIO = JournalConstants.DEFAULT_JOURNAL_BUFFER_SIZE_AIO;
-   private static int DEFAULT_JOURNAL_MAX_IO_NIO = 1;
-   private static int DEFAULT_JOURNAL_BUFFER_TIMEOUT_NIO = JournalConstants.DEFAULT_JOURNAL_BUFFER_TIMEOUT_NIO;
-   private static int DEFAULT_JOURNAL_BUFFER_SIZE_NIO = JournalConstants.DEFAULT_JOURNAL_BUFFER_SIZE_NIO;
-
-   // XXX not on schema.
-   //properties passed to acceptor/connectors.
-   private static String PROP_MASK_PASSWORD = "hornetq.usemaskedpassword";
-   private static String PROP_PASSWORD_CODEC = "hornetq.passwordcodec";
-
-
-   // what kind of HA Policy should we use
-   private static String DEFAULT_HAPOLICY_TYPE = "NONE";
-
-   // The backup strategy to use if we are a backup or for any colocated backups.
-   private static String DEFAULT_HAPOLICY_BACKUP_STRATEGY = "FULL";

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-core-client/src/main/resources/hqDefaults.xsl
----------------------------------------------------------------------
diff --git a/activemq-core-client/src/main/resources/hqDefaults.xsl b/activemq-core-client/src/main/resources/hqDefaults.xsl
deleted file mode 100644
index 6f67fff..0000000
--- a/activemq-core-client/src/main/resources/hqDefaults.xsl
+++ /dev/null
@@ -1,128 +0,0 @@
-<?xml version="1.0" encoding="iso-8859-1"?>
-
-<xsl:stylesheet version="2.0"
-                xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-                xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-                xmlns:hq="urn:org.apache.activemq"
-                xmlns:fn="http://www.w3.org/2005/xpath-functions">
-
-  <!-- This XSLT creates the class HornetQDefaultsConfiguration.java.
-
-  It makes use of a text file with the first part of the class' body, and creates fields and methods
-  using information encoded in the hornetq-configuration.xsd.
-
-  Any element in the hornetq-configuration.xsd with an attribute 'hq:field_name' will trigger the
-  creation of a field using also its 'type' to determine the correct Java type. -->
-
-  <xsl:output method="text" indent="yes"/>
-  <!-- 16.2 Reading Text Files -->
-  <xsl:template match="/">
-    <xsl:text>/*
-    * THIS IS A GENERATED FILE! DO NOT EDIT IT DIRECTLY!
-
-      To see how this file is generated, please refer to
-      hornetq-core-client/src/main/resources/hqDefaults.xsl
-
-      To add new entries either document them in the hornetq-configuration.xsd by adding:
-
-      1. a default value to the schema element (using the standard way of adding a default)
-      2. adding a hq:field_name attribute to a xsd:annotation element of the element in question.
-
-      It is probably easier to just go to the hornetq-configuration.xsd and see how this is done for
-      other values, and then copy it.
-
-      The advantage of adding the default to the schema is that:
-
-      a. the schema will inform users of it (for users that check such things through the schema,
-      think of XML editors as users...);
-
-      b. the manual gets an entry for it automatically;
-
-      c. the Java code gets the same value;
-
-      d. all 3 sources of defaults will match since they take the value from the same place
-      (i.e. the schema).
-
-    */
-</xsl:text>
-/*
-      XSLT Version = <xsl:copy-of select="system-property('xsl:version')"/>
-      XSLT Vendor = <xsl:copy-of select="system-property('xsl:vendor')"/>
-      XSLT Vendor URL = <xsl:copy-of select="system-property('xsl:vendor-url')"/>
-*/
-    <xsl:value-of select="unparsed-text('./HornetQDefaultConfiguration.txt', 'iso-8859-1')" disable-output-escaping="yes"/>
-
-<xsl:text>&#xa;    // -------------------------------------------------------------------
-    // Following fields are generated from the hornetq-schema.xsd annotations
-    // -------------------------------------------------------------------&#xa;</xsl:text>
-
-        <xsl:for-each select="xsd:schema//xsd:complexType//xsd:element[ xsd:annotation/@hq:field_name ]">
-   // <xsl:value-of select="normalize-space(xsd:annotation/xsd:documentation)"/>
-   private static <xsl:call-template name="determine-type"/><xsl:text> </xsl:text><xsl:value-of select="xsd:annotation/@hq:field_name"/> = <xsl:call-template name="quote-default-value"/>;
-</xsl:for-each>
-
-<xsl:text>&#xa;&#xa;</xsl:text>
-
-        <xsl:for-each select="xsd:schema//xsd:complexType//xsd:element[ xsd:annotation/@hq:field_name ]">
-
-<xsl:text>   /**&#xa;    * </xsl:text>
-<xsl:value-of select="normalize-space(xsd:annotation/xsd:documentation)"/>
-<xsl:text>&#xa;    */</xsl:text>
-   public static <xsl:call-template name="determine-type"/> <xsl:call-template name="method-prefix-verb"/><xsl:for-each select="fn:tokenize(xsd:annotation/@hq:field_name,'_')">
-  <xsl:value-of select=
-                "concat(upper-case(substring(.,1,1)),
-                 lower-case(substring(., 2)),
-                 ' '[not(last())]
-                 )
-                 "/>
-</xsl:for-each>()
-   <xsl:text>&#123;&#xa;     return </xsl:text>
-  <xsl:value-of select="xsd:annotation/@hq:field_name" />
-    <xsl:text>;
-   &#125;&#xa;</xsl:text>
-        </xsl:for-each>
-    <xsl:text>
-&#125;&#xa;</xsl:text>
-  </xsl:template>
-
-<xsl:template name="method-prefix-verb">
-  <xsl:choose>
-    <xsl:when test="@type='xsd:boolean'">
-      <xsl:text> is</xsl:text>
-    </xsl:when>
-    <xsl:otherwise>      <xsl:text> get</xsl:text>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="quote-default-value">
-  <xsl:choose>
-    <xsl:when test="xsd:annotation/@hq:type='SimpleString'">
-      <xsl:value-of select="concat( 'new SimpleString(&#34;', @default, '&#34;)')"/>
-    </xsl:when>
-    <xsl:when test="@type='xsd:string'">
-      <xsl:value-of select="concat( '&#34;', @default, '&#34;')"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="@default"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-
-<xsl:template name="determine-type">
-  <xsl:choose>
-    <xsl:when test="xsd:annotation/@hq:type">
-      <xsl:value-of select="xsd:annotation/@hq:type"/>
-    </xsl:when>
-    <xsl:when test="@type = 'xsd:string'">
-      <xsl:text>String</xsl:text>
-    </xsl:when>
-    <xsl:when test="fn:starts-with(@type,'xsd:')">
-      <xsl:value-of select="fn:substring-after(@type,':')"/>
-    </xsl:when>
-    <xsl:otherwise>
-      <xsl:value-of select="@type"/>
-    </xsl:otherwise>
-  </xsl:choose>
-</xsl:template>
-</xsl:stylesheet>

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/JMSConfigurationImpl.java
----------------------------------------------------------------------
diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/JMSConfigurationImpl.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/JMSConfigurationImpl.java
index 3561d44..ed97183 100644
--- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/JMSConfigurationImpl.java
+++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/JMSConfigurationImpl.java
@@ -17,7 +17,7 @@ import java.util.List;
 
 import javax.naming.Context;
 
-import org.apache.activemq.api.config.HornetQDefaultConfiguration;
+import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
 import org.apache.activemq.jms.server.config.ConnectionFactoryConfiguration;
 import org.apache.activemq.jms.server.config.JMSConfiguration;
 import org.apache.activemq.jms.server.config.JMSQueueConfiguration;
@@ -36,7 +36,7 @@ public class JMSConfigurationImpl implements JMSConfiguration
 
    private List<TopicConfiguration> topicConfigurations = new ArrayList<TopicConfiguration>();
 
-   private String domain = HornetQDefaultConfiguration.getDefaultJmxDomain();
+   private String domain = ActiveMQDefaultConfiguration.getDefaultJmxDomain();
 
    private Context context = null;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerConfigParserImpl.java
----------------------------------------------------------------------
diff --git a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerConfigParserImpl.java b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerConfigParserImpl.java
index 6293fe4..0c9d47f 100644
--- a/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerConfigParserImpl.java
+++ b/activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerConfigParserImpl.java
@@ -18,7 +18,7 @@ import java.io.Reader;
 import java.util.ArrayList;
 import java.util.List;
 
-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.client.HornetQClient;
 import org.apache.activemq.api.jms.JMSFactoryType;
@@ -74,7 +74,7 @@ public final class JMSServerConfigParserImpl implements JMSServerConfigParser
       ArrayList<JMSQueueConfiguration> queues = new ArrayList<JMSQueueConfiguration>();
       ArrayList<TopicConfiguration> topics = new ArrayList<TopicConfiguration>();
       ArrayList<ConnectionFactoryConfiguration> cfs = new ArrayList<ConnectionFactoryConfiguration>();
-      String domain = HornetQDefaultConfiguration.getDefaultJmxDomain();
+      String domain = ActiveMQDefaultConfiguration.getDefaultJmxDomain();
 
       Element e = (Element) rootnode;
 
@@ -111,7 +111,7 @@ public final class JMSServerConfigParserImpl implements JMSServerConfigParser
          }
       }
 
-      domain = XMLConfigurationUtil.getString(e, JMSServerDeployer.JMX_DOMAIN_NAME, HornetQDefaultConfiguration.getDefaultJmxDomain(), Validators.NO_CHECK);
+      domain = XMLConfigurationUtil.getString(e, JMSServerDeployer.JMX_DOMAIN_NAME, ActiveMQDefaultConfiguration.getDefaultJmxDomain(), Validators.NO_CHECK);
 
 
       JMSConfiguration value = newConfig(queues, topics, cfs, domain);

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-server/src/main/java/org/apache/activemq/core/config/BridgeConfiguration.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/BridgeConfiguration.java b/activemq-server/src/main/java/org/apache/activemq/core/config/BridgeConfiguration.java
index 8ad1e54..6b60332 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/config/BridgeConfiguration.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/config/BridgeConfiguration.java
@@ -15,7 +15,7 @@ package org.apache.activemq.core.config;
 import java.io.Serializable;
 import java.util.List;
 
-import org.apache.activemq.api.config.HornetQDefaultConfiguration;
+import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
 import org.apache.activemq.api.core.client.HornetQClient;
 
 /**
@@ -46,21 +46,21 @@ public final class BridgeConfiguration implements Serializable
 
    private double retryIntervalMultiplier = HornetQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER;
 
-   private int initialConnectAttempts = HornetQDefaultConfiguration.getDefaultBridgeInitialConnectAttempts();
+   private int initialConnectAttempts = ActiveMQDefaultConfiguration.getDefaultBridgeInitialConnectAttempts();
 
-   private int reconnectAttempts = HornetQDefaultConfiguration.getDefaultBridgeReconnectAttempts();
+   private int reconnectAttempts = ActiveMQDefaultConfiguration.getDefaultBridgeReconnectAttempts();
 
-   private int reconnectAttemptsOnSameNode = HornetQDefaultConfiguration.getDefaultBridgeConnectSameNode();
+   private int reconnectAttemptsOnSameNode = ActiveMQDefaultConfiguration.getDefaultBridgeConnectSameNode();
 
-   private boolean useDuplicateDetection = HornetQDefaultConfiguration.isDefaultBridgeDuplicateDetection();
+   private boolean useDuplicateDetection = ActiveMQDefaultConfiguration.isDefaultBridgeDuplicateDetection();
 
    private int confirmationWindowSize = HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE;
 
    private long clientFailureCheckPeriod = HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD;
 
-   private String user = HornetQDefaultConfiguration.getDefaultClusterUser();
+   private String user = ActiveMQDefaultConfiguration.getDefaultClusterUser();
 
-   private String password = HornetQDefaultConfiguration.getDefaultClusterPassword();
+   private String password = ActiveMQDefaultConfiguration.getDefaultClusterPassword();
 
    private long connectionTTL = HornetQClient.DEFAULT_CONNECTION_TTL;
 

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/d0d686b5/activemq-server/src/main/java/org/apache/activemq/core/config/ClusterConnectionConfiguration.java
----------------------------------------------------------------------
diff --git a/activemq-server/src/main/java/org/apache/activemq/core/config/ClusterConnectionConfiguration.java b/activemq-server/src/main/java/org/apache/activemq/core/config/ClusterConnectionConfiguration.java
index 2375893..7cfd8a2 100644
--- a/activemq-server/src/main/java/org/apache/activemq/core/config/ClusterConnectionConfiguration.java
+++ b/activemq-server/src/main/java/org/apache/activemq/core/config/ClusterConnectionConfiguration.java
@@ -16,7 +16,7 @@ import java.io.Serializable;
 import java.util.Collections;
 import java.util.List;
 
-import org.apache.activemq.api.config.HornetQDefaultConfiguration;
+import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
 import org.apache.activemq.api.core.client.HornetQClient;
 
 /**
@@ -34,43 +34,43 @@ public final class ClusterConnectionConfiguration implements Serializable
 
    private String connectorName;
 
-   private long clientFailureCheckPeriod = HornetQDefaultConfiguration.getDefaultClusterFailureCheckPeriod();
+   private long clientFailureCheckPeriod = ActiveMQDefaultConfiguration.getDefaultClusterFailureCheckPeriod();
 
-   private long connectionTTL = HornetQDefaultConfiguration.getDefaultClusterConnectionTtl();
+   private long connectionTTL = ActiveMQDefaultConfiguration.getDefaultClusterConnectionTtl();
 
-   private long retryInterval = HornetQDefaultConfiguration.getDefaultClusterRetryInterval();
+   private long retryInterval = ActiveMQDefaultConfiguration.getDefaultClusterRetryInterval();
 
-   private double retryIntervalMultiplier = HornetQDefaultConfiguration.getDefaultClusterRetryIntervalMultiplier();
+   private double retryIntervalMultiplier = ActiveMQDefaultConfiguration.getDefaultClusterRetryIntervalMultiplier();
 
-   private long maxRetryInterval = HornetQDefaultConfiguration.getDefaultClusterMaxRetryInterval();
+   private long maxRetryInterval = ActiveMQDefaultConfiguration.getDefaultClusterMaxRetryInterval();
 
-   private int initialConnectAttempts = HornetQDefaultConfiguration.getDefaultClusterInitialConnectAttempts();
+   private int initialConnectAttempts = ActiveMQDefaultConfiguration.getDefaultClusterInitialConnectAttempts();
 
-   private int reconnectAttempts = HornetQDefaultConfiguration.getDefaultClusterReconnectAttempts();
+   private int reconnectAttempts = ActiveMQDefaultConfiguration.getDefaultClusterReconnectAttempts();
 
-   private long callTimeout = HornetQDefaultConfiguration.getDefaultClusterCallTimeout();
+   private long callTimeout = ActiveMQDefaultConfiguration.getDefaultClusterCallTimeout();
 
-   private long callFailoverTimeout = HornetQDefaultConfiguration.getDefaultClusterCallFailoverTimeout();
+   private long callFailoverTimeout = ActiveMQDefaultConfiguration.getDefaultClusterCallFailoverTimeout();
 
-   private boolean duplicateDetection = HornetQDefaultConfiguration.isDefaultClusterDuplicateDetection();
+   private boolean duplicateDetection = ActiveMQDefaultConfiguration.isDefaultClusterDuplicateDetection();
 
-   private boolean forwardWhenNoConsumers = HornetQDefaultConfiguration.isDefaultClusterForwardWhenNoConsumers();
+   private boolean forwardWhenNoConsumers = ActiveMQDefaultConfiguration.isDefaultClusterForwardWhenNoConsumers();
 
    private List<String> staticConnectors = Collections.emptyList();
 
    private String discoveryGroupName = null;
 
-   private int maxHops = HornetQDefaultConfiguration.getDefaultClusterMaxHops();
+   private int maxHops = ActiveMQDefaultConfiguration.getDefaultClusterMaxHops();
 
-   private int confirmationWindowSize = HornetQDefaultConfiguration.getDefaultClusterConfirmationWindowSize();
+   private int confirmationWindowSize = ActiveMQDefaultConfiguration.getDefaultClusterConfirmationWindowSize();
 
    private boolean allowDirectConnectionsOnly = false;
 
    private int minLargeMessageSize = HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE;
 
-   private long clusterNotificationInterval = HornetQDefaultConfiguration.getDefaultClusterNotificationInterval();
+   private long clusterNotificationInterval = ActiveMQDefaultConfiguration.getDefaultClusterNotificationInterval();
 
-   private int clusterNotificationAttempts = HornetQDefaultConfiguration.getDefaultClusterNotificationAttempts();
+   private int clusterNotificationAttempts = ActiveMQDefaultConfiguration.getDefaultClusterNotificationAttempts();
 
    public ClusterConnectionConfiguration()
    {


Mime
View raw message