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/03 00:21:07 UTC
svn commit: r1767807 - in /qpid/java/trunk/broker-core/src:
main/java/org/apache/qpid/server/logging/messages/
main/java/org/apache/qpid/server/model/
test/java/org/apache/qpid/server/configuration/
velocity/templates/org/apache/qpid/server/logging/mes...
Author: rgodfrey
Date: Thu Nov 3 00:21:06 2016
New Revision: 1767807
URL: http://svn.apache.org/viewvc?rev=1767807&view=rev
Log:
QPID-7486 : remove BrokerPropertiesTest, fix logging messages template
Removed:
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/configuration/BrokerPropertiesTest.java
Modified:
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/velocity/templates/org/apache/qpid/server/logging/messages/LogMessages.vm
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=1767807&r1=1767806&r2=1767807&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 Thu Nov 3 00:21:06 2016
@@ -29,7 +29,6 @@ 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.
@@ -47,7 +46,7 @@ public class AccessControlMessages
static
{
Locale locale = Locale.US;
- String localeSetting = System.getProperty(Broker.PROPERTY_LOCALE);
+ String localeSetting = System.getProperty("qpid.broker_locale");
if (localeSetting != null)
{
String[] localeParts = localeSetting.split("_");
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=1767807&r1=1767806&r2=1767807&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 Thu Nov 3 00:21:06 2016
@@ -25,7 +25,6 @@ import static org.apache.qpid.server.log
import org.slf4j.LoggerFactory;
import org.apache.qpid.server.logging.LogMessage;
-import org.apache.qpid.server.model.Broker;
import java.text.MessageFormat;
import java.util.Locale;
@@ -47,7 +46,7 @@ public class AuthenticationProviderMessa
static
{
Locale locale = Locale.US;
- String localeSetting = System.getProperty(Broker.PROPERTY_LOCALE);
+ String localeSetting = System.getProperty("qpid.broker_locale");
if (localeSetting != null)
{
String[] localeParts = localeSetting.split("_");
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=1767807&r1=1767806&r2=1767807&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 Thu Nov 3 00:21:06 2016
@@ -25,7 +25,6 @@ import static org.apache.qpid.server.log
import org.slf4j.LoggerFactory;
import org.apache.qpid.server.logging.LogMessage;
-import org.apache.qpid.server.model.Broker;
import java.text.MessageFormat;
import java.util.Locale;
@@ -47,7 +46,7 @@ public class BindingMessages
static
{
Locale locale = Locale.US;
- String localeSetting = System.getProperty(Broker.PROPERTY_LOCALE);
+ String localeSetting = System.getProperty("qpid.broker_locale");
if (localeSetting != null)
{
String[] localeParts = localeSetting.split("_");
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=1767807&r1=1767806&r2=1767807&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 Thu Nov 3 00:21:06 2016
@@ -25,7 +25,6 @@ import static org.apache.qpid.server.log
import org.slf4j.LoggerFactory;
import org.apache.qpid.server.logging.LogMessage;
-import org.apache.qpid.server.model.Broker;
import java.text.MessageFormat;
import java.util.Locale;
@@ -47,7 +46,7 @@ public class BrokerMessages
static
{
Locale locale = Locale.US;
- String localeSetting = System.getProperty(Broker.PROPERTY_LOCALE);
+ String localeSetting = System.getProperty("qpid.broker_locale");
if (localeSetting != null)
{
String[] localeParts = localeSetting.split("_");
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=1767807&r1=1767806&r2=1767807&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 Thu Nov 3 00:21:06 2016
@@ -25,7 +25,6 @@ import static org.apache.qpid.server.log
import org.slf4j.LoggerFactory;
import org.apache.qpid.server.logging.LogMessage;
-import org.apache.qpid.server.model.Broker;
import java.text.MessageFormat;
import java.util.Locale;
@@ -47,7 +46,7 @@ public class ChannelMessages
static
{
Locale locale = Locale.US;
- String localeSetting = System.getProperty(Broker.PROPERTY_LOCALE);
+ String localeSetting = System.getProperty("qpid.broker_locale");
if (localeSetting != null)
{
String[] localeParts = localeSetting.split("_");
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=1767807&r1=1767806&r2=1767807&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 Thu Nov 3 00:21:06 2016
@@ -25,7 +25,6 @@ import static org.apache.qpid.server.log
import org.slf4j.LoggerFactory;
import org.apache.qpid.server.logging.LogMessage;
-import org.apache.qpid.server.model.Broker;
import java.text.MessageFormat;
import java.util.Locale;
@@ -47,7 +46,7 @@ public class ConfigStoreMessages
static
{
Locale locale = Locale.US;
- String localeSetting = System.getProperty(Broker.PROPERTY_LOCALE);
+ String localeSetting = System.getProperty("qpid.broker_locale");
if (localeSetting != null)
{
String[] localeParts = localeSetting.split("_");
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=1767807&r1=1767806&r2=1767807&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 Thu Nov 3 00:21:06 2016
@@ -25,7 +25,6 @@ import static org.apache.qpid.server.log
import org.slf4j.LoggerFactory;
import org.apache.qpid.server.logging.LogMessage;
-import org.apache.qpid.server.model.Broker;
import java.text.MessageFormat;
import java.util.Locale;
@@ -47,7 +46,7 @@ public class ConnectionMessages
static
{
Locale locale = Locale.US;
- String localeSetting = System.getProperty(Broker.PROPERTY_LOCALE);
+ String localeSetting = System.getProperty("qpid.broker_locale");
if (localeSetting != null)
{
String[] localeParts = localeSetting.split("_");
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=1767807&r1=1767806&r2=1767807&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 Thu Nov 3 00:21:06 2016
@@ -25,7 +25,6 @@ import static org.apache.qpid.server.log
import org.slf4j.LoggerFactory;
import org.apache.qpid.server.logging.LogMessage;
-import org.apache.qpid.server.model.Broker;
import java.text.MessageFormat;
import java.util.Locale;
@@ -47,7 +46,7 @@ public class ExchangeMessages
static
{
Locale locale = Locale.US;
- String localeSetting = System.getProperty(Broker.PROPERTY_LOCALE);
+ String localeSetting = System.getProperty("qpid.broker_locale");
if (localeSetting != null)
{
String[] localeParts = localeSetting.split("_");
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=1767807&r1=1767806&r2=1767807&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 Thu Nov 3 00:21:06 2016
@@ -25,7 +25,6 @@ import static org.apache.qpid.server.log
import org.slf4j.LoggerFactory;
import org.apache.qpid.server.logging.LogMessage;
-import org.apache.qpid.server.model.Broker;
import java.text.MessageFormat;
import java.util.Locale;
@@ -47,7 +46,7 @@ public class HighAvailabilityMessages
static
{
Locale locale = Locale.US;
- String localeSetting = System.getProperty(Broker.PROPERTY_LOCALE);
+ String localeSetting = System.getProperty("qpid.broker_locale");
if (localeSetting != null)
{
String[] localeParts = localeSetting.split("_");
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=1767807&r1=1767806&r2=1767807&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 Thu Nov 3 00:21:06 2016
@@ -25,7 +25,6 @@ import static org.apache.qpid.server.log
import org.slf4j.LoggerFactory;
import org.apache.qpid.server.logging.LogMessage;
-import org.apache.qpid.server.model.Broker;
import java.text.MessageFormat;
import java.util.Locale;
@@ -47,7 +46,7 @@ public class KeyStoreMessages
static
{
Locale locale = Locale.US;
- String localeSetting = System.getProperty(Broker.PROPERTY_LOCALE);
+ String localeSetting = System.getProperty("qpid.broker_locale");
if (localeSetting != null)
{
String[] localeParts = localeSetting.split("_");
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=1767807&r1=1767806&r2=1767807&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 Thu Nov 3 00:21:06 2016
@@ -25,7 +25,6 @@ import static org.apache.qpid.server.log
import org.slf4j.LoggerFactory;
import org.apache.qpid.server.logging.LogMessage;
-import org.apache.qpid.server.model.Broker;
import java.text.MessageFormat;
import java.util.Locale;
@@ -47,7 +46,7 @@ public class ManagementConsoleMessages
static
{
Locale locale = Locale.US;
- String localeSetting = System.getProperty(Broker.PROPERTY_LOCALE);
+ String localeSetting = System.getProperty("qpid.broker_locale");
if (localeSetting != null)
{
String[] localeParts = localeSetting.split("_");
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=1767807&r1=1767806&r2=1767807&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 Thu Nov 3 00:21:06 2016
@@ -25,7 +25,6 @@ import static org.apache.qpid.server.log
import org.slf4j.LoggerFactory;
import org.apache.qpid.server.logging.LogMessage;
-import org.apache.qpid.server.model.Broker;
import java.text.MessageFormat;
import java.util.Locale;
@@ -47,7 +46,7 @@ public class MessageStoreMessages
static
{
Locale locale = Locale.US;
- String localeSetting = System.getProperty(Broker.PROPERTY_LOCALE);
+ String localeSetting = System.getProperty("qpid.broker_locale");
if (localeSetting != null)
{
String[] localeParts = localeSetting.split("_");
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=1767807&r1=1767806&r2=1767807&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 Thu Nov 3 00:21:06 2016
@@ -25,7 +25,6 @@ import static org.apache.qpid.server.log
import org.slf4j.LoggerFactory;
import org.apache.qpid.server.logging.LogMessage;
-import org.apache.qpid.server.model.Broker;
import java.text.MessageFormat;
import java.util.Locale;
@@ -47,7 +46,7 @@ public class PortMessages
static
{
Locale locale = Locale.US;
- String localeSetting = System.getProperty(Broker.PROPERTY_LOCALE);
+ String localeSetting = System.getProperty("qpid.broker_locale");
if (localeSetting != null)
{
String[] localeParts = localeSetting.split("_");
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=1767807&r1=1767806&r2=1767807&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 Thu Nov 3 00:21:06 2016
@@ -25,7 +25,6 @@ import static org.apache.qpid.server.log
import org.slf4j.LoggerFactory;
import org.apache.qpid.server.logging.LogMessage;
-import org.apache.qpid.server.model.Broker;
import java.text.MessageFormat;
import java.util.Locale;
@@ -47,7 +46,7 @@ public class QueueMessages
static
{
Locale locale = Locale.US;
- String localeSetting = System.getProperty(Broker.PROPERTY_LOCALE);
+ String localeSetting = System.getProperty("qpid.broker_locale");
if (localeSetting != null)
{
String[] localeParts = localeSetting.split("_");
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=1767807&r1=1767806&r2=1767807&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 Thu Nov 3 00:21:06 2016
@@ -25,7 +25,6 @@ import static org.apache.qpid.server.log
import org.slf4j.LoggerFactory;
import org.apache.qpid.server.logging.LogMessage;
-import org.apache.qpid.server.model.Broker;
import java.text.MessageFormat;
import java.util.Locale;
@@ -47,7 +46,7 @@ public class SubscriptionMessages
static
{
Locale locale = Locale.US;
- String localeSetting = System.getProperty(Broker.PROPERTY_LOCALE);
+ String localeSetting = System.getProperty("qpid.broker_locale");
if (localeSetting != null)
{
String[] localeParts = localeSetting.split("_");
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=1767807&r1=1767806&r2=1767807&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 Thu Nov 3 00:21:06 2016
@@ -25,7 +25,6 @@ import static org.apache.qpid.server.log
import org.slf4j.LoggerFactory;
import org.apache.qpid.server.logging.LogMessage;
-import org.apache.qpid.server.model.Broker;
import java.text.MessageFormat;
import java.util.Locale;
@@ -47,7 +46,7 @@ public class TransactionLogMessages
static
{
Locale locale = Locale.US;
- String localeSetting = System.getProperty(Broker.PROPERTY_LOCALE);
+ String localeSetting = System.getProperty("qpid.broker_locale");
if (localeSetting != null)
{
String[] localeParts = localeSetting.split("_");
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=1767807&r1=1767806&r2=1767807&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 Thu Nov 3 00:21:06 2016
@@ -25,7 +25,6 @@ import static org.apache.qpid.server.log
import org.slf4j.LoggerFactory;
import org.apache.qpid.server.logging.LogMessage;
-import org.apache.qpid.server.model.Broker;
import java.text.MessageFormat;
import java.util.Locale;
@@ -47,7 +46,7 @@ public class TrustStoreMessages
static
{
Locale locale = Locale.US;
- String localeSetting = System.getProperty(Broker.PROPERTY_LOCALE);
+ String localeSetting = System.getProperty("qpid.broker_locale");
if (localeSetting != null)
{
String[] localeParts = localeSetting.split("_");
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=1767807&r1=1767806&r2=1767807&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 Thu Nov 3 00:21:06 2016
@@ -25,7 +25,6 @@ import static org.apache.qpid.server.log
import org.slf4j.LoggerFactory;
import org.apache.qpid.server.logging.LogMessage;
-import org.apache.qpid.server.model.Broker;
import java.text.MessageFormat;
import java.util.Locale;
@@ -47,7 +46,7 @@ public class VirtualHostMessages
static
{
Locale locale = Locale.US;
- String localeSetting = System.getProperty(Broker.PROPERTY_LOCALE);
+ String localeSetting = System.getProperty("qpid.broker_locale");
if (localeSetting != null)
{
String[] localeParts = localeSetting.split("_");
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=1767807&r1=1767806&r2=1767807&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 Thu Nov 3 00:21:06 2016
@@ -113,8 +113,6 @@ public interface Broker<X extends Broker
String PROPERTY_DISABLED_FEATURES = "qpid.broker_disabled_features";
- String PROPERTY_LOCALE = "qpid.broker_locale";
-
@DerivedAttribute
String getBuildVersion();
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=1767807&r1=1767806&r2=1767807&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 Thu Nov 3 00:21:06 2016
@@ -46,7 +46,7 @@ public class ${type.name}Messages
static
{
Locale locale = Locale.US;
- String localeSetting = System.getProperty(Broker.PROPERTY_LOCALE);
+ String localeSetting = System.getProperty("qpid.broker_locale");
if (localeSetting != null)
{
String[] localeParts = localeSetting.split("_");
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org