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 09:20:02 UTC
svn commit: r1767846 - in /qpid/java/branches/remove-queue-runner: ./
bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/
broker-core/src/main/java/org/apache/qpid/server/
broker-core/src/main/java/org/apache/qpid/server/exchange/...
Author: rgodfrey
Date: Thu Nov 3 09:20:01 2016
New Revision: 1767846
URL: http://svn.apache.org/viewvc?rev=1767846&view=rev
Log:
Merged from trunk
Added:
qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/util/urlstreamhandler/classpath/
- copied from r1767845, qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/util/urlstreamhandler/classpath/
Removed:
qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/configuration/BrokerPropertiesTest.java
Modified:
qpid/java/branches/remove-queue-runner/ (props changed)
qpid/java/branches/remove-queue-runner/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/SystemLauncher.java
qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AccessControlMessages.java
qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AuthenticationProviderMessages.java
qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BindingMessages.java
qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BrokerMessages.java
qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ChannelMessages.java
qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConfigStoreMessages.java
qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConnectionMessages.java
qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ExchangeMessages.java
qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/HighAvailabilityMessages.java
qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/KeyStoreMessages.java
qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessages.java
qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/MessageStoreMessages.java
qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/PortMessages.java
qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/QueueMessages.java
qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/SubscriptionMessages.java
qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TransactionLogMessages.java
qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TrustStoreMessages.java
qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/VirtualHostMessages.java
qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObjectTypeFactory.java
qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/model/AbstractSystemConfig.java
qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/model/SystemConfig.java
qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractAuthenticationManager.java
qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecoverer.java
qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/util/urlstreamhandler/data/Handler.java
qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractVirtualHostNode.java
qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostNodeImpl.java
qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/store/BrokerRecovererTest.java
qpid/java/branches/remove-queue-runner/broker-core/src/velocity/templates/org/apache/qpid/server/logging/messages/LogMessages.vm
qpid/java/branches/remove-queue-runner/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerMemoryLoggerTest.java
qpid/java/branches/remove-queue-runner/broker/src/main/java/org/apache/qpid/server/Main.java
Propchange: qpid/java/branches/remove-queue-runner/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 3 09:20:01 2016
@@ -9,4 +9,5 @@
/qpid/branches/java-broker-vhost-refactor/java:1493674-1494547
/qpid/branches/java-network-refactor/qpid/java:805429-821809
/qpid/branches/qpid-2935/qpid/java:1061302-1072333
+/qpid/java/trunk:1767741-1767845
/qpid/trunk/qpid:796646-796653
Modified: qpid/java/branches/remove-queue-runner/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java?rev=1767846&r1=1767845&r2=1767846&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java (original)
+++ qpid/java/branches/remove-queue-runner/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java Thu Nov 3 09:20:01 2016
@@ -393,7 +393,7 @@ public class BDBHAVirtualHostNodeImpl ex
final SettableFuture<Void> returnVal = SettableFuture.create();
ListenableFuture<Void> superFuture = super.doStop();
- Futures.addCallback(superFuture, new FutureCallback<Void>()
+ addFutureCallback(superFuture, new FutureCallback<Void>()
{
@Override
public void onSuccess(final Void result)
@@ -424,7 +424,7 @@ public class BDBHAVirtualHostNodeImpl ex
}
}
- });
+ }, getTaskExecutor());
return returnVal;
}
@@ -1330,7 +1330,7 @@ public class BDBHAVirtualHostNodeImpl ex
}
});
- Futures.addCallback(future, new FutureCallback<Void>()
+ addFutureCallback(future, new FutureCallback<Void>()
{
@Override
public void onSuccess(final Void result)
@@ -1342,7 +1342,7 @@ public class BDBHAVirtualHostNodeImpl ex
{
LOGGER.error("Failed to close children when handling intruder", t);
}
- });
+ }, getTaskExecutor());
}
private abstract class VirtualHostNodeGroupTask implements Task<Void, RuntimeException>
Modified: qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/SystemLauncher.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/SystemLauncher.java?rev=1767846&r1=1767845&r2=1767846&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/SystemLauncher.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/SystemLauncher.java Thu Nov 3 09:20:01 2016
@@ -21,10 +21,12 @@
package org.apache.qpid.server;
import java.io.File;
+import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.PrintWriter;
import java.io.StringWriter;
+import java.net.MalformedURLException;
import java.net.URL;
import java.security.Principal;
import java.security.PrivilegedExceptionAction;
@@ -52,19 +54,28 @@ import org.apache.qpid.server.logging.Lo
import org.apache.qpid.server.logging.LoggingMessageLogger;
import org.apache.qpid.server.logging.MessageLogger;
import org.apache.qpid.server.logging.SystemOutMessageLogger;
-import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.State;
import org.apache.qpid.server.model.SystemConfig;
import org.apache.qpid.server.plugin.PluggableFactoryLoader;
import org.apache.qpid.server.plugin.SystemConfigFactory;
import org.apache.qpid.server.security.auth.TaskPrincipal;
+import org.apache.qpid.server.util.urlstreamhandler.classpath.Handler;
public class SystemLauncher
{
+
private static final Logger LOGGER = LoggerFactory.getLogger(SystemLauncher.class);
- public static final SystemLauncherListener.DefaultSystemLauncherListener DEFAULT_SYSTEM_LAUNCHER_LISTENER =
+ private static final String DEFAULT_INITIAL_PROPERTIES_LOCATION = "classpath:system.properties";
+
+ private static final SystemLauncherListener.DefaultSystemLauncherListener DEFAULT_SYSTEM_LAUNCHER_LISTENER =
new SystemLauncherListener.DefaultSystemLauncherListener();
+ static
+ {
+ Handler.register();
+ }
+
+
private EventLogger _eventLogger;
private final TaskExecutor _taskExecutor = new TaskExecutorImpl();
@@ -103,20 +114,32 @@ public class SystemLauncher
URL initialPropertiesLocation;
if(initialProperties == null)
{
- initialPropertiesLocation = SystemLauncher.class.getClassLoader().getResource("system.properties");
+ initialPropertiesLocation = new URL(DEFAULT_INITIAL_PROPERTIES_LOCATION);
}
else
{
- initialPropertiesLocation = (new File(initialProperties)).toURI().toURL();
+ try
+ {
+ initialPropertiesLocation = new URL(initialProperties);
+ }
+ catch (MalformedURLException e)
+ {
+ initialPropertiesLocation = new File(initialProperties).toURI().toURL();
+
+ }
}
Properties props = new Properties(CommonProperties.asProperties());
- if(initialPropertiesLocation != null)
- {
- try(InputStream inStream = initialPropertiesLocation.openStream())
+ try(InputStream inStream = initialPropertiesLocation.openStream())
+ {
+ props.load(inStream);
+ }
+ catch (FileNotFoundException e)
+ {
+ if(initialProperties != null)
{
- props.load(inStream);
+ throw e;
}
}
@@ -259,9 +282,9 @@ public class SystemLauncher
_systemConfig.open();
- if (_systemConfig.getChild(Broker.class).getState() == State.ERRORED)
+ if (_systemConfig.getContainer().getState() == State.ERRORED)
{
- throw new RuntimeException("Closing broker as it cannot operate due to errors");
+ throw new RuntimeException("Closing due to errors");
}
}
Modified: qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java?rev=1767846&r1=1767845&r2=1767846&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java Thu Nov 3 09:20:01 2016
@@ -736,7 +736,7 @@ public abstract class AbstractExchange<T
final SettableFuture<Boolean> returnVal = SettableFuture.create();
- Futures.addCallback(b.createAsync(), new FutureCallback<Void>()
+ addFutureCallback(b.createAsync(), new FutureCallback<Void>()
{
@Override
public void onSuccess(final Void result)
Modified: qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AccessControlMessages.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AccessControlMessages.java?rev=1767846&r1=1767845&r2=1767846&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AccessControlMessages.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AccessControlMessages.java Thu Nov 3 09:20:01 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/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AuthenticationProviderMessages.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AuthenticationProviderMessages.java?rev=1767846&r1=1767845&r2=1767846&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AuthenticationProviderMessages.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/AuthenticationProviderMessages.java Thu Nov 3 09:20:01 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/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BindingMessages.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BindingMessages.java?rev=1767846&r1=1767845&r2=1767846&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BindingMessages.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BindingMessages.java Thu Nov 3 09:20:01 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/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BrokerMessages.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BrokerMessages.java?rev=1767846&r1=1767845&r2=1767846&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BrokerMessages.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/BrokerMessages.java Thu Nov 3 09:20:01 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/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ChannelMessages.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ChannelMessages.java?rev=1767846&r1=1767845&r2=1767846&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ChannelMessages.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ChannelMessages.java Thu Nov 3 09:20:01 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/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConfigStoreMessages.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConfigStoreMessages.java?rev=1767846&r1=1767845&r2=1767846&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConfigStoreMessages.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConfigStoreMessages.java Thu Nov 3 09:20:01 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/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConnectionMessages.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConnectionMessages.java?rev=1767846&r1=1767845&r2=1767846&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConnectionMessages.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ConnectionMessages.java Thu Nov 3 09:20:01 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/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ExchangeMessages.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ExchangeMessages.java?rev=1767846&r1=1767845&r2=1767846&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ExchangeMessages.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ExchangeMessages.java Thu Nov 3 09:20:01 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/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/HighAvailabilityMessages.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/HighAvailabilityMessages.java?rev=1767846&r1=1767845&r2=1767846&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/HighAvailabilityMessages.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/HighAvailabilityMessages.java Thu Nov 3 09:20:01 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/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/KeyStoreMessages.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/KeyStoreMessages.java?rev=1767846&r1=1767845&r2=1767846&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/KeyStoreMessages.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/KeyStoreMessages.java Thu Nov 3 09:20:01 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/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessages.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessages.java?rev=1767846&r1=1767845&r2=1767846&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessages.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessages.java Thu Nov 3 09:20:01 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/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/MessageStoreMessages.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/MessageStoreMessages.java?rev=1767846&r1=1767845&r2=1767846&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/MessageStoreMessages.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/MessageStoreMessages.java Thu Nov 3 09:20:01 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/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/PortMessages.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/PortMessages.java?rev=1767846&r1=1767845&r2=1767846&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/PortMessages.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/PortMessages.java Thu Nov 3 09:20:01 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/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/QueueMessages.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/QueueMessages.java?rev=1767846&r1=1767845&r2=1767846&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/QueueMessages.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/QueueMessages.java Thu Nov 3 09:20:01 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/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/SubscriptionMessages.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/SubscriptionMessages.java?rev=1767846&r1=1767845&r2=1767846&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/SubscriptionMessages.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/SubscriptionMessages.java Thu Nov 3 09:20:01 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/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TransactionLogMessages.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TransactionLogMessages.java?rev=1767846&r1=1767845&r2=1767846&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TransactionLogMessages.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TransactionLogMessages.java Thu Nov 3 09:20:01 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/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TrustStoreMessages.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TrustStoreMessages.java?rev=1767846&r1=1767845&r2=1767846&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TrustStoreMessages.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/TrustStoreMessages.java Thu Nov 3 09:20:01 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/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/VirtualHostMessages.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/VirtualHostMessages.java?rev=1767846&r1=1767845&r2=1767846&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/VirtualHostMessages.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/logging/messages/VirtualHostMessages.java Thu Nov 3 09:20:01 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/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java?rev=1767846&r1=1767845&r2=1767846&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObject.java Thu Nov 3 09:20:01 2016
@@ -629,7 +629,7 @@ public abstract class AbstractConfigured
{
try
{
- Futures.addCallback(task.execute(), new FutureCallback<T>()
+ addFutureCallback(task.execute(), new FutureCallback<T>()
{
@Override
public void onSuccess(final T result)
@@ -642,7 +642,7 @@ public abstract class AbstractConfigured
{
returnVal.setException(t);
}
- });
+ }, getTaskExecutor());
}
catch(Throwable t)
{
@@ -700,7 +700,7 @@ public abstract class AbstractConfigured
public void performAction(final ConfiguredObject<?> child)
{
ListenableFuture<Void> childCloseFuture = child.closeAsync();
- Futures.addCallback(childCloseFuture, new FutureCallback<Void>()
+ addFutureCallback(childCloseFuture, new FutureCallback<Void>()
{
@Override
public void onSuccess(final Void result)
@@ -713,7 +713,7 @@ public abstract class AbstractConfigured
LOGGER.error("Exception occurred while closing {} : {}",
child.getClass().getSimpleName(), child.getName(), t);
}
- });
+ }, getTaskExecutor());
childCloseFutures.add(childCloseFuture);
}
});
@@ -1025,14 +1025,14 @@ public abstract class AbstractConfigured
ListenableFuture<List<Void>> combinedChildStateFuture = Futures.allAsList(childStateFutures);
final SettableFuture<Void> returnVal = SettableFuture.create();
- Futures.addCallback(combinedChildStateFuture, new FutureCallback<List<Void>>()
+ addFutureCallback(combinedChildStateFuture, new FutureCallback<List<Void>>()
{
@Override
public void onSuccess(final List<Void> result)
{
try
{
- Futures.addCallback(attainState(),
+ addFutureCallback(attainState(),
new FutureCallback<Void>()
{
@Override
@@ -1061,16 +1061,16 @@ public abstract class AbstractConfigured
}
}
}
- }, getTaskExecutor());
+ }, getTaskExecutor());
}
- catch(RuntimeException e)
+ catch (RuntimeException e)
{
try
{
exceptionHandler.handleException(e, AbstractConfiguredObject.this);
returnVal.set(null);
}
- catch(Throwable t)
+ catch (Throwable t)
{
returnVal.setException(t);
}
@@ -1083,7 +1083,7 @@ public abstract class AbstractConfigured
// One or more children failed to attain state but the error could not be handled by the handler
returnVal.setException(t);
}
- });
+ }, getTaskExecutor());
return returnVal;
}
@@ -1480,7 +1480,7 @@ public abstract class AbstractConfigured
{
final SettableFuture<Void> stateTransitionResult = SettableFuture.create();
ListenableFuture<Void> stateTransitionFuture = (ListenableFuture<Void>) stateChangingMethod.invoke(this);
- Futures.addCallback(stateTransitionFuture, new FutureCallback<Void>()
+ addFutureCallback(stateTransitionFuture, new FutureCallback<Void>()
{
@Override
public void onSuccess(Void result)
@@ -1511,7 +1511,7 @@ public abstract class AbstractConfigured
_attainStateFuture.set(AbstractConfiguredObject.this);
stateTransitionResult.setException(t);
}
- });
+ }, getTaskExecutor());
returnVal = stateTransitionResult;
}
catch (IllegalAccessException e)
@@ -2372,7 +2372,7 @@ public abstract class AbstractConfigured
protected static <V> ChainedListenableFuture<Void> doAfter(Executor executor, ListenableFuture<V> first, final Runnable second)
{
final ChainedSettableFuture<Void> returnVal = new ChainedSettableFuture<Void>(executor);
- Futures.addCallback(first, new FutureCallback<V>()
+ addFutureCallback(first, new FutureCallback<V>()
{
@Override
public void onSuccess(final V result)
@@ -2464,7 +2464,7 @@ public abstract class AbstractConfigured
protected static <V> ChainedListenableFuture<V> doAfter(final Executor executor, ListenableFuture<V> first, final Callable<ListenableFuture<V>> second)
{
final ChainedSettableFuture<V> returnVal = new ChainedSettableFuture<V>(executor);
- Futures.addCallback(first, new FutureCallback<V>()
+ addFutureCallback(first, new FutureCallback<V>()
{
@Override
public void onSuccess(final V result)
@@ -2472,7 +2472,7 @@ public abstract class AbstractConfigured
try
{
final ListenableFuture<V> future = second.call();
- Futures.addCallback(future, new FutureCallback<V>()
+ addFutureCallback(future, new FutureCallback<V>()
{
@Override
public void onSuccess(final V result)
@@ -2508,7 +2508,7 @@ public abstract class AbstractConfigured
protected static <V,A> ChainedListenableFuture<V> doAfter(final Executor executor, ListenableFuture<A> first, final CallableWithArgument<ListenableFuture<V>,A> second)
{
final ChainedSettableFuture<V> returnVal = new ChainedSettableFuture<>(executor);
- Futures.addCallback(first, new FutureCallback<A>()
+ addFutureCallback(first, new FutureCallback<A>()
{
@Override
public void onSuccess(final A result)
@@ -2516,7 +2516,7 @@ public abstract class AbstractConfigured
try
{
final ListenableFuture<V> future = second.call(result);
- Futures.addCallback(future, new FutureCallback<V>()
+ addFutureCallback(future, new FutureCallback<V>()
{
@Override
public void onSuccess(final V result)
@@ -2558,7 +2558,7 @@ public abstract class AbstractConfigured
final Runnable after)
{
final ChainedSettableFuture<Void> returnVal = new ChainedSettableFuture<Void>(executor);
- Futures.addCallback(future, new FutureCallback<V>()
+ addFutureCallback(future, new FutureCallback<V>()
{
@Override
public void onSuccess(final V result)
@@ -2591,6 +2591,42 @@ public abstract class AbstractConfigured
return returnVal;
}
+ protected static <V> void addFutureCallback(ListenableFuture<V> future, final FutureCallback<V> callback,
+ Executor taskExecutor)
+ {
+ final Subject subject = Subject.getSubject(AccessController.getContext());
+
+ Futures.addCallback(future, new FutureCallback<V>()
+ {
+ @Override
+ public void onSuccess(final V result)
+ {
+ Subject.doAs(subject, new PrivilegedAction<Void>()
+ {
+ @Override
+ public Void run()
+ {
+ callback.onSuccess(result);
+ return null;
+ }
+ });
+ }
+
+ @Override
+ public void onFailure(final Throwable t)
+ {
+ Subject.doAs(subject, new PrivilegedAction<Void>()
+ {
+ @Override
+ public Void run()
+ {
+ callback.onFailure(t);
+ return null;
+ }
+ });
+ }
+ }, taskExecutor);
+ }
@Override
public ListenableFuture<Void> setAttributesAsync(final Map<String, Object> attributes) throws IllegalStateException, AccessControlException, IllegalArgumentException
Modified: qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObjectTypeFactory.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObjectTypeFactory.java?rev=1767846&r1=1767845&r2=1767846&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObjectTypeFactory.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/model/AbstractConfiguredObjectTypeFactory.java Thu Nov 3 09:20:01 2016
@@ -74,7 +74,7 @@ abstract public class AbstractConfigured
final SettableFuture<X> returnVal = SettableFuture.create();
final X instance = createInstance(attributes, parents);
final ListenableFuture<Void> createFuture = instance.createAsync();
- Futures.addCallback(createFuture, new FutureCallback<Void>()
+ AbstractConfiguredObject.addFutureCallback(createFuture, new FutureCallback<Void>()
{
@Override
public void onSuccess(final Void result)
@@ -87,7 +87,7 @@ abstract public class AbstractConfigured
{
returnVal.setException(t);
}
- },MoreExecutors.directExecutor());
+ }, MoreExecutors.directExecutor());
return returnVal;
}
Modified: qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/model/AbstractSystemConfig.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/model/AbstractSystemConfig.java?rev=1767846&r1=1767845&r2=1767846&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/model/AbstractSystemConfig.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/model/AbstractSystemConfig.java Thu Nov 3 09:20:01 2016
@@ -66,6 +66,7 @@ import org.apache.qpid.server.store.pref
import org.apache.qpid.server.store.preferences.PreferenceStoreAttributes;
import org.apache.qpid.server.store.preferences.PreferenceStoreFactoryService;
import org.apache.qpid.server.util.ServerScopedRuntimeException;
+import org.apache.qpid.server.util.urlstreamhandler.classpath.Handler;
public abstract class AbstractSystemConfig<X extends SystemConfig<X>>
extends AbstractConfiguredObject<X> implements SystemConfig<X>, DynamicModel
@@ -112,6 +113,11 @@ public abstract class AbstractSystemConf
private final Thread _shutdownHook = new Thread(new ShutdownService(), "QpidBrokerShutdownHook");
+ static
+ {
+ Handler.register();
+ }
+
public AbstractSystemConfig(final TaskExecutor taskExecutor,
final EventLogger eventLogger,
final Principal systemPrincipal,
@@ -190,20 +196,50 @@ public abstract class AbstractSystemConf
}
@Override
- public <C extends ConfiguredObject<C>> C getChild(Class<C> childClass)
+ public final <T extends Container<? extends T>> T getContainer(Class<T> clazz)
{
- Collection<C> children = getChildren(childClass);
+ Collection<? extends T> children = getChildren(clazz);
if(children == null || children.isEmpty())
{
return null;
}
else if(children.size() != 1)
{
- throw new IllegalConfigurationException("More than one broker has been registered in a single context");
+ throw new IllegalConfigurationException("More than one " + clazz.getSimpleName() + " has been registered in a single context");
}
+
return children.iterator().next();
+
}
+ @Override
+ public final Container<?> getContainer()
+ {
+ final Collection<Class<? extends ConfiguredObject>> containerTypes =
+ getModel().getChildTypes(SystemConfig.class);
+ Class containerClass = null;
+ for(Class<? extends ConfiguredObject> clazz : containerTypes)
+ {
+ if(Container.class.isAssignableFrom(clazz))
+ {
+ if(containerClass == null)
+ {
+ containerClass = clazz;
+ }
+ else
+ {
+ throw new IllegalArgumentException("Model has more than one child Container class beneath SystemConfig");
+ }
+ }
+ }
+
+ if(containerClass == null)
+ {
+ throw new IllegalArgumentException("Model has no child Container class beneath SystemConfig");
+ }
+
+ return getContainer(containerClass);
+ }
@Override
protected void onOpen()
@@ -237,7 +273,7 @@ public abstract class AbstractSystemConf
container.setEventLogger(startupLogger);
final SettableFuture<Void> returnVal = SettableFuture.create();
- Futures.addCallback(container.openAsync(), new FutureCallback()
+ addFutureCallback(container.openAsync(), new FutureCallback()
{
@Override
public void onSuccess(final Object result)
@@ -275,8 +311,7 @@ public abstract class AbstractSystemConf
private Container<?> initateStoreAndRecovery() throws IOException
{
- ConfiguredObjectRecord[] initialRecords = convertToConfigurationRecords(getInitialConfigurationLocation()
- );
+ ConfiguredObjectRecord[] initialRecords = convertToConfigurationRecords(getInitialConfigurationLocation());
final DurableConfigurationStore store = getConfigurationStore();
final List<ConfiguredObjectRecord> records = new ArrayList<>();
@@ -313,7 +348,7 @@ public abstract class AbstractSystemConf
}
final Class categoryClass = containerType.getCategoryClass();
- return (Container<?>) getChild(categoryClass);
+ return (Container<?>) getContainer(categoryClass);
}
Modified: qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java?rev=1767846&r1=1767845&r2=1767846&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java Thu Nov 3 09:20:01 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/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/model/SystemConfig.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/model/SystemConfig.java?rev=1767846&r1=1767845&r2=1767846&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/model/SystemConfig.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/model/SystemConfig.java Thu Nov 3 09:20:01 2016
@@ -85,7 +85,7 @@ public interface SystemConfig<X extends
String DEFAULT_INITIAL_CONFIG_NAME = "initial-config.json";
@ManagedContextDefault(name="qpid.initialConfigurationLocation")
- String DEFAULT_INITIAL_CONFIG_LOCATION = SystemConfig.class.getClassLoader().getResource(DEFAULT_INITIAL_CONFIG_NAME).toExternalForm();
+ String DEFAULT_INITIAL_CONFIG_LOCATION = "classpath:"+DEFAULT_INITIAL_CONFIG_NAME;
@ManagedAttribute(defaultValue = "${qpid.initialConfigurationLocation}")
String getInitialConfigurationLocation();
@@ -102,7 +102,7 @@ public interface SystemConfig<X extends
EventLogger getEventLogger();
- <C extends ConfiguredObject<C>> C getChild(Class<C> childClass);
+ Container<?> getContainer();
DurableConfigurationStore getConfigurationStore();
@@ -113,4 +113,6 @@ public interface SystemConfig<X extends
Runnable getOnContainerCloseTask();
void setOnContainerCloseTask(Runnable runnable);
+
+ <T extends Container<? extends T>> T getContainer(Class<T> clazz);
}
Modified: qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java?rev=1767846&r1=1767845&r2=1767846&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/queue/AbstractQueue.java Thu Nov 3 09:20:01 2016
@@ -1992,7 +1992,7 @@ public abstract class AbstractQueue<X ex
ListenableFuture<List<Void>> combinedFuture = Futures.allAsList(removeBindingFutures);
- Futures.addCallback(combinedFuture, new FutureCallback<List<Void>>()
+ addFutureCallback(combinedFuture, new FutureCallback<List<Void>>()
{
@Override
public void onSuccess(final List<Void> result)
Modified: qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractAuthenticationManager.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractAuthenticationManager.java?rev=1767846&r1=1767845&r2=1767846&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractAuthenticationManager.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/security/auth/manager/AbstractAuthenticationManager.java Thu Nov 3 09:20:01 2016
@@ -141,7 +141,7 @@ public abstract class AbstractAuthentica
private ListenableFuture<Void> performDelete()
{
final SettableFuture<Void> futureResult = SettableFuture.create();
- Futures.addCallback(closeAsync(), new FutureCallback<Void>()
+ addFutureCallback(closeAsync(), new FutureCallback<Void>()
{
@Override
public void onSuccess(final Void result)
@@ -176,7 +176,7 @@ public abstract class AbstractAuthentica
setState(State.DELETED);
_eventLogger.message(AuthenticationProviderMessages.DELETE(getName()));
}
- });
+ }, getTaskExecutor());
return futureResult;
}
Modified: qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecoverer.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecoverer.java?rev=1767846&r1=1767845&r2=1767846&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecoverer.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecoverer.java Thu Nov 3 09:20:01 2016
@@ -919,7 +919,7 @@ public class BrokerStoreUpgraderAndRecov
new GenericRecoverer(_systemConfig).recover(upgradedRecords, false);
final StoreConfigurationChangeListener configChangeListener = new StoreConfigurationChangeListener(store);
- applyRecursively(_systemConfig.getChild(Broker.class), new RecursiveAction<ConfiguredObject<?>>()
+ applyRecursively(_systemConfig.getContainer(Broker.class), new RecursiveAction<ConfiguredObject<?>>()
{
@Override
public void performAction(final ConfiguredObject<?> object)
@@ -934,7 +934,7 @@ public class BrokerStoreUpgraderAndRecov
}
});
- return _systemConfig.getChild(Broker.class);
+ return _systemConfig.getContainer(Broker.class);
}
List<ConfiguredObjectRecord> upgrade(final DurableConfigurationStore store,
Modified: qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/util/urlstreamhandler/data/Handler.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/util/urlstreamhandler/data/Handler.java?rev=1767846&r1=1767845&r2=1767846&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/util/urlstreamhandler/data/Handler.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/util/urlstreamhandler/data/Handler.java Thu Nov 3 09:20:01 2016
@@ -44,23 +44,25 @@ public class Handler extends URLStreamHa
return new DataUrlConnection(u);
}
- public synchronized static void register()
+ public static void register()
{
- if(!_registered)
+ synchronized (System.getProperties())
{
- String registeredPackages = System.getProperty(PROTOCOL_HANDLER_PROPERTY);
- String thisPackage = Handler.class.getPackage().getName();
- String packageToRegister = thisPackage.substring(0, thisPackage.lastIndexOf('.') );
- System.setProperty(PROTOCOL_HANDLER_PROPERTY,
- registeredPackages == null
- ? packageToRegister
- : packageToRegister + "|" + registeredPackages);
+ if (!_registered)
+ {
+ String registeredPackages = System.getProperty(PROTOCOL_HANDLER_PROPERTY);
+ String thisPackage = Handler.class.getPackage().getName();
+ String packageToRegister = thisPackage.substring(0, thisPackage.lastIndexOf('.'));
+ System.setProperty(PROTOCOL_HANDLER_PROPERTY,
+ registeredPackages == null
+ ? packageToRegister
+ : packageToRegister + "|" + registeredPackages);
- _registered = true;
+ _registered = true;
+ }
}
-
}
private static class DataUrlConnection extends URLConnection
Modified: qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java?rev=1767846&r1=1767845&r2=1767846&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/virtualhost/AbstractVirtualHost.java Thu Nov 3 09:20:01 2016
@@ -648,7 +648,7 @@ public abstract class AbstractVirtualHos
attributes.put(Exchange.ID, UUIDGenerator.generateExchangeUUID(name, getName()));
final ListenableFuture<Exchange<?>> future = addExchangeAsync(attributes);
final SettableFuture<Void> returnVal = SettableFuture.create();
- Futures.addCallback(future, new FutureCallback<Exchange<?>>()
+ addFutureCallback(future, new FutureCallback<Exchange<?>>()
{
@Override
public void onSuccess(final Exchange<?> result)
@@ -1392,7 +1392,7 @@ public abstract class AbstractVirtualHos
NoFactoryForTypeException
{
final SettableFuture<Exchange<?>> returnVal = SettableFuture.create();
- Futures.addCallback(getObjectFactory().createAsync(Exchange.class, attributes, this),
+ addFutureCallback(getObjectFactory().createAsync(Exchange.class, attributes, this),
new FutureCallback<Exchange>()
{
@Override
@@ -1414,7 +1414,7 @@ public abstract class AbstractVirtualHos
returnVal.setException(t);
}
}
- });
+ }, getTaskExecutor());
return returnVal;
}
@@ -2629,7 +2629,7 @@ public abstract class AbstractVirtualHos
final ListenableFuture<Void> childOpenFuture = child.openAsync();
childOpenFutures.add(childOpenFuture);
- Futures.addCallback(childOpenFuture, new FutureCallback<Void>()
+ addFutureCallback(childOpenFuture, new FutureCallback<Void>()
{
@Override
public void onSuccess(final Void result)
@@ -2643,7 +2643,7 @@ public abstract class AbstractVirtualHos
child.getClass().getSimpleName(), child.getName(), t);
}
- });
+ }, getTaskExecutor());
}
});
return null;
Modified: qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractVirtualHostNode.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractVirtualHostNode.java?rev=1767846&r1=1767845&r2=1767846&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractVirtualHostNode.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractVirtualHostNode.java Thu Nov 3 09:20:01 2016
@@ -164,7 +164,7 @@ public abstract class AbstractVirtualHos
try
{
- Futures.addCallback(activate(),
+ addFutureCallback(activate(),
new FutureCallback<Void>()
{
@Override
@@ -295,12 +295,12 @@ public abstract class AbstractVirtualHos
final SettableFuture<Void> futureResult = SettableFuture.create();
// Delete the node only if deletion of the virtualhost succeeds.
- Futures.addCallback(deleteVirtualHostIfExists(), new FutureCallback<Void>()
+ addFutureCallback(deleteVirtualHostIfExists(), new FutureCallback<Void>()
{
@Override
public void onSuccess(final Void result)
{
- Futures.addCallback(closeAsync(), new FutureCallback<Void>()
+ addFutureCallback(closeAsync(), new FutureCallback<Void>()
{
@Override
public void onSuccess(final Void result)
@@ -339,7 +339,7 @@ public abstract class AbstractVirtualHos
configurationStore.onDelete(AbstractVirtualHostNode.this);
}
}
- });
+ }, getTaskExecutor());
}
@Override
@@ -347,7 +347,7 @@ public abstract class AbstractVirtualHos
{
futureResult.setException(t);
}
- });
+ }, getTaskExecutor());
return futureResult;
}
Modified: qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostNodeImpl.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostNodeImpl.java?rev=1767846&r1=1767845&r2=1767846&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostNodeImpl.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/RedirectingVirtualHostNodeImpl.java Thu Nov 3 09:20:01 2016
@@ -90,7 +90,7 @@ public class RedirectingVirtualHostNodeI
final ListenableFuture<VirtualHost> virtualHostFuture = getObjectFactory().createAsync(VirtualHost.class, attributes, this);
- Futures.addCallback(virtualHostFuture, new FutureCallback<VirtualHost>()
+ addFutureCallback(virtualHostFuture, new FutureCallback<VirtualHost>()
{
@Override
public void onSuccess(final VirtualHost virtualHost)
@@ -115,7 +115,7 @@ public class RedirectingVirtualHostNodeI
resultFuture.setException(t);
}
}
- });
+ }, getTaskExecutor());
return resultFuture;
}
Modified: qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/store/BrokerRecovererTest.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/store/BrokerRecovererTest.java?rev=1767846&r1=1767845&r2=1767846&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/store/BrokerRecovererTest.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/test/java/org/apache/qpid/server/store/BrokerRecovererTest.java Thu Nov 3 09:20:01 2016
@@ -119,7 +119,7 @@ public class BrokerRecovererTest extends
when(_brokerEntry.getAttributes()).thenReturn(entryAttributes);
resolveObjects(_brokerEntry);
- Broker<?> broker = _systemConfig.getChild(Broker.class);
+ Broker<?> broker = _systemConfig.getContainer(Broker.class);
assertNotNull(broker);
@@ -178,7 +178,7 @@ public class BrokerRecovererTest extends
portId,
5672,
"authProvider"));
- Broker<?> broker = _systemConfig.getChild(Broker.class);
+ Broker<?> broker = _systemConfig.getContainer(Broker.class);
assertNotNull(broker);
@@ -192,7 +192,7 @@ public class BrokerRecovererTest extends
UUID authProviderId = UUID.randomUUID();
resolveObjects(_brokerEntry, createAuthProviderRecord(authProviderId, "authProvider"));
- Broker<?> broker = _systemConfig.getChild(Broker.class);
+ Broker<?> broker = _systemConfig.getContainer(Broker.class);
assertNotNull(broker);
@@ -214,7 +214,7 @@ public class BrokerRecovererTest extends
createPortRecord(portId, 5672, "authProvider"),
createAuthProviderRecord(authProvider2Id, "authProvider2"),
createPortRecord(port2Id, 5673, "authProvider2"));
- Broker<?> broker = _systemConfig.getChild(Broker.class);
+ Broker<?> broker = _systemConfig.getContainer(Broker.class);
assertNotNull(broker);
@@ -232,7 +232,7 @@ public class BrokerRecovererTest extends
UUID authProviderId = UUID.randomUUID();
resolveObjects(_brokerEntry, createGroupProviderRecord(authProviderId, "groupProvider"));
- Broker<?> broker = _systemConfig.getChild(Broker.class);
+ Broker<?> broker = _systemConfig.getContainer(Broker.class);
assertNotNull(broker);
@@ -255,7 +255,7 @@ public class BrokerRecovererTest extends
when(_brokerEntry.getAttributes()).thenReturn(brokerAttributes);
resolveObjects(_brokerEntry);
- Broker<?> broker = _systemConfig.getChild(Broker.class);
+ Broker<?> broker = _systemConfig.getContainer(Broker.class);
broker.open();
assertEquals("Unexpected broker state", State.ERRORED, broker.getState());
}
Modified: qpid/java/branches/remove-queue-runner/broker-core/src/velocity/templates/org/apache/qpid/server/logging/messages/LogMessages.vm
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-core/src/velocity/templates/org/apache/qpid/server/logging/messages/LogMessages.vm?rev=1767846&r1=1767845&r2=1767846&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-core/src/velocity/templates/org/apache/qpid/server/logging/messages/LogMessages.vm (original)
+++ qpid/java/branches/remove-queue-runner/broker-core/src/velocity/templates/org/apache/qpid/server/logging/messages/LogMessages.vm Thu Nov 3 09:20:01 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("_");
Modified: qpid/java/branches/remove-queue-runner/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerMemoryLoggerTest.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerMemoryLoggerTest.java?rev=1767846&r1=1767845&r2=1767846&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerMemoryLoggerTest.java (original)
+++ qpid/java/branches/remove-queue-runner/broker-plugins/logging-logback/src/test/java/org/apache/qpid/server/logging/logback/BrokerMemoryLoggerTest.java Thu Nov 3 09:20:01 2016
@@ -86,7 +86,7 @@ public class BrokerMemoryLoggerTest exte
final String brokerLoggerName = "TestBrokerLogger";
ch.qos.logback.classic.Logger rootLogger =
(ch.qos.logback.classic.Logger) LoggerFactory.getLogger(Logger.ROOT_LOGGER_NAME);
- Broker broker = _systemConfig.getChild(Broker.class);
+ Broker broker = _systemConfig.getContainer(Broker.class);
Map<String, Object> attributes = new HashMap<>();
attributes.put(ConfiguredObject.NAME, brokerLoggerName);
attributes.put(ConfiguredObject.TYPE, BrokerMemoryLogger.TYPE);
@@ -114,7 +114,7 @@ public class BrokerMemoryLoggerTest exte
{
final String brokerLoggerName = "TestBrokerLogger";
- Broker broker = _systemConfig.getChild(Broker.class);
+ Broker broker = _systemConfig.getContainer(Broker.class);
Map<String, Object> attributes = new HashMap<>();
attributes.put(ConfiguredObject.NAME, brokerLoggerName);
attributes.put(ConfiguredObject.TYPE, BrokerMemoryLogger.TYPE);
Modified: qpid/java/branches/remove-queue-runner/broker/src/main/java/org/apache/qpid/server/Main.java
URL: http://svn.apache.org/viewvc/qpid/java/branches/remove-queue-runner/broker/src/main/java/org/apache/qpid/server/Main.java?rev=1767846&r1=1767845&r2=1767846&view=diff
==============================================================================
--- qpid/java/branches/remove-queue-runner/broker/src/main/java/org/apache/qpid/server/Main.java (original)
+++ qpid/java/branches/remove-queue-runner/broker/src/main/java/org/apache/qpid/server/Main.java Thu Nov 3 09:20:01 2016
@@ -190,7 +190,7 @@ public class Main
}
else if (_commandLine.hasOption(OPTION_CREATE_INITIAL_CONFIG.getOpt()))
{
- createInitialConficCopy(initialConfigLocation);
+ createInitialConfigCopy(initialConfigLocation);
}
else if (_commandLine.hasOption(OPTION_VERSION.getOpt()))
{
@@ -318,7 +318,7 @@ public class Main
System.out.println(CommonProperties.getVersionString() + " (" + protocol + ")");
}
- private void createInitialConficCopy(String initialConfigLocation)
+ private void createInitialConfigCopy(String initialConfigLocation)
{
File destinationFile = null;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org