You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ro...@apache.org on 2012/04/20 10:58:09 UTC
svn commit: r1328264 - in
/qpid/branches/java-config-and-management/qpid/java:
broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/
broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/
broker-plugins/management/src/main/java/org/...
Author: robbie
Date: Fri Apr 20 08:58:08 2012
New Revision: 1328264
URL: http://svn.apache.org/viewvc?rev=1328264&view=rev
Log:
NO-JIRA: update start/stop process for new plugins, change BrokerAdapter to be per Broker/AppRegistry instance, add some mocks to fix some failing unit tests, hackily disable old MBeans
Modified:
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/JMXService.java
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBean.java
qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/org/apache/qpid/server/management/plugin/Management.java
qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/org/apache/qpid/server/management/plugin/ManagementActivator.java
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/IApplicationRegistry.java
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnectionDelegate.java
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java
qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/MockSubscription.java
qpid/branches/java-config-and-management/qpid/java/systests/build.xml
Modified: qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/JMXService.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/JMXService.java?rev=1328264&r1=1328263&r2=1328264&view=diff
==============================================================================
--- qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/JMXService.java (original)
+++ qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/JMXService.java Fri Apr 20 08:58:08 2012
@@ -27,10 +27,6 @@ import org.apache.qpid.server.jmx.mbeans
import org.apache.qpid.server.jmx.mbeans.VirtualHostMBean;
import org.apache.qpid.server.jmx.mbeans.Shutdown;
-import org.apache.qpid.server.logging.LogActor;
-import org.apache.qpid.server.logging.LogMessage;
-import org.apache.qpid.server.logging.LogSubject;
-import org.apache.qpid.server.logging.RootMessageLogger;
import org.apache.qpid.server.logging.SystemOutMessageLogger;
import org.apache.qpid.server.logging.actors.AbstractActor;
import org.apache.qpid.server.logging.actors.CurrentActor;
@@ -39,7 +35,7 @@ import org.apache.qpid.server.model.Conf
import org.apache.qpid.server.model.ConfiguredObject;
import org.apache.qpid.server.model.State;
import org.apache.qpid.server.model.VirtualHost;
-import org.apache.qpid.server.model.adapter.BrokerAdapter;
+import org.apache.qpid.server.registry.ApplicationRegistry;
import javax.management.JMException;
import java.io.IOException;
@@ -69,7 +65,7 @@ public class JMXService implements Confi
}
});
- _broker = BrokerAdapter.getInstance();
+ _broker = ApplicationRegistry.getInstance().getBroker();
_objectRegistry = new JMXManagedObjectRegistry();
_broker.addChangeListener(this);
@@ -94,6 +90,8 @@ public class JMXService implements Confi
public void close()
{
+ _broker.removeChangeListener(this);
+
_objectRegistry.close();
}
Modified: qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBean.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBean.java?rev=1328264&r1=1328263&r2=1328264&view=diff
==============================================================================
--- qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBean.java (original)
+++ qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBean.java Fri Apr 20 08:58:08 2012
@@ -61,7 +61,7 @@ public class VirtualHostManagerMBean ext
public String getObjectInstanceName()
{
- return _virtualHostMBean.getName();
+ return ObjectName.quote(_virtualHostMBean.getName());
}
@Override
Modified: qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/org/apache/qpid/server/management/plugin/Management.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/org/apache/qpid/server/management/plugin/Management.java?rev=1328264&r1=1328263&r2=1328264&view=diff
==============================================================================
--- qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/org/apache/qpid/server/management/plugin/Management.java (original)
+++ qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/org/apache/qpid/server/management/plugin/Management.java Fri Apr 20 08:58:08 2012
@@ -32,7 +32,7 @@ import org.apache.qpid.server.management
import org.apache.qpid.server.management.plugin.servlet.rest.SaslServlet;
import org.apache.qpid.server.management.plugin.servlet.rest.VirtualHostServlet;
import org.apache.qpid.server.model.Broker;
-import org.apache.qpid.server.model.adapter.BrokerAdapter;
+import org.apache.qpid.server.registry.ApplicationRegistry;
import org.mortbay.jetty.Server;
import org.mortbay.jetty.SessionManager;
import org.mortbay.jetty.servlet.Context;
@@ -45,61 +45,57 @@ public class Management
private Broker _broker;
+ private Server _server;
+
public Management()
{
_logger.info("Starting up web server on port 8080");
- _broker = BrokerAdapter.getInstance();
+ _broker = ApplicationRegistry.getInstance().getBroker();
+
+ _server = new Server(8080);
- start();
+ Context root = new Context(_server,"/", Context.SESSIONS);
+ root.addServlet(new ServletHolder(new VhostsServlet(_broker)), "/api/vhosts/*");
+ root.addServlet(new ServletHolder(new ExchangesServlet(_broker)), "/api/exchanges/*");
+
+ root.addServlet(new ServletHolder(new VirtualHostServlet(_broker)), "/rest/virtualhost/*");
+ root.addServlet(new ServletHolder(new ExchangeServlet(_broker)), "/rest/exchange/*");
+ root.addServlet(new ServletHolder(new QueueServlet(_broker)), "/rest/queue/*");
+ root.addServlet(new ServletHolder(new ConnectionServlet(_broker)), "/rest/connection/*");
+ root.addServlet(new ServletHolder(new BindingServlet(_broker)), "/rest/binding/*");
+ root.addServlet(new ServletHolder(new SaslServlet(_broker)), "/rest/sasl");
+
+ root.addServlet(new ServletHolder(new DefinedFileServlet("queue.html")),"/queue");
+ root.addServlet(new ServletHolder(new DefinedFileServlet("exchange.html")),"/exchange");
+ root.addServlet(new ServletHolder(new DefinedFileServlet("vhost.html")),"/vhost");
+ root.addServlet(new ServletHolder(new DefinedFileServlet("broker.html")),"/broker");
+ root.addServlet(new ServletHolder(new DefinedFileServlet("connection.html")),"/connection");
+
+
+ root.addServlet(new ServletHolder(FileServlet.INSTANCE), "*.js");
+ root.addServlet(new ServletHolder(FileServlet.INSTANCE), "*.css");
+ root.addServlet(new ServletHolder(FileServlet.INSTANCE), "*.html");
+ root.addServlet(new ServletHolder(FileServlet.INSTANCE), "*.png");
+ root.addServlet(new ServletHolder(FileServlet.INSTANCE), "*.gif");
+ root.addServlet(new ServletHolder(FileServlet.INSTANCE), "*.jpg");
+ root.addServlet(new ServletHolder(FileServlet.INSTANCE), "*.jpeg");
+ root.addServlet(new ServletHolder(FileServlet.INSTANCE), "*.json");
+ final SessionManager sessionManager = root.getSessionHandler().getSessionManager();
+ sessionManager.setMaxCookieAge(60 * 30);
+ sessionManager.setMaxInactiveInterval(60 * 15);
+ }
+ public void start() throws Exception
+ {
+ _server.start();
}
- private void start()
+ public void stop() throws Exception
{
- Server server = new Server(8080);
- try
- {
- Context root = new Context(server,"/", Context.SESSIONS);
- root.addServlet(new ServletHolder(new VhostsServlet(_broker)), "/api/vhosts/*");
- root.addServlet(new ServletHolder(new ExchangesServlet(_broker)), "/api/exchanges/*");
-
- root.addServlet(new ServletHolder(new VirtualHostServlet(_broker)), "/rest/virtualhost/*");
- root.addServlet(new ServletHolder(new ExchangeServlet(_broker)), "/rest/exchange/*");
- root.addServlet(new ServletHolder(new QueueServlet(_broker)), "/rest/queue/*");
- root.addServlet(new ServletHolder(new ConnectionServlet(_broker)), "/rest/connection/*");
- root.addServlet(new ServletHolder(new BindingServlet(_broker)), "/rest/binding/*");
- root.addServlet(new ServletHolder(new SaslServlet(_broker)), "/rest/sasl");
-
- root.addServlet(new ServletHolder(new DefinedFileServlet("queue.html")),"/queue");
- root.addServlet(new ServletHolder(new DefinedFileServlet("exchange.html")),"/exchange");
- root.addServlet(new ServletHolder(new DefinedFileServlet("vhost.html")),"/vhost");
- root.addServlet(new ServletHolder(new DefinedFileServlet("broker.html")),"/broker");
- root.addServlet(new ServletHolder(new DefinedFileServlet("connection.html")),"/connection");
-
-
- root.addServlet(new ServletHolder(FileServlet.INSTANCE), "*.js");
- root.addServlet(new ServletHolder(FileServlet.INSTANCE), "*.css");
- root.addServlet(new ServletHolder(FileServlet.INSTANCE), "*.html");
- root.addServlet(new ServletHolder(FileServlet.INSTANCE), "*.png");
- root.addServlet(new ServletHolder(FileServlet.INSTANCE), "*.gif");
- root.addServlet(new ServletHolder(FileServlet.INSTANCE), "*.jpg");
- root.addServlet(new ServletHolder(FileServlet.INSTANCE), "*.jpeg");
- root.addServlet(new ServletHolder(FileServlet.INSTANCE), "*.json");
-
- final SessionManager sessionManager = root.getSessionHandler().getSessionManager();
-
- sessionManager.setMaxCookieAge(60 * 30);
- sessionManager.setMaxInactiveInterval(60 * 15);
-
- server.start();
- }
- catch (Exception e)
- {
- e.printStackTrace(); //TODO
- }
+ _server.stop();
}
}
Modified: qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/org/apache/qpid/server/management/plugin/ManagementActivator.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/org/apache/qpid/server/management/plugin/ManagementActivator.java?rev=1328264&r1=1328263&r2=1328264&view=diff
==============================================================================
--- qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/org/apache/qpid/server/management/plugin/ManagementActivator.java (original)
+++ qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/src/main/java/org/apache/qpid/server/management/plugin/ManagementActivator.java Fri Apr 20 08:58:08 2012
@@ -39,6 +39,7 @@ public class ManagementActivator impleme
{
_ctx = ctx;
_managementService = new Management();
+ _managementService.start();
_bundleName = ctx.getBundle().getSymbolicName();
// register the service
@@ -51,6 +52,8 @@ public class ManagementActivator impleme
{
_logger.info("Stopping management plugin: " + _bundleName);
+ _managementService.stop();
+
// null object references
_managementService = null;
_ctx = null;
Modified: qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java?rev=1328264&r1=1328263&r2=1328264&view=diff
==============================================================================
--- qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java (original)
+++ qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/model/adapter/BrokerAdapter.java Fri Apr 20 08:58:08 2012
@@ -33,7 +33,6 @@ import org.apache.qpid.server.model.Port
import org.apache.qpid.server.model.State;
import org.apache.qpid.server.model.Statistics;
import org.apache.qpid.server.model.VirtualHost;
-import org.apache.qpid.server.registry.ApplicationRegistry;
import org.apache.qpid.server.registry.IApplicationRegistry;
import org.apache.qpid.server.transport.QpidAcceptor;
import org.apache.qpid.server.virtualhost.VirtualHostRegistry;
@@ -48,9 +47,7 @@ public class BrokerAdapter extends Abstr
new HashMap<org.apache.qpid.server.virtualhost.VirtualHost, VirtualHostAdapter>();
private final StatisticsAdapter _statistics;
- private static final BrokerAdapter INSTANCE = new BrokerAdapter(ApplicationRegistry.getInstance());
-
- private BrokerAdapter(final IApplicationRegistry instance)
+ public BrokerAdapter(final IApplicationRegistry instance)
{
_applicationRegistry = instance;
_name = "Broker";
@@ -77,11 +74,6 @@ public class BrokerAdapter extends Abstr
}
}
- public static Broker getInstance()
- {
- return INSTANCE;
- }
-
public Collection<VirtualHost> getVirtualHosts()
{
Collection<org.apache.qpid.server.virtualhost.VirtualHost> actualVhosts =
Modified: qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java?rev=1328264&r1=1328263&r2=1328264&view=diff
==============================================================================
--- qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java (original)
+++ qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java Fri Apr 20 08:58:08 2012
@@ -47,6 +47,8 @@ import org.apache.qpid.server.logging.me
import org.apache.qpid.server.logging.messages.VirtualHostMessages;
import org.apache.qpid.server.management.ManagedObjectRegistry;
import org.apache.qpid.server.management.NoopManagedObjectRegistry;
+import org.apache.qpid.server.model.Broker;
+import org.apache.qpid.server.model.adapter.BrokerAdapter;
import org.apache.qpid.server.plugins.Plugin;
import org.apache.qpid.server.plugins.PluginManager;
import org.apache.qpid.server.security.SecurityManager;
@@ -106,7 +108,9 @@ public abstract class ApplicationRegistr
private QMFService _qmfService;
- private BrokerConfig _broker;
+ private BrokerConfig _brokerConfig;
+
+ private Broker _broker;
private ConfigStore _configStore;
@@ -203,11 +207,14 @@ public abstract class ApplicationRegistr
store.setRoot(new SystemConfigImpl(store));
instance.setConfigStore(store);
- BrokerConfig broker = new BrokerConfigAdapter(instance);
+ final BrokerConfig brokerConfig = new BrokerConfigAdapter(instance);
+
+ final SystemConfig system = store.getRoot();
+ system.addBroker(brokerConfig);
+ instance.setBrokerConfig(brokerConfig);
- SystemConfig system = store.getRoot();
- system.addBroker(broker);
- instance.setBroker(broker);
+ final Broker brokerAdapter = new BrokerAdapter(instance);
+ instance.setBroker(brokerAdapter);
try
{
@@ -220,7 +227,7 @@ public abstract class ApplicationRegistr
//remove the Broker instance, then re-throw
try
{
- system.removeBroker(broker);
+ system.removeBroker(brokerConfig);
}
catch(Throwable t)
{
@@ -549,7 +556,7 @@ public abstract class ApplicationRegistr
close(_managedObjectRegistry);
- BrokerConfig broker = getBroker();
+ BrokerConfig broker = getBrokerConfig();
if(broker != null)
{
broker.getSystem().removeBroker(broker);
@@ -648,21 +655,21 @@ public abstract class ApplicationRegistr
return _qmfService;
}
- public BrokerConfig getBroker()
+ public BrokerConfig getBrokerConfig()
{
- return _broker;
+ return _brokerConfig;
}
- public void setBroker(final BrokerConfig broker)
+ public void setBrokerConfig(final BrokerConfig broker)
{
- _broker = broker;
+ _brokerConfig = broker;
}
public VirtualHost createVirtualHost(final VirtualHostConfiguration vhostConfig) throws Exception
{
VirtualHostImpl virtualHost = new VirtualHostImpl(this, vhostConfig);
_virtualHostRegistry.registerVirtualHost(virtualHost);
- getBroker().addVirtualHost(virtualHost);
+ getBrokerConfig().addVirtualHost(virtualHost);
return virtualHost;
}
@@ -751,4 +758,14 @@ public abstract class ApplicationRegistr
logActor.message(BrokerMessages.MAX_MEMORY(Runtime.getRuntime().maxMemory()));
}
+ public void setBroker(final Broker broker)
+ {
+ _broker = broker;
+ }
+
+ public Broker getBroker()
+ {
+ return _broker;
+ }
+
}
Modified: qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java?rev=1328264&r1=1328263&r2=1328264&view=diff
==============================================================================
--- qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java (original)
+++ qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java Fri Apr 20 08:58:08 2012
@@ -45,14 +45,14 @@ public class ConfigurationFileApplicatio
@Override
protected void initialiseManagedObjectRegistry() throws AMQException
{
- if (getConfiguration().getManagementEnabled())
- {
- setManagedObjectRegistry(new JMXManagedObjectRegistry());
- }
- else
- {
- setManagedObjectRegistry(new NoopManagedObjectRegistry());
- }
+// if (getConfiguration().getManagementEnabled())
+// {
+// setManagedObjectRegistry(new JMXManagedObjectRegistry());
+// }
+// else
+// {
+ setManagedObjectRegistry(new NoopManagedObjectRegistry());
+// }
}
}
Modified: qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/IApplicationRegistry.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/IApplicationRegistry.java?rev=1328264&r1=1328263&r2=1328264&view=diff
==============================================================================
--- qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/IApplicationRegistry.java (original)
+++ qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/IApplicationRegistry.java Fri Apr 20 08:58:08 2012
@@ -28,6 +28,7 @@ import org.apache.qpid.server.configurat
import org.apache.qpid.server.configuration.VirtualHostConfiguration;
import org.apache.qpid.server.logging.RootMessageLogger;
import org.apache.qpid.server.management.ManagedObjectRegistry;
+import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.plugins.PluginManager;
import org.apache.qpid.server.security.SecurityManager;
import org.apache.qpid.server.security.auth.manager.AuthenticationManager;
@@ -86,9 +87,13 @@ public interface IApplicationRegistry ex
QMFService getQMFService();
- void setBroker(BrokerConfig broker);
+ void setBrokerConfig(BrokerConfig broker);
- BrokerConfig getBroker();
+ BrokerConfig getBrokerConfig();
+
+ void setBroker(Broker broker);
+
+ Broker getBroker();
VirtualHost createVirtualHost(VirtualHostConfiguration vhostConfig) throws Exception;
Modified: qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnectionDelegate.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnectionDelegate.java?rev=1328264&r1=1328263&r2=1328264&view=diff
==============================================================================
--- qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnectionDelegate.java (original)
+++ qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnectionDelegate.java Fri Apr 20 08:58:08 2012
@@ -61,7 +61,7 @@ public class ServerConnectionDelegate ex
public ServerConnectionDelegate(IApplicationRegistry appRegistry, String localFQDN)
{
- this(createConnectionProperties(appRegistry.getBroker()), Collections.singletonList((Object)"en_US"), appRegistry, localFQDN);
+ this(createConnectionProperties(appRegistry.getBrokerConfig()), Collections.singletonList((Object)"en_US"), appRegistry, localFQDN);
}
public ServerConnectionDelegate(Map<String, Object> properties,
Modified: qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java?rev=1328264&r1=1328263&r2=1328264&view=diff
==============================================================================
--- qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java (original)
+++ qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java Fri Apr 20 08:58:08 2012
@@ -140,7 +140,7 @@ public class VirtualHostImpl implements
}
_appRegistry = appRegistry;
- _brokerConfig = _appRegistry.getBroker();
+ _brokerConfig = _appRegistry.getBrokerConfig();
_vhostConfig = hostConfig;
_name = _vhostConfig.getName();
_dtxRegistry = new DtxRegistry();
Modified: qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/MockSubscription.java
URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/MockSubscription.java?rev=1328264&r1=1328263&r2=1328264&view=diff
==============================================================================
--- qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/MockSubscription.java (original)
+++ qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/subscription/MockSubscription.java Fri Apr 20 08:58:08 2012
@@ -23,15 +23,21 @@ package org.apache.qpid.server.subscript
import org.apache.qpid.AMQException;
import org.apache.qpid.framing.AMQShortString;
+import org.apache.qpid.protocol.AMQConstant;
import org.apache.qpid.server.AMQChannel;
import org.apache.qpid.server.logging.LogActor;
+import org.apache.qpid.server.logging.LogSubject;
+import org.apache.qpid.server.message.InboundMessage;
+import org.apache.qpid.server.protocol.AMQConnectionModel;
import org.apache.qpid.server.protocol.AMQSessionModel;
import org.apache.qpid.server.queue.AMQQueue;
import org.apache.qpid.server.queue.QueueEntry;
import org.apache.qpid.server.queue.QueueEntry.SubscriptionAcquiredState;
+import org.apache.qpid.server.stats.StatisticsCounter;
import java.util.ArrayList;
import java.util.List;
+import java.util.UUID;
import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
@@ -154,7 +160,7 @@ public class MockSubscription implements
public AMQSessionModel getSessionModel()
{
- return null;
+ return new MockSessionModel();
}
public boolean trySendLock()
@@ -315,4 +321,248 @@ public class MockSubscription implements
{
_isActive = isActive;
}
+
+ private static class MockSessionModel implements AMQSessionModel
+ {
+
+ @Override
+ public int compareTo(AMQSessionModel o)
+ {
+ return 0;
+ }
+
+ @Override
+ public UUID getId()
+ {
+ return null;
+ }
+
+ @Override
+ public AMQConnectionModel getConnectionModel()
+ {
+ return new MockConnectionModel();
+ }
+
+ @Override
+ public String getClientID()
+ {
+ return null;
+ }
+
+ @Override
+ public void close() throws AMQException
+ {
+
+ }
+
+ @Override
+ public LogSubject getLogSubject()
+ {
+ return null;
+ }
+
+ @Override
+ public void checkTransactionStatus(long openWarn, long openClose,
+ long idleWarn, long idleClose) throws AMQException
+ {
+
+ }
+
+ @Override
+ public void block(AMQQueue queue)
+ {
+
+ }
+
+ @Override
+ public void unblock(AMQQueue queue)
+ {
+
+ }
+
+ @Override
+ public boolean onSameConnection(InboundMessage inbound)
+ {
+ return false;
+ }
+
+ @Override
+ public int getUnacknowledgedMessageCount()
+ {
+ return 0;
+ }
+
+ @Override
+ public Long getTxnCount()
+ {
+ return null;
+ }
+
+ @Override
+ public Long getTxnCommits()
+ {
+ return null;
+ }
+
+ @Override
+ public Long getTxnRejects()
+ {
+ return null;
+ }
+
+ @Override
+ public int getChannelId()
+ {
+ return 0;
+ }
+ }
+
+ private static class MockConnectionModel implements AMQConnectionModel
+ {
+ @Override
+ public void initialiseStatistics()
+ {
+
+ }
+
+ @Override
+ public void registerMessageReceived(long messageSize, long timestamp)
+ {
+
+ }
+
+ @Override
+ public void registerMessageDelivered(long messageSize)
+ {
+
+ }
+
+ @Override
+ public StatisticsCounter getMessageDeliveryStatistics()
+ {
+ return null;
+ }
+
+ @Override
+ public StatisticsCounter getMessageReceiptStatistics()
+ {
+ return null;
+ }
+
+ @Override
+ public StatisticsCounter getDataDeliveryStatistics()
+ {
+ return null;
+ }
+
+ @Override
+ public StatisticsCounter getDataReceiptStatistics()
+ {
+ return null;
+ }
+
+ @Override
+ public void resetStatistics()
+ {
+
+ }
+
+ @Override
+ public boolean isStatisticsEnabled()
+ {
+ return false;
+ }
+
+ @Override
+ public void setStatisticsEnabled(boolean enabled)
+ {
+
+ }
+
+ @Override
+ public UUID getId()
+ {
+ return null;
+ }
+
+ @Override
+ public void close(AMQConstant cause, String message)
+ throws AMQException
+ {
+
+ }
+
+ @Override
+ public void closeSession(AMQSessionModel session, AMQConstant cause,
+ String message) throws AMQException
+ {
+
+ }
+
+ @Override
+ public long getConnectionId()
+ {
+ return 0;
+ }
+
+ @Override
+ public List<AMQSessionModel> getSessionModels()
+ {
+ return null;
+ }
+
+ @Override
+ public LogSubject getLogSubject()
+ {
+ return null;
+ }
+
+ @Override
+ public String getUserName()
+ {
+ return null;
+ }
+
+ @Override
+ public boolean isSessionNameUnique(byte[] name)
+ {
+ return false;
+ }
+
+ @Override
+ public String getRemoteAddressString()
+ {
+ return "remoteAddress:1234";
+ }
+
+ @Override
+ public String getClientId()
+ {
+ return null;
+ }
+
+ @Override
+ public String getClientVersion()
+ {
+ return null;
+ }
+
+ @Override
+ public String getPrincipalAsString()
+ {
+ return null;
+ }
+
+ @Override
+ public long getSessionCountLimit()
+ {
+ return 0;
+ }
+
+ @Override
+ public long getLastIoTime()
+ {
+ return 0;
+ }
+ }
}
Modified: qpid/branches/java-config-and-management/qpid/java/systests/build.xml
URL: http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/systests/build.xml?rev=1328264&r1=1328263&r2=1328264&view=diff
==============================================================================
--- qpid/branches/java-config-and-management/qpid/java/systests/build.xml (original)
+++ qpid/branches/java-config-and-management/qpid/java/systests/build.xml Fri Apr 20 08:58:08 2012
@@ -27,7 +27,7 @@ nn - or more contributor license agreeme
</and>
</condition>
- <property name="module.depends" value="client management/common broker broker/test common amqp-1-0-common common/test jca ${systests.optional.depends}"/>
+ <property name="module.depends" value="client management/common broker broker/test common amqp-1-0-common common/test jca broker-plugins/management broker-plugins/jmx ${systests.optional.depends}"/>
<property name="module.test.src" location="src/main/java"/>
<property name="module.test.excludes"
value="**/DropInTest.java,**/TestClientControlledTest.java"/>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org