Author: orudyy
Date: Tue Nov 6 18:37:58 2012
New Revision: 1406267
URL: http://svn.apache.org/viewvc?rev=1406267&view=rev
Log:
Add more comments to remove references to ServerConfiguration
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/AbstractServlet.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/MBeanInvocationHandlerImpl.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionSecureOkMethodHandler.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionStartOkMethodHandler.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueFactory.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/IncomingMessage.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/AmqpPortAdapter.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnectionDelegate.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSessionDelegate.java
qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AbstractTestLogging.java
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/AbstractServlet.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/AbstractServlet.java?rev=1406267&r1=1406266&r2=1406267&view=diff
==============================================================================
---
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/AbstractServlet.java
(original)
+++
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/servlet/rest/AbstractServlet.java
Tue Nov 6 18:37:58 2012
@@ -380,6 +380,7 @@ public abstract class AbstractServlet ex
return subject;
}
+ // XXX remove reference on ServerConfiguration
private boolean isBasicAuthSupported(HttpServletRequest req)
{
return req.isSecure() ?
ApplicationRegistry.getInstance().getConfiguration().getHTTPSManagementBasicAuth()
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/MBeanInvocationHandlerImpl.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/MBeanInvocationHandlerImpl.java?rev=1406267&r1=1406266&r2=1406267&view=diff
==============================================================================
---
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/MBeanInvocationHandlerImpl.java
(original)
+++
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/MBeanInvocationHandlerImpl.java
Tue Nov 6 18:37:58 2012
@@ -59,6 +59,8 @@ public class MBeanInvocationHandlerImpl
private final static String DELEGATE =
"JMImplementation:type=MBeanServerDelegate";
private MBeanServer _mbs;
private final ManagementActor _logActor = new
ManagementActor(_appRegistry.getRootMessageLogger());
+
+ // XXX remove reference to ServerConfiguration
private final boolean _managementRightsInferAllAccess =
_appRegistry.getConfiguration().getManagementRightsInferAllAccess();
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java?rev=1406267&r1=1406266&r2=1406267&view=diff
==============================================================================
---
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
(original)
+++
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/AMQChannel.java
Tue Nov 6 18:37:58 2012
@@ -97,7 +97,8 @@ public class AMQChannel implements AMQSe
public static final int DEFAULT_PREFETCH = 4096;
private static final Logger _logger = Logger.getLogger(AMQChannel.class);
-
+
+ // XXX remove reference on ServerConfiguration
private static final boolean MSG_AUTH =
ApplicationRegistry.getInstance().getConfiguration().getMsgAuth();
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java?rev=1406267&r1=1406266&r2=1406267&view=diff
==============================================================================
---
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
(original)
+++
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/ServerConfiguration.java
Tue Nov 6 18:37:58 2012
@@ -883,6 +883,7 @@ public class ServerConfiguration extends
return disabledFeatures;
}
+ // XXX move into management attributes for JMX & HTTP plugins
public boolean getManagementRightsInferAllAccess()
{
return getBooleanValue("management.managementRightsInferAllAccess",
true);
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java?rev=1406267&r1=1406266&r2=1406267&view=diff
==============================================================================
---
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
(original)
+++
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/VirtualHostConfiguration.java
Tue Nov 6 18:37:58 2012
@@ -80,6 +80,7 @@ public class VirtualHostConfiguration ex
return _name;
}
+ // XXX remove reference on ServerConfiguration
public long getHousekeepingCheckPeriod()
{
return getLongValue("housekeeping.checkPeriod",
ApplicationRegistry.getInstance().getConfiguration().getHousekeepingCheckPeriod());
@@ -157,6 +158,7 @@ public class VirtualHostConfiguration ex
return getLongValue("queues.maximumMessageCount");
}
+ // XXX remove reference on ServerConfiguration
public Long getMinimumAlertRepeatGap()
{
return getLongValue("queues.minimumAlertRepeatGap",
ApplicationRegistry.getInstance().getConfiguration().getMinimumAlertRepeatGap());
@@ -223,6 +225,7 @@ public class VirtualHostConfiguration ex
return getLongValue("transactionTimeout.idleClose", 0L);
}
+ // XXX remove reference on ServerConfiguration
public int getMaxDeliveryCount()
{
return getIntValue("queues.maximumDeliveryCount",
ApplicationRegistry.getInstance().getConfiguration().getMaxDeliveryCount());
@@ -231,6 +234,7 @@ public class VirtualHostConfiguration ex
/**
* Check if dead letter queue delivery is enabled, deferring to the broker
configuration if not set.
*/
+ // XXX remove reference on ServerConfiguration
public boolean isDeadLetterQueueEnabled()
{
return getBooleanValue("queues.deadLetterQueues",
ApplicationRegistry.getInstance().getConfiguration().isDeadLetterQueueEnabled());
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionSecureOkMethodHandler.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionSecureOkMethodHandler.java?rev=1406267&r1=1406266&r2=1406267&view=diff
==============================================================================
---
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionSecureOkMethodHandler.java
(original)
+++
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionSecureOkMethodHandler.java
Tue Nov 6 18:37:58 2012
@@ -95,6 +95,7 @@ public class ConnectionSecureOkMethodHan
}
stateManager.changeState(AMQState.CONNECTION_NOT_TUNED);
+ // XXX remove reference on ServerConfiguration
ConnectionTuneBody tuneBody =
methodRegistry.createConnectionTuneBody(ApplicationRegistry.getInstance().getConfiguration().getMaxChannelCount(),
ConnectionStartOkMethodHandler.getConfiguredFrameSize(),
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionStartOkMethodHandler.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionStartOkMethodHandler.java?rev=1406267&r1=1406266&r2=1406267&view=diff
==============================================================================
---
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionStartOkMethodHandler.java
(original)
+++
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/handler/ConnectionStartOkMethodHandler.java
Tue Nov 6 18:37:58 2012
@@ -111,6 +111,7 @@ public class ConnectionStartOkMethodHand
stateManager.changeState(AMQState.CONNECTION_NOT_TUNED);
+ // XXX remove reference on ServerConfiguration
ConnectionTuneBody tuneBody =
methodRegistry.createConnectionTuneBody(ApplicationRegistry.getInstance().getConfiguration().getMaxChannelCount(),
getConfiguredFrameSize(),
ApplicationRegistry.getInstance().getConfiguration().getHeartBeatDelay());
@@ -149,6 +150,7 @@ public class ConnectionStartOkMethodHand
static int getConfiguredFrameSize()
{
+ // XXX remove reference to ServerConfiguration and introduce
FRAME_SIZE attribute in Broker interface
final ServerConfiguration config =
ApplicationRegistry.getInstance().getConfiguration();
final int framesize = config.getFrameSize();
_logger.info("Framesize set to " + framesize);
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java?rev=1406267&r1=1406266&r2=1406267&view=diff
==============================================================================
---
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java
(original)
+++
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/AMQProtocolEngine.java
Tue Nov 6 18:37:58 2012
@@ -110,6 +110,7 @@ public class AMQProtocolEngine implement
private volatile boolean _closed;
+ // XXX remove reference on ServerConfiguration
// maximum number of channels this session should have
private long _maxNoOfChannels =
ApplicationRegistry.getInstance().getConfiguration().getMaxChannelCount();
@@ -735,6 +736,7 @@ public class AMQProtocolEngine implement
*
* @param delay delay in seconds (not ms)
*/
+ // XXX remove reference on ServerConfiguration
public void initHeartbeats(int delay)
{
if (delay > 0)
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueFactory.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueFactory.java?rev=1406267&r1=1406266&r2=1406267&view=diff
==============================================================================
---
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueFactory.java
(original)
+++
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/AMQQueueFactory.java
Tue Nov 6 18:37:58 2012
@@ -411,6 +411,7 @@ public class AMQQueueFactory
*/
protected static String getDeadLetterQueueName(String name)
{
+ //XXX remove reference to ServerConfiguration
ServerConfiguration serverConfig =
ApplicationRegistry.getInstance().getConfiguration();
String dlQueueName = name + serverConfig.getDeadLetterQueueSuffix();
return dlQueueName;
@@ -425,6 +426,7 @@ public class AMQQueueFactory
*/
protected static String getDeadLetterExchangeName(String name)
{
+ //XXX remove reference to ServerConfiguration
ServerConfiguration serverConfig =
ApplicationRegistry.getInstance().getConfiguration();
String dlExchangeName = name +
serverConfig.getDeadLetterExchangeSuffix();
return dlExchangeName;
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/IncomingMessage.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/IncomingMessage.java?rev=1406267&r1=1406266&r2=1406267&view=diff
==============================================================================
---
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/IncomingMessage.java
(original)
+++
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/IncomingMessage.java
Tue Nov 6 18:37:58 2012
@@ -46,7 +46,8 @@ public class IncomingMessage implements
/** Used for debugging purposes. */
private static final Logger _logger =
Logger.getLogger(IncomingMessage.class);
-
+
+ // XXX remove reference on ServerConfiguration
private static final boolean SYNCHED_CLOCKS =
ApplicationRegistry.getInstance().getConfiguration().getSynchedClocks();
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java?rev=1406267&r1=1406266&r2=1406267&view=diff
==============================================================================
---
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
(original)
+++
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/SimpleAMQQueue.java
Tue Nov 6 18:37:58 2012
@@ -131,6 +131,7 @@ public class SimpleAMQQueue implements A
private final AtomicInteger _bindingCountHigh = new AtomicInteger();
+ // XXX remove references to ServerConfiguration
/** max allowed size(KB) of a single message */
private long _maximumMessageSize =
ApplicationRegistry.getInstance().getConfiguration().getMaximumMessageSize();
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/AmqpPortAdapter.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/AmqpPortAdapter.java?rev=1406267&r1=1406266&r2=1406267&view=diff
==============================================================================
---
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/AmqpPortAdapter.java
(original)
+++
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/AmqpPortAdapter.java
Tue Nov 6 18:37:58 2012
@@ -107,6 +107,7 @@ public class AmqpPortAdapter extends Por
/** This will be delegated to the KeyStore and TrustStore model objects */
private SSLContext createSslContext()
{
+ // XXX: remove reference to ServerConfiguration
ServerConfiguration configuration = _appRegistry.getConfiguration();
final String keystorePath = configuration.getConnectorKeyStorePath();
final String keystorePassword =
configuration.getConnectorKeyStorePassword();
@@ -144,6 +145,7 @@ public class AmqpPortAdapter extends Por
/** This will be refactored later into AmqpPort model */
private AmqpProtocolVersion getDefaultAmqpSupportedReply()
{
+ // XXX: remove reference to server configuration. Add attribute on a
Broker interface or Port?
ServerConfiguration configuration = _appRegistry.getConfiguration();
return configuration.getDefaultSupportedProtocolReply();
}
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnectionDelegate.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnectionDelegate.java?rev=1406267&r1=1406266&r2=1406267&view=diff
==============================================================================
---
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnectionDelegate.java
(original)
+++
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnectionDelegate.java
Tue Nov 6 18:37:58 2012
@@ -73,10 +73,12 @@ public class ServerConnectionDelegate ex
_appRegistry = appRegistry;
_localFQDN = localFQDN;
+ // XXX remove reference on ServerConfiguration
_maxNoOfChannels = appRegistry.getConfiguration().getMaxChannelCount();
_subjectCreator = subjectCreator;
}
+ // XXX remove reference on ServerConfiguration
private static List<String> getFeatures(IApplicationRegistry appRegistry)
{
final List<String> features = new ArrayList<String>();
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSessionDelegate.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSessionDelegate.java?rev=1406267&r1=1406266&r2=1406267&view=diff
==============================================================================
---
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSessionDelegate.java
(original)
+++
qpid/branches/java-broker-config-qpid-4390/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerSessionDelegate.java
Tue Nov 6 18:37:58 2012
@@ -1266,6 +1266,8 @@ public class ServerSessionDelegate exten
}
}
queueRegistry.registerQueue(queue);
+
+ // XXX remove reference on ServerConfiguration
boolean autoRegister =
ApplicationRegistry.getInstance().getConfiguration().getQueueAutoRegister();
if (autoRegister)
Modified:
qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AbstractTestLogging.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AbstractTestLogging.java?rev=1406267&r1=1406266&r2=1406267&view=diff
==============================================================================
---
qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AbstractTestLogging.java
(original)
+++
qpid/branches/java-broker-config-qpid-4390/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/AbstractTestLogging.java
Tue Nov 6 18:37:58 2012
@@ -58,6 +58,7 @@ public class AbstractTestLogging extends
_monitor = new LogMonitor(_outputFile);
}
+ // XXX remove reference on ServerConfiguration
protected ServerConfiguration getServerConfig() throws
ConfigurationException
{
ServerConfiguration _serverConfiguration;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
