Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Andy Taylor 2014-11-17 11:00:52 +00:00
parent f9bdb25aef
commit d0d686b527
65 changed files with 1550 additions and 730 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
activemq-core-client/pom.xml
View File

@ -97,67 +97,6 @@
</resource>
</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>

1125
activemq-core-client/src/main/java/org/apache/activemq/api/config/ActiveMQDefaultConfiguration.java Normal file
View File

File diff suppressed because it is too large Load Diff

4
activemq-core-client/src/main/java/org/apache/activemq/api/core/BroadcastGroupConfiguration.java
View File

@ -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;

10
activemq-core-client/src/main/java/org/apache/activemq/api/core/client/HornetQClient.java
View File

@ -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;

6
activemq-core-client/src/main/java/org/apache/activemq/api/core/management/ObjectNameBuilder.java
View File

@ -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
{

10
activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyConnector.java
View File

@ -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,

10
activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/TransportConstants.java
View File

@ -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);

116
activemq-core-client/src/main/resources/HornetQDefaultConfiguration.txt
View File

@ -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";

128
activemq-core-client/src/main/resources/hqDefaults.xsl
View File

@ -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>

4
activemq-jms-server/src/main/java/org/apache/activemq/jms/server/config/impl/JMSConfigurationImpl.java
View File

@ -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;

6
activemq-jms-server/src/main/java/org/apache/activemq/jms/server/impl/JMSServerConfigParserImpl.java
View File

@ -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);

14
activemq-server/src/main/java/org/apache/activemq/core/config/BridgeConfiguration.java
View File

@ -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;

32
activemq-server/src/main/java/org/apache/activemq/core/config/ClusterConnectionConfiguration.java
View File

@ -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()
{

88
activemq-server/src/main/java/org/apache/activemq/core/config/Configuration.java
View File

@ -83,7 +83,7 @@ public interface Configuration extends Serializable
/**
* Returns whether delivery count is persisted before messages are delivered to the consumers. <br>
* Default value is
* {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_PERSIST_DELIVERY_COUNT_BEFORE_DELIVERY}.
* {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_PERSIST_DELIVERY_COUNT_BEFORE_DELIVERY}.
*/
boolean isPersistDeliveryCountBeforeDelivery();
@ -95,7 +95,7 @@ public interface Configuration extends Serializable
/**
* Returns {@code true} if this server is a backup, {@code false} if it is a live server. <br>
* If a backup server has been activated, returns {@code false}. <br>
* Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_BACKUP}.
* Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_BACKUP}.
*
* @deprecated replaced by {@link org.apache.activemq.core.server.cluster.ha.HAPolicy#isBackup()}
*/
@ -112,7 +112,7 @@ public interface Configuration extends Serializable
/**
* Returns whether this server shares its data store with a corresponding live or backup server. <br>
* Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_SHARED_STORE}.
* Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_SHARED_STORE}.
*
* @deprecated replaced by {@link org.apache.activemq.core.server.cluster.ha.HAPolicy#isSharedStore()}
*/
@ -129,7 +129,7 @@ public interface Configuration extends Serializable
/**
* Returns whether this server will use files to configure and deploy its resources. <br>
* Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_FILE_DEPLOYMENT_ENABLED}.
* Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_FILE_DEPLOYMENT_ENABLED}.
*/
boolean isFileDeploymentEnabled();
@ -140,7 +140,7 @@ public interface Configuration extends Serializable
/**
* Returns whether this server is using persistence and store data. <br>
* Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_PERSISTENCE_ENABLED}.
* Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_PERSISTENCE_ENABLED}.
*/
boolean isPersistenceEnabled();
@ -151,7 +151,7 @@ public interface Configuration extends Serializable
/**
* Returns the period (in milliseconds) to scan configuration files used by deployment. <br>
* Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_FILE_DEPLOYER_SCAN_PERIOD}.
* Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_FILE_DEPLOYER_SCAN_PERIOD}.
*/
long getFileDeployerScanPeriod();
@ -162,7 +162,7 @@ public interface Configuration extends Serializable
/**
* Returns the maximum number of threads in the thread pool of this server. <br>
* Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_THREAD_POOL_MAX_SIZE}.
* Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_THREAD_POOL_MAX_SIZE}.
*/
int getThreadPoolMaxSize();
@ -173,7 +173,7 @@ public interface Configuration extends Serializable
/**
* Returns the maximum number of threads in the <em>scheduled</em> thread pool of this server. <br>
* Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE}.
* Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE}.
*/
int getScheduledThreadPoolMaxSize();
@ -184,7 +184,7 @@ public interface Configuration extends Serializable
/**
* Returns the interval time (in milliseconds) to invalidate security credentials. <br>
* Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_SECURITY_INVALIDATION_INTERVAL}.
* Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_SECURITY_INVALIDATION_INTERVAL}.
*/
long getSecurityInvalidationInterval();
@ -195,7 +195,7 @@ public interface Configuration extends Serializable
/**
* Returns whether security is enabled for this server. <br>
* Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_SECURITY_ENABLED}.
* Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_SECURITY_ENABLED}.
*/
boolean isSecurityEnabled();
@ -206,19 +206,19 @@ public interface Configuration extends Serializable
/**
* Returns whether this server is manageable using JMX or not. <br>
* Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_JMX_MANAGEMENT_ENABLED}.
* Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_JMX_MANAGEMENT_ENABLED}.
*/
boolean isJMXManagementEnabled();
/**
* Sets whether this server is manageable using JMX or not. <br>
* Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_JMX_MANAGEMENT_ENABLED}.
* Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_JMX_MANAGEMENT_ENABLED}.
*/
Configuration setJMXManagementEnabled(boolean enabled);
/**
* Returns the domain used by JMX MBeans (provided JMX management is enabled). <br>
* Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_JMX_DOMAIN}.
* Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_JMX_DOMAIN}.
*/
String getJMXDomain();
@ -287,7 +287,7 @@ public interface Configuration extends Serializable
/**
* Returns the connection time to live. <br>
* This value overrides the connection time to live <em>sent by the client</em>. <br>
* Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_CONNECTION_TTL_OVERRIDE}.
* Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_CONNECTION_TTL_OVERRIDE}.
*/
long getConnectionTTLOverride();
@ -299,7 +299,7 @@ public interface Configuration extends Serializable
/**
* Returns whether code coming from connection is executed asynchronously or not. <br>
* Default value is
* {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_ASYNC_CONNECTION_EXECUTION_ENABLED}.
* {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_ASYNC_CONNECTION_EXECUTION_ENABLED}.
*/
boolean isAsyncConnectionExecutionEnabled();
@ -420,7 +420,7 @@ public interface Configuration extends Serializable
/**
* Returns the management address of this server. <br>
* Clients can send management messages to this address to manage this server. <br>
* Default value is {@link org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_MANAGEMENT_ADDRESS}.
* Default value is {@link org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_MANAGEMENT_ADDRESS}.
*/
SimpleString getManagementAddress();
@ -433,7 +433,7 @@ public interface Configuration extends Serializable
* Returns the management notification address of this server. <br>
* Clients can bind queues to this address to receive management notifications emitted by this
* server. <br>
* Default value is {@link org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_MANAGEMENT_NOTIFICATION_ADDRESS}.
* Default value is {@link org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_MANAGEMENT_NOTIFICATION_ADDRESS}.
*/
SimpleString getManagementNotificationAddress();
@ -444,7 +444,7 @@ public interface Configuration extends Serializable
/**
* Returns the cluster user for this server. <br>
* Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_CLUSTER_USER}.
* Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_CLUSTER_USER}.
*/
String getClusterUser();
@ -455,7 +455,7 @@ public interface Configuration extends Serializable
/**
* Returns the cluster password for this server. <br>
* Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_CLUSTER_PASSWORD}.
* Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_CLUSTER_PASSWORD}.
*/
String getClusterPassword();
@ -490,7 +490,7 @@ public interface Configuration extends Serializable
/**
* Returns the size of the cache for pre-creating message IDs. <br>
* Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_ID_CACHE_SIZE}.
* Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_ID_CACHE_SIZE}.
*/
int getIDCacheSize();
@ -501,7 +501,7 @@ public interface Configuration extends Serializable
/**
* Returns whether message ID cache is persisted. <br>
* Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_PERSIST_ID_CACHE}.
* Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_PERSIST_ID_CACHE}.
*/
boolean isPersistIDCache();
@ -514,7 +514,7 @@ public interface Configuration extends Serializable
/**
* Returns the file system directory used to store bindings. <br>
* Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_BINDINGS_DIRECTORY}.
* Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_BINDINGS_DIRECTORY}.
*/
String getBindingsDirectory();
@ -526,7 +526,7 @@ public interface Configuration extends Serializable
/**
* The max number of concurrent reads allowed on paging.
* <p/>
* Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_MAX_CONCURRENT_PAGE_IO}.
* Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_MAX_CONCURRENT_PAGE_IO}.
*/
int getPageMaxConcurrentIO();
@ -539,7 +539,7 @@ public interface Configuration extends Serializable
/**
* Returns the file system directory used to store journal log. <br>
* Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_JOURNAL_DIR}.
* Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_JOURNAL_DIR}.
*/
String getJournalDirectory();
@ -562,7 +562,7 @@ public interface Configuration extends Serializable
/**
* Returns whether the journal is synchronized when receiving transactional data. <br>
* Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_JOURNAL_SYNC_TRANSACTIONAL}.
* Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_JOURNAL_SYNC_TRANSACTIONAL}.
*/
boolean isJournalSyncTransactional();
@ -573,7 +573,7 @@ public interface Configuration extends Serializable
/**
* Returns whether the journal is synchronized when receiving non-transactional data. <br>
* Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_JOURNAL_SYNC_NON_TRANSACTIONAL}.
* Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_JOURNAL_SYNC_NON_TRANSACTIONAL}.
*/
boolean isJournalSyncNonTransactional();
@ -584,7 +584,7 @@ public interface Configuration extends Serializable
/**
* Returns the size (in bytes) of each journal files. <br>
* Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_JOURNAL_FILE_SIZE}.
* Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_JOURNAL_FILE_SIZE}.
*/
int getJournalFileSize();
@ -595,7 +595,7 @@ public interface Configuration extends Serializable
/**
* Returns the minimal number of journal files before compacting. <br>
* Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_JOURNAL_COMPACT_MIN_FILES}.
* Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_JOURNAL_COMPACT_MIN_FILES}.
*/
int getJournalCompactMinFiles();
@ -606,7 +606,7 @@ public interface Configuration extends Serializable
/**
* Returns the percentage of live data before compacting the journal. <br>
* Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_JOURNAL_COMPACT_PERCENTAGE}.
* Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_JOURNAL_COMPACT_PERCENTAGE}.
*/
int getJournalCompactPercentage();
@ -617,7 +617,7 @@ public interface Configuration extends Serializable
/**
* Returns the number of journal files to pre-create. <br>
* Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_JOURNAL_MIN_FILES}.
* Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_JOURNAL_MIN_FILES}.
*/
int getJournalMinFiles();
@ -630,7 +630,7 @@ public interface Configuration extends Serializable
/**
* Returns the maximum number of write requests that can be in the AIO queue at any given time. <br>
* Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_JOURNAL_MAX_IO_AIO}.
* Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_JOURNAL_MAX_IO_AIO}.
*/
int getJournalMaxIO_AIO();
@ -665,7 +665,7 @@ public interface Configuration extends Serializable
/**
* Returns the maximum number of write requests for NIO journal. <br>
* Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_JOURNAL_MAX_IO_NIO}.
* Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_JOURNAL_MAX_IO_NIO}.
*/
int getJournalMaxIO_NIO();
@ -700,7 +700,7 @@ public interface Configuration extends Serializable
/**
* Returns whether the bindings directory is created on this server startup. <br>
* Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_CREATE_BINDINGS_DIR}.
* Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_CREATE_BINDINGS_DIR}.
*/
boolean isCreateBindingsDir();
@ -711,7 +711,7 @@ public interface Configuration extends Serializable
/**
* Returns whether the journal directory is created on this server startup. <br>
* Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_CREATE_JOURNAL_DIR}.
* Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_CREATE_JOURNAL_DIR}.
*/
boolean isCreateJournalDir();
@ -750,7 +750,7 @@ public interface Configuration extends Serializable
/**
* Returns the file system directory used to store paging files. <br>
* Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_PAGING_DIR}.
* Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_PAGING_DIR}.
*/
String getPagingDirectory();
@ -763,7 +763,7 @@ public interface Configuration extends Serializable
/**
* Returns the file system directory used to store large messages. <br>
* Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_LARGE_MESSAGES_DIR}.
* Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_LARGE_MESSAGES_DIR}.
*/
String getLargeMessagesDirectory();
@ -776,7 +776,7 @@ public interface Configuration extends Serializable
/**
* Returns whether wildcard routing is supported by this server. <br>
* Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_WILDCARD_ROUTING_ENABLED}.
* Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_WILDCARD_ROUTING_ENABLED}.
*/
boolean isWildcardRoutingEnabled();
@ -788,7 +788,7 @@ public interface Configuration extends Serializable
/**
* Returns the timeout (in milliseconds) after which transactions is removed from the resource
* manager after it was created. <br>
* Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_TRANSACTION_TIMEOUT}.
* Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_TRANSACTION_TIMEOUT}.
*/
long getTransactionTimeout();
@ -800,7 +800,7 @@ public interface Configuration extends Serializable
/**
* Returns whether message counter is enabled for this server. <br>
* Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_MESSAGE_COUNTER_ENABLED}.
* Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_MESSAGE_COUNTER_ENABLED}.
*/
boolean isMessageCounterEnabled();
@ -811,7 +811,7 @@ public interface Configuration extends Serializable
/**
* Returns the sample period (in milliseconds) to take message counter snapshot. <br>
* Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_MESSAGE_COUNTER_SAMPLE_PERIOD}.
* Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_MESSAGE_COUNTER_SAMPLE_PERIOD}.
*/
long getMessageCounterSamplePeriod();
@ -824,7 +824,7 @@ public interface Configuration extends Serializable
/**
* Returns the maximum number of days kept in memory for message counter. <br>
* Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_MESSAGE_COUNTER_MAX_DAY_HISTORY}.
* Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_MESSAGE_COUNTER_MAX_DAY_HISTORY}.
*/
int getMessageCounterMaxDayHistory();
@ -838,7 +838,7 @@ public interface Configuration extends Serializable
/**
* Returns the frequency (in milliseconds) to scan transactions to detect which transactions have
* timed out. <br>
* Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_TRANSACTION_TIMEOUT_SCAN_PERIOD}.
* Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_TRANSACTION_TIMEOUT_SCAN_PERIOD}.
*/
long getTransactionTimeoutScanPeriod();
@ -851,7 +851,7 @@ public interface Configuration extends Serializable
/**
* Returns the frequency (in milliseconds) to scan messages to detect which messages have
* expired. <br>
* Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_MESSAGE_EXPIRY_SCAN_PERIOD}.
* Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_MESSAGE_EXPIRY_SCAN_PERIOD}.
*/
long getMessageExpiryScanPeriod();
@ -863,7 +863,7 @@ public interface Configuration extends Serializable
/**
* Returns the priority of the thread used to scan message expiration. <br>
* Default value is {@value org.apache.activemq.api.config.HornetQDefaultConfiguration#DEFAULT_MESSAGE_EXPIRY_THREAD_PRIORITY}.
* Default value is {@value org.apache.activemq.api.config.ActiveMQDefaultConfiguration#DEFAULT_MESSAGE_EXPIRY_THREAD_PRIORITY}.
*/
int getMessageExpiryThreadPriority();

4
activemq-server/src/main/java/org/apache/activemq/core/config/DivertConfiguration.java
View File

@ -14,7 +14,7 @@ package org.apache.activemq.core.config;
import java.io.Serializable;
import org.apache.activemq.api.config.HornetQDefaultConfiguration;
import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
import org.apache.activemq.utils.UUIDGenerator;
/**
@ -34,7 +34,7 @@ public class DivertConfiguration implements Serializable
private String forwardingAddress = null;
private boolean exclusive = HornetQDefaultConfiguration.isDefaultDivertExclusive();
private boolean exclusive = ActiveMQDefaultConfiguration.isDefaultDivertExclusive();
private String filterString = null;

4
activemq-server/src/main/java/org/apache/activemq/core/config/ScaleDownConfiguration.java
View File

@ -12,7 +12,7 @@
*/
package org.apache.activemq.core.config;
import org.apache.activemq.api.config.HornetQDefaultConfiguration;
import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
import java.io.Serializable;
import java.util.ArrayList;
@ -28,7 +28,7 @@ public class ScaleDownConfiguration implements Serializable
private String clusterName = null;
private boolean enabled = HornetQDefaultConfiguration.isDefaultScaleDownEnabled();
private boolean enabled = ActiveMQDefaultConfiguration.isDefaultScaleDownEnabled();
public List<String> getConnectors()
{

14
activemq-server/src/main/java/org/apache/activemq/core/config/ha/ColocatedPolicyConfiguration.java
View File

@ -12,7 +12,7 @@
*/
package org.apache.activemq.core.config.ha;
import org.apache.activemq.api.config.HornetQDefaultConfiguration;
import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
import org.apache.activemq.core.config.HAPolicyConfiguration;
import java.util.ArrayList;
@ -20,19 +20,19 @@ import java.util.List;
public class ColocatedPolicyConfiguration implements HAPolicyConfiguration
{
private boolean requestBackup = HornetQDefaultConfiguration.isDefaultHapolicyRequestBackup();
private boolean requestBackup = ActiveMQDefaultConfiguration.isDefaultHapolicyRequestBackup();
private int backupRequestRetries = HornetQDefaultConfiguration.getDefaultHapolicyBackupRequestRetries();
private int backupRequestRetries = ActiveMQDefaultConfiguration.getDefaultHapolicyBackupRequestRetries();
private long backupRequestRetryInterval = HornetQDefaultConfiguration.getDefaultHapolicyBackupRequestRetryInterval();
private long backupRequestRetryInterval = ActiveMQDefaultConfiguration.getDefaultHapolicyBackupRequestRetryInterval();
private int maxBackups = HornetQDefaultConfiguration.getDefaultHapolicyMaxBackups();
private int maxBackups = ActiveMQDefaultConfiguration.getDefaultHapolicyMaxBackups();
private int backupPortOffset = HornetQDefaultConfiguration.getDefaultHapolicyBackupPortOffset();
private int backupPortOffset = ActiveMQDefaultConfiguration.getDefaultHapolicyBackupPortOffset();
private List<String> excludedConnectors = new ArrayList<>();
private int portOffset = HornetQDefaultConfiguration.getDefaultHapolicyBackupPortOffset();
private int portOffset = ActiveMQDefaultConfiguration.getDefaultHapolicyBackupPortOffset();
private HAPolicyConfiguration liveConfig;

8
activemq-server/src/main/java/org/apache/activemq/core/config/ha/ReplicaPolicyConfiguration.java
View File

@ -12,7 +12,7 @@
*/
package org.apache.activemq.core.config.ha;
import org.apache.activemq.api.config.HornetQDefaultConfiguration;
import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
import org.apache.activemq.core.config.HAPolicyConfiguration;
import org.apache.activemq.core.config.ScaleDownConfiguration;
@ -20,11 +20,11 @@ public class ReplicaPolicyConfiguration implements HAPolicyConfiguration
{
private String clusterName = null;
private int maxSavedReplicatedJournalsSize = HornetQDefaultConfiguration.getDefaultMaxSavedReplicatedJournalsSize();
private int maxSavedReplicatedJournalsSize = ActiveMQDefaultConfiguration.getDefaultMaxSavedReplicatedJournalsSize();
private String groupName = null;
private boolean restartBackup = HornetQDefaultConfiguration.isDefaultRestartBackup();
private boolean restartBackup = ActiveMQDefaultConfiguration.isDefaultRestartBackup();
private ScaleDownConfiguration scaleDownConfiguration;
@ -33,7 +33,7 @@ public class ReplicaPolicyConfiguration implements HAPolicyConfiguration
* */
private boolean allowFailBack = false;
private long failbackDelay = HornetQDefaultConfiguration.getDefaultFailbackDelay();
private long failbackDelay = ActiveMQDefaultConfiguration.getDefaultFailbackDelay();
public ReplicaPolicyConfiguration()
{

4
activemq-server/src/main/java/org/apache/activemq/core/config/ha/ReplicatedPolicyConfiguration.java
View File

@ -12,12 +12,12 @@
*/
package org.apache.activemq.core.config.ha;
import org.apache.activemq.api.config.HornetQDefaultConfiguration;
import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
import org.apache.activemq.core.config.HAPolicyConfiguration;
public class ReplicatedPolicyConfiguration implements HAPolicyConfiguration
{
private boolean checkForLiveServer = HornetQDefaultConfiguration.isDefaultCheckForLiveServer();
private boolean checkForLiveServer = ActiveMQDefaultConfiguration.isDefaultCheckForLiveServer();
private String groupName = null;

6
activemq-server/src/main/java/org/apache/activemq/core/config/ha/SharedStoreMasterPolicyConfiguration.java
View File

@ -12,14 +12,14 @@
*/
package org.apache.activemq.core.config.ha;
import org.apache.activemq.api.config.HornetQDefaultConfiguration;
import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
import org.apache.activemq.core.config.HAPolicyConfiguration;
public class SharedStoreMasterPolicyConfiguration implements HAPolicyConfiguration
{
private long failbackDelay = HornetQDefaultConfiguration.getDefaultFailbackDelay();
private long failbackDelay = ActiveMQDefaultConfiguration.getDefaultFailbackDelay();
private boolean failoverOnServerShutdown = HornetQDefaultConfiguration.isDefaultFailoverOnServerShutdown();
private boolean failoverOnServerShutdown = ActiveMQDefaultConfiguration.isDefaultFailoverOnServerShutdown();
public SharedStoreMasterPolicyConfiguration()
{

10
activemq-server/src/main/java/org/apache/activemq/core/config/ha/SharedStoreSlavePolicyConfiguration.java
View File

@ -12,19 +12,19 @@
*/
package org.apache.activemq.core.config.ha;
import org.apache.activemq.api.config.HornetQDefaultConfiguration;
import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
import org.apache.activemq.core.config.HAPolicyConfiguration;
import org.apache.activemq.core.config.ScaleDownConfiguration;
public class SharedStoreSlavePolicyConfiguration implements HAPolicyConfiguration
{
private long failbackDelay = HornetQDefaultConfiguration.getDefaultFailbackDelay();
private long failbackDelay = ActiveMQDefaultConfiguration.getDefaultFailbackDelay();
private boolean failoverOnServerShutdown = HornetQDefaultConfiguration.isDefaultFailoverOnServerShutdown();
private boolean failoverOnServerShutdown = ActiveMQDefaultConfiguration.isDefaultFailoverOnServerShutdown();
private boolean restartBackup = HornetQDefaultConfiguration.isDefaultRestartBackup();
private boolean restartBackup = ActiveMQDefaultConfiguration.isDefaultRestartBackup();
private boolean allowFailBack = HornetQDefaultConfiguration.isDefaultAllowAutoFailback();
private boolean allowFailBack = ActiveMQDefaultConfiguration.isDefaultAllowAutoFailback();
private ScaleDownConfiguration scaleDownConfiguration;

112
activemq-server/src/main/java/org/apache/activemq/core/config/impl/ConfigurationImpl.java
View File

@ -24,7 +24,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import org.apache.activemq.api.config.HornetQDefaultConfiguration;
import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
import org.apache.activemq.api.core.BroadcastGroupConfiguration;
import org.apache.activemq.api.core.DiscoveryGroupConfiguration;
import org.apache.activemq.api.core.SimpleString;
@ -61,38 +61,38 @@ public class ConfigurationImpl implements Configuration
private String name = "ConfigurationImpl::" + System.identityHashCode(this);
protected boolean fileDeploymentEnabled = HornetQDefaultConfiguration.isDefaultFileDeploymentEnabled();
protected boolean fileDeploymentEnabled = ActiveMQDefaultConfiguration.isDefaultFileDeploymentEnabled();
private boolean persistenceEnabled = HornetQDefaultConfiguration.isDefaultPersistenceEnabled();
private boolean persistenceEnabled = ActiveMQDefaultConfiguration.isDefaultPersistenceEnabled();
protected long fileDeploymentScanPeriod = HornetQDefaultConfiguration.getDefaultFileDeployerScanPeriod();
protected long fileDeploymentScanPeriod = ActiveMQDefaultConfiguration.getDefaultFileDeployerScanPeriod();
private boolean persistDeliveryCountBeforeDelivery =
HornetQDefaultConfiguration.isDefaultPersistDeliveryCountBeforeDelivery();
ActiveMQDefaultConfiguration.isDefaultPersistDeliveryCountBeforeDelivery();
private int scheduledThreadPoolMaxSize = HornetQDefaultConfiguration.getDefaultScheduledThreadPoolMaxSize();
private int scheduledThreadPoolMaxSize = ActiveMQDefaultConfiguration.getDefaultScheduledThreadPoolMaxSize();
private int threadPoolMaxSize = HornetQDefaultConfiguration.getDefaultThreadPoolMaxSize();
private int threadPoolMaxSize = ActiveMQDefaultConfiguration.getDefaultThreadPoolMaxSize();
private long securityInvalidationInterval = HornetQDefaultConfiguration.getDefaultSecurityInvalidationInterval();
private long securityInvalidationInterval = ActiveMQDefaultConfiguration.getDefaultSecurityInvalidationInterval();
private boolean securityEnabled = HornetQDefaultConfiguration.isDefaultSecurityEnabled();
private boolean securityEnabled = ActiveMQDefaultConfiguration.isDefaultSecurityEnabled();
protected boolean jmxManagementEnabled = HornetQDefaultConfiguration.isDefaultJmxManagementEnabled();
protected boolean jmxManagementEnabled = ActiveMQDefaultConfiguration.isDefaultJmxManagementEnabled();
protected String jmxDomain = HornetQDefaultConfiguration.getDefaultJmxDomain();
protected String jmxDomain = ActiveMQDefaultConfiguration.getDefaultJmxDomain();
protected long connectionTTLOverride = HornetQDefaultConfiguration.getDefaultConnectionTtlOverride();
protected long connectionTTLOverride = ActiveMQDefaultConfiguration.getDefaultConnectionTtlOverride();
protected boolean asyncConnectionExecutionEnabled = HornetQDefaultConfiguration.isDefaultAsyncConnectionExecutionEnabled();
protected boolean asyncConnectionExecutionEnabled = ActiveMQDefaultConfiguration.isDefaultAsyncConnectionExecutionEnabled();
private long messageExpiryScanPeriod = HornetQDefaultConfiguration.getDefaultMessageExpiryScanPeriod();
private long messageExpiryScanPeriod = ActiveMQDefaultConfiguration.getDefaultMessageExpiryScanPeriod();
private int messageExpiryThreadPriority = HornetQDefaultConfiguration.getDefaultMessageExpiryThreadPriority();
private int messageExpiryThreadPriority = ActiveMQDefaultConfiguration.getDefaultMessageExpiryThreadPriority();
protected int idCacheSize = HornetQDefaultConfiguration.getDefaultIdCacheSize();
protected int idCacheSize = ActiveMQDefaultConfiguration.getDefaultIdCacheSize();
private boolean persistIDCache = HornetQDefaultConfiguration.isDefaultPersistIdCache();
private boolean persistIDCache = ActiveMQDefaultConfiguration.isDefaultPersistIdCache();
private List<String> incomingInterceptorClassNames = new ArrayList<String>();
@ -116,84 +116,84 @@ public class ConfigurationImpl implements Configuration
// Paging related attributes ------------------------------------------------------------
private String pagingDirectory = HornetQDefaultConfiguration.getDefaultPagingDir();
private String pagingDirectory = ActiveMQDefaultConfiguration.getDefaultPagingDir();
// File related attributes -----------------------------------------------------------
private int maxConcurrentPageIO = HornetQDefaultConfiguration.getDefaultMaxConcurrentPageIo();
private int maxConcurrentPageIO = ActiveMQDefaultConfiguration.getDefaultMaxConcurrentPageIo();
protected String largeMessagesDirectory = HornetQDefaultConfiguration.getDefaultLargeMessagesDir();
protected String largeMessagesDirectory = ActiveMQDefaultConfiguration.getDefaultLargeMessagesDir();
protected String bindingsDirectory = HornetQDefaultConfiguration.getDefaultBindingsDirectory();
protected String bindingsDirectory = ActiveMQDefaultConfiguration.getDefaultBindingsDirectory();
protected boolean createBindingsDir = HornetQDefaultConfiguration.isDefaultCreateBindingsDir();
protected boolean createBindingsDir = ActiveMQDefaultConfiguration.isDefaultCreateBindingsDir();
protected String journalDirectory = HornetQDefaultConfiguration.getDefaultJournalDir();
protected String journalDirectory = ActiveMQDefaultConfiguration.getDefaultJournalDir();
protected boolean createJournalDir = HornetQDefaultConfiguration.isDefaultCreateJournalDir();
protected boolean createJournalDir = ActiveMQDefaultConfiguration.isDefaultCreateJournalDir();
public JournalType journalType = ConfigurationImpl.DEFAULT_JOURNAL_TYPE;
protected boolean journalSyncTransactional = HornetQDefaultConfiguration.isDefaultJournalSyncTransactional();
protected boolean journalSyncTransactional = ActiveMQDefaultConfiguration.isDefaultJournalSyncTransactional();
protected boolean journalSyncNonTransactional = HornetQDefaultConfiguration.isDefaultJournalSyncNonTransactional();
protected boolean journalSyncNonTransactional = ActiveMQDefaultConfiguration.isDefaultJournalSyncNonTransactional();
protected int journalCompactMinFiles = HornetQDefaultConfiguration.getDefaultJournalCompactMinFiles();
protected int journalCompactMinFiles = ActiveMQDefaultConfiguration.getDefaultJournalCompactMinFiles();
protected int journalCompactPercentage = HornetQDefaultConfiguration.getDefaultJournalCompactPercentage();
protected int journalCompactPercentage = ActiveMQDefaultConfiguration.getDefaultJournalCompactPercentage();
protected int journalFileSize = HornetQDefaultConfiguration.getDefaultJournalFileSize();
protected int journalFileSize = ActiveMQDefaultConfiguration.getDefaultJournalFileSize();
protected int journalMinFiles = HornetQDefaultConfiguration.getDefaultJournalMinFiles();
protected int journalMinFiles = ActiveMQDefaultConfiguration.getDefaultJournalMinFiles();
// AIO and NIO need different values for these attributes
protected int journalMaxIO_AIO = HornetQDefaultConfiguration.getDefaultJournalMaxIoAio();
protected int journalMaxIO_AIO = ActiveMQDefaultConfiguration.getDefaultJournalMaxIoAio();
protected int journalBufferTimeout_AIO = HornetQDefaultConfiguration.getDefaultJournalBufferTimeoutAio();
protected int journalBufferTimeout_AIO = ActiveMQDefaultConfiguration.getDefaultJournalBufferTimeoutAio();
protected int journalBufferSize_AIO = HornetQDefaultConfiguration.getDefaultJournalBufferSizeAio();
protected int journalBufferSize_AIO = ActiveMQDefaultConfiguration.getDefaultJournalBufferSizeAio();
protected int journalMaxIO_NIO = HornetQDefaultConfiguration.getDefaultJournalMaxIoNio();
protected int journalMaxIO_NIO = ActiveMQDefaultConfiguration.getDefaultJournalMaxIoNio();
protected int journalBufferTimeout_NIO = HornetQDefaultConfiguration.getDefaultJournalBufferTimeoutNio();
protected int journalBufferTimeout_NIO = ActiveMQDefaultConfiguration.getDefaultJournalBufferTimeoutNio();
protected int journalBufferSize_NIO = HornetQDefaultConfiguration.getDefaultJournalBufferSizeNio();
protected int journalBufferSize_NIO = ActiveMQDefaultConfiguration.getDefaultJournalBufferSizeNio();
protected boolean logJournalWriteRate = HornetQDefaultConfiguration.isDefaultJournalLogWriteRate();
protected boolean logJournalWriteRate = ActiveMQDefaultConfiguration.isDefaultJournalLogWriteRate();
protected int journalPerfBlastPages = HornetQDefaultConfiguration.getDefaultJournalPerfBlastPages();
protected int journalPerfBlastPages = ActiveMQDefaultConfiguration.getDefaultJournalPerfBlastPages();
protected boolean runSyncSpeedTest = HornetQDefaultConfiguration.isDefaultRunSyncSpeedTest();
protected boolean runSyncSpeedTest = ActiveMQDefaultConfiguration.isDefaultRunSyncSpeedTest();
private boolean wildcardRoutingEnabled = HornetQDefaultConfiguration.isDefaultWildcardRoutingEnabled();
private boolean wildcardRoutingEnabled = ActiveMQDefaultConfiguration.isDefaultWildcardRoutingEnabled();
private boolean messageCounterEnabled = HornetQDefaultConfiguration.isDefaultMessageCounterEnabled();
private boolean messageCounterEnabled = ActiveMQDefaultConfiguration.isDefaultMessageCounterEnabled();
private long messageCounterSamplePeriod = HornetQDefaultConfiguration.getDefaultMessageCounterSamplePeriod();
private long messageCounterSamplePeriod = ActiveMQDefaultConfiguration.getDefaultMessageCounterSamplePeriod();
private int messageCounterMaxDayHistory = HornetQDefaultConfiguration.getDefaultMessageCounterMaxDayHistory();
private int messageCounterMaxDayHistory = ActiveMQDefaultConfiguration.getDefaultMessageCounterMaxDayHistory();
private long transactionTimeout = HornetQDefaultConfiguration.getDefaultTransactionTimeout();
private long transactionTimeout = ActiveMQDefaultConfiguration.getDefaultTransactionTimeout();
private long transactionTimeoutScanPeriod = HornetQDefaultConfiguration.getDefaultTransactionTimeoutScanPeriod();
private long transactionTimeoutScanPeriod = ActiveMQDefaultConfiguration.getDefaultTransactionTimeoutScanPeriod();
private SimpleString managementAddress = HornetQDefaultConfiguration.getDefaultManagementAddress();
private SimpleString managementAddress = ActiveMQDefaultConfiguration.getDefaultManagementAddress();
private SimpleString managementNotificationAddress = HornetQDefaultConfiguration.getDefaultManagementNotificationAddress();
private SimpleString managementNotificationAddress = ActiveMQDefaultConfiguration.getDefaultManagementNotificationAddress();
protected String clusterUser = HornetQDefaultConfiguration.getDefaultClusterUser();
protected String clusterUser = ActiveMQDefaultConfiguration.getDefaultClusterUser();
protected String clusterPassword = HornetQDefaultConfiguration.getDefaultClusterPassword();
protected String clusterPassword = ActiveMQDefaultConfiguration.getDefaultClusterPassword();
private long serverDumpInterval = HornetQDefaultConfiguration.getDefaultServerDumpInterval();
private long serverDumpInterval = ActiveMQDefaultConfiguration.getDefaultServerDumpInterval();
protected boolean failoverOnServerShutdown = HornetQDefaultConfiguration.isDefaultFailoverOnServerShutdown();
protected boolean failoverOnServerShutdown = ActiveMQDefaultConfiguration.isDefaultFailoverOnServerShutdown();
// percentage of free memory which triggers warning from the memory manager
private int memoryWarningThreshold = HornetQDefaultConfiguration.getDefaultMemoryWarningThreshold();
private int memoryWarningThreshold = ActiveMQDefaultConfiguration.getDefaultMemoryWarningThreshold();
private long memoryMeasureInterval = HornetQDefaultConfiguration.getDefaultMemoryMeasureInterval();
private long memoryMeasureInterval = ActiveMQDefaultConfiguration.getDefaultMemoryMeasureInterval();
protected GroupingHandlerConfiguration groupingHandlerConfiguration;
@ -203,13 +203,13 @@ public class ConfigurationImpl implements Configuration
protected List<ConnectorServiceConfiguration> connectorServiceConfigurations = new ArrayList<ConnectorServiceConfiguration>();
private boolean maskPassword = HornetQDefaultConfiguration.isDefaultMaskPassword();
private boolean maskPassword = ActiveMQDefaultConfiguration.isDefaultMaskPassword();
private transient String passwordCodec;
private boolean resolveProtocols = HornetQDefaultConfiguration.isDefaultResolveProtocols();
private boolean resolveProtocols = ActiveMQDefaultConfiguration.isDefaultResolveProtocols();
private long journalLockAcquisitionTimeout = HornetQDefaultConfiguration.getDefaultJournalLockAcquisitionTimeout();
private long journalLockAcquisitionTimeout = ActiveMQDefaultConfiguration.getDefaultJournalLockAcquisitionTimeout();
private HAPolicyConfiguration haPolicyConfiguration;

66
activemq-server/src/main/java/org/apache/activemq/core/deployers/impl/FileConfigurationParser.java
View File

@ -22,7 +22,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import org.apache.activemq.api.config.HornetQDefaultConfiguration;
import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
import org.apache.activemq.api.core.BroadcastEndpointFactoryConfiguration;
import org.apache.activemq.api.core.BroadcastGroupConfiguration;
import org.apache.activemq.api.core.DiscoveryGroupConfiguration;
@ -790,8 +790,8 @@ public final class FileConfigurationParser extends XMLConfigurationUtil
int journalMaxIO = getInteger(e,
"journal-max-io",
config.getJournalType() == JournalType.ASYNCIO ? HornetQDefaultConfiguration.getDefaultJournalMaxIoAio()
: HornetQDefaultConfiguration.getDefaultJournalMaxIoNio(),
config.getJournalType() == JournalType.ASYNCIO ? ActiveMQDefaultConfiguration.getDefaultJournalMaxIoAio()
: ActiveMQDefaultConfiguration.getDefaultJournalMaxIoNio(),
Validators.GT_ZERO);
if (config.getJournalType() == JournalType.ASYNCIO)
@ -819,11 +819,11 @@ public final class FileConfigurationParser extends XMLConfigurationUtil
config.setLogJournalWriteRate(getBoolean(e,
"log-journal-write-rate",
HornetQDefaultConfiguration.isDefaultJournalLogWriteRate()));
ActiveMQDefaultConfiguration.isDefaultJournalLogWriteRate()));
config.setJournalPerfBlastPages(getInteger(e,
"perf-blast-pages",
HornetQDefaultConfiguration.getDefaultJournalPerfBlastPages(),
ActiveMQDefaultConfiguration.getDefaultJournalPerfBlastPages(),
Validators.MINUS_ONE_OR_GT_ZERO));
config.setRunSyncSpeedTest(getBoolean(e, "run-sync-speed-test", config.isRunSyncSpeedTest()));
@ -1185,11 +1185,11 @@ public final class FileConfigurationParser extends XMLConfigurationUtil
if (mainConfig.isMaskPassword())
{
params.put(HornetQDefaultConfiguration.getPropMaskPassword(), mainConfig.isMaskPassword());
params.put(ActiveMQDefaultConfiguration.getPropMaskPassword(), mainConfig.isMaskPassword());
if (mainConfig.getPasswordCodec() != null)
{
params.put(HornetQDefaultConfiguration.getPropPasswordCodec(), mainConfig.getPasswordCodec());
params.put(ActiveMQDefaultConfiguration.getPropPasswordCodec(), mainConfig.getPasswordCodec());
}
}
@ -1482,7 +1482,7 @@ public final class FileConfigurationParser extends XMLConfigurationUtil
}
long broadcastPeriod =
getLong(e, "broadcast-period", HornetQDefaultConfiguration.getDefaultBroadcastPeriod(), Validators.GT_ZERO);
getLong(e, "broadcast-period", ActiveMQDefaultConfiguration.getDefaultBroadcastPeriod(), Validators.GT_ZERO);
String localAddress = getString(e, "local-bind-address", null, Validators.NO_CHECK);
@ -1532,7 +1532,7 @@ public final class FileConfigurationParser extends XMLConfigurationUtil
Validators.GT_ZERO);
long refreshTimeout =
getLong(e, "refresh-timeout", HornetQDefaultConfiguration.getDefaultBroadcastRefreshTimeout(),
getLong(e, "refresh-timeout", ActiveMQDefaultConfiguration.getDefaultBroadcastRefreshTimeout(),
Validators.GT_ZERO);
String localBindAddress = getString(e, "local-bind-address", null, Validators.NO_CHECK);
@ -1589,27 +1589,27 @@ public final class FileConfigurationParser extends XMLConfigurationUtil
String connectorName = getString(e, "connector-ref", null, Validators.NOT_NULL_OR_EMPTY);
boolean duplicateDetection =
getBoolean(e, "use-duplicate-detection", HornetQDefaultConfiguration.isDefaultClusterDuplicateDetection());
getBoolean(e, "use-duplicate-detection", ActiveMQDefaultConfiguration.isDefaultClusterDuplicateDetection());
boolean forwardWhenNoConsumers =
getBoolean(e, "forward-when-no-consumers",
HornetQDefaultConfiguration.isDefaultClusterForwardWhenNoConsumers());
ActiveMQDefaultConfiguration.isDefaultClusterForwardWhenNoConsumers());
int maxHops = getInteger(e, "max-hops",
HornetQDefaultConfiguration.getDefaultClusterMaxHops(),
ActiveMQDefaultConfiguration.getDefaultClusterMaxHops(),
Validators.GE_ZERO);
long clientFailureCheckPeriod =
getLong(e, "check-period", HornetQDefaultConfiguration.getDefaultClusterFailureCheckPeriod(),
getLong(e, "check-period", ActiveMQDefaultConfiguration.getDefaultClusterFailureCheckPeriod(),
Validators.GT_ZERO);
long connectionTTL =
getLong(e, "connection-ttl", HornetQDefaultConfiguration.getDefaultClusterConnectionTtl(),
getLong(e, "connection-ttl", ActiveMQDefaultConfiguration.getDefaultClusterConnectionTtl(),
Validators.GT_ZERO);
long retryInterval =
getLong(e, "retry-interval", HornetQDefaultConfiguration.getDefaultClusterRetryInterval(),
getLong(e, "retry-interval", ActiveMQDefaultConfiguration.getDefaultClusterRetryInterval(),
Validators.GT_ZERO);
long callTimeout = getLong(e, "call-timeout", HornetQClient.DEFAULT_CALL_TIMEOUT, Validators.GT_ZERO);
@ -1617,24 +1617,24 @@ public final class FileConfigurationParser extends XMLConfigurationUtil
long callFailoverTimeout = getLong(e, "call-failover-timeout", HornetQClient.DEFAULT_CALL_FAILOVER_TIMEOUT, Validators.MINUS_ONE_OR_GT_ZERO);
double retryIntervalMultiplier = getDouble(e, "retry-interval-multiplier",
HornetQDefaultConfiguration.getDefaultClusterRetryIntervalMultiplier(), Validators.GT_ZERO);
ActiveMQDefaultConfiguration.getDefaultClusterRetryIntervalMultiplier(), Validators.GT_ZERO);
int minLargeMessageSize = getInteger(e, "min-large-message-size", HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, Validators.GT_ZERO);
long maxRetryInterval = getLong(e, "max-retry-interval", HornetQDefaultConfiguration.getDefaultClusterMaxRetryInterval(), Validators.GT_ZERO);
long maxRetryInterval = getLong(e, "max-retry-interval", ActiveMQDefaultConfiguration.getDefaultClusterMaxRetryInterval(), Validators.GT_ZERO);
int initialConnectAttempts = getInteger(e, "initial-connect-attempts", HornetQDefaultConfiguration.getDefaultClusterInitialConnectAttempts(), Validators.MINUS_ONE_OR_GE_ZERO);
int initialConnectAttempts = getInteger(e, "initial-connect-attempts", ActiveMQDefaultConfiguration.getDefaultClusterInitialConnectAttempts(), Validators.MINUS_ONE_OR_GE_ZERO);
int reconnectAttempts = getInteger(e, "reconnect-attempts", HornetQDefaultConfiguration.getDefaultClusterReconnectAttempts(), Validators.MINUS_ONE_OR_GE_ZERO);
int reconnectAttempts = getInteger(e, "reconnect-attempts", ActiveMQDefaultConfiguration.getDefaultClusterReconnectAttempts(), Validators.MINUS_ONE_OR_GE_ZERO);
int confirmationWindowSize =
getInteger(e, "confirmation-window-size", HornetQDefaultConfiguration.getDefaultClusterConfirmationWindowSize(),
getInteger(e, "confirmation-window-size", ActiveMQDefaultConfiguration.getDefaultClusterConfirmationWindowSize(),
Validators.GT_ZERO);
long clusterNotificationInterval = getLong(e, "notification-interval", HornetQDefaultConfiguration.getDefaultClusterNotificationInterval(), Validators.GT_ZERO);
long clusterNotificationInterval = getLong(e, "notification-interval", ActiveMQDefaultConfiguration.getDefaultClusterNotificationInterval(), Validators.GT_ZERO);
int clusterNotificationAttempts = getInteger(e, "notification-attempts", HornetQDefaultConfiguration.getDefaultClusterNotificationAttempts(), Validators.GT_ZERO);
int clusterNotificationAttempts = getInteger(e, "notification-attempts", ActiveMQDefaultConfiguration.getDefaultClusterNotificationAttempts(), Validators.GT_ZERO);
String scaleDownConnector = e.getAttribute("scale-down-connector");
@ -1704,9 +1704,9 @@ public final class FileConfigurationParser extends XMLConfigurationUtil
String name = node.getAttribute("name");
String type = getString(node, "type", null, Validators.NOT_NULL_OR_EMPTY);
String address = getString(node, "address", null, Validators.NOT_NULL_OR_EMPTY);
Integer timeout = getInteger(node, "timeout", HornetQDefaultConfiguration.getDefaultGroupingHandlerTimeout(), Validators.GT_ZERO);
Long groupTimeout = getLong(node, "group-timeout", HornetQDefaultConfiguration.getDefaultGroupingHandlerGroupTimeout(), Validators.MINUS_ONE_OR_GT_ZERO);
Long reaperPeriod = getLong(node, "reaper-period", HornetQDefaultConfiguration.getDefaultGroupingHandlerReaperPeriod(), Validators.GT_ZERO);
Integer timeout = getInteger(node, "timeout", ActiveMQDefaultConfiguration.getDefaultGroupingHandlerTimeout(), Validators.GT_ZERO);
Long groupTimeout = getLong(node, "group-timeout", ActiveMQDefaultConfiguration.getDefaultGroupingHandlerGroupTimeout(), Validators.MINUS_ONE_OR_GT_ZERO);
Long reaperPeriod = getLong(node, "reaper-period", ActiveMQDefaultConfiguration.getDefaultGroupingHandlerReaperPeriod(), Validators.GT_ZERO);
mainConfiguration.setGroupingHandlerConfiguration(new GroupingHandlerConfiguration()
.setName(new SimpleString(name))
.setType(
@ -1731,7 +1731,7 @@ public final class FileConfigurationParser extends XMLConfigurationUtil
// Default bridge conf
int confirmationWindowSize =
getInteger(brNode, "confirmation-window-size", HornetQDefaultConfiguration.getDefaultBridgeConfirmationWindowSize(),
getInteger(brNode, "confirmation-window-size", ActiveMQDefaultConfiguration.getDefaultBridgeConfirmationWindowSize(),
Validators.GT_ZERO);
long retryInterval = getLong(brNode, "retry-interval", HornetQClient.DEFAULT_RETRY_INTERVAL, Validators.GT_ZERO);
@ -1753,24 +1753,24 @@ public final class FileConfigurationParser extends XMLConfigurationUtil
Validators.GT_ZERO);
int initialConnectAttempts =
getInteger(brNode, "initial-connect-attempts", HornetQDefaultConfiguration.getDefaultBridgeInitialConnectAttempts(),
getInteger(brNode, "initial-connect-attempts", ActiveMQDefaultConfiguration.getDefaultBridgeInitialConnectAttempts(),
Validators.MINUS_ONE_OR_GE_ZERO);
int reconnectAttempts =
getInteger(brNode, "reconnect-attempts", HornetQDefaultConfiguration.getDefaultBridgeReconnectAttempts(),
getInteger(brNode, "reconnect-attempts", ActiveMQDefaultConfiguration.getDefaultBridgeReconnectAttempts(),
Validators.MINUS_ONE_OR_GE_ZERO);
int reconnectAttemptsSameNode =
getInteger(brNode, "reconnect-attempts-same-node", HornetQDefaultConfiguration.getDefaultBridgeConnectSameNode(),
getInteger(brNode, "reconnect-attempts-same-node", ActiveMQDefaultConfiguration.getDefaultBridgeConnectSameNode(),
Validators.MINUS_ONE_OR_GE_ZERO);
boolean useDuplicateDetection = getBoolean(brNode,
"use-duplicate-detection",
HornetQDefaultConfiguration.isDefaultBridgeDuplicateDetection());
ActiveMQDefaultConfiguration.isDefaultBridgeDuplicateDetection());
String user = getString(brNode,
"user",
HornetQDefaultConfiguration.getDefaultClusterUser(),
ActiveMQDefaultConfiguration.getDefaultClusterUser(),
Validators.NO_CHECK);
NodeList clusterPassNodes = brNode.getElementsByTagName("password");
@ -1795,7 +1795,7 @@ public final class FileConfigurationParser extends XMLConfigurationUtil
}
else
{
password = HornetQDefaultConfiguration.getDefaultClusterPassword();
password = ActiveMQDefaultConfiguration.getDefaultClusterPassword();
}
boolean ha = getBoolean(brNode, "ha", false);
@ -1883,7 +1883,7 @@ public final class FileConfigurationParser extends XMLConfigurationUtil
String forwardingAddress = getString(e, "forwarding-address", null, Validators.NOT_NULL_OR_EMPTY);
boolean exclusive = getBoolean(e, "exclusive", HornetQDefaultConfiguration.isDefaultDivertExclusive());
boolean exclusive = getBoolean(e, "exclusive", ActiveMQDefaultConfiguration.isDefaultDivertExclusive());
String transformerClassName = getString(e, "transformer-class-name", null, Validators.NO_CHECK);

6
activemq-server/src/main/java/org/apache/activemq/core/messagecounter/impl/MessageCounterManagerImpl.java
View File

@ -21,7 +21,7 @@ import java.util.concurrent.Future;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import org.apache.activemq.api.config.HornetQDefaultConfiguration;
import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
import org.apache.activemq.core.messagecounter.MessageCounter;
import org.apache.activemq.core.messagecounter.MessageCounterManager;
@ -39,11 +39,11 @@ import org.apache.activemq.core.messagecounter.MessageCounterManager;
public class MessageCounterManagerImpl implements MessageCounterManager
{
public static final long DEFAULT_SAMPLE_PERIOD = HornetQDefaultConfiguration.getDefaultMessageCounterSamplePeriod();
public static final long DEFAULT_SAMPLE_PERIOD = ActiveMQDefaultConfiguration.getDefaultMessageCounterSamplePeriod();
public static final long MIN_SAMPLE_PERIOD = 1000;
public static final int DEFAULT_MAX_DAY_COUNT = HornetQDefaultConfiguration.getDefaultMessageCounterMaxDayHistory();
public static final int DEFAULT_MAX_DAY_COUNT = ActiveMQDefaultConfiguration.getDefaultMessageCounterMaxDayHistory();
private final Map<String, MessageCounter> messageCounters;

10
activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/invm/TransportConstants.java
View File

@ -16,7 +16,7 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
import org.apache.activemq.api.config.HornetQDefaultConfiguration;
import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
/**
* A TransportConstants
@ -40,15 +40,15 @@ public final class TransportConstants
Set<String> allowableAcceptorKeys = new HashSet<String>();
allowableAcceptorKeys.add(TransportConstants.SERVER_ID_PROP_NAME);
allowableAcceptorKeys.add(org.apache.activemq.core.remoting.impl.netty.TransportConstants.CLUSTER_CONNECTION);
allowableAcceptorKeys.add(HornetQDefaultConfiguration.getPropMaskPassword());
allowableAcceptorKeys.add(HornetQDefaultConfiguration.getPropPasswordCodec());
allowableAcceptorKeys.add(ActiveMQDefaultConfiguration.getPropMaskPassword());
allowableAcceptorKeys.add(ActiveMQDefaultConfiguration.getPropPasswordCodec());
ALLOWABLE_ACCEPTOR_KEYS = Collections.unmodifiableSet(allowableAcceptorKeys);
Set<String> allowableConnectorKeys = new HashSet<String>();
allowableConnectorKeys.add(TransportConstants.SERVER_ID_PROP_NAME);
allowableConnectorKeys.add(HornetQDefaultConfiguration.getPropMaskPassword());
allowableConnectorKeys.add(HornetQDefaultConfiguration.getPropPasswordCodec());
allowableConnectorKeys.add(ActiveMQDefaultConfiguration.getPropMaskPassword());
allowableConnectorKeys.add(ActiveMQDefaultConfiguration.getPropPasswordCodec());
ALLOWABLE_CONNECTOR_KEYS = Collections.unmodifiableSet(allowableConnectorKeys);
}

10
activemq-server/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyAcceptor.java
View File

@ -50,7 +50,7 @@ import io.netty.util.ResourceLeakDetector;
import io.netty.util.concurrent.GenericFutureListener;
import io.netty.util.concurrent.GlobalEventExecutor;
import org.apache.activemq.api.config.HornetQDefaultConfiguration;
import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
import org.apache.activemq.api.core.ActiveMQException;
import org.apache.activemq.api.core.SimpleString;
import org.apache.activemq.api.core.TransportConfiguration;
@ -221,8 +221,8 @@ public class NettyAcceptor implements Acceptor
keyStorePassword = ConfigurationHelper.getPasswordProperty(TransportConstants.KEYSTORE_PASSWORD_PROP_NAME,
TransportConstants.DEFAULT_KEYSTORE_PASSWORD,
configuration,
HornetQDefaultConfiguration.getPropMaskPassword(),
HornetQDefaultConfiguration.getPropMaskPassword());
ActiveMQDefaultConfiguration.getPropMaskPassword(),
ActiveMQDefaultConfiguration.getPropMaskPassword());
trustStoreProvider = ConfigurationHelper.getStringProperty(TransportConstants.TRUSTSTORE_PROVIDER_PROP_NAME,
TransportConstants.DEFAULT_TRUSTSTORE_PROVIDER,
@ -235,8 +235,8 @@ public class NettyAcceptor implements Acceptor
trustStorePassword = ConfigurationHelper.getPasswordProperty(TransportConstants.TRUSTSTORE_PASSWORD_PROP_NAME,
TransportConstants.DEFAULT_TRUSTSTORE_PASSWORD,
configuration,
HornetQDefaultConfiguration.getPropMaskPassword(),
HornetQDefaultConfiguration.getPropMaskPassword());
ActiveMQDefaultConfiguration.getPropMaskPassword(),
ActiveMQDefaultConfiguration.getPropMaskPassword());
enabledCipherSuites = ConfigurationHelper.getStringProperty(TransportConstants.ENABLED_CIPHER_SUITES_PROP_NAME,
TransportConstants.DEFAULT_ENABLED_CIPHER_SUITES,

4
activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/BackupPolicy.java
View File

@ -12,13 +12,13 @@
*/
package org.apache.activemq.core.server.cluster.ha;
import org.apache.activemq.api.config.HornetQDefaultConfiguration;
import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
import org.apache.activemq.core.server.impl.Activation;
public abstract class BackupPolicy implements HAPolicy<Activation>
{
protected ScaleDownPolicy scaleDownPolicy;
protected boolean restartBackup = HornetQDefaultConfiguration.isDefaultRestartBackup();
protected boolean restartBackup = ActiveMQDefaultConfiguration.isDefaultRestartBackup();
public ScaleDownPolicy getScaleDownPolicy()
{

12
activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ColocatedPolicy.java
View File

@ -12,7 +12,7 @@
*/
package org.apache.activemq.core.server.cluster.ha;
import org.apache.activemq.api.config.HornetQDefaultConfiguration;
import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
import org.apache.activemq.core.server.impl.ColocatedActivation;
import org.apache.activemq.core.server.impl.HornetQServerImpl;
import org.apache.activemq.core.server.impl.LiveActivation;
@ -25,15 +25,15 @@ public class ColocatedPolicy implements HAPolicy<LiveActivation>
{
/*live stuff*/
private boolean requestBackup = HornetQDefaultConfiguration.isDefaultHapolicyRequestBackup();
private boolean requestBackup = ActiveMQDefaultConfiguration.isDefaultHapolicyRequestBackup();
private int backupRequestRetries = HornetQDefaultConfiguration.getDefaultHapolicyBackupRequestRetries();
private int backupRequestRetries = ActiveMQDefaultConfiguration.getDefaultHapolicyBackupRequestRetries();
private long backupRequestRetryInterval = HornetQDefaultConfiguration.getDefaultHapolicyBackupRequestRetryInterval();
private long backupRequestRetryInterval = ActiveMQDefaultConfiguration.getDefaultHapolicyBackupRequestRetryInterval();
private int maxBackups = HornetQDefaultConfiguration.getDefaultHapolicyMaxBackups();
private int maxBackups = ActiveMQDefaultConfiguration.getDefaultHapolicyMaxBackups();
private int backupPortOffset = HornetQDefaultConfiguration.getDefaultHapolicyBackupPortOffset();
private int backupPortOffset = ActiveMQDefaultConfiguration.getDefaultHapolicyBackupPortOffset();
/*backup stuff*/
private List<String> excludedConnectors = new ArrayList<>();

6
activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ReplicaPolicy.java
View File

@ -12,7 +12,7 @@
*/
package org.apache.activemq.core.server.cluster.ha;
import org.apache.activemq.api.config.HornetQDefaultConfiguration;
import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
import org.apache.activemq.core.server.impl.Activation;
import org.apache.activemq.core.server.impl.HornetQServerImpl;
import org.apache.activemq.core.server.impl.SharedNothingBackupActivation;
@ -23,11 +23,11 @@ public class ReplicaPolicy extends BackupPolicy
{
private String clusterName;
private int maxSavedReplicatedJournalsSize = HornetQDefaultConfiguration.getDefaultMaxSavedReplicatedJournalsSize();
private int maxSavedReplicatedJournalsSize = ActiveMQDefaultConfiguration.getDefaultMaxSavedReplicatedJournalsSize();
private String groupName = null;
private boolean restartBackup = HornetQDefaultConfiguration.isDefaultRestartBackup();
private boolean restartBackup = ActiveMQDefaultConfiguration.isDefaultRestartBackup();
private ReplicatedPolicy replicatedPolicy;

8
activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/ReplicatedPolicy.java
View File

@ -12,7 +12,7 @@
*/
package org.apache.activemq.core.server.cluster.ha;
import org.apache.activemq.api.config.HornetQDefaultConfiguration;
import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
import org.apache.activemq.core.server.impl.HornetQServerImpl;
import org.apache.activemq.core.server.impl.LiveActivation;
import org.apache.activemq.core.server.impl.SharedNothingLiveActivation;
@ -21,7 +21,7 @@ import java.util.Map;
public class ReplicatedPolicy implements HAPolicy<LiveActivation>
{
private boolean checkForLiveServer = HornetQDefaultConfiguration.isDefaultCheckForLiveServer();
private boolean checkForLiveServer = ActiveMQDefaultConfiguration.isDefaultCheckForLiveServer();
private String groupName = null;
@ -31,9 +31,9 @@ public class ReplicatedPolicy implements HAPolicy<LiveActivation>
* these are only set by the ReplicaPolicy after failover to decide if the live server can failback, these should not
* be exposed in configuration.
* */
private boolean allowAutoFailBack = HornetQDefaultConfiguration.isDefaultAllowAutoFailback();
private boolean allowAutoFailBack = ActiveMQDefaultConfiguration.isDefaultAllowAutoFailback();
private long failbackDelay = HornetQDefaultConfiguration.getDefaultFailbackDelay();
private long failbackDelay = ActiveMQDefaultConfiguration.getDefaultFailbackDelay();
/*
* this is used as the policy when the server is started after a failover

6
activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/SharedStoreMasterPolicy.java
View File

@ -12,7 +12,7 @@
*/
package org.apache.activemq.core.server.cluster.ha;
import org.apache.activemq.api.config.HornetQDefaultConfiguration;
import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
import org.apache.activemq.core.server.impl.HornetQServerImpl;
import org.apache.activemq.core.server.impl.LiveActivation;
import org.apache.activemq.core.server.impl.SharedStoreLiveActivation;
@ -21,9 +21,9 @@ import java.util.Map;
public class SharedStoreMasterPolicy implements HAPolicy<LiveActivation>
{
private long failbackDelay = HornetQDefaultConfiguration.getDefaultFailbackDelay();
private long failbackDelay = ActiveMQDefaultConfiguration.getDefaultFailbackDelay();
private boolean failoverOnServerShutdown = HornetQDefaultConfiguration.isDefaultFailoverOnServerShutdown();
private boolean failoverOnServerShutdown = ActiveMQDefaultConfiguration.isDefaultFailoverOnServerShutdown();
private SharedStoreSlavePolicy sharedStoreSlavePolicy;

8
activemq-server/src/main/java/org/apache/activemq/core/server/cluster/ha/SharedStoreSlavePolicy.java
View File

@ -12,7 +12,7 @@
*/
package org.apache.activemq.core.server.cluster.ha;
import org.apache.activemq.api.config.HornetQDefaultConfiguration;
import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
import org.apache.activemq.core.server.impl.Activation;
import org.apache.activemq.core.server.impl.HornetQServerImpl;
import org.apache.activemq.core.server.impl.SharedStoreBackupActivation;
@ -21,11 +21,11 @@ import java.util.Map;
public class SharedStoreSlavePolicy extends BackupPolicy
{
private long failbackDelay = HornetQDefaultConfiguration.getDefaultFailbackDelay();
private long failbackDelay = ActiveMQDefaultConfiguration.getDefaultFailbackDelay();
private boolean failoverOnServerShutdown = HornetQDefaultConfiguration.isDefaultFailoverOnServerShutdown();
private boolean failoverOnServerShutdown = ActiveMQDefaultConfiguration.isDefaultFailoverOnServerShutdown();
private boolean allowAutoFailBack = HornetQDefaultConfiguration.isDefaultAllowAutoFailback();
private boolean allowAutoFailBack = ActiveMQDefaultConfiguration.isDefaultAllowAutoFailback();
//this is how we act once we have failed over
private SharedStoreMasterPolicy sharedStoreMasterPolicy;

8
activemq-server/src/main/java/org/apache/activemq/core/server/group/impl/GroupingHandlerConfiguration.java
View File

@ -14,7 +14,7 @@ package org.apache.activemq.core.server.group.impl;
import java.io.Serializable;
import org.apache.activemq.api.config.HornetQDefaultConfiguration;
import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
import org.apache.activemq.api.core.SimpleString;
/**
@ -36,11 +36,11 @@ public final class GroupingHandlerConfiguration implements Serializable
private SimpleString address = null;
private long timeout = HornetQDefaultConfiguration.getDefaultGroupingHandlerTimeout();
private long timeout = ActiveMQDefaultConfiguration.getDefaultGroupingHandlerTimeout();
private long groupTimeout = HornetQDefaultConfiguration.getDefaultGroupingHandlerGroupTimeout();
private long groupTimeout = ActiveMQDefaultConfiguration.getDefaultGroupingHandlerGroupTimeout();
private long reaperPeriod = HornetQDefaultConfiguration.getDefaultGroupingHandlerReaperPeriod();
private long reaperPeriod = ActiveMQDefaultConfiguration.getDefaultGroupingHandlerReaperPeriod();
public GroupingHandlerConfiguration()
{

4
activemq-server/src/main/java/org/apache/activemq/core/server/impl/HornetQServerImpl.java
View File

@ -37,7 +37,7 @@ import java.util.concurrent.ScheduledThreadPoolExecutor;
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.TimeUnit;
import org.apache.activemq.api.config.HornetQDefaultConfiguration;
import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
import org.apache.activemq.api.core.Pair;
import org.apache.activemq.api.core.SimpleString;
import org.apache.activemq.core.asyncio.impl.AsynchronousFileImpl;
@ -1631,7 +1631,7 @@ public class HornetQServerImpl implements HornetQServer
storageManager = createStorageManager();
if (HornetQDefaultConfiguration.getDefaultClusterUser().equals(configuration.getClusterUser()) && HornetQDefaultConfiguration.getDefaultClusterPassword().equals(configuration.getClusterPassword()))
if (ActiveMQDefaultConfiguration.getDefaultClusterUser().equals(configuration.getClusterUser()) && ActiveMQDefaultConfiguration.getDefaultClusterPassword().equals(configuration.getClusterPassword()))
{
HornetQServerLogger.LOGGER.clusterSecurityRisk();
}

88
activemq-server/src/test/java/org/apache/activemq/core/config/impl/ConfigurationImplTest.java
View File

@ -11,6 +11,7 @@
* permissions and limitations under the License.
*/
package org.apache.activemq.core.config.impl;
import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
import org.apache.activemq.core.config.ha.LiveOnlyPolicyConfiguration;
import org.junit.Before;
@ -23,7 +24,6 @@ import java.io.ObjectOutputStream;
import org.junit.Assert;
import org.apache.activemq.api.config.HornetQDefaultConfiguration;
import org.apache.activemq.api.core.SimpleString;
import org.apache.activemq.core.config.Configuration;
import org.apache.activemq.core.journal.impl.JournalConstants;
@ -45,63 +45,63 @@ public class ConfigurationImplTest extends UnitTestCase
@Test
public void testDefaults()
{
Assert.assertEquals(HornetQDefaultConfiguration.getDefaultScheduledThreadPoolMaxSize(),
Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultScheduledThreadPoolMaxSize(),
conf.getScheduledThreadPoolMaxSize());
Assert.assertEquals(HornetQDefaultConfiguration.getDefaultSecurityInvalidationInterval(),
Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultSecurityInvalidationInterval(),
conf.getSecurityInvalidationInterval());
Assert.assertEquals(HornetQDefaultConfiguration.isDefaultSecurityEnabled(), conf.isSecurityEnabled());
Assert.assertEquals(HornetQDefaultConfiguration.getDefaultBindingsDirectory(), conf.getBindingsDirectory());
Assert.assertEquals(HornetQDefaultConfiguration.isDefaultCreateBindingsDir(), conf.isCreateBindingsDir());
Assert.assertEquals(HornetQDefaultConfiguration.getDefaultJournalDir(), conf.getJournalDirectory());
Assert.assertEquals(HornetQDefaultConfiguration.isDefaultCreateJournalDir(), conf.isCreateJournalDir());
Assert.assertEquals(ActiveMQDefaultConfiguration.isDefaultSecurityEnabled(), conf.isSecurityEnabled());
Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultBindingsDirectory(), conf.getBindingsDirectory());
Assert.assertEquals(ActiveMQDefaultConfiguration.isDefaultCreateBindingsDir(), conf.isCreateBindingsDir());
Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultJournalDir(), conf.getJournalDirectory());
Assert.assertEquals(ActiveMQDefaultConfiguration.isDefaultCreateJournalDir(), conf.isCreateJournalDir());
Assert.assertEquals(ConfigurationImpl.DEFAULT_JOURNAL_TYPE, conf.getJournalType());
Assert.assertEquals(HornetQDefaultConfiguration.isDefaultJournalSyncTransactional(), conf.isJournalSyncTransactional());
Assert.assertEquals(HornetQDefaultConfiguration.isDefaultJournalSyncNonTransactional(),
Assert.assertEquals(ActiveMQDefaultConfiguration.isDefaultJournalSyncTransactional(), conf.isJournalSyncTransactional());
Assert.assertEquals(ActiveMQDefaultConfiguration.isDefaultJournalSyncNonTransactional(),
conf.isJournalSyncNonTransactional());
Assert.assertEquals(HornetQDefaultConfiguration.getDefaultJournalFileSize(), conf.getJournalFileSize());
Assert.assertEquals(HornetQDefaultConfiguration.getDefaultJournalMinFiles(), conf.getJournalMinFiles());
Assert.assertEquals(HornetQDefaultConfiguration.getDefaultJournalMaxIoAio(), conf.getJournalMaxIO_AIO());
Assert.assertEquals(HornetQDefaultConfiguration.getDefaultJournalMaxIoNio(), conf.getJournalMaxIO_NIO());
Assert.assertEquals(HornetQDefaultConfiguration.isDefaultWildcardRoutingEnabled(), conf.isWildcardRoutingEnabled());
Assert.assertEquals(HornetQDefaultConfiguration.getDefaultTransactionTimeout(), conf.getTransactionTimeout());
Assert.assertEquals(HornetQDefaultConfiguration.getDefaultMessageExpiryScanPeriod(), conf.getMessageExpiryScanPeriod()); // OK
Assert.assertEquals(HornetQDefaultConfiguration.getDefaultMessageExpiryThreadPriority(),
Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultJournalFileSize(), conf.getJournalFileSize());
Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultJournalMinFiles(), conf.getJournalMinFiles());
Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultJournalMaxIoAio(), conf.getJournalMaxIO_AIO());
Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultJournalMaxIoNio(), conf.getJournalMaxIO_NIO());
Assert.assertEquals(ActiveMQDefaultConfiguration.isDefaultWildcardRoutingEnabled(), conf.isWildcardRoutingEnabled());
Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultTransactionTimeout(), conf.getTransactionTimeout());
Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultMessageExpiryScanPeriod(), conf.getMessageExpiryScanPeriod()); // OK
Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultMessageExpiryThreadPriority(),
conf.getMessageExpiryThreadPriority()); // OK
Assert.assertEquals(HornetQDefaultConfiguration.getDefaultTransactionTimeoutScanPeriod(),
Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultTransactionTimeoutScanPeriod(),
conf.getTransactionTimeoutScanPeriod()); // OK
Assert.assertEquals(HornetQDefaultConfiguration.getDefaultManagementAddress(), conf.getManagementAddress()); // OK
Assert.assertEquals(HornetQDefaultConfiguration.getDefaultManagementNotificationAddress(),
Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultManagementAddress(), conf.getManagementAddress()); // OK
Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultManagementNotificationAddress(),
conf.getManagementNotificationAddress()); // OK
Assert.assertEquals(HornetQDefaultConfiguration.getDefaultClusterUser(), conf.getClusterUser()); // OK
Assert.assertEquals(HornetQDefaultConfiguration.getDefaultClusterPassword(), conf.getClusterPassword()); // OK
Assert.assertEquals(HornetQDefaultConfiguration.isDefaultPersistenceEnabled(), conf.isPersistenceEnabled());
Assert.assertEquals(HornetQDefaultConfiguration.isDefaultFileDeploymentEnabled(), conf.isFileDeploymentEnabled());
Assert.assertEquals(HornetQDefaultConfiguration.isDefaultPersistDeliveryCountBeforeDelivery(),
Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultClusterUser(), conf.getClusterUser()); // OK
Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultClusterPassword(), conf.getClusterPassword()); // OK
Assert.assertEquals(ActiveMQDefaultConfiguration.isDefaultPersistenceEnabled(), conf.isPersistenceEnabled());
Assert.assertEquals(ActiveMQDefaultConfiguration.isDefaultFileDeploymentEnabled(), conf.isFileDeploymentEnabled());
Assert.assertEquals(ActiveMQDefaultConfiguration.isDefaultPersistDeliveryCountBeforeDelivery(),
conf.isPersistDeliveryCountBeforeDelivery());
Assert.assertEquals(HornetQDefaultConfiguration.getDefaultFileDeployerScanPeriod(), conf.getFileDeployerScanPeriod());
Assert.assertEquals(HornetQDefaultConfiguration.getDefaultThreadPoolMaxSize(), conf.getThreadPoolMaxSize());
Assert.assertEquals(HornetQDefaultConfiguration.isDefaultJmxManagementEnabled(), conf.isJMXManagementEnabled());
Assert.assertEquals(HornetQDefaultConfiguration.getDefaultConnectionTtlOverride(), conf.getConnectionTTLOverride());
Assert.assertEquals(HornetQDefaultConfiguration.isDefaultAsyncConnectionExecutionEnabled(),
Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultFileDeployerScanPeriod(), conf.getFileDeployerScanPeriod());
Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultThreadPoolMaxSize(), conf.getThreadPoolMaxSize());
Assert.assertEquals(ActiveMQDefaultConfiguration.isDefaultJmxManagementEnabled(), conf.isJMXManagementEnabled());
Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultConnectionTtlOverride(), conf.getConnectionTTLOverride());
Assert.assertEquals(ActiveMQDefaultConfiguration.isDefaultAsyncConnectionExecutionEnabled(),
conf.isAsyncConnectionExecutionEnabled());
Assert.assertEquals(HornetQDefaultConfiguration.getDefaultPagingDir(), conf.getPagingDirectory());
Assert.assertEquals(HornetQDefaultConfiguration.getDefaultLargeMessagesDir(), conf.getLargeMessagesDirectory());
Assert.assertEquals(HornetQDefaultConfiguration.getDefaultJournalCompactPercentage(), conf.getJournalCompactPercentage());
Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultPagingDir(), conf.getPagingDirectory());
Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultLargeMessagesDir(), conf.getLargeMessagesDirectory());
Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultJournalCompactPercentage(), conf.getJournalCompactPercentage());
Assert.assertEquals(JournalConstants.DEFAULT_JOURNAL_BUFFER_TIMEOUT_AIO, conf.getJournalBufferTimeout_AIO());
Assert.assertEquals(JournalConstants.DEFAULT_JOURNAL_BUFFER_TIMEOUT_NIO, conf.getJournalBufferTimeout_NIO());
Assert.assertEquals(JournalConstants.DEFAULT_JOURNAL_BUFFER_SIZE_AIO, conf.getJournalBufferSize_AIO());
Assert.assertEquals(JournalConstants.DEFAULT_JOURNAL_BUFFER_SIZE_NIO, conf.getJournalBufferSize_NIO());
Assert.assertEquals(HornetQDefaultConfiguration.isDefaultJournalLogWriteRate(), conf.isLogJournalWriteRate());
Assert.assertEquals(HornetQDefaultConfiguration.getDefaultJournalPerfBlastPages(), conf.getJournalPerfBlastPages());
Assert.assertEquals(HornetQDefaultConfiguration.isDefaultMessageCounterEnabled(), conf.isMessageCounterEnabled());
Assert.assertEquals(HornetQDefaultConfiguration.getDefaultMessageCounterMaxDayHistory(),
Assert.assertEquals(ActiveMQDefaultConfiguration.isDefaultJournalLogWriteRate(), conf.isLogJournalWriteRate());
Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultJournalPerfBlastPages(), conf.getJournalPerfBlastPages());
Assert.assertEquals(ActiveMQDefaultConfiguration.isDefaultMessageCounterEnabled(), conf.isMessageCounterEnabled());
Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultMessageCounterMaxDayHistory(),
conf.getMessageCounterMaxDayHistory());
Assert.assertEquals(HornetQDefaultConfiguration.getDefaultMessageCounterSamplePeriod(), conf.getMessageCounterSamplePeriod());
Assert.assertEquals(HornetQDefaultConfiguration.getDefaultIdCacheSize(), conf.getIDCacheSize());
Assert.assertEquals(HornetQDefaultConfiguration.isDefaultPersistIdCache(), conf.isPersistIDCache());
Assert.assertEquals(HornetQDefaultConfiguration.getDefaultServerDumpInterval(), conf.getServerDumpInterval());
Assert.assertEquals(HornetQDefaultConfiguration.getDefaultMemoryWarningThreshold(), conf.getMemoryWarningThreshold());
Assert.assertEquals(HornetQDefaultConfiguration.getDefaultMemoryMeasureInterval(), conf.getMemoryMeasureInterval());
Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultMessageCounterSamplePeriod(), conf.getMessageCounterSamplePeriod());
Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultIdCacheSize(), conf.getIDCacheSize());
Assert.assertEquals(ActiveMQDefaultConfiguration.isDefaultPersistIdCache(), conf.isPersistIDCache());
Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultServerDumpInterval(), conf.getServerDumpInterval());
Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultMemoryWarningThreshold(), conf.getMemoryWarningThreshold());
Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultMemoryMeasureInterval(), conf.getMemoryMeasureInterval());
}
@Test

68
activemq-server/src/test/java/org/apache/activemq/core/config/impl/DefaultsFileConfigurationTest.java
View File

@ -12,6 +12,7 @@
*/
package org.apache.activemq.core.config.impl;
import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
import org.apache.activemq.core.config.ha.LiveOnlyPolicyConfiguration;
import org.junit.Test;
@ -19,7 +20,6 @@ import java.util.Collections;
import org.junit.Assert;
import org.apache.activemq.api.config.HornetQDefaultConfiguration;
import org.apache.activemq.core.config.Configuration;
import org.apache.activemq.core.journal.impl.JournalConstants;
@ -38,23 +38,23 @@ public class DefaultsFileConfigurationTest extends ConfigurationImplTest
public void testDefaults()
{
Assert.assertEquals(HornetQDefaultConfiguration.getDefaultScheduledThreadPoolMaxSize(),
Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultScheduledThreadPoolMaxSize(),
conf.getScheduledThreadPoolMaxSize());
Assert.assertEquals(HornetQDefaultConfiguration.getDefaultThreadPoolMaxSize(), conf.getThreadPoolMaxSize());
Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultThreadPoolMaxSize(), conf.getThreadPoolMaxSize());
Assert.assertEquals(HornetQDefaultConfiguration.getDefaultSecurityInvalidationInterval(),
Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultSecurityInvalidationInterval(),
conf.getSecurityInvalidationInterval());
Assert.assertEquals(HornetQDefaultConfiguration.isDefaultSecurityEnabled(), conf.isSecurityEnabled());
Assert.assertEquals(ActiveMQDefaultConfiguration.isDefaultSecurityEnabled(), conf.isSecurityEnabled());
Assert.assertEquals(HornetQDefaultConfiguration.isDefaultJmxManagementEnabled(), conf.isJMXManagementEnabled());
Assert.assertEquals(ActiveMQDefaultConfiguration.isDefaultJmxManagementEnabled(), conf.isJMXManagementEnabled());
Assert.assertEquals(HornetQDefaultConfiguration.getDefaultJmxDomain(), conf.getJMXDomain());
Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultJmxDomain(), conf.getJMXDomain());
Assert.assertEquals(0, conf.getIncomingInterceptorClassNames().size());
Assert.assertEquals(HornetQDefaultConfiguration.getDefaultConnectionTtlOverride(), conf.getConnectionTTLOverride());
Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultConnectionTtlOverride(), conf.getConnectionTTLOverride());
Assert.assertEquals(0, conf.getAcceptorConfigurations().size());
@ -72,70 +72,70 @@ public class DefaultsFileConfigurationTest extends ConfigurationImplTest
Assert.assertEquals(Collections.emptyList(), conf.getQueueConfigurations());
Assert.assertEquals(HornetQDefaultConfiguration.getDefaultManagementAddress(), conf.getManagementAddress());
Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultManagementAddress(), conf.getManagementAddress());
Assert.assertEquals(HornetQDefaultConfiguration.getDefaultManagementNotificationAddress(),
Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultManagementNotificationAddress(),
conf.getManagementNotificationAddress());
Assert.assertEquals(HornetQDefaultConfiguration.getDefaultClusterUser(), conf.getClusterUser());
Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultClusterUser(), conf.getClusterUser());
Assert.assertEquals(HornetQDefaultConfiguration.getDefaultClusterPassword(), conf.getClusterPassword());
Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultClusterPassword(), conf.getClusterPassword());
Assert.assertEquals(HornetQDefaultConfiguration.getDefaultIdCacheSize(), conf.getIDCacheSize());
Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultIdCacheSize(), conf.getIDCacheSize());
Assert.assertEquals(HornetQDefaultConfiguration.isDefaultPersistIdCache(), conf.isPersistIDCache());
Assert.assertEquals(ActiveMQDefaultConfiguration.isDefaultPersistIdCache(), conf.isPersistIDCache());
Assert.assertEquals(HornetQDefaultConfiguration.getDefaultBindingsDirectory(), conf.getBindingsDirectory());
Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultBindingsDirectory(), conf.getBindingsDirectory());
Assert.assertEquals(HornetQDefaultConfiguration.getDefaultJournalDir(), conf.getJournalDirectory());
Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultJournalDir(), conf.getJournalDirectory());
Assert.assertEquals(getDefaultJournalType(), conf.getJournalType());
Assert.assertEquals(HornetQDefaultConfiguration.isDefaultJournalSyncTransactional(), conf.isJournalSyncTransactional());
Assert.assertEquals(ActiveMQDefaultConfiguration.isDefaultJournalSyncTransactional(), conf.isJournalSyncTransactional());
Assert.assertEquals(HornetQDefaultConfiguration.isDefaultJournalSyncNonTransactional(),
Assert.assertEquals(ActiveMQDefaultConfiguration.isDefaultJournalSyncNonTransactional(),
conf.isJournalSyncNonTransactional());
Assert.assertEquals(HornetQDefaultConfiguration.getDefaultJournalFileSize(), conf.getJournalFileSize());
Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultJournalFileSize(), conf.getJournalFileSize());
Assert.assertEquals(HornetQDefaultConfiguration.getDefaultJournalCompactMinFiles(), conf.getJournalCompactMinFiles());
Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultJournalCompactMinFiles(), conf.getJournalCompactMinFiles());
Assert.assertEquals(HornetQDefaultConfiguration.getDefaultJournalCompactPercentage(), conf.getJournalCompactPercentage());
Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultJournalCompactPercentage(), conf.getJournalCompactPercentage());
Assert.assertEquals(HornetQDefaultConfiguration.getDefaultJournalMinFiles(), conf.getJournalMinFiles());
Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultJournalMinFiles(), conf.getJournalMinFiles());
Assert.assertEquals(HornetQDefaultConfiguration.getDefaultJournalMaxIoAio(), conf.getJournalMaxIO_AIO());
Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultJournalMaxIoAio(), conf.getJournalMaxIO_AIO());
Assert.assertEquals(JournalConstants.DEFAULT_JOURNAL_BUFFER_TIMEOUT_AIO, conf.getJournalBufferTimeout_AIO());
Assert.assertEquals(JournalConstants.DEFAULT_JOURNAL_BUFFER_SIZE_AIO, conf.getJournalBufferSize_AIO());
Assert.assertEquals(HornetQDefaultConfiguration.getDefaultJournalMaxIoNio(), conf.getJournalMaxIO_NIO());
Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultJournalMaxIoNio(), conf.getJournalMaxIO_NIO());
Assert.assertEquals(JournalConstants.DEFAULT_JOURNAL_BUFFER_TIMEOUT_NIO, conf.getJournalBufferTimeout_NIO());
Assert.assertEquals(JournalConstants.DEFAULT_JOURNAL_BUFFER_SIZE_NIO, conf.getJournalBufferSize_NIO());
Assert.assertEquals(HornetQDefaultConfiguration.isDefaultCreateBindingsDir(), conf.isCreateBindingsDir());
Assert.assertEquals(ActiveMQDefaultConfiguration.isDefaultCreateBindingsDir(), conf.isCreateBindingsDir());
Assert.assertEquals(HornetQDefaultConfiguration.isDefaultCreateJournalDir(), conf.isCreateJournalDir());
Assert.assertEquals(ActiveMQDefaultConfiguration.isDefaultCreateJournalDir(), conf.isCreateJournalDir());
Assert.assertEquals(HornetQDefaultConfiguration.getDefaultPagingDir(), conf.getPagingDirectory());
Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultPagingDir(), conf.getPagingDirectory());
Assert.assertEquals(HornetQDefaultConfiguration.getDefaultLargeMessagesDir(), conf.getLargeMessagesDirectory());
Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultLargeMessagesDir(), conf.getLargeMessagesDirectory());
Assert.assertEquals(HornetQDefaultConfiguration.isDefaultWildcardRoutingEnabled(), conf.isWildcardRoutingEnabled());
Assert.assertEquals(ActiveMQDefaultConfiguration.isDefaultWildcardRoutingEnabled(), conf.isWildcardRoutingEnabled());
Assert.assertEquals(HornetQDefaultConfiguration.getDefaultTransactionTimeout(), conf.getTransactionTimeout());
Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultTransactionTimeout(), conf.getTransactionTimeout());
Assert.assertEquals(HornetQDefaultConfiguration.isDefaultMessageCounterEnabled(), conf.isMessageCounterEnabled());
Assert.assertEquals(ActiveMQDefaultConfiguration.isDefaultMessageCounterEnabled(), conf.isMessageCounterEnabled());
Assert.assertEquals(HornetQDefaultConfiguration.getDefaultTransactionTimeoutScanPeriod(),
Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultTransactionTimeoutScanPeriod(),
conf.getTransactionTimeoutScanPeriod());
Assert.assertEquals(HornetQDefaultConfiguration.getDefaultMessageExpiryScanPeriod(), conf.getMessageExpiryScanPeriod());
Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultMessageExpiryScanPeriod(), conf.getMessageExpiryScanPeriod());
Assert.assertEquals(HornetQDefaultConfiguration.getDefaultMessageExpiryThreadPriority(),
Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultMessageExpiryThreadPriority(),
conf.getMessageExpiryThreadPriority());
Assert.assertTrue(conf.getHAPolicyConfiguration() instanceof LiveOnlyPolicyConfiguration);

4
activemq-server/src/test/java/org/apache/activemq/core/config/impl/FileConfigurationParserTest.java
View File

@ -17,7 +17,7 @@ import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.Map;
import org.apache.activemq.api.config.HornetQDefaultConfiguration;
import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
import org.apache.activemq.core.config.Configuration;
import org.apache.activemq.core.deployers.impl.FileConfigurationParser;
import org.apache.activemq.tests.util.UnitTestCase;
@ -82,7 +82,7 @@ public class FileConfigurationParserTest extends UnitTestCase
String clusterPassword = config.getClusterPassword();
assertEquals(HornetQDefaultConfiguration.getDefaultClusterPassword(), clusterPassword);
assertEquals(ActiveMQDefaultConfiguration.getDefaultClusterPassword(), clusterPassword);
//if we add cluster-password, it should be default plain text
String clusterPasswordPart = "<cluster-password>helloworld</cluster-password>";

10
tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/JournalCrashTest.java
View File

@ -15,7 +15,7 @@ package org.apache.activemq.tests.integration.client;
import java.util.ArrayList;
import java.util.Arrays;
import org.apache.activemq.api.config.HornetQDefaultConfiguration;
import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
import org.apache.activemq.api.core.SimpleString;
import org.apache.activemq.api.core.client.ClientConsumer;
import org.apache.activemq.api.core.client.ClientMessage;
@ -60,9 +60,9 @@ public class JournalCrashTest extends ServiceTestBase
protected void startServer() throws Exception
{
Configuration config = createDefaultConfig()
.setJournalFileSize(HornetQDefaultConfiguration.getDefaultJournalFileSize())
.setJournalCompactMinFiles(HornetQDefaultConfiguration.getDefaultJournalCompactMinFiles())
.setJournalCompactPercentage(HornetQDefaultConfiguration.getDefaultJournalCompactPercentage())
.setJournalFileSize(ActiveMQDefaultConfiguration.getDefaultJournalFileSize())
.setJournalCompactMinFiles(ActiveMQDefaultConfiguration.getDefaultJournalCompactMinFiles())
.setJournalCompactPercentage(ActiveMQDefaultConfiguration.getDefaultJournalCompactPercentage())
.setJournalMinFiles(2);
server = super.createServer(true, config);
@ -222,7 +222,7 @@ public class JournalCrashTest extends ServiceTestBase
private void printJournal() throws Exception
{
NIOSequentialFileFactory factory = new NIOSequentialFileFactory(getJournalDir());
JournalImpl journal = new JournalImpl(HornetQDefaultConfiguration.getDefaultJournalFileSize(),
JournalImpl journal = new JournalImpl(ActiveMQDefaultConfiguration.getDefaultJournalFileSize(),
2,
0,
0,

4
tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/client/SlowConsumerTest.java
View File

@ -18,7 +18,7 @@ import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
import org.apache.activemq.api.config.HornetQDefaultConfiguration;
import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
import org.apache.activemq.api.core.ActiveMQException;
import org.apache.activemq.api.core.ActiveMQExceptionType;
import org.apache.activemq.api.core.ActiveMQObjectClosedException;
@ -155,7 +155,7 @@ public class SlowConsumerTest extends ServiceTestBase
SimpleString notifQueue = RandomUtil.randomSimpleString();
session.createQueue(HornetQDefaultConfiguration.getDefaultManagementNotificationAddress(), notifQueue, null, false);
session.createQueue(ActiveMQDefaultConfiguration.getDefaultManagementNotificationAddress(), notifQueue, null, false);
ClientConsumer notifConsumer = session.createConsumer(notifQueue.toString(), ManagementHelper.HDR_NOTIFICATION_TYPE + "='" + CoreNotificationType.CONSUMER_SLOW + "'");

4
tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/distribution/ClusterTestBase.java
View File

@ -27,7 +27,7 @@ import java.util.Set;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.activemq.api.config.HornetQDefaultConfiguration;
import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
import org.apache.activemq.api.core.ActiveMQException;
import org.apache.activemq.api.core.BroadcastGroupConfiguration;
import org.apache.activemq.api.core.DiscoveryGroupConfiguration;
@ -866,7 +866,7 @@ public abstract class ClusterTestBase extends ServiceTestBase
protected void setUpGroupHandler(final GroupingHandlerConfiguration.TYPE type, final int node, final int timeout)
{
setUpGroupHandler(type, node, timeout, -1, HornetQDefaultConfiguration.getDefaultGroupingHandlerReaperPeriod());
setUpGroupHandler(type, node, timeout, -1, ActiveMQDefaultConfiguration.getDefaultGroupingHandlerReaperPeriod());
}
protected void setUpGroupHandler(final GroupingHandlerConfiguration.TYPE type, final int node, final int timeout, final long groupTimeout,

10
tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/AutomaticColocatedQuorumVoteTest.java
View File

@ -21,7 +21,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import org.apache.activemq.api.config.HornetQDefaultConfiguration;
import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
import org.apache.activemq.api.core.TransportConfiguration;
import org.apache.activemq.api.core.client.ClientSessionFactory;
import org.apache.activemq.api.core.client.HornetQClient;
@ -310,10 +310,10 @@ public class AutomaticColocatedQuorumVoteTest extends ServiceTestBase
.clearAcceptorConfigurations()
.addAcceptorConfiguration(liveAcceptor)
.addConnectorConfiguration(liveConnector.getName(), liveConnector)
.setJournalDirectory(HornetQDefaultConfiguration.getDefaultJournalDir() + identity)
.setBindingsDirectory(HornetQDefaultConfiguration.getDefaultBindingsDirectory() + identity)
.setLargeMessagesDirectory(HornetQDefaultConfiguration.getDefaultLargeMessagesDir() + identity)
.setPagingDirectory(HornetQDefaultConfiguration.getDefaultPagingDir() + identity)
.setJournalDirectory(ActiveMQDefaultConfiguration.getDefaultJournalDir() + identity)
.setBindingsDirectory(ActiveMQDefaultConfiguration.getDefaultBindingsDirectory() + identity)
.setLargeMessagesDirectory(ActiveMQDefaultConfiguration.getDefaultLargeMessagesDir() + identity)
.setPagingDirectory(ActiveMQDefaultConfiguration.getDefaultPagingDir() + identity)
.addQueueConfiguration(new CoreQueueConfiguration()
.setAddress("jms.queue.testQueue")
.setName("jms.queue.testQueue"));

18
tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/MultipleLivesMultipleBackupsFailoverTest.java
View File

@ -17,7 +17,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.activemq.api.config.HornetQDefaultConfiguration;
import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
import org.apache.activemq.api.core.TransportConfiguration;
import org.apache.activemq.api.core.client.ClientSession;
import org.apache.activemq.api.core.client.ServerLocator;
@ -160,10 +160,10 @@ public class MultipleLivesMultipleBackupsFailoverTest extends MultipleBackupsFai
.addAcceptorConfiguration(createTransportConfiguration(isNetty(), true, generateParams(nodeid, isNetty())))
.setSecurityEnabled(false)
.setHAPolicyConfiguration(sharedStore ? new SharedStoreSlavePolicyConfiguration() : new ReplicaPolicyConfiguration())
.setBindingsDirectory(HornetQDefaultConfiguration.getDefaultBindingsDirectory() + "_" + liveNode)
.setJournalDirectory(HornetQDefaultConfiguration.getDefaultJournalDir() + "_" + liveNode)
.setPagingDirectory(HornetQDefaultConfiguration.getDefaultPagingDir() + "_" + liveNode)
.setLargeMessagesDirectory(HornetQDefaultConfiguration.getDefaultLargeMessagesDir() + "_" + liveNode);
.setBindingsDirectory(ActiveMQDefaultConfiguration.getDefaultBindingsDirectory() + "_" + liveNode)
.setJournalDirectory(ActiveMQDefaultConfiguration.getDefaultJournalDir() + "_" + liveNode)
.setPagingDirectory(ActiveMQDefaultConfiguration.getDefaultPagingDir() + "_" + liveNode)
.setLargeMessagesDirectory(ActiveMQDefaultConfiguration.getDefaultLargeMessagesDir() + "_" + liveNode);
for (int node : otherBackupNodes)
{
@ -195,10 +195,10 @@ public class MultipleLivesMultipleBackupsFailoverTest extends MultipleBackupsFai
.addAcceptorConfiguration(createTransportConfiguration(isNetty(), true, generateParams(liveNode, isNetty())))
.setSecurityEnabled(false)
.setHAPolicyConfiguration(sharedStore ? new SharedStoreMasterPolicyConfiguration() : new ReplicatedPolicyConfiguration())
.setBindingsDirectory(HornetQDefaultConfiguration.getDefaultBindingsDirectory() + "_" + liveNode)
.setJournalDirectory(HornetQDefaultConfiguration.getDefaultJournalDir() + "_" + liveNode)
.setPagingDirectory(HornetQDefaultConfiguration.getDefaultPagingDir() + "_" + liveNode)
.setLargeMessagesDirectory(HornetQDefaultConfiguration.getDefaultLargeMessagesDir() + "_" + liveNode)
.setBindingsDirectory(ActiveMQDefaultConfiguration.getDefaultBindingsDirectory() + "_" + liveNode)
.setJournalDirectory(ActiveMQDefaultConfiguration.getDefaultJournalDir() + "_" + liveNode)
.setPagingDirectory(ActiveMQDefaultConfiguration.getDefaultPagingDir() + "_" + liveNode)
.setLargeMessagesDirectory(ActiveMQDefaultConfiguration.getDefaultLargeMessagesDir() + "_" + liveNode)
.addConnectorConfiguration(liveConnector.getName(), liveConnector);
List<String> pairs = new ArrayList<String>();

18
tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/cluster/failover/SingleLiveMultipleBackupsFailoverTest.java
View File

@ -17,7 +17,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.apache.activemq.api.config.HornetQDefaultConfiguration;
import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
import org.apache.activemq.api.core.TransportConfiguration;
import org.apache.activemq.api.core.client.ClientSession;
import org.apache.activemq.core.client.impl.ClientSessionFactoryInternal;
@ -138,10 +138,10 @@ public class SingleLiveMultipleBackupsFailoverTest extends MultipleBackupsFailov
.setSecurityEnabled(false)
.setHAPolicyConfiguration(sharedStore ? new SharedStoreSlavePolicyConfiguration() : new ReplicatedPolicyConfiguration())
.addConnectorConfiguration(backupConnector.getName(), backupConnector)
.setBindingsDirectory(HornetQDefaultConfiguration.getDefaultBindingsDirectory() + "_" + liveNode)
.setJournalDirectory(HornetQDefaultConfiguration.getDefaultJournalDir() + "_" + liveNode)
.setPagingDirectory(HornetQDefaultConfiguration.getDefaultPagingDir() + "_" + liveNode)
.setLargeMessagesDirectory(HornetQDefaultConfiguration.getDefaultLargeMessagesDir() + "_" + liveNode);
.setBindingsDirectory(ActiveMQDefaultConfiguration.getDefaultBindingsDirectory() + "_" + liveNode)
.setJournalDirectory(ActiveMQDefaultConfiguration.getDefaultJournalDir() + "_" + liveNode)
.setPagingDirectory(ActiveMQDefaultConfiguration.getDefaultPagingDir() + "_" + liveNode)
.setLargeMessagesDirectory(ActiveMQDefaultConfiguration.getDefaultLargeMessagesDir() + "_" + liveNode);
List<String> staticConnectors = new ArrayList<String>();
@ -167,10 +167,10 @@ public class SingleLiveMultipleBackupsFailoverTest extends MultipleBackupsFailov
.setHAPolicyConfiguration(sharedStore ? new SharedStoreMasterPolicyConfiguration() : new ReplicatedPolicyConfiguration())
.addClusterConfiguration(basicClusterConnectionConfig(liveConnector.getName()))
.addConnectorConfiguration(liveConnector.getName(), liveConnector)
.setBindingsDirectory(HornetQDefaultConfiguration.getDefaultBindingsDirectory() + "_" + liveNode)
.setJournalDirectory(HornetQDefaultConfiguration.getDefaultJournalDir() + "_" + liveNode)
.setPagingDirectory(HornetQDefaultConfiguration.getDefaultPagingDir() + "_" + liveNode)
.setLargeMessagesDirectory(HornetQDefaultConfiguration.getDefaultLargeMessagesDir() + "_" + liveNode);
.setBindingsDirectory(ActiveMQDefaultConfiguration.getDefaultBindingsDirectory() + "_" + liveNode)
.setJournalDirectory(ActiveMQDefaultConfiguration.getDefaultJournalDir() + "_" + liveNode)
.setPagingDirectory(ActiveMQDefaultConfiguration.getDefaultPagingDir() + "_" + liveNode)
.setLargeMessagesDirectory(ActiveMQDefaultConfiguration.getDefaultLargeMessagesDir() + "_" + liveNode);
servers.put(liveNode, new SameProcessHornetQServer(createInVMFailoverServer(true, config0, nodeManager, liveNode)));
}

4
tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/jms/server/management/JMSServerControlTest.java
View File

@ -34,7 +34,7 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
import org.apache.activemq.api.config.HornetQDefaultConfiguration;
import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
import org.apache.activemq.api.core.ActiveMQObjectClosedException;
import org.apache.activemq.api.core.SimpleString;
import org.apache.activemq.api.core.TransportConfiguration;
@ -874,7 +874,7 @@ public class JMSServerControlTest extends ManagementTestBase
control.destroyConnectionFactory("test");
ObjectNameBuilder nameBuilder = ObjectNameBuilder.create(HornetQDefaultConfiguration.getDefaultJmxDomain());
ObjectNameBuilder nameBuilder = ObjectNameBuilder.create(ActiveMQDefaultConfiguration.getDefaultJmxDomain());
assertFalse(mbeanServer.isRegistered(nameBuilder.getConnectionFactoryObjectName("test")));
stopServer();

4
tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/AddressControlTest.java
View File

@ -15,7 +15,7 @@ package org.apache.activemq.tests.integration.management;
import java.util.HashSet;
import java.util.Set;
import org.apache.activemq.api.config.HornetQDefaultConfiguration;
import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
import org.apache.activemq.api.core.SimpleString;
import org.apache.activemq.api.core.TransportConfiguration;
import org.apache.activemq.api.core.client.ClientMessage;
@ -279,7 +279,7 @@ public class AddressControlTest extends ManagementTestBase
session.createQueue(address, address, true);
AddressControl addressControl = createManagementControl(address);
Assert.assertEquals(HornetQDefaultConfiguration.getDefaultJournalFileSize(), addressControl.getNumberOfBytesPerPage());
Assert.assertEquals(ActiveMQDefaultConfiguration.getDefaultJournalFileSize(), addressControl.getNumberOfBytesPerPage());
session.close();
server.stop();

4
tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/CoreMessagingProxy.java
View File

@ -12,7 +12,7 @@
*/
package org.apache.activemq.tests.integration.management;
import org.apache.activemq.api.config.HornetQDefaultConfiguration;
import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
import org.apache.activemq.api.core.client.ClientMessage;
import org.apache.activemq.api.core.client.ClientRequestor;
import org.apache.activemq.api.core.client.ClientSession;
@ -48,7 +48,7 @@ public class CoreMessagingProxy
this.resourceName = resourceName;
requestor = new ClientRequestor(session, HornetQDefaultConfiguration.getDefaultManagementAddress());
requestor = new ClientRequestor(session, ActiveMQDefaultConfiguration.getDefaultManagementAddress());
}

4
tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/JMXDomainTest.java
View File

@ -15,7 +15,7 @@ package org.apache.activemq.tests.integration.management;
import java.util.HashMap;
import java.util.Map;
import org.apache.activemq.api.config.HornetQDefaultConfiguration;
import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
import org.apache.activemq.api.core.TransportConfiguration;
import org.apache.activemq.api.core.management.ObjectNameBuilder;
import org.apache.activemq.core.config.Configuration;
@ -42,7 +42,7 @@ public class JMXDomainTest extends ManagementTestBase
Configuration config_0 = createDefaultConfig()
.setJMXManagementEnabled(true);
String jmxDomain_1 = HornetQDefaultConfiguration.getDefaultJmxDomain() + ".1";
String jmxDomain_1 = ActiveMQDefaultConfiguration.getDefaultJmxDomain() + ".1";
Map<String, Object> params = new HashMap<String, Object>();
params.put(TransportConstants.SERVER_ID_PROP_NAME, 1);

6
tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/ManagementWithStompTest.java
View File

@ -11,6 +11,7 @@
* permissions and limitations under the License.
*/
package org.apache.activemq.tests.integration.management;
import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
import org.apache.activemq.core.protocol.stomp.StompProtocolManagerFactory;
import org.junit.Before;
import org.junit.After;
@ -28,7 +29,6 @@ import java.util.Map;
import org.junit.Assert;
import org.apache.activemq.api.config.HornetQDefaultConfiguration;
import org.apache.activemq.api.core.SimpleString;
import org.apache.activemq.api.core.TransportConfiguration;
import org.apache.activemq.api.core.client.ClientSession;
@ -90,7 +90,7 @@ public class ManagementWithStompTest extends ManagementTestBase
sendFrame(frame);
// retrieve the address of the queue
frame = "\nSEND\n" + "destination:" + HornetQDefaultConfiguration.getDefaultManagementAddress() + "\n" +
frame = "\nSEND\n" + "destination:" + ActiveMQDefaultConfiguration.getDefaultManagementAddress() + "\n" +
"reply-to:" + address + "\n" +
"_HQ_ResourceName:" + ResourceNames.CORE_QUEUE + queue + "\n" +
"_HQ_Attribute: Address\n\n" +
@ -133,7 +133,7 @@ public class ManagementWithStompTest extends ManagementTestBase
sendFrame(frame);
// count number of message with filter "color = 'blue'"
frame = "\nSEND\n" + "destination:" + HornetQDefaultConfiguration.getDefaultManagementAddress() + "\n" +
frame = "\nSEND\n" + "destination:" + ActiveMQDefaultConfiguration.getDefaultManagementAddress() + "\n" +
"reply-to:" + address + "\n" +
"_HQ_ResourceName:" + ResourceNames.CORE_QUEUE + queue + "\n" +
"_HQ_OperationName: countMessages\n\n" +

4
tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/NotificationTest.java
View File

@ -12,7 +12,7 @@
*/
package org.apache.activemq.tests.integration.management;
import org.apache.activemq.api.config.HornetQDefaultConfiguration;
import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
import org.apache.activemq.api.core.ActiveMQException;
import org.apache.activemq.api.core.SimpleString;
import org.apache.activemq.api.core.TransportConfiguration;
@ -265,7 +265,7 @@ public class NotificationTest extends UnitTestCase
notifQueue = RandomUtil.randomSimpleString();
session.createQueue(HornetQDefaultConfiguration.getDefaultManagementNotificationAddress(), notifQueue, null, false);
session.createQueue(ActiveMQDefaultConfiguration.getDefaultManagementNotificationAddress(), notifQueue, null, false);
notifConsumer = session.createConsumer(notifQueue);
}

4
tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityManagementTestBase.java
View File

@ -11,12 +11,12 @@
* permissions and limitations under the License.
*/
package org.apache.activemq.tests.integration.management;
import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
import org.junit.Before;
import org.junit.After;
import org.junit.Assert;
import org.apache.activemq.api.config.HornetQDefaultConfiguration;
import org.apache.activemq.api.core.TransportConfiguration;
import org.apache.activemq.api.core.client.ClientMessage;
import org.apache.activemq.api.core.client.ClientRequestor;
@ -96,7 +96,7 @@ public abstract class SecurityManagementTestBase extends UnitTestCase
session.start();
ClientRequestor requestor = new ClientRequestor(session, HornetQDefaultConfiguration.getDefaultManagementAddress());
ClientRequestor requestor = new ClientRequestor(session, ActiveMQDefaultConfiguration.getDefaultManagementAddress());
ClientMessage mngmntMessage = session.createMessage(false);
ManagementHelper.putAttribute(mngmntMessage, ResourceNames.CORE_SERVER, "started");

8
tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java
View File

@ -12,11 +12,11 @@
*/
package org.apache.activemq.tests.integration.management;
import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
import org.junit.Test;
import java.util.Set;
import org.apache.activemq.api.config.HornetQDefaultConfiguration;
import org.apache.activemq.api.core.TransportConfiguration;
import org.apache.activemq.core.config.Configuration;
import org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory;
@ -60,7 +60,7 @@ public class SecurityManagementWithConfiguredAdminUserTest extends SecurityManag
@Test
public void testSendManagementMessageWithClusterAdminUser() throws Exception
{
doSendManagementMessage(HornetQDefaultConfiguration.getDefaultClusterUser(), CLUSTER_PASSWORD, true);
doSendManagementMessage(ActiveMQDefaultConfiguration.getDefaultClusterUser(), CLUSTER_PASSWORD, true);
}
@Test
@ -102,9 +102,9 @@ public class SecurityManagementWithConfiguredAdminUserTest extends SecurityManag
securityManager.addRole(validAdminUser, "guest");
securityManager.addRole(invalidAdminUser, "guest");
Set<Role> adminRole = securityRepository.getMatch(HornetQDefaultConfiguration.getDefaultManagementAddress().toString());
Set<Role> adminRole = securityRepository.getMatch(ActiveMQDefaultConfiguration.getDefaultManagementAddress().toString());
adminRole.add(new Role("admin", true, true, true, true, true, true, true));
securityRepository.addMatch(HornetQDefaultConfiguration.getDefaultManagementAddress().toString(), adminRole);
securityRepository.addMatch(ActiveMQDefaultConfiguration.getDefaultManagementAddress().toString(), adminRole);
Set<Role> guestRole = securityRepository.getMatch("*");
guestRole.add(new Role("guest", true, true, true, true, true, true, false));
securityRepository.addMatch("*", guestRole);

8
tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityManagementWithDefaultConfigurationTest.java
View File

@ -12,9 +12,9 @@
*/
package org.apache.activemq.tests.integration.management;
import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
import org.junit.Test;
import org.apache.activemq.api.config.HornetQDefaultConfiguration;
import org.apache.activemq.api.core.TransportConfiguration;
import org.apache.activemq.core.config.Configuration;
import org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory;
@ -32,8 +32,8 @@ public class SecurityManagementWithDefaultConfigurationTest extends SecurityMana
@Test
public void testSendManagementMessageWithDefaultClusterAdminUser() throws Exception
{
doSendManagementMessage(HornetQDefaultConfiguration.getDefaultClusterUser(),
HornetQDefaultConfiguration.getDefaultClusterPassword(),
doSendManagementMessage(ActiveMQDefaultConfiguration.getDefaultClusterUser(),
ActiveMQDefaultConfiguration.getDefaultClusterPassword(),
true);
}
@ -57,7 +57,7 @@ public class SecurityManagementWithDefaultConfigurationTest extends SecurityMana
protected HornetQServer setupAndStartHornetQServer() throws Exception
{
Configuration conf = createBasicConfig()
.setClusterPassword(HornetQDefaultConfiguration.getDefaultClusterPassword())
.setClusterPassword(ActiveMQDefaultConfiguration.getDefaultClusterPassword())
.setSecurityEnabled(true)
.addAcceptorConfiguration(new TransportConfiguration(InVMAcceptorFactory.class.getName()));
HornetQServer server = addServer(HornetQServers.newHornetQServer(conf, false));

8
tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityManagementWithModifiedConfigurationTest.java
View File

@ -12,9 +12,9 @@
*/
package org.apache.activemq.tests.integration.management;
import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
import org.junit.Test;
import org.apache.activemq.api.config.HornetQDefaultConfiguration;
import org.apache.activemq.api.core.TransportConfiguration;
import org.apache.activemq.core.config.impl.ConfigurationImpl;
import org.apache.activemq.core.remoting.impl.invm.InVMAcceptorFactory;
@ -44,14 +44,14 @@ public class SecurityManagementWithModifiedConfigurationTest extends SecurityMan
@Test
public void testSendManagementMessageWithModifiedClusterAdminUser() throws Exception
{
doSendManagementMessage(HornetQDefaultConfiguration.getDefaultClusterUser(), configuredClusterPassword, true);
doSendManagementMessage(ActiveMQDefaultConfiguration.getDefaultClusterUser(), configuredClusterPassword, true);
}
@Test
public void testSendManagementMessageWithDefaultClusterAdminUser() throws Exception
{
doSendManagementMessage(HornetQDefaultConfiguration.getDefaultClusterUser(),
HornetQDefaultConfiguration.getDefaultClusterPassword(),
doSendManagementMessage(ActiveMQDefaultConfiguration.getDefaultClusterUser(),
ActiveMQDefaultConfiguration.getDefaultClusterPassword(),
false);
}

6
tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/management/SecurityNotificationTest.java
View File

@ -25,7 +25,7 @@ import java.util.Set;
import org.junit.Assert;
import org.apache.activemq.api.config.HornetQDefaultConfiguration;
import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
import org.apache.activemq.api.core.SimpleString;
import org.apache.activemq.api.core.TransportConfiguration;
import org.apache.activemq.api.core.client.ClientConsumer;
@ -166,7 +166,7 @@ public class SecurityNotificationTest extends UnitTestCase
Role role = new Role("notif", true, true, true, true, true, true, true);
Set<Role> roles = new HashSet<Role>();
roles.add(role);
server.getSecurityRepository().addMatch(HornetQDefaultConfiguration.getDefaultManagementNotificationAddress().toString(),
server.getSecurityRepository().addMatch(ActiveMQDefaultConfiguration.getDefaultManagementNotificationAddress().toString(),
roles);
securityManager.addRole("admin", "notif");
@ -176,7 +176,7 @@ public class SecurityNotificationTest extends UnitTestCase
adminSession = sf.createSession("admin", "admin", false, true, true, false, 1);
adminSession.start();
adminSession.createTemporaryQueue(HornetQDefaultConfiguration.getDefaultManagementNotificationAddress(), notifQueue);
adminSession.createTemporaryQueue(ActiveMQDefaultConfiguration.getDefaultManagementNotificationAddress(), notifQueue);
notifConsumer = adminSession.createConsumer(notifQueue);
}

10
tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/replication/ReplicationTest.java
View File

@ -26,7 +26,7 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.activemq.api.config.HornetQDefaultConfiguration;
import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
import org.apache.activemq.api.core.ActiveMQBuffer;
import org.apache.activemq.api.core.ActiveMQBuffers;
import org.apache.activemq.api.core.ActiveMQException;
@ -123,10 +123,10 @@ public final class ReplicationTest extends ServiceTestBase
Configuration backupConfig = createDefaultConfig()
.setHAPolicyConfiguration(new SharedStoreSlavePolicyConfiguration())
.setBindingsDirectory(HornetQDefaultConfiguration.getDefaultBindingsDirectory() + suffix)
.setJournalDirectory(HornetQDefaultConfiguration.getDefaultJournalDir() + suffix)
.setPagingDirectory(HornetQDefaultConfiguration.getDefaultPagingDir() + suffix)
.setLargeMessagesDirectory(HornetQDefaultConfiguration.getDefaultLargeMessagesDir() + suffix)
.setBindingsDirectory(ActiveMQDefaultConfiguration.getDefaultBindingsDirectory() + suffix)
.setJournalDirectory(ActiveMQDefaultConfiguration.getDefaultJournalDir() + suffix)
.setPagingDirectory(ActiveMQDefaultConfiguration.getDefaultPagingDir() + suffix)
.setLargeMessagesDirectory(ActiveMQDefaultConfiguration.getDefaultLargeMessagesDir() + suffix)
.setIncomingInterceptorClassNames(interceptors.length > 0 ? Arrays.asList(interceptors) : new ArrayList<String>());
ReplicatedBackupUtils.configureReplicationPair(backupConfig, backupConnector, backupAcceptor, liveConfig, liveConnector);

6
tests/integration-tests/src/test/java/org/apache/activemq/tests/integration/server/ScaleDown3NodeTest.java
View File

@ -12,7 +12,7 @@
*/
package org.apache.activemq.tests.integration.server;
import org.apache.activemq.api.config.HornetQDefaultConfiguration;
import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
import org.apache.activemq.api.core.Message;
import org.apache.activemq.api.core.SimpleString;
import org.apache.activemq.api.core.client.ClientMessage;
@ -91,7 +91,7 @@ public class ScaleDown3NodeTest extends ClusterTestBase
@Test
public void testBasicScaleDownWithDefaultReconnectAttempts() throws Exception
{
testBasicScaleDownInternal(HornetQDefaultConfiguration.getDefaultBridgeReconnectAttempts(), false);
testBasicScaleDownInternal(ActiveMQDefaultConfiguration.getDefaultBridgeReconnectAttempts(), false);
}
@Test
@ -103,7 +103,7 @@ public class ScaleDown3NodeTest extends ClusterTestBase
@Test
public void testBasicScaleDownWithDefaultReconnectAttemptsAndLargeMessages() throws Exception
{
testBasicScaleDownInternal(HornetQDefaultConfiguration.getDefaultBridgeReconnectAttempts(), true);
testBasicScaleDownInternal(ActiveMQDefaultConfiguration.getDefaultBridgeReconnectAttempts(), true);
}
private void testBasicScaleDownInternal(int reconnectAttempts, boolean large) throws Exception

8
tests/joram-tests/src/test/java/org/apache/activemq/jms/HornetQAdmin.java
View File

@ -20,7 +20,7 @@ import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.util.Hashtable;
import org.apache.activemq.api.config.HornetQDefaultConfiguration;
import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
import org.apache.activemq.api.core.TransportConfiguration;
import org.apache.activemq.api.core.client.ClientMessage;
import org.apache.activemq.api.core.client.ClientRequestor;
@ -85,14 +85,14 @@ public class HornetQAdmin implements Admin
{
serverLocator = HornetQClient.createServerLocatorWithoutHA(new TransportConfiguration(NettyConnectorFactory.class.getName()));
sf = serverLocator.createSessionFactory();
clientSession = sf.createSession(HornetQDefaultConfiguration.getDefaultClusterUser(),
HornetQDefaultConfiguration.getDefaultClusterPassword(),
clientSession = sf.createSession(ActiveMQDefaultConfiguration.getDefaultClusterUser(),
ActiveMQDefaultConfiguration.getDefaultClusterPassword(),
false,
true,
true,
false,
1);
requestor = new ClientRequestor(clientSession, HornetQDefaultConfiguration.getDefaultManagementAddress());
requestor = new ClientRequestor(clientSession, ActiveMQDefaultConfiguration.getDefaultManagementAddress());
clientSession.start();
}

4
tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/CompactingStressTest.java
View File

@ -12,6 +12,7 @@
*/
package org.apache.activemq.tests.stress.journal;
import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
import org.junit.Test;
import java.util.concurrent.CountDownLatch;
@ -19,7 +20,6 @@ import java.util.concurrent.atomic.AtomicInteger;
import org.junit.Assert;
import org.apache.activemq.api.config.HornetQDefaultConfiguration;
import org.apache.activemq.api.core.Message;
import org.apache.activemq.api.core.client.ClientConsumer;
import org.apache.activemq.api.core.client.ClientMessage;
@ -417,7 +417,7 @@ public class CompactingStressTest extends ServiceTestBase
{
Configuration config = createDefaultConfig()
.setJournalSyncNonTransactional(false)
.setJournalFileSize(HornetQDefaultConfiguration.getDefaultJournalFileSize())
.setJournalFileSize(ActiveMQDefaultConfiguration.getDefaultJournalFileSize())
.setJournalType(journalType)
.setJournalCompactMinFiles(10)
.setJournalCompactPercentage(50);

8
tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/JournalCleanupCompactStressTest.java
View File

@ -28,7 +28,7 @@ import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import org.apache.activemq.api.config.HornetQDefaultConfiguration;
import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
import org.apache.activemq.core.asyncio.impl.AsynchronousFileImpl;
import org.apache.activemq.core.journal.IOAsyncTask;
import org.apache.activemq.core.journal.PreparedTransactionInfo;
@ -117,18 +117,18 @@ public class JournalCleanupCompactStressTest extends ServiceTestBase
if (AsynchronousFileImpl.isLoaded())
{
factory = new AIOSequentialFileFactory(dir.getPath());
maxAIO = HornetQDefaultConfiguration.getDefaultJournalMaxIoAio();
maxAIO = ActiveMQDefaultConfiguration.getDefaultJournalMaxIoAio();
}
else
{
factory = new NIOSequentialFileFactory(dir.getPath(), true);
maxAIO = HornetQDefaultConfiguration.getDefaultJournalMaxIoNio();
maxAIO = ActiveMQDefaultConfiguration.getDefaultJournalMaxIoNio();
}
journal = new JournalImpl(50 * 1024,
20,
50,
HornetQDefaultConfiguration.getDefaultJournalCompactPercentage(),
ActiveMQDefaultConfiguration.getDefaultJournalCompactPercentage(),
factory,
"hornetq-data",
"hq",

4
tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/LargeJournalStressTest.java
View File

@ -15,7 +15,7 @@ package org.apache.activemq.tests.stress.journal;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.activemq.api.config.HornetQDefaultConfiguration;
import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
import org.apache.activemq.api.core.client.ClientConsumer;
import org.apache.activemq.api.core.client.ClientMessage;
import org.apache.activemq.api.core.client.ClientProducer;
@ -278,7 +278,7 @@ public class LargeJournalStressTest extends ServiceTestBase
{
Configuration config = createDefaultConfig()
.setJournalSyncNonTransactional(false)
.setJournalFileSize(HornetQDefaultConfiguration.getDefaultJournalFileSize())
.setJournalFileSize(ActiveMQDefaultConfiguration.getDefaultJournalFileSize())
.setJournalType(journalType)
.setJournalCompactMinFiles(0)
.setJournalCompactPercentage(50);

6
tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/MultiThreadConsumerStressTest.java
View File

@ -15,7 +15,7 @@ package org.apache.activemq.tests.stress.journal;
import java.util.ArrayList;
import java.util.concurrent.CountDownLatch;
import org.apache.activemq.api.config.HornetQDefaultConfiguration;
import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
import org.apache.activemq.api.core.SimpleString;
import org.apache.activemq.api.core.client.ClientConsumer;
import org.apache.activemq.api.core.client.ClientMessage;
@ -155,8 +155,8 @@ public class MultiThreadConsumerStressTest extends ServiceTestBase
{
Configuration config = createDefaultConfig(true)
.setJournalType(journalType)
.setJournalFileSize(HornetQDefaultConfiguration.getDefaultJournalFileSize())
.setJournalMinFiles(HornetQDefaultConfiguration.getDefaultJournalMinFiles())
.setJournalFileSize(ActiveMQDefaultConfiguration.getDefaultJournalFileSize())
.setJournalMinFiles(ActiveMQDefaultConfiguration.getDefaultJournalMinFiles())
.setJournalCompactMinFiles(2)
.setJournalCompactPercentage(50);

14
tests/stress-tests/src/test/java/org/apache/activemq/tests/stress/journal/NIOMultiThreadCompactorStressTest.java
View File

@ -18,7 +18,7 @@ import java.util.ArrayList;
import java.util.List;
import java.util.concurrent.CountDownLatch;
import org.apache.activemq.api.config.HornetQDefaultConfiguration;
import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
import org.apache.activemq.api.core.ActiveMQException;
import org.apache.activemq.api.core.SimpleString;
import org.apache.activemq.api.core.client.ClientConsumer;
@ -93,7 +93,7 @@ public class NIOMultiThreadCompactorStressTest extends ServiceTestBase
stopServer();
NIOSequentialFileFactory factory = new NIOSequentialFileFactory(getJournalDir());
JournalImpl journal = new JournalImpl(HornetQDefaultConfiguration.getDefaultJournalFileSize(),
JournalImpl journal = new JournalImpl(ActiveMQDefaultConfiguration.getDefaultJournalFileSize(),
2,
0,
0,
@ -348,13 +348,13 @@ public class NIOMultiThreadCompactorStressTest extends ServiceTestBase
if (server == null)
{
Configuration config = createDefaultConfig(true)
.setJournalFileSize(HornetQDefaultConfiguration.getDefaultJournalFileSize())
.setJournalFileSize(ActiveMQDefaultConfiguration.getDefaultJournalFileSize())
.setJournalType(journalType)
.setJMXManagementEnabled(false)
.setJournalFileSize(HornetQDefaultConfiguration.getDefaultJournalFileSize())
.setJournalMinFiles(HornetQDefaultConfiguration.getDefaultJournalMinFiles())
.setJournalCompactMinFiles(HornetQDefaultConfiguration.getDefaultJournalCompactMinFiles())
.setJournalCompactPercentage(HornetQDefaultConfiguration.getDefaultJournalCompactPercentage())
.setJournalFileSize(ActiveMQDefaultConfiguration.getDefaultJournalFileSize())
.setJournalMinFiles(ActiveMQDefaultConfiguration.getDefaultJournalMinFiles())
.setJournalCompactMinFiles(ActiveMQDefaultConfiguration.getDefaultJournalCompactMinFiles())
.setJournalCompactPercentage(ActiveMQDefaultConfiguration.getDefaultJournalCompactPercentage())
// This test is supposed to not sync.. All the ACKs are async, and it was supposed to not sync
.setJournalSyncNonTransactional(false);

4
tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java
View File

@ -19,7 +19,7 @@ import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import org.apache.activemq.api.config.HornetQDefaultConfiguration;
import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
import org.apache.activemq.api.core.Pair;
import org.apache.activemq.api.core.SimpleString;
import org.apache.activemq.core.config.Configuration;
@ -95,7 +95,7 @@ public class DuplicateDetectionUnitTest extends ServiceTestBase
PostOffice postOffice = new FakePostOffice();
ScheduledExecutorService scheduledThreadPool = Executors.newScheduledThreadPool(HornetQDefaultConfiguration.getDefaultScheduledThreadPoolMaxSize());
ScheduledExecutorService scheduledThreadPool = Executors.newScheduledThreadPool(ActiveMQDefaultConfiguration.getDefaultScheduledThreadPoolMaxSize());
journal = new JournalStorageManager(configuration, factory, null);

4
tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java
View File

@ -16,7 +16,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.concurrent.Executors;
import org.apache.activemq.api.config.HornetQDefaultConfiguration;
import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
import org.apache.activemq.api.core.ActiveMQBuffer;
import org.apache.activemq.api.core.ActiveMQException;
import org.apache.activemq.core.remoting.impl.netty.NettyAcceptor;
@ -79,7 +79,7 @@ public class NettyAcceptorFactoryTest extends UnitTestCase
handler,
listener,
Executors.newCachedThreadPool(),
Executors.newScheduledThreadPool(HornetQDefaultConfiguration.getDefaultScheduledThreadPoolMaxSize()),
Executors.newScheduledThreadPool(ActiveMQDefaultConfiguration.getDefaultScheduledThreadPoolMaxSize()),
null);
Assert.assertTrue(acceptor instanceof NettyAcceptor);

4
tests/unit-tests/src/test/java/org/apache/activemq/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java
View File

@ -18,7 +18,7 @@ import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.TimeUnit;
import org.apache.activemq.api.config.HornetQDefaultConfiguration;
import org.apache.activemq.api.config.ActiveMQDefaultConfiguration;
import org.apache.activemq.api.core.ActiveMQBuffer;
import org.apache.activemq.api.core.ActiveMQException;
import org.apache.activemq.core.remoting.impl.netty.NettyAcceptor;
@ -98,7 +98,7 @@ public class NettyAcceptorTest extends UnitTestCase
{
}
};
pool2 = Executors.newScheduledThreadPool(HornetQDefaultConfiguration.getDefaultScheduledThreadPoolMaxSize());
pool2 = Executors.newScheduledThreadPool(ActiveMQDefaultConfiguration.getDefaultScheduledThreadPoolMaxSize());
NettyAcceptor acceptor = new NettyAcceptor("netty",
null,
params,