You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2016/11/02 10:43:14 UTC
svn commit: r1767630 [1/2] - in /qpid/java/trunk:
broker-core/src/main/java/org/apache/qpid/server/
broker-core/src/main/java/org/apache/qpid/server/configuration/
broker-core/src/main/java/org/apache/qpid/server/logging/messages/
broker-core/src/main/...
Author: rgodfrey
Date: Wed Nov 2 10:43:13 2016
New Revision: 1767630
URL: http://svn.apache.org/viewvc?rev=1767630&view=rev
Log:
QPID-7486 : Remove BrokerProperties
Removed:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/configuration/BrokerProperties.java
Modified:
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/SystemLauncher.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AccessControlMessages.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AuthenticationProviderMessages.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BindingMessages.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BrokerMessages.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ChannelMessages.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConfigStoreMessages.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConnectionMessages.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ExchangeMessages.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/HighAvailabilityMessages.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/KeyStoreMessages.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessages.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/MessageStoreMessages.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/PortMessages.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/QueueMessages.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/SubscriptionMessages.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TransactionLogMessages.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TrustStoreMessages.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/VirtualHostMessages.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/SystemConfig.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPort.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPortImpl.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/encryption/AESKeyFileEncrypterFactory.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/VirtualHostStoreUpgraderAndRecoverer.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/preferences/JsonFilePreferenceStoreFactoryService.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/configuration/BrokerPropertiesTest.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/encryption/AESKeyFileEncrypterFactoryTest.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhost/VirtualHostQueueCreationTest.java
qpid/java/trunk/broker-core/src/velocity/templates/org/apache/qpid/server/logging/messages/LogMessages.vm
qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnectionDelegate.java
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8.java
qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Impl.java
qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/StartupAppender.java
qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/StartupAppenderTest.java
qpid/java/trunk/broker/src/main/java/org/apache/qpid/server/Main.java
qpid/java/trunk/broker/src/test/java/org/apache/qpid/server/MainTest.java
qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/SpawnedBrokerHolder.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/transport/ProtocolNegotiationTest.java
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/SystemLauncher.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/SystemLauncher.java?rev=1767630&r1=1767629&r2=1767630&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/SystemLauncher.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/SystemLauncher.java Wed Nov 2 10:43:13 2016
@@ -20,14 +20,20 @@
*/
package org.apache.qpid.server;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
import java.io.PrintWriter;
import java.io.StringWriter;
+import java.net.URL;
import java.security.Principal;
import java.security.PrivilegedExceptionAction;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashSet;
import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
@@ -38,7 +44,7 @@ import com.google.common.util.concurrent
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.qpid.server.configuration.BrokerProperties;
+import org.apache.qpid.configuration.CommonProperties;
import org.apache.qpid.server.configuration.updater.TaskExecutor;
import org.apache.qpid.server.configuration.updater.TaskExecutorImpl;
import org.apache.qpid.server.logging.EventLogger;
@@ -92,6 +98,36 @@ public class SystemLauncher
this(DEFAULT_SYSTEM_LAUNCHER_LISTENER);
}
+ public static void populateSystemPropertiesFromDefaults(final String initialProperties) throws IOException
+ {
+ URL initialPropertiesLocation;
+ if(initialProperties == null)
+ {
+ initialPropertiesLocation = SystemLauncher.class.getClassLoader().getResource("system.properties");
+ }
+ else
+ {
+ initialPropertiesLocation = (new File(initialProperties)).toURI().toURL();
+ }
+
+ Properties props = new Properties(CommonProperties.asProperties());
+ if(initialPropertiesLocation != null)
+ {
+
+ try(InputStream inStream = initialPropertiesLocation.openStream())
+ {
+ props.load(inStream);
+ }
+ }
+
+ Set<String> propertyNames = new HashSet<>(props.stringPropertyNames());
+ propertyNames.removeAll(System.getProperties().stringPropertyNames());
+ for (String propName : propertyNames)
+ {
+ System.setProperty(propName, props.getProperty(propName));
+ }
+ }
+
public Principal getSystemPrincipal()
{
return _systemPrincipal;
@@ -175,12 +211,12 @@ public class SystemLauncher
private void startupImpl(Map<String,Object> systemConfigAttributes) throws Exception
{
- BrokerProperties.populateSystemPropertiesFromDefaults((String) systemConfigAttributes.get(SystemConfig.INITIAL_SYSTEM_PROPERTIES_LOCATION));
+ populateSystemPropertiesFromDefaults((String) systemConfigAttributes.get(SystemConfig.INITIAL_SYSTEM_PROPERTIES_LOCATION));
String storeType = (String) systemConfigAttributes.get(SystemConfig.TYPE);
// Create the RootLogger to be used during broker operation
- boolean statusUpdatesEnabled = Boolean.parseBoolean(System.getProperty(BrokerProperties.PROPERTY_STATUS_UPDATES, "true"));
+ boolean statusUpdatesEnabled = Boolean.parseBoolean(System.getProperty(SystemConfig.PROPERTY_STATUS_UPDATES, "true"));
MessageLogger messageLogger = new LoggingMessageLogger(statusUpdatesEnabled);
_eventLogger.setMessageLogger(messageLogger);
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AccessControlMessages.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AccessControlMessages.java?rev=1767630&r1=1767629&r2=1767630&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AccessControlMessages.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AccessControlMessages.java Wed Nov 2 10:43:13 2016
@@ -22,14 +22,15 @@ package org.apache.qpid.server.logging.m
import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX;
-import org.slf4j.LoggerFactory;
-import org.apache.qpid.server.configuration.BrokerProperties;
-import org.apache.qpid.server.logging.LogMessage;
-
import java.text.MessageFormat;
import java.util.Locale;
import java.util.ResourceBundle;
+import org.slf4j.LoggerFactory;
+
+import org.apache.qpid.server.logging.LogMessage;
+import org.apache.qpid.server.model.Broker;
+
/**
* DO NOT EDIT DIRECTLY, THIS FILE WAS GENERATED.
*
@@ -41,7 +42,26 @@ import java.util.ResourceBundle;
public class AccessControlMessages
{
private static ResourceBundle _messages;
- private static Locale _currentLocale = BrokerProperties.getLocale();
+ private static Locale _currentLocale;
+
+ static
+ {
+ Locale locale = Locale.US;
+ String localeSetting = System.getProperty(Broker.PROPERTY_LOCALE);
+ if (localeSetting != null)
+ {
+ String[] localeParts = localeSetting.split("_");
+ String language = (localeParts.length > 0 ? localeParts[0] : "");
+ String country = (localeParts.length > 1 ? localeParts[1] : "");
+ String variant = "";
+ if (localeParts.length > 2)
+ {
+ variant = localeSetting.substring(language.length() + 1 + country.length() + 1);
+ }
+ locale = new Locale(language, country, variant);
+ }
+ _currentLocale = locale;
+ }
public static final String ACCESSCONTROL_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "accesscontrol";
public static final String OPEN_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "accesscontrol.open";
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AuthenticationProviderMessages.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AuthenticationProviderMessages.java?rev=1767630&r1=1767629&r2=1767630&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AuthenticationProviderMessages.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AuthenticationProviderMessages.java Wed Nov 2 10:43:13 2016
@@ -23,8 +23,9 @@ package org.apache.qpid.server.logging.m
import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX;
import org.slf4j.LoggerFactory;
-import org.apache.qpid.server.configuration.BrokerProperties;
+
import org.apache.qpid.server.logging.LogMessage;
+import org.apache.qpid.server.model.Broker;
import java.text.MessageFormat;
import java.util.Locale;
@@ -41,7 +42,26 @@ import java.util.ResourceBundle;
public class AuthenticationProviderMessages
{
private static ResourceBundle _messages;
- private static Locale _currentLocale = BrokerProperties.getLocale();
+ private static Locale _currentLocale;
+
+ static
+ {
+ Locale locale = Locale.US;
+ String localeSetting = System.getProperty(Broker.PROPERTY_LOCALE);
+ if (localeSetting != null)
+ {
+ String[] localeParts = localeSetting.split("_");
+ String language = (localeParts.length > 0 ? localeParts[0] : "");
+ String country = (localeParts.length > 1 ? localeParts[1] : "");
+ String variant = "";
+ if (localeParts.length > 2)
+ {
+ variant = localeSetting.substring(language.length() + 1 + country.length() + 1);
+ }
+ locale = new Locale(language, country, variant);
+ }
+ _currentLocale = locale;
+ }
public static final String AUTHENTICATIONPROVIDER_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "authenticationprovider";
public static final String OPEN_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "authenticationprovider.open";
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BindingMessages.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BindingMessages.java?rev=1767630&r1=1767629&r2=1767630&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BindingMessages.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BindingMessages.java Wed Nov 2 10:43:13 2016
@@ -23,8 +23,9 @@ package org.apache.qpid.server.logging.m
import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX;
import org.slf4j.LoggerFactory;
-import org.apache.qpid.server.configuration.BrokerProperties;
+
import org.apache.qpid.server.logging.LogMessage;
+import org.apache.qpid.server.model.Broker;
import java.text.MessageFormat;
import java.util.Locale;
@@ -41,7 +42,26 @@ import java.util.ResourceBundle;
public class BindingMessages
{
private static ResourceBundle _messages;
- private static Locale _currentLocale = BrokerProperties.getLocale();
+ private static Locale _currentLocale;
+
+ static
+ {
+ Locale locale = Locale.US;
+ String localeSetting = System.getProperty(Broker.PROPERTY_LOCALE);
+ if (localeSetting != null)
+ {
+ String[] localeParts = localeSetting.split("_");
+ String language = (localeParts.length > 0 ? localeParts[0] : "");
+ String country = (localeParts.length > 1 ? localeParts[1] : "");
+ String variant = "";
+ if (localeParts.length > 2)
+ {
+ variant = localeSetting.substring(language.length() + 1 + country.length() + 1);
+ }
+ locale = new Locale(language, country, variant);
+ }
+ _currentLocale = locale;
+ }
public static final String BINDING_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "binding";
public static final String CREATED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "binding.created";
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BrokerMessages.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BrokerMessages.java?rev=1767630&r1=1767629&r2=1767630&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BrokerMessages.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BrokerMessages.java Wed Nov 2 10:43:13 2016
@@ -23,8 +23,9 @@ package org.apache.qpid.server.logging.m
import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX;
import org.slf4j.LoggerFactory;
-import org.apache.qpid.server.configuration.BrokerProperties;
+
import org.apache.qpid.server.logging.LogMessage;
+import org.apache.qpid.server.model.Broker;
import java.text.MessageFormat;
import java.util.Locale;
@@ -41,7 +42,26 @@ import java.util.ResourceBundle;
public class BrokerMessages
{
private static ResourceBundle _messages;
- private static Locale _currentLocale = BrokerProperties.getLocale();
+ private static Locale _currentLocale;
+
+ static
+ {
+ Locale locale = Locale.US;
+ String localeSetting = System.getProperty(Broker.PROPERTY_LOCALE);
+ if (localeSetting != null)
+ {
+ String[] localeParts = localeSetting.split("_");
+ String language = (localeParts.length > 0 ? localeParts[0] : "");
+ String country = (localeParts.length > 1 ? localeParts[1] : "");
+ String variant = "";
+ if (localeParts.length > 2)
+ {
+ variant = localeSetting.substring(language.length() + 1 + country.length() + 1);
+ }
+ locale = new Locale(language, country, variant);
+ }
+ _currentLocale = locale;
+ }
public static final String BROKER_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "broker";
public static final String READY_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "broker.ready";
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ChannelMessages.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ChannelMessages.java?rev=1767630&r1=1767629&r2=1767630&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ChannelMessages.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ChannelMessages.java Wed Nov 2 10:43:13 2016
@@ -23,8 +23,9 @@ package org.apache.qpid.server.logging.m
import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX;
import org.slf4j.LoggerFactory;
-import org.apache.qpid.server.configuration.BrokerProperties;
+
import org.apache.qpid.server.logging.LogMessage;
+import org.apache.qpid.server.model.Broker;
import java.text.MessageFormat;
import java.util.Locale;
@@ -41,7 +42,26 @@ import java.util.ResourceBundle;
public class ChannelMessages
{
private static ResourceBundle _messages;
- private static Locale _currentLocale = BrokerProperties.getLocale();
+ private static Locale _currentLocale;
+
+ static
+ {
+ Locale locale = Locale.US;
+ String localeSetting = System.getProperty(Broker.PROPERTY_LOCALE);
+ if (localeSetting != null)
+ {
+ String[] localeParts = localeSetting.split("_");
+ String language = (localeParts.length > 0 ? localeParts[0] : "");
+ String country = (localeParts.length > 1 ? localeParts[1] : "");
+ String variant = "";
+ if (localeParts.length > 2)
+ {
+ variant = localeSetting.substring(language.length() + 1 + country.length() + 1);
+ }
+ locale = new Locale(language, country, variant);
+ }
+ _currentLocale = locale;
+ }
public static final String CHANNEL_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "channel";
public static final String FLOW_ENFORCED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "channel.flow_enforced";
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConfigStoreMessages.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConfigStoreMessages.java?rev=1767630&r1=1767629&r2=1767630&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConfigStoreMessages.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConfigStoreMessages.java Wed Nov 2 10:43:13 2016
@@ -23,8 +23,9 @@ package org.apache.qpid.server.logging.m
import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX;
import org.slf4j.LoggerFactory;
-import org.apache.qpid.server.configuration.BrokerProperties;
+
import org.apache.qpid.server.logging.LogMessage;
+import org.apache.qpid.server.model.Broker;
import java.text.MessageFormat;
import java.util.Locale;
@@ -41,7 +42,26 @@ import java.util.ResourceBundle;
public class ConfigStoreMessages
{
private static ResourceBundle _messages;
- private static Locale _currentLocale = BrokerProperties.getLocale();
+ private static Locale _currentLocale;
+
+ static
+ {
+ Locale locale = Locale.US;
+ String localeSetting = System.getProperty(Broker.PROPERTY_LOCALE);
+ if (localeSetting != null)
+ {
+ String[] localeParts = localeSetting.split("_");
+ String language = (localeParts.length > 0 ? localeParts[0] : "");
+ String country = (localeParts.length > 1 ? localeParts[1] : "");
+ String variant = "";
+ if (localeParts.length > 2)
+ {
+ variant = localeSetting.substring(language.length() + 1 + country.length() + 1);
+ }
+ locale = new Locale(language, country, variant);
+ }
+ _currentLocale = locale;
+ }
public static final String CONFIGSTORE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "configstore";
public static final String RECOVERY_COMPLETE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "configstore.recovery_complete";
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConnectionMessages.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConnectionMessages.java?rev=1767630&r1=1767629&r2=1767630&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConnectionMessages.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConnectionMessages.java Wed Nov 2 10:43:13 2016
@@ -23,8 +23,9 @@ package org.apache.qpid.server.logging.m
import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX;
import org.slf4j.LoggerFactory;
-import org.apache.qpid.server.configuration.BrokerProperties;
+
import org.apache.qpid.server.logging.LogMessage;
+import org.apache.qpid.server.model.Broker;
import java.text.MessageFormat;
import java.util.Locale;
@@ -41,7 +42,26 @@ import java.util.ResourceBundle;
public class ConnectionMessages
{
private static ResourceBundle _messages;
- private static Locale _currentLocale = BrokerProperties.getLocale();
+ private static Locale _currentLocale;
+
+ static
+ {
+ Locale locale = Locale.US;
+ String localeSetting = System.getProperty(Broker.PROPERTY_LOCALE);
+ if (localeSetting != null)
+ {
+ String[] localeParts = localeSetting.split("_");
+ String language = (localeParts.length > 0 ? localeParts[0] : "");
+ String country = (localeParts.length > 1 ? localeParts[1] : "");
+ String variant = "";
+ if (localeParts.length > 2)
+ {
+ variant = localeSetting.substring(language.length() + 1 + country.length() + 1);
+ }
+ locale = new Locale(language, country, variant);
+ }
+ _currentLocale = locale;
+ }
public static final String CONNECTION_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "connection";
public static final String OPEN_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "connection.open";
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ExchangeMessages.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ExchangeMessages.java?rev=1767630&r1=1767629&r2=1767630&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ExchangeMessages.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ExchangeMessages.java Wed Nov 2 10:43:13 2016
@@ -23,8 +23,9 @@ package org.apache.qpid.server.logging.m
import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX;
import org.slf4j.LoggerFactory;
-import org.apache.qpid.server.configuration.BrokerProperties;
+
import org.apache.qpid.server.logging.LogMessage;
+import org.apache.qpid.server.model.Broker;
import java.text.MessageFormat;
import java.util.Locale;
@@ -41,7 +42,26 @@ import java.util.ResourceBundle;
public class ExchangeMessages
{
private static ResourceBundle _messages;
- private static Locale _currentLocale = BrokerProperties.getLocale();
+ private static Locale _currentLocale;
+
+ static
+ {
+ Locale locale = Locale.US;
+ String localeSetting = System.getProperty(Broker.PROPERTY_LOCALE);
+ if (localeSetting != null)
+ {
+ String[] localeParts = localeSetting.split("_");
+ String language = (localeParts.length > 0 ? localeParts[0] : "");
+ String country = (localeParts.length > 1 ? localeParts[1] : "");
+ String variant = "";
+ if (localeParts.length > 2)
+ {
+ variant = localeSetting.substring(language.length() + 1 + country.length() + 1);
+ }
+ locale = new Locale(language, country, variant);
+ }
+ _currentLocale = locale;
+ }
public static final String EXCHANGE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "exchange";
public static final String DISCARDMSG_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "exchange.discardmsg";
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/HighAvailabilityMessages.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/HighAvailabilityMessages.java?rev=1767630&r1=1767629&r2=1767630&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/HighAvailabilityMessages.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/HighAvailabilityMessages.java Wed Nov 2 10:43:13 2016
@@ -23,8 +23,9 @@ package org.apache.qpid.server.logging.m
import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX;
import org.slf4j.LoggerFactory;
-import org.apache.qpid.server.configuration.BrokerProperties;
+
import org.apache.qpid.server.logging.LogMessage;
+import org.apache.qpid.server.model.Broker;
import java.text.MessageFormat;
import java.util.Locale;
@@ -41,7 +42,26 @@ import java.util.ResourceBundle;
public class HighAvailabilityMessages
{
private static ResourceBundle _messages;
- private static Locale _currentLocale = BrokerProperties.getLocale();
+ private static Locale _currentLocale;
+
+ static
+ {
+ Locale locale = Locale.US;
+ String localeSetting = System.getProperty(Broker.PROPERTY_LOCALE);
+ if (localeSetting != null)
+ {
+ String[] localeParts = localeSetting.split("_");
+ String language = (localeParts.length > 0 ? localeParts[0] : "");
+ String country = (localeParts.length > 1 ? localeParts[1] : "");
+ String variant = "";
+ if (localeParts.length > 2)
+ {
+ variant = localeSetting.substring(language.length() + 1 + country.length() + 1);
+ }
+ locale = new Locale(language, country, variant);
+ }
+ _currentLocale = locale;
+ }
public static final String HIGHAVAILABILITY_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "highavailability";
public static final String INTRUDER_DETECTED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "highavailability.intruder_detected";
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/KeyStoreMessages.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/KeyStoreMessages.java?rev=1767630&r1=1767629&r2=1767630&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/KeyStoreMessages.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/KeyStoreMessages.java Wed Nov 2 10:43:13 2016
@@ -23,8 +23,9 @@ package org.apache.qpid.server.logging.m
import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX;
import org.slf4j.LoggerFactory;
-import org.apache.qpid.server.configuration.BrokerProperties;
+
import org.apache.qpid.server.logging.LogMessage;
+import org.apache.qpid.server.model.Broker;
import java.text.MessageFormat;
import java.util.Locale;
@@ -41,7 +42,26 @@ import java.util.ResourceBundle;
public class KeyStoreMessages
{
private static ResourceBundle _messages;
- private static Locale _currentLocale = BrokerProperties.getLocale();
+ private static Locale _currentLocale;
+
+ static
+ {
+ Locale locale = Locale.US;
+ String localeSetting = System.getProperty(Broker.PROPERTY_LOCALE);
+ if (localeSetting != null)
+ {
+ String[] localeParts = localeSetting.split("_");
+ String language = (localeParts.length > 0 ? localeParts[0] : "");
+ String country = (localeParts.length > 1 ? localeParts[1] : "");
+ String variant = "";
+ if (localeParts.length > 2)
+ {
+ variant = localeSetting.substring(language.length() + 1 + country.length() + 1);
+ }
+ locale = new Locale(language, country, variant);
+ }
+ _currentLocale = locale;
+ }
public static final String KEYSTORE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "keystore";
public static final String OPEN_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "keystore.open";
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessages.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessages.java?rev=1767630&r1=1767629&r2=1767630&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessages.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessages.java Wed Nov 2 10:43:13 2016
@@ -23,8 +23,9 @@ package org.apache.qpid.server.logging.m
import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX;
import org.slf4j.LoggerFactory;
-import org.apache.qpid.server.configuration.BrokerProperties;
+
import org.apache.qpid.server.logging.LogMessage;
+import org.apache.qpid.server.model.Broker;
import java.text.MessageFormat;
import java.util.Locale;
@@ -41,7 +42,26 @@ import java.util.ResourceBundle;
public class ManagementConsoleMessages
{
private static ResourceBundle _messages;
- private static Locale _currentLocale = BrokerProperties.getLocale();
+ private static Locale _currentLocale;
+
+ static
+ {
+ Locale locale = Locale.US;
+ String localeSetting = System.getProperty(Broker.PROPERTY_LOCALE);
+ if (localeSetting != null)
+ {
+ String[] localeParts = localeSetting.split("_");
+ String language = (localeParts.length > 0 ? localeParts[0] : "");
+ String country = (localeParts.length > 1 ? localeParts[1] : "");
+ String variant = "";
+ if (localeParts.length > 2)
+ {
+ variant = localeSetting.substring(language.length() + 1 + country.length() + 1);
+ }
+ locale = new Locale(language, country, variant);
+ }
+ _currentLocale = locale;
+ }
public static final String MANAGEMENTCONSOLE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "managementconsole";
public static final String OPEN_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "managementconsole.open";
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/MessageStoreMessages.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/MessageStoreMessages.java?rev=1767630&r1=1767629&r2=1767630&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/MessageStoreMessages.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/MessageStoreMessages.java Wed Nov 2 10:43:13 2016
@@ -23,8 +23,9 @@ package org.apache.qpid.server.logging.m
import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX;
import org.slf4j.LoggerFactory;
-import org.apache.qpid.server.configuration.BrokerProperties;
+
import org.apache.qpid.server.logging.LogMessage;
+import org.apache.qpid.server.model.Broker;
import java.text.MessageFormat;
import java.util.Locale;
@@ -41,7 +42,26 @@ import java.util.ResourceBundle;
public class MessageStoreMessages
{
private static ResourceBundle _messages;
- private static Locale _currentLocale = BrokerProperties.getLocale();
+ private static Locale _currentLocale;
+
+ static
+ {
+ Locale locale = Locale.US;
+ String localeSetting = System.getProperty(Broker.PROPERTY_LOCALE);
+ if (localeSetting != null)
+ {
+ String[] localeParts = localeSetting.split("_");
+ String language = (localeParts.length > 0 ? localeParts[0] : "");
+ String country = (localeParts.length > 1 ? localeParts[1] : "");
+ String variant = "";
+ if (localeParts.length > 2)
+ {
+ variant = localeSetting.substring(language.length() + 1 + country.length() + 1);
+ }
+ locale = new Locale(language, country, variant);
+ }
+ _currentLocale = locale;
+ }
public static final String MESSAGESTORE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "messagestore";
public static final String RECOVERY_COMPLETE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "messagestore.recovery_complete";
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/PortMessages.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/PortMessages.java?rev=1767630&r1=1767629&r2=1767630&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/PortMessages.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/PortMessages.java Wed Nov 2 10:43:13 2016
@@ -23,8 +23,9 @@ package org.apache.qpid.server.logging.m
import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX;
import org.slf4j.LoggerFactory;
-import org.apache.qpid.server.configuration.BrokerProperties;
+
import org.apache.qpid.server.logging.LogMessage;
+import org.apache.qpid.server.model.Broker;
import java.text.MessageFormat;
import java.util.Locale;
@@ -41,7 +42,26 @@ import java.util.ResourceBundle;
public class PortMessages
{
private static ResourceBundle _messages;
- private static Locale _currentLocale = BrokerProperties.getLocale();
+ private static Locale _currentLocale;
+
+ static
+ {
+ Locale locale = Locale.US;
+ String localeSetting = System.getProperty(Broker.PROPERTY_LOCALE);
+ if (localeSetting != null)
+ {
+ String[] localeParts = localeSetting.split("_");
+ String language = (localeParts.length > 0 ? localeParts[0] : "");
+ String country = (localeParts.length > 1 ? localeParts[1] : "");
+ String variant = "";
+ if (localeParts.length > 2)
+ {
+ variant = localeSetting.substring(language.length() + 1 + country.length() + 1);
+ }
+ locale = new Locale(language, country, variant);
+ }
+ _currentLocale = locale;
+ }
public static final String PORT_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "port";
public static final String DELETE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "port.delete";
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/QueueMessages.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/QueueMessages.java?rev=1767630&r1=1767629&r2=1767630&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/QueueMessages.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/QueueMessages.java Wed Nov 2 10:43:13 2016
@@ -23,8 +23,9 @@ package org.apache.qpid.server.logging.m
import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX;
import org.slf4j.LoggerFactory;
-import org.apache.qpid.server.configuration.BrokerProperties;
+
import org.apache.qpid.server.logging.LogMessage;
+import org.apache.qpid.server.model.Broker;
import java.text.MessageFormat;
import java.util.Locale;
@@ -41,7 +42,26 @@ import java.util.ResourceBundle;
public class QueueMessages
{
private static ResourceBundle _messages;
- private static Locale _currentLocale = BrokerProperties.getLocale();
+ private static Locale _currentLocale;
+
+ static
+ {
+ Locale locale = Locale.US;
+ String localeSetting = System.getProperty(Broker.PROPERTY_LOCALE);
+ if (localeSetting != null)
+ {
+ String[] localeParts = localeSetting.split("_");
+ String language = (localeParts.length > 0 ? localeParts[0] : "");
+ String country = (localeParts.length > 1 ? localeParts[1] : "");
+ String variant = "";
+ if (localeParts.length > 2)
+ {
+ variant = localeSetting.substring(language.length() + 1 + country.length() + 1);
+ }
+ locale = new Locale(language, country, variant);
+ }
+ _currentLocale = locale;
+ }
public static final String QUEUE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "queue";
public static final String OVERFULL_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "queue.overfull";
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/SubscriptionMessages.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/SubscriptionMessages.java?rev=1767630&r1=1767629&r2=1767630&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/SubscriptionMessages.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/SubscriptionMessages.java Wed Nov 2 10:43:13 2016
@@ -23,8 +23,9 @@ package org.apache.qpid.server.logging.m
import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX;
import org.slf4j.LoggerFactory;
-import org.apache.qpid.server.configuration.BrokerProperties;
+
import org.apache.qpid.server.logging.LogMessage;
+import org.apache.qpid.server.model.Broker;
import java.text.MessageFormat;
import java.util.Locale;
@@ -41,7 +42,26 @@ import java.util.ResourceBundle;
public class SubscriptionMessages
{
private static ResourceBundle _messages;
- private static Locale _currentLocale = BrokerProperties.getLocale();
+ private static Locale _currentLocale;
+
+ static
+ {
+ Locale locale = Locale.US;
+ String localeSetting = System.getProperty(Broker.PROPERTY_LOCALE);
+ if (localeSetting != null)
+ {
+ String[] localeParts = localeSetting.split("_");
+ String language = (localeParts.length > 0 ? localeParts[0] : "");
+ String country = (localeParts.length > 1 ? localeParts[1] : "");
+ String variant = "";
+ if (localeParts.length > 2)
+ {
+ variant = localeSetting.substring(language.length() + 1 + country.length() + 1);
+ }
+ locale = new Locale(language, country, variant);
+ }
+ _currentLocale = locale;
+ }
public static final String SUBSCRIPTION_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "subscription";
public static final String STATE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "subscription.state";
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TransactionLogMessages.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TransactionLogMessages.java?rev=1767630&r1=1767629&r2=1767630&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TransactionLogMessages.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TransactionLogMessages.java Wed Nov 2 10:43:13 2016
@@ -23,8 +23,9 @@ package org.apache.qpid.server.logging.m
import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX;
import org.slf4j.LoggerFactory;
-import org.apache.qpid.server.configuration.BrokerProperties;
+
import org.apache.qpid.server.logging.LogMessage;
+import org.apache.qpid.server.model.Broker;
import java.text.MessageFormat;
import java.util.Locale;
@@ -41,7 +42,26 @@ import java.util.ResourceBundle;
public class TransactionLogMessages
{
private static ResourceBundle _messages;
- private static Locale _currentLocale = BrokerProperties.getLocale();
+ private static Locale _currentLocale;
+
+ static
+ {
+ Locale locale = Locale.US;
+ String localeSetting = System.getProperty(Broker.PROPERTY_LOCALE);
+ if (localeSetting != null)
+ {
+ String[] localeParts = localeSetting.split("_");
+ String language = (localeParts.length > 0 ? localeParts[0] : "");
+ String country = (localeParts.length > 1 ? localeParts[1] : "");
+ String variant = "";
+ if (localeParts.length > 2)
+ {
+ variant = localeSetting.substring(language.length() + 1 + country.length() + 1);
+ }
+ locale = new Locale(language, country, variant);
+ }
+ _currentLocale = locale;
+ }
public static final String TRANSACTIONLOG_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "transactionlog";
public static final String CLOSED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "transactionlog.closed";
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TrustStoreMessages.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TrustStoreMessages.java?rev=1767630&r1=1767629&r2=1767630&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TrustStoreMessages.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TrustStoreMessages.java Wed Nov 2 10:43:13 2016
@@ -23,8 +23,9 @@ package org.apache.qpid.server.logging.m
import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX;
import org.slf4j.LoggerFactory;
-import org.apache.qpid.server.configuration.BrokerProperties;
+
import org.apache.qpid.server.logging.LogMessage;
+import org.apache.qpid.server.model.Broker;
import java.text.MessageFormat;
import java.util.Locale;
@@ -41,7 +42,26 @@ import java.util.ResourceBundle;
public class TrustStoreMessages
{
private static ResourceBundle _messages;
- private static Locale _currentLocale = BrokerProperties.getLocale();
+ private static Locale _currentLocale;
+
+ static
+ {
+ Locale locale = Locale.US;
+ String localeSetting = System.getProperty(Broker.PROPERTY_LOCALE);
+ if (localeSetting != null)
+ {
+ String[] localeParts = localeSetting.split("_");
+ String language = (localeParts.length > 0 ? localeParts[0] : "");
+ String country = (localeParts.length > 1 ? localeParts[1] : "");
+ String variant = "";
+ if (localeParts.length > 2)
+ {
+ variant = localeSetting.substring(language.length() + 1 + country.length() + 1);
+ }
+ locale = new Locale(language, country, variant);
+ }
+ _currentLocale = locale;
+ }
public static final String TRUSTSTORE_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "truststore";
public static final String OPEN_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "truststore.open";
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/VirtualHostMessages.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/VirtualHostMessages.java?rev=1767630&r1=1767629&r2=1767630&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/VirtualHostMessages.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/logging/messages/VirtualHostMessages.java Wed Nov 2 10:43:13 2016
@@ -23,8 +23,9 @@ package org.apache.qpid.server.logging.m
import static org.apache.qpid.server.logging.AbstractMessageLogger.DEFAULT_LOG_HIERARCHY_PREFIX;
import org.slf4j.LoggerFactory;
-import org.apache.qpid.server.configuration.BrokerProperties;
+
import org.apache.qpid.server.logging.LogMessage;
+import org.apache.qpid.server.model.Broker;
import java.text.MessageFormat;
import java.util.Locale;
@@ -41,7 +42,26 @@ import java.util.ResourceBundle;
public class VirtualHostMessages
{
private static ResourceBundle _messages;
- private static Locale _currentLocale = BrokerProperties.getLocale();
+ private static Locale _currentLocale;
+
+ static
+ {
+ Locale locale = Locale.US;
+ String localeSetting = System.getProperty(Broker.PROPERTY_LOCALE);
+ if (localeSetting != null)
+ {
+ String[] localeParts = localeSetting.split("_");
+ String language = (localeParts.length > 0 ? localeParts[0] : "");
+ String country = (localeParts.length > 1 ? localeParts[1] : "");
+ String variant = "";
+ if (localeParts.length > 2)
+ {
+ variant = localeSetting.substring(language.length() + 1 + country.length() + 1);
+ }
+ locale = new Locale(language, country, variant);
+ }
+ _currentLocale = locale;
+ }
public static final String VIRTUALHOST_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "virtualhost";
public static final String CLOSED_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "virtualhost.closed";
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java?rev=1767630&r1=1767629&r2=1767630&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java Wed Nov 2 10:43:13 2016
@@ -111,6 +111,10 @@ public interface Broker<X extends Broker
@ManagedContextDefault(name = QPID_DOCUMENTATION_URL)
String DEFAULT_DOCUMENTATION_URL = "http://qpid.apache.org/releases/qpid-java-${qpid.version}/java-broker/book/";
+ String PROPERTY_DISABLED_FEATURES = "qpid.broker_disabled_features";
+
+ String PROPERTY_LOCALE = "qpid.broker_locale";
+
@DerivedAttribute
String getBuildVersion();
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/SystemConfig.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/SystemConfig.java?rev=1767630&r1=1767629&r2=1767630&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/SystemConfig.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/SystemConfig.java Wed Nov 2 10:43:13 2016
@@ -20,7 +20,6 @@
*/
package org.apache.qpid.server.model;
-import org.apache.qpid.server.configuration.BrokerProperties;
import org.apache.qpid.server.logging.EventLogger;
import org.apache.qpid.server.store.DurableConfigurationStore;
import org.apache.qpid.server.store.preferences.PreferenceStoreAttributes;
@@ -40,21 +39,34 @@ public interface SystemConfig<X extends
String STARTUP_LOGGED_TO_SYSTEM_OUT = "startupLoggedToSystemOut";
- @ManagedContextDefault(name=BrokerProperties.PROPERTY_QPID_WORK)
+ String PROPERTY_QPID_WORK = "QPID_WORK";
+ @ManagedContextDefault(name= SystemConfig.PROPERTY_QPID_WORK)
String DEFAULT_QPID_WORK = "${user.dir}${file.separator}work";
- @ManagedContextDefault(name=BrokerProperties.QPID_WORK_DIR)
+ /**
+ * Configuration property name for the absolute path to use for the broker work directory.
+ *
+ * If not otherwise set, the value for this configuration property defaults to the location
+ * set in the "QPID_WORK" system property if that was set, or the 'work' sub-directory of
+ * the JVM working directory ("user.dir" property) for the Java process if it was not.
+ */
+ String QPID_WORK_DIR = "qpid.work_dir";
+
+ @ManagedContextDefault(name= SystemConfig.QPID_WORK_DIR)
String DEFAULT_QPID_WORK_DIR = "${QPID_WORK}";
@ManagedContextDefault(name="qpid.broker.defaultPreferenceStoreAttributes")
String DEFAULT_PREFERENCE_STORE_ATTRIBUTES = "{\"type\": \"JSON\", \"attributes\":{\"path\": \"${json:qpid.work_dir}${json:file.separator}preferences.json\"}}";
- @ManagedContextDefault(name = BrokerProperties.POSIX_FILE_PERMISSIONS)
+ String POSIX_FILE_PERMISSIONS = "qpid.default_posix_file_permissions";
+ @ManagedContextDefault(name = SystemConfig.POSIX_FILE_PERMISSIONS)
String DEFAULT_POSIX_FILE_PERMISSIONS = "rw-r-----";
String MANAGEMENT_MODE_USER_NAME = "mm_admin";
+ String PROPERTY_STATUS_UPDATES = "qpid.broker_status_updates";
+
@ManagedAttribute(immutable = true, defaultValue = Broker.BROKER_TYPE)
String getDefaultContainerType();
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java?rev=1767630&r1=1767629&r2=1767630&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/VirtualHost.java Wed Nov 2 10:43:13 2016
@@ -74,10 +74,13 @@ public interface VirtualHost<X extends V
String NODE_AUTO_CREATION_POLICIES = "nodeAutoCreationPolicies";
@ManagedContextDefault( name = VIRTUALHOST_WORK_DIR_VAR)
- public static final String VIRTUALHOST_WORK_DIR = VIRTUALHOST_WORK_DIR_VAR_EXPRESSION;
+ String VIRTUALHOST_WORK_DIR = VIRTUALHOST_WORK_DIR_VAR_EXPRESSION;
@ManagedContextDefault( name = "queue.deadLetterQueueEnabled")
- public static final boolean DEFAULT_DEAD_LETTER_QUEUE_ENABLED = false;
+ boolean DEFAULT_DEAD_LETTER_QUEUE_ENABLED = false;
+
String DEFAULT_DLE_NAME_SUFFIX = "_DLE";
+ String PROPERTY_DEAD_LETTER_EXCHANGE_SUFFIX = "qpid.broker_dead_letter_exchange_suffix";
+ String PROPERTY_DEAD_LETTER_QUEUE_SUFFIX = "qpid.broker_dead_letter_queue_suffix";
@ManagedAttribute( defaultValue = "${queue.deadLetterQueueEnabled}", initialization = materialize)
boolean isQueue_deadLetterQueueEnabled();
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java?rev=1767630&r1=1767629&r2=1767630&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/adapter/FileBasedGroupProviderImpl.java Wed Nov 2 10:43:13 2016
@@ -36,7 +36,6 @@ import com.google.common.util.concurrent
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.qpid.server.configuration.BrokerProperties;
import org.apache.qpid.server.configuration.IllegalConfigurationException;
import org.apache.qpid.server.model.AbstractConfiguredObject;
import org.apache.qpid.server.model.ConfiguredObject;
@@ -164,7 +163,7 @@ public class FileBasedGroupProviderImpl
try
{
- String posixFileAttributes = getContextValue(String.class, BrokerProperties.POSIX_FILE_PERMISSIONS);
+ String posixFileAttributes = getContextValue(String.class, SystemConfig.POSIX_FILE_PERMISSIONS);
new FileHelper().createNewFile(file, posixFileAttributes);
}
catch (IOException e)
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPort.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPort.java?rev=1767630&r1=1767629&r2=1767630&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPort.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPort.java Wed Nov 2 10:43:13 2016
@@ -23,6 +23,8 @@ package org.apache.qpid.server.model.por
import java.net.SocketAddress;
import java.util.Set;
+import javax.net.ssl.SSLContext;
+
import org.apache.qpid.server.model.AuthenticationProvider;
import org.apache.qpid.server.model.DerivedAttribute;
import org.apache.qpid.server.model.ManagedAttribute;
@@ -36,8 +38,6 @@ import org.apache.qpid.server.model.Stat
import org.apache.qpid.server.model.Transport;
import org.apache.qpid.server.model.TrustStore;
-import javax.net.ssl.SSLContext;
-
@ManagedObject( category = false, type = "AMQP")
public interface AmqpPort<X extends AmqpPort<X>> extends ClientAuthCapablePort<X>
{
@@ -102,6 +102,8 @@ public interface AmqpPort<X extends Amqp
+ " the connection will be aborted.")
long DEFAULT_PROTOCOL_HANDSHAKE_TIMEOUT = 2000;
+ String PROPERTY_DEFAULT_SUPPORTED_PROTOCOL_REPLY = "qpid.broker_default_supported_protocol_version_reply";
+
SSLContext getSSLContext();
@ManagedAttribute(defaultValue = "*")
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPortImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPortImpl.java?rev=1767630&r1=1767629&r2=1767630&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPortImpl.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/port/AmqpPortImpl.java Wed Nov 2 10:43:13 2016
@@ -48,7 +48,6 @@ import com.google.common.util.concurrent
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.qpid.server.configuration.BrokerProperties;
import org.apache.qpid.server.configuration.IllegalConfigurationException;
import org.apache.qpid.server.logging.messages.BrokerMessages;
import org.apache.qpid.server.logging.messages.PortMessages;
@@ -453,8 +452,8 @@ public class AmqpPortImpl extends Abstra
private Protocol getDefaultAmqpSupportedReply()
{
- String defaultAmqpSupportedReply = getContextKeys(false).contains(BrokerProperties.PROPERTY_DEFAULT_SUPPORTED_PROTOCOL_REPLY) ?
- getContextValue(String.class, BrokerProperties.PROPERTY_DEFAULT_SUPPORTED_PROTOCOL_REPLY) : null;
+ String defaultAmqpSupportedReply = getContextKeys(false).contains(AmqpPort.PROPERTY_DEFAULT_SUPPORTED_PROTOCOL_REPLY) ?
+ getContextValue(String.class, AmqpPort.PROPERTY_DEFAULT_SUPPORTED_PROTOCOL_REPLY) : null;
Protocol protocol = null;
if (defaultAmqpSupportedReply != null && defaultAmqpSupportedReply.length() != 0)
{
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java?rev=1767630&r1=1767629&r2=1767630&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java Wed Nov 2 10:43:13 2016
@@ -45,7 +45,6 @@ import com.google.common.util.concurrent
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.qpid.server.configuration.BrokerProperties;
import org.apache.qpid.server.configuration.IllegalConfigurationException;
import org.apache.qpid.server.model.AbstractConfiguredObject;
import org.apache.qpid.server.model.ConfiguredObject;
@@ -54,6 +53,7 @@ import org.apache.qpid.server.model.Exte
import org.apache.qpid.server.model.ManagedAttributeField;
import org.apache.qpid.server.model.State;
import org.apache.qpid.server.model.StateTransition;
+import org.apache.qpid.server.model.SystemConfig;
import org.apache.qpid.server.model.User;
import org.apache.qpid.server.security.auth.AuthenticationResult;
import org.apache.qpid.server.security.auth.AuthenticationResult.AuthenticationStatus;
@@ -100,7 +100,7 @@ public abstract class PrincipalDatabaseA
{
try
{
- Path path = new FileHelper().createNewFile(passwordFile, getContextValue(String.class, BrokerProperties.POSIX_FILE_PERMISSIONS));
+ Path path = new FileHelper().createNewFile(passwordFile, getContextValue(String.class, SystemConfig.POSIX_FILE_PERMISSIONS));
if (!Files.exists(path))
{
throw new IllegalConfigurationException(String.format("Cannot create password file at '%s'", _path));
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/encryption/AESKeyFileEncrypterFactory.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/encryption/AESKeyFileEncrypterFactory.java?rev=1767630&r1=1767629&r2=1767630&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/encryption/AESKeyFileEncrypterFactory.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/encryption/AESKeyFileEncrypterFactory.java Wed Nov 2 10:43:13 2016
@@ -55,9 +55,9 @@ import javax.crypto.spec.SecretKeySpec;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.qpid.server.configuration.BrokerProperties;
import org.apache.qpid.server.configuration.IllegalConfigurationException;
import org.apache.qpid.server.model.ConfiguredObject;
+import org.apache.qpid.server.model.SystemConfig;
import org.apache.qpid.server.plugin.ConditionallyAvailable;
import org.apache.qpid.server.plugin.ConfigurationSecretEncrypterFactory;
import org.apache.qpid.server.plugin.PluggableService;
@@ -115,7 +115,7 @@ public class AESKeyFileEncrypterFactory
else
{
- fileLocation = object.getContextValue(String.class, BrokerProperties.QPID_WORK_DIR)
+ fileLocation = object.getContextValue(String.class, SystemConfig.QPID_WORK_DIR)
+ File.separator + DEFAULT_KEYS_SUBDIR_NAME + File.separator
+ object.getCategoryClass().getSimpleName() + "_"
+ object.getName() + ".key";
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java?rev=1767630&r1=1767629&r2=1767630&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/JsonFileConfigStore.java Wed Nov 2 10:43:13 2016
@@ -43,12 +43,12 @@ import com.fasterxml.jackson.databind.Se
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.qpid.server.configuration.BrokerProperties;
import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.model.ConfiguredObjectJacksonModule;
import org.apache.qpid.server.model.ContainerType;
import org.apache.qpid.server.model.DynamicModel;
import org.apache.qpid.server.model.Model;
+import org.apache.qpid.server.model.SystemConfig;
import org.apache.qpid.server.plugin.QpidServiceLoader;
import org.apache.qpid.server.store.handler.ConfiguredObjectRecordHandler;
@@ -113,7 +113,7 @@ public class JsonFileConfigStore extends
FileBasedSettings fileBasedSettings = (FileBasedSettings) _parent;
setup(parent.getName(),
fileBasedSettings.getStorePath(),
- parent.getContextValue(String.class, BrokerProperties.POSIX_FILE_PERMISSIONS),
+ parent.getContextValue(String.class, SystemConfig.POSIX_FILE_PERMISSIONS),
Collections.emptyMap());
changeState(State.CLOSED, State.CONFIGURED);
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/VirtualHostStoreUpgraderAndRecoverer.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/VirtualHostStoreUpgraderAndRecoverer.java?rev=1767630&r1=1767629&r2=1767630&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/VirtualHostStoreUpgraderAndRecoverer.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/VirtualHostStoreUpgraderAndRecoverer.java Wed Nov 2 10:43:13 2016
@@ -32,7 +32,6 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.UUID;
-import org.apache.qpid.server.configuration.BrokerProperties;
import org.apache.qpid.server.configuration.IllegalConfigurationException;
import org.apache.qpid.server.configuration.store.StoreConfigurationChangeListener;
import org.apache.qpid.server.filter.FilterSupport;
@@ -452,7 +451,7 @@ public class VirtualHostStoreUpgraderAnd
throw new IllegalConfigurationException("Queue name is not found in queue configuration entry attributes: " + attributes);
}
- String dleSuffix = System.getProperty(BrokerProperties.PROPERTY_DEAD_LETTER_EXCHANGE_SUFFIX, DEFAULT_DLE_NAME_SUFFIX);
+ String dleSuffix = System.getProperty(VirtualHost.PROPERTY_DEAD_LETTER_EXCHANGE_SUFFIX, DEFAULT_DLE_NAME_SUFFIX);
String dleExchangeName = queueName + dleSuffix;
ConfiguredObjectRecord exchangeRecord = findConfiguredObjectRecordInUpdateMap("Exchange", dleExchangeName);
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/preferences/JsonFilePreferenceStoreFactoryService.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/preferences/JsonFilePreferenceStoreFactoryService.java?rev=1767630&r1=1767629&r2=1767630&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/preferences/JsonFilePreferenceStoreFactoryService.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/preferences/JsonFilePreferenceStoreFactoryService.java Wed Nov 2 10:43:13 2016
@@ -21,9 +21,9 @@ package org.apache.qpid.server.store.pre
import java.util.Map;
-import org.apache.qpid.server.configuration.BrokerProperties;
import org.apache.qpid.server.configuration.IllegalConfigurationException;
import org.apache.qpid.server.model.ConfiguredObject;
+import org.apache.qpid.server.model.SystemConfig;
import org.apache.qpid.server.plugin.PluggableService;
@SuppressWarnings("unused")
@@ -42,7 +42,7 @@ public class JsonFilePreferenceStoreFact
{
throw new IllegalConfigurationException("JsonFilePreferenceStore requires path");
}
- final String posixFilePermissions = parent.getContextValue(String.class, BrokerProperties.POSIX_FILE_PERMISSIONS);
+ final String posixFilePermissions = parent.getContextValue(String.class, SystemConfig.POSIX_FILE_PERMISSIONS);
return new JsonFilePreferenceStore((String) path, posixFilePermissions);
}
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java?rev=1767630&r1=1767629&r2=1767630&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java Wed Nov 2 10:43:13 2016
@@ -75,7 +75,6 @@ import org.slf4j.LoggerFactory;
import org.apache.qpid.exchange.ExchangeDefaults;
import org.apache.qpid.pool.SuppressingInheritedAccessControlContextThreadFactory;
-import org.apache.qpid.server.configuration.BrokerProperties;
import org.apache.qpid.server.configuration.IllegalConfigurationException;
import org.apache.qpid.server.configuration.updater.Task;
import org.apache.qpid.server.configuration.updater.TaskExecutor;
@@ -2310,12 +2309,12 @@ public abstract class AbstractVirtualHos
private static String getDeadLetterQueueName(String name)
{
- return name + System.getProperty(BrokerProperties.PROPERTY_DEAD_LETTER_QUEUE_SUFFIX, AbstractVirtualHost.DEFAULT_DLQ_NAME_SUFFIX);
+ return name + System.getProperty(VirtualHost.PROPERTY_DEAD_LETTER_QUEUE_SUFFIX, AbstractVirtualHost.DEFAULT_DLQ_NAME_SUFFIX);
}
private static String getDeadLetterExchangeName(String name)
{
- return name + System.getProperty(BrokerProperties.PROPERTY_DEAD_LETTER_EXCHANGE_SUFFIX, VirtualHost.DEFAULT_DLE_NAME_SUFFIX);
+ return name + System.getProperty(VirtualHost.PROPERTY_DEAD_LETTER_EXCHANGE_SUFFIX, VirtualHost.DEFAULT_DLE_NAME_SUFFIX);
}
@Override
Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/configuration/BrokerPropertiesTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/configuration/BrokerPropertiesTest.java?rev=1767630&r1=1767629&r2=1767630&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/configuration/BrokerPropertiesTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/configuration/BrokerPropertiesTest.java Wed Nov 2 10:43:13 2016
@@ -22,27 +22,70 @@ package org.apache.qpid.server.configura
import java.util.Locale;
+import org.apache.qpid.server.model.Broker;
import org.apache.qpid.test.utils.QpidTestCase;
public class BrokerPropertiesTest extends QpidTestCase
{
public void testGetLocaleDefault()
{
- Locale locale = BrokerProperties.getLocale();
+ Locale locale1 = Locale.US;
+ String localeSetting = System.getProperty(Broker.PROPERTY_LOCALE);
+ if (localeSetting != null)
+ {
+ String[] localeParts = localeSetting.split("_");
+ String language = (localeParts.length > 0 ? localeParts[0] : "");
+ String country = (localeParts.length > 1 ? localeParts[1] : "");
+ String variant = "";
+ if (localeParts.length > 2)
+ {
+ variant = localeSetting.substring(language.length() + 1 + country.length() + 1);
+ }
+ locale1 = new Locale(language, country, variant);
+ }
+ Locale locale = locale1;
assertEquals("Unexpected locale", Locale.US, locale);
}
public void testGetLocaleSetWithJVMProperty()
{
- setTestSystemProperty(BrokerProperties.PROPERTY_LOCALE, "en_GB");
- Locale locale = BrokerProperties.getLocale();
+ setTestSystemProperty(Broker.PROPERTY_LOCALE, "en_GB");
+ Locale locale1 = Locale.US;
+ String localeSetting = System.getProperty(Broker.PROPERTY_LOCALE);
+ if (localeSetting != null)
+ {
+ String[] localeParts = localeSetting.split("_");
+ String language = (localeParts.length > 0 ? localeParts[0] : "");
+ String country = (localeParts.length > 1 ? localeParts[1] : "");
+ String variant = "";
+ if (localeParts.length > 2)
+ {
+ variant = localeSetting.substring(language.length() + 1 + country.length() + 1);
+ }
+ locale1 = new Locale(language, country, variant);
+ }
+ Locale locale = locale1;
assertEquals("Unexpected locale", Locale.UK, locale);
}
public void testGetLocaleSetWithJVMPropertyInUnexpectedFormat()
{
- setTestSystemProperty(BrokerProperties.PROPERTY_LOCALE, "penguins_ANTARCTIC_Moubray_Bay");
- Locale locale = BrokerProperties.getLocale();
+ setTestSystemProperty(Broker.PROPERTY_LOCALE, "penguins_ANTARCTIC_Moubray_Bay");
+ Locale locale1 = Locale.US;
+ String localeSetting = System.getProperty(Broker.PROPERTY_LOCALE);
+ if (localeSetting != null)
+ {
+ String[] localeParts = localeSetting.split("_");
+ String language = (localeParts.length > 0 ? localeParts[0] : "");
+ String country = (localeParts.length > 1 ? localeParts[1] : "");
+ String variant = "";
+ if (localeParts.length > 2)
+ {
+ variant = localeSetting.substring(language.length() + 1 + country.length() + 1);
+ }
+ locale1 = new Locale(language, country, variant);
+ }
+ Locale locale = locale1;
assertEquals("Unexpected locale language", "penguins", locale.getLanguage());
assertEquals("Unexpected locale country", "ANTARCTIC", locale.getCountry());
assertEquals("Unexpected locale country", "Moubray_Bay", locale.getVariant());
Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/encryption/AESKeyFileEncrypterFactoryTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/encryption/AESKeyFileEncrypterFactoryTest.java?rev=1767630&r1=1767629&r2=1767630&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/encryption/AESKeyFileEncrypterFactoryTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/encryption/AESKeyFileEncrypterFactoryTest.java Wed Nov 2 10:43:13 2016
@@ -49,8 +49,8 @@ import org.mockito.ArgumentCaptor;
import org.mockito.invocation.InvocationOnMock;
import org.mockito.stubbing.Answer;
-import org.apache.qpid.server.configuration.BrokerProperties;
import org.apache.qpid.server.model.Broker;
+import org.apache.qpid.server.model.SystemConfig;
import org.apache.qpid.test.utils.QpidTestCase;
public class AESKeyFileEncrypterFactoryTest extends QpidTestCase
@@ -67,7 +67,7 @@ public class AESKeyFileEncrypterFactoryT
_tmpDir = Files.createTempDirectory(getTestName());
when(_broker.getContextKeys(eq(false))).thenReturn(Collections.<String>emptySet());
- when(_broker.getContextValue(eq(String.class), eq(BrokerProperties.QPID_WORK_DIR))).thenReturn(_tmpDir.toString());
+ when(_broker.getContextValue(eq(String.class), eq(SystemConfig.QPID_WORK_DIR))).thenReturn(_tmpDir.toString());
when(_broker.getCategoryClass()).thenReturn(Broker.class);
when(_broker.getName()).thenReturn(getName());
final ArgumentCaptor<Map> attributesCaptor = ArgumentCaptor.forClass(Map.class);
Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhost/VirtualHostQueueCreationTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhost/VirtualHostQueueCreationTest.java?rev=1767630&r1=1767629&r2=1767630&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhost/VirtualHostQueueCreationTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/virtualhost/VirtualHostQueueCreationTest.java Wed Nov 2 10:43:13 2016
@@ -29,7 +29,6 @@ import java.util.Map;
import java.util.UUID;
import org.apache.qpid.exchange.ExchangeDefaults;
-import org.apache.qpid.server.configuration.BrokerProperties;
import org.apache.qpid.server.configuration.updater.CurrentThreadTaskExecutor;
import org.apache.qpid.server.configuration.updater.TaskExecutor;
import org.apache.qpid.server.logging.EventLogger;
@@ -392,8 +391,8 @@ public class VirtualHostQueueCreationTes
try
{
// change DLQ name to make its length bigger than exchange name
- setTestSystemProperty(BrokerProperties.PROPERTY_DEAD_LETTER_EXCHANGE_SUFFIX, "_DLE");
- setTestSystemProperty(BrokerProperties.PROPERTY_DEAD_LETTER_QUEUE_SUFFIX, "_DLQUEUE");
+ setTestSystemProperty(VirtualHost.PROPERTY_DEAD_LETTER_EXCHANGE_SUFFIX, "_DLE");
+ setTestSystemProperty(VirtualHost.PROPERTY_DEAD_LETTER_QUEUE_SUFFIX, "_DLQUEUE");
Map<String,Object> attributes = new HashMap<String, Object>();
attributes.put(Queue.ID, UUID.randomUUID());
@@ -422,8 +421,8 @@ public class VirtualHostQueueCreationTes
try
{
// change DLQ name to make its length bigger than exchange name
- setTestSystemProperty(BrokerProperties.PROPERTY_DEAD_LETTER_EXCHANGE_SUFFIX, "_DLEXCHANGE");
- setTestSystemProperty(BrokerProperties.PROPERTY_DEAD_LETTER_QUEUE_SUFFIX, "_DLQ");
+ setTestSystemProperty(VirtualHost.PROPERTY_DEAD_LETTER_EXCHANGE_SUFFIX, "_DLEXCHANGE");
+ setTestSystemProperty(VirtualHost.PROPERTY_DEAD_LETTER_QUEUE_SUFFIX, "_DLQ");
Map<String,Object> attributes = new HashMap<String, Object>();
attributes.put(Queue.ID, UUID.randomUUID());
Modified: qpid/java/trunk/broker-core/src/velocity/templates/org/apache/qpid/server/logging/messages/LogMessages.vm
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/velocity/templates/org/apache/qpid/server/logging/messages/LogMessages.vm?rev=1767630&r1=1767629&r2=1767630&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/velocity/templates/org/apache/qpid/server/logging/messages/LogMessages.vm (original)
+++ qpid/java/trunk/broker-core/src/velocity/templates/org/apache/qpid/server/logging/messages/LogMessages.vm Wed Nov 2 10:43:13 2016
@@ -24,7 +24,6 @@ import static org.apache.qpid.server.log
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.qpid.server.configuration.BrokerProperties;
import org.apache.qpid.server.logging.LogMessage;
import java.text.MessageFormat;
@@ -42,7 +41,26 @@ import java.util.ResourceBundle;
public class ${type.name}Messages
{
private static ResourceBundle _messages;
- private static Locale _currentLocale = BrokerProperties.getLocale();
+ private static Locale _currentLocale;
+
+ static
+ {
+ Locale locale = Locale.US;
+ String localeSetting = System.getProperty(Broker.PROPERTY_LOCALE);
+ if (localeSetting != null)
+ {
+ String[] localeParts = localeSetting.split("_");
+ String language = (localeParts.length > 0 ? localeParts[0] : "");
+ String country = (localeParts.length > 1 ? localeParts[1] : "");
+ String variant = "";
+ if (localeParts.length > 2)
+ {
+ variant = localeSetting.substring(language.length() + 1 + country.length() + 1);
+ }
+ locale = new Locale(language, country, variant);
+ }
+ _currentLocale = locale;
+ }
public static final String ${type.name.toUpperCase()}_LOG_HIERARCHY = DEFAULT_LOG_HIERARCHY_PREFIX + "${type.name.toLowerCase()}";
#foreach( $message in ${type.list} )
Modified: qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnectionDelegate.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnectionDelegate.java?rev=1767630&r1=1767629&r2=1767630&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnectionDelegate.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-10-protocol/src/main/java/org/apache/qpid/server/protocol/v0_10/ServerConnectionDelegate.java Wed Nov 2 10:43:13 2016
@@ -41,7 +41,6 @@ import org.slf4j.LoggerFactory;
import org.apache.qpid.common.ServerPropertyNames;
import org.apache.qpid.configuration.CommonProperties;
import org.apache.qpid.properties.ConnectionStartProperties;
-import org.apache.qpid.server.configuration.BrokerProperties;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.NamedAddressSpace;
import org.apache.qpid.server.model.port.AmqpPort;
@@ -128,7 +127,7 @@ public class ServerConnectionDelegate ex
private static List<String> getFeatures(Broker<?> broker)
{
- String brokerDisabledFeatures = System.getProperty(BrokerProperties.PROPERTY_DISABLED_FEATURES);
+ String brokerDisabledFeatures = System.getProperty(Broker.PROPERTY_DISABLED_FEATURES);
final List<String> features = new ArrayList<String>();
if (brokerDisabledFeatures == null || !brokerDisabledFeatures.contains(ServerPropertyNames.FEATURE_QPID_JMS_SELECTOR))
{
Modified: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8.java?rev=1767630&r1=1767629&r2=1767630&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8.java Wed Nov 2 10:43:13 2016
@@ -32,6 +32,10 @@ import org.apache.qpid.server.transport.
interface AMQPConnection_0_8<C extends AMQPConnection_0_8<C>> extends AMQPConnection<C>, ProtocolEngine, EventLoggerProvider
{
+ int DEFAULT_HEARTBEAT_TIMEOUT_FACTOR = 2;
+ String PROPERTY_HEARTBEAT_TIMEOUT_FACTOR = "qpid.broker_heartbeat_timeout_factor";
+ int HEARTBEAT_TIMEOUT_FACTOR = Integer.getInteger(PROPERTY_HEARTBEAT_TIMEOUT_FACTOR, DEFAULT_HEARTBEAT_TIMEOUT_FACTOR);
+
Broker<?> getBroker();
MethodRegistry getMethodRegistry();
Modified: qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Impl.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Impl.java?rev=1767630&r1=1767629&r2=1767630&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Impl.java (original)
+++ qpid/java/trunk/broker-plugins/amqp-0-8-protocol/src/main/java/org/apache/qpid/server/protocol/v0_8/AMQPConnection_0_8Impl.java Wed Nov 2 10:43:13 2016
@@ -60,7 +60,6 @@ import org.apache.qpid.configuration.Com
import org.apache.qpid.framing.*;
import org.apache.qpid.properties.ConnectionStartProperties;
import org.apache.qpid.protocol.AMQConstant;
-import org.apache.qpid.server.configuration.BrokerProperties;
import org.apache.qpid.server.consumer.ConsumerImpl;
import org.apache.qpid.server.logging.messages.ConnectionMessages;
import org.apache.qpid.server.message.InstanceProperties;
@@ -1214,7 +1213,7 @@ public class AMQPConnection_0_8Impl
if (heartbeat > 0)
{
long writerDelay = 1000L * heartbeat;
- long readerDelay = 1000L * BrokerProperties.HEARTBEAT_TIMEOUT_FACTOR * heartbeat;
+ long readerDelay = 1000L * AMQPConnection_0_8.HEARTBEAT_TIMEOUT_FACTOR * heartbeat;
initialiseHeartbeating(writerDelay, readerDelay);
}
Modified: qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/StartupAppender.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/StartupAppender.java?rev=1767630&r1=1767629&r2=1767630&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/StartupAppender.java (original)
+++ qpid/java/trunk/broker-plugins/logging-logback/src/main/java/org/apache/qpid/server/logging/logback/StartupAppender.java Wed Nov 2 10:43:13 2016
@@ -32,10 +32,10 @@ import ch.qos.logback.core.ConsoleAppend
import ch.qos.logback.core.Context;
import ch.qos.logback.core.filter.Filter;
import ch.qos.logback.core.spi.FilterReply;
-import org.apache.qpid.server.configuration.BrokerProperties;
public class StartupAppender extends AppenderBase<ILoggingEvent>
{
+ public static final String PROPERTY_STARTUP_FAILOVER_CONSOLE_LOG_LEVEL = "qpid.startup_failover_console_log_level";
private List<ILoggingEvent> _accumulatedLoggingEvents = new ArrayList<>();
private Level _consoleAppenderAcceptLogLevel = Level.INFO;
@@ -43,7 +43,7 @@ public class StartupAppender extends Ap
{
super();
setName(StartupAppender.class.getName());
- String overriddenLogLevel = System.getProperty(BrokerProperties.PROPERTY_STARTUP_FAILOVER_CONSOLE_LOG_LEVEL);
+ String overriddenLogLevel = System.getProperty(PROPERTY_STARTUP_FAILOVER_CONSOLE_LOG_LEVEL);
if (overriddenLogLevel != null)
{
_consoleAppenderAcceptLogLevel = Level.valueOf(overriddenLogLevel);
Modified: qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/StartupAppenderTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/StartupAppenderTest.java?rev=1767630&r1=1767629&r2=1767630&view=diff
==============================================================================
--- qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/StartupAppenderTest.java (original)
+++ qpid/java/trunk/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/StartupAppenderTest.java Wed Nov 2 10:43:13 2016
@@ -38,8 +38,7 @@ import ch.qos.logback.classic.Level;
import ch.qos.logback.classic.spi.ILoggingEvent;
import ch.qos.logback.core.Appender;
import ch.qos.logback.core.Context;
-import org.apache.qpid.server.configuration.BrokerProperties;
-import org.apache.qpid.server.logging.logback.StartupAppender;
+
import org.apache.qpid.test.utils.QpidTestCase;
public class StartupAppenderTest extends QpidTestCase
@@ -89,7 +88,7 @@ public class StartupAppenderTest extends
public void testLogToConsoleWithOverriddenLogLevel() throws Exception
{
- setTestSystemProperty(BrokerProperties.PROPERTY_STARTUP_FAILOVER_CONSOLE_LOG_LEVEL, "DEBUG");
+ setTestSystemProperty(StartupAppender.PROPERTY_STARTUP_FAILOVER_CONSOLE_LOG_LEVEL, "DEBUG");
_startupAppender = createAndStartStartupAppender();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org