Author: kwall
Date: Thu Jun 28 10:17:05 2012
New Revision: 1354897
URL: http://svn.apache.org/viewvc?rev=1354897&view=rev
Log:
NO-JIRA: Moved the mBean focused system tests to broker-plugins/jmx module.
Renabled ManagementLoggingTest/ManagementActorLoggingTest and fixed SSL
management connections. ApplicationRegistry now sets a default actor early,
thus allowing plugins such as JMX to make use operational logging at startup
time. MBeanInvocationHandlerImpl now sets/removes a management actor around the
mbean invocation.
Added:
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/test/java/org/apache/qpid/systest/management/jmx/BrokerManagementTest.java
- copied, changed from r1354874,
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagedBrokerMBeanTest.java
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/test/java/org/apache/qpid/systest/management/jmx/ConnectionManagementTest.java
- copied, changed from r1354874,
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagedConnectionMBeanTest.java
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/test/java/org/apache/qpid/systest/management/jmx/ManagementActorLoggingTest.java
- copied, changed from r1354874,
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagementActorLoggingTest.java
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/test/java/org/apache/qpid/systest/management/jmx/ManagementLoggingTest.java
- copied, changed from r1354874,
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ManagementLoggingTest.java
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/test/java/org/apache/qpid/systest/management/jmx/QueueManagementTest.java
- copied, changed from r1354874,
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagedQueueMBeanTest.java
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/test/java/org/apache/qpid/systest/management/jmx/StatisticsTest.java
- copied, changed from r1354874,
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageStatisticsTest.java
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/server/stats/
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/server/stats/StatisticsReportingTest.java
- copied, changed from r1354874,
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageStatisticsReportingTest.java
Removed:
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagedBrokerMBeanTest.java
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagedConnectionMBeanTest.java
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagedQueueMBeanTest.java
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagementActorLoggingTest.java
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageStatisticsReportingTest.java
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageStatisticsTest.java
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ManagementLoggingTest.java
Modified:
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/MANIFEST.MF
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/build.xml
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/JMXActivator.java
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/MBeanInvocationHandlerImpl.java
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/OsgiSystemPackages.properties
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/systests/build.xml
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/BrokerClosesClientConnectionTest.java
qpid/branches/java-config-and-management/qpid/java/test-profiles/CPPExcludes
qpid/branches/java-config-and-management/qpid/java/test-profiles/Excludes
qpid/branches/java-config-and-management/qpid/java/test-profiles/JavaPre010Excludes
qpid/branches/java-config-and-management/qpid/java/test-profiles/JavaTransientExcludes
Modified:
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/MANIFEST.MF?rev=1354897&r1=1354896&r2=1354897&view=diff
==============================================================================
---
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/MANIFEST.MF
(original)
+++
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/MANIFEST.MF
Thu Jun 28 10:17:05 2012
@@ -59,6 +59,7 @@ Import-Package: org.apache.qpid,
javax.management.openmbean;version=1.0.0,
javax.security.auth.login;version=1.0.0,
javax.security.auth;version=1.0.0,
+ javax.rmi.ssl;version=1.0.0,
org.osgi.util.tracker;version=1.0.0,
org.osgi.framework;version=1.3
Export-Package: org.apache.qpid.server.jmx;uses:="org.osgi.framework"
Modified:
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/build.xml
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/build.xml?rev=1354897&r1=1354896&r2=1354897&view=diff
==============================================================================
---
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/build.xml
(original)
+++
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/build.xml
Thu Jun 28 10:17:05 2012
@@ -17,8 +17,22 @@
- under the License.
-->
<project name="Qpid Broker-Plugins JMX" default="build">
+
+ <condition property="systests.optional.depends" value="bdbstore" else="">
+ <or>
+ <and>
+ <contains string="${modules.opt}" substring="bdbstore"/>
+ <contains string="${profile}" substring="bdb"/>
+ </and>
+ <and>
+ <istrue value="${optional}"/>
+ <contains string="${profile}" substring="bdb"/>
+ </and>
+ </or>
+ </condition>
+
<property name="module.depends" value="common broker broker-plugins
broker-plugins-jmx management/common" />
- <property name="module.test.depends" value="systests test broker/test
common/test management/common client" />
+ <property name="module.test.depends" value="systests test broker/test
common/test management/common client ${systests.optional.depends}" />
<property name="module.manifest" value="MANIFEST.MF" />
<property name="module.plugin" value="true" />
Modified:
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/JMXActivator.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/JMXActivator.java?rev=1354897&r1=1354896&r2=1354897&view=diff
==============================================================================
---
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/JMXActivator.java
(original)
+++
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/JMXActivator.java
Thu Jun 28 10:17:05 2012
@@ -35,7 +35,6 @@ public class JMXActivator implements Bu
{
private static final Logger LOGGER = Logger.getLogger(JMXActivator.class);
-
private String _bundleName;
private JMXService _jmxService;
@@ -49,10 +48,9 @@ public class JMXActivator implements Bu
if (jmxManagementEnabled)
{
_jmxService = new JMXService();
- _jmxService.start();
+ startJmsService(_jmxService);
_bundleName = ctx.getBundle().getSymbolicName();
- LOGGER.info("Registering jmx plugin: " + _bundleName);
_registeredServices = registerServices(ctx);
}
@@ -68,7 +66,10 @@ public class JMXActivator implements Bu
{
if (_jmxService != null)
{
- LOGGER.info("Stopping jmx plugin: " + _bundleName);
+ if (LOGGER.isInfoEnabled())
+ {
+ LOGGER.info("Stopping jmx plugin: " + _bundleName);
+ }
_jmxService.close();
}
@@ -87,6 +88,11 @@ public class JMXActivator implements Bu
private List<ServiceRegistration> registerServices(BundleContext ctx)
{
+ if (LOGGER.isInfoEnabled())
+ {
+ LOGGER.info("Registering jmx plugin: " + _bundleName);
+ }
+
List<ServiceRegistration> serviceRegistrations = new
ArrayList<ServiceRegistration>();
ServiceRegistration jmxServiceRegistration =
ctx.registerService(JMXService.class.getName(), _jmxService, null);
@@ -97,6 +103,28 @@ public class JMXActivator implements Bu
return serviceRegistrations;
}
+ private void startJmsService(JMXService jmxService) throws Exception
+ {
+ if (LOGGER.isInfoEnabled())
+ {
+ LOGGER.info("Starting JMX service");
+ }
+ boolean startedSuccessfully = false;
+ try
+ {
+ jmxService.start();
+ startedSuccessfully = true;
+ }
+ finally
+ {
+ if (!startedSuccessfully)
+ {
+ LOGGER.error("JMX failed to start normally, closing service");
+ jmxService.close();
+ }
+ }
+ }
+
private void unregisterServices()
{
for (Iterator<ServiceRegistration> iterator =
_registeredServices.iterator(); iterator.hasNext();)
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=1354897&r1=1354896&r2=1354897&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
Thu Jun 28 10:17:05 2012
@@ -38,9 +38,6 @@ import org.apache.qpid.server.jmx.mbeans
import org.apache.qpid.server.jmx.mbeans.ServerInformationMBean;
import org.apache.qpid.server.jmx.mbeans.Shutdown;
import org.apache.qpid.server.jmx.mbeans.VirtualHostMBean;
-import org.apache.qpid.server.logging.SystemOutMessageLogger;
-import org.apache.qpid.server.logging.actors.AbstractActor;
-import org.apache.qpid.server.logging.actors.CurrentActor;
import org.apache.qpid.server.model.Broker;
import org.apache.qpid.server.model.ConfigurationChangeListener;
import org.apache.qpid.server.model.ConfiguredObject;
@@ -66,17 +63,6 @@ public class JMXService implements Confi
public JMXService() throws AMQException, JMException
{
- // TODO - logging actor
- CurrentActor.set(new AbstractActor(new SystemOutMessageLogger())
- {
-
- @Override
- public String getLogMessage()
- {
- return "[JMX Service]";
- }
- });
-
_broker = ApplicationRegistry.getInstance().getBroker();
_objectRegistry = new JMXManagedObjectRegistry();
Modified:
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/MBeanInvocationHandlerImpl.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/MBeanInvocationHandlerImpl.java?rev=1354897&r1=1354896&r2=1354897&view=diff
==============================================================================
---
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/MBeanInvocationHandlerImpl.java
(original)
+++
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/MBeanInvocationHandlerImpl.java
Thu Jun 28 10:17:05 2012
@@ -22,6 +22,7 @@ package org.apache.qpid.server.jmx;
import org.apache.log4j.Logger;
+import org.apache.qpid.server.logging.actors.CurrentActor;
import org.apache.qpid.server.logging.actors.ManagementActor;
import org.apache.qpid.server.logging.messages.ManagementConsoleMessages;
import org.apache.qpid.server.registry.ApplicationRegistry;
@@ -199,8 +200,7 @@ public class MBeanInvocationHandlerImpl
try
{
- // Actually invoke the method
- return method.invoke(_mbs, args);
+ return doInvokeWrappingWithManagementActor(method, args);
}
finally
{
@@ -216,6 +216,21 @@ public class MBeanInvocationHandlerImpl
}
}
+ private Object doInvokeWrappingWithManagementActor(Method method,
+ Object[] args) throws IllegalAccessException,
+ InvocationTargetException
+ {
+ try
+ {
+ CurrentActor.set(_logActor);
+ return method.invoke(_mbs, args);
+ }
+ finally
+ {
+ CurrentActor.remove();
+ }
+ }
+
private String getType(Method method, Object[] args)
{
if (args[0] instanceof ObjectName)
Copied:
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/test/java/org/apache/qpid/systest/management/jmx/BrokerManagementTest.java
(from r1354874,
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagedBrokerMBeanTest.java)
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/test/java/org/apache/qpid/systest/management/jmx/BrokerManagementTest.java?p2=qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/test/java/org/apache/qpid/systest/management/jmx/BrokerManagementTest.java&p1=qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagedBrokerMBeanTest.java&r1=1354874&r2=1354897&rev=1354897&view=diff
==============================================================================
---
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagedBrokerMBeanTest.java
(original)
+++
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/test/java/org/apache/qpid/systest/management/jmx/BrokerManagementTest.java
Thu Jun 28 10:17:05 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.qpid.management.jmx;
+package org.apache.qpid.systest.management.jmx;
import org.apache.qpid.exchange.ExchangeDefaults;
import org.apache.qpid.management.common.mbeans.ManagedBroker;
@@ -31,7 +31,7 @@ import javax.management.ObjectName;
* Tests the JMX API for the Managed Broker.
*
*/
-public class ManagedBrokerMBeanTest extends QpidBrokerTestCase
+public class BrokerManagementTest extends QpidBrokerTestCase
{
/**
* Test virtual host
Copied:
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/test/java/org/apache/qpid/systest/management/jmx/ConnectionManagementTest.java
(from r1354874,
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagedConnectionMBeanTest.java)
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/test/java/org/apache/qpid/systest/management/jmx/ConnectionManagementTest.java?p2=qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/test/java/org/apache/qpid/systest/management/jmx/ConnectionManagementTest.java&p1=qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagedConnectionMBeanTest.java&r1=1354874&r2=1354897&rev=1354897&view=diff
==============================================================================
---
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagedConnectionMBeanTest.java
(original)
+++
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/test/java/org/apache/qpid/systest/management/jmx/ConnectionManagementTest.java
Thu Jun 28 10:17:05 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.qpid.management.jmx;
+package org.apache.qpid.systest.management.jmx;
import java.io.IOException;
import java.util.Date;
@@ -42,7 +42,7 @@ import org.apache.qpid.management.common
import org.apache.qpid.test.utils.JMXTestUtils;
import org.apache.qpid.test.utils.QpidBrokerTestCase;
-public class ManagedConnectionMBeanTest extends QpidBrokerTestCase
+public class ConnectionManagementTest extends QpidBrokerTestCase
{
private static final String VIRTUAL_HOST_NAME = "test";
Copied:
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/test/java/org/apache/qpid/systest/management/jmx/ManagementActorLoggingTest.java
(from r1354874,
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagementActorLoggingTest.java)
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/test/java/org/apache/qpid/systest/management/jmx/ManagementActorLoggingTest.java?p2=qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/test/java/org/apache/qpid/systest/management/jmx/ManagementActorLoggingTest.java&p1=qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagementActorLoggingTest.java&r1=1354874&r2=1354897&rev=1354897&view=diff
==============================================================================
---
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagementActorLoggingTest.java
(original)
+++
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/test/java/org/apache/qpid/systest/management/jmx/ManagementActorLoggingTest.java
Thu Jun 28 10:17:05 2012
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpid.management.jmx;
+package org.apache.qpid.systest.management.jmx;
import org.apache.qpid.management.common.mbeans.ManagedBroker;
import org.apache.qpid.management.common.mbeans.ManagedConnection;
Copied:
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/test/java/org/apache/qpid/systest/management/jmx/ManagementLoggingTest.java
(from r1354874,
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ManagementLoggingTest.java)
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/test/java/org/apache/qpid/systest/management/jmx/ManagementLoggingTest.java?p2=qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/test/java/org/apache/qpid/systest/management/jmx/ManagementLoggingTest.java&p1=qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ManagementLoggingTest.java&r1=1354874&r2=1354897&rev=1354897&view=diff
==============================================================================
---
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/server/logging/ManagementLoggingTest.java
(original)
+++
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/test/java/org/apache/qpid/systest/management/jmx/ManagementLoggingTest.java
Thu Jun 28 10:17:05 2012
@@ -18,10 +18,11 @@
* under the License.
*
*/
-package org.apache.qpid.server.logging;
+package org.apache.qpid.systest.management.jmx;
import org.apache.qpid.server.configuration.ServerConfiguration;
+import org.apache.qpid.server.logging.AbstractTestLogging;
import org.apache.qpid.test.utils.JMXTestUtils;
import org.apache.qpid.util.LogMonitor;
@@ -177,7 +178,7 @@ public class ManagementLoggingTest exten
if (isJavaBroker())
{
startBrokerAndCreateMonitor(true, false);
-
+
List<String> results = waitAndFindMatches("MNG-1002");
// Validation
Copied:
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/test/java/org/apache/qpid/systest/management/jmx/QueueManagementTest.java
(from r1354874,
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagedQueueMBeanTest.java)
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/test/java/org/apache/qpid/systest/management/jmx/QueueManagementTest.java?p2=qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/test/java/org/apache/qpid/systest/management/jmx/QueueManagementTest.java&p1=qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagedQueueMBeanTest.java&r1=1354874&r2=1354897&rev=1354897&view=diff
==============================================================================
---
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/ManagedQueueMBeanTest.java
(original)
+++
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/test/java/org/apache/qpid/systest/management/jmx/QueueManagementTest.java
Thu Jun 28 10:17:05 2012
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.qpid.management.jmx;
+package org.apache.qpid.systest.management.jmx;
import org.apache.commons.lang.time.FastDateFormat;
@@ -64,10 +64,10 @@ import java.util.concurrent.atomic.Atomi
* Tests the JMX API for the Managed Queue.
*
*/
-public class ManagedQueueMBeanTest extends QpidBrokerTestCase
+public class QueueManagementTest extends QpidBrokerTestCase
{
- private static final Logger LOGGER =
Logger.getLogger(ManagedQueueMBeanTest.class);
+ private static final Logger LOGGER =
Logger.getLogger(QueueManagementTest.class);
private static final String VIRTUAL_HOST = "test";
private static final String TEST_QUEUE_DESCRIPTION = "my description";
Copied:
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/test/java/org/apache/qpid/systest/management/jmx/StatisticsTest.java
(from r1354874,
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageStatisticsTest.java)
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/test/java/org/apache/qpid/systest/management/jmx/StatisticsTest.java?p2=qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/test/java/org/apache/qpid/systest/management/jmx/StatisticsTest.java&p1=qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageStatisticsTest.java&r1=1354874&r2=1354897&rev=1354897&view=diff
==============================================================================
---
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageStatisticsTest.java
(original)
+++
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/test/java/org/apache/qpid/systest/management/jmx/StatisticsTest.java
Thu Jun 28 10:17:05 2012
@@ -17,7 +17,7 @@
* under the License.
*
*/
-package org.apache.qpid.management.jmx;
+package org.apache.qpid.systest.management.jmx;
import java.util.List;
@@ -34,7 +34,7 @@ import org.apache.qpid.management.common
import org.apache.qpid.test.utils.JMXTestUtils;
import org.apache.qpid.test.utils.QpidBrokerTestCase;
-public class MessageStatisticsTest extends QpidBrokerTestCase
+public class StatisticsTest extends QpidBrokerTestCase
{
private static final String TEST_USER = "admin";
private static final String TEST_PASSWORD = "admin";
@@ -160,7 +160,7 @@ public class MessageStatisticsTest exten
final MessageConsumer consumer = session.createConsumer(queue);
for (int i = 0 ; i < numberOfMessages ; i++)
{
- assertNotNull("an expected message was not recieved",
consumer.receive(1500));
+ assertNotNull("an expected message was not received",
consumer.receive(1500));
}
session.commit();
consumer.close();
Modified:
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/OsgiSystemPackages.properties
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/OsgiSystemPackages.properties?rev=1354897&r1=1354896&r2=1354897&view=diff
==============================================================================
---
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/OsgiSystemPackages.properties
(original)
+++
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/OsgiSystemPackages.properties
Thu Jun 28 10:17:05 2012
@@ -47,6 +47,8 @@ javax.security.auth.login=1.0.0
javax.security.sasl=1.0.0
javax.security=1.0.0
+javax.rmi.ssl=1.0.0
+
org.xml.sax=1.0.0
org.xml.sax.helpers=1.0.0
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=1354897&r1=1354896&r2=1354897&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
Thu Jun 28 10:17:05 2012
@@ -287,7 +287,9 @@ public abstract class ApplicationRegistr
RootMessageLogger[] messageLoggers = {new SystemOutMessageLogger(),
_rootMessageLogger};
_startupMessageLogger = new
CompositeStartupMessageLogger(messageLoggers);
- CurrentActor.set(new BrokerActor(_startupMessageLogger));
+ BrokerActor actor = new BrokerActor(_startupMessageLogger);
+ CurrentActor.setDefault(actor);
+ CurrentActor.set(actor);
try
{
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=1354897&r1=1354896&r2=1354897&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 Thu
Jun 28 10:17:05 2012
@@ -32,7 +32,7 @@ nn - or more contributor license agreeme
</or>
</condition>
- <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.depends" value="client management/common broker
broker/test common amqp-1-0-common common/test jca broker-plugins/management
${systests.optional.depends}"/>
<property name="module.test.src" location="src/main/java"/>
<property name="module.test.excludes"
value="**/DropInTest.java,**/TestClientControlledTest.java"/>
Copied:
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/server/stats/StatisticsReportingTest.java
(from r1354874,
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageStatisticsReportingTest.java)
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/server/stats/StatisticsReportingTest.java?p2=qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/server/stats/StatisticsReportingTest.java&p1=qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageStatisticsReportingTest.java&r1=1354874&r2=1354897&rev=1354897&view=diff
==============================================================================
---
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/management/jmx/MessageStatisticsReportingTest.java
(original)
+++
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/server/stats/StatisticsReportingTest.java
Thu Jun 28 10:17:05 2012
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpid.management.jmx;
+package org.apache.qpid.server.stats;
import org.apache.qpid.AMQException;
import org.apache.qpid.client.AMQConnection;
@@ -27,7 +27,6 @@ import org.apache.qpid.client.AMQQueue;
import org.apache.qpid.client.AMQSession;
import org.apache.qpid.exchange.ExchangeDefaults;
import org.apache.qpid.framing.AMQShortString;
-import org.apache.qpid.test.utils.JMXTestUtils;
import org.apache.qpid.test.utils.QpidBrokerTestCase;
import org.apache.qpid.util.LogMonitor;
@@ -41,14 +40,14 @@ import javax.jms.Session;
import javax.jms.TextMessage;
/**
- * Test generation of message statistics reporting.
+ * Test generation of message/data statistics reporting and the ability
+ * to control from the configuration file.
*/
-public class MessageStatisticsReportingTest extends QpidBrokerTestCase
+public class StatisticsReportingTest extends QpidBrokerTestCase
{
protected LogMonitor _monitor;
protected static final String USER = "admin";
- protected JMXTestUtils _jmxUtils;
protected Connection _test, _dev, _local;
protected String _queueName = "statistics";
protected Destination _queue;
@@ -57,9 +56,6 @@ public class MessageStatisticsReportingT
@Override
public void setUp() throws Exception
{
- _jmxUtils = new JMXTestUtils(this, USER, USER);
- _jmxUtils.setUp();
-
setConfigurationProperty("statistics.generation.broker", "true");
setConfigurationProperty("statistics.generation.virtualhosts", "true");
@@ -81,14 +77,11 @@ public class MessageStatisticsReportingT
_dev.start();
_local.start();
- _jmxUtils.open();
}
@Override
public void tearDown() throws Exception
{
- _jmxUtils.close();
-
_test.close();
_dev.close();
_local.close();
@@ -104,14 +97,14 @@ public class MessageStatisticsReportingT
sendUsing(_test, 10, 100);
sendUsing(_dev, 20, 100);
sendUsing(_local, 15, 100);
-
+
Thread.sleep(10 * 1000); // 15s
-
+
List<String> brokerStatsData = _monitor.findMatches("BRK-1008");
List<String> brokerStatsMessages = _monitor.findMatches("BRK-1009");
List<String> vhostStatsData = _monitor.findMatches("VHT-1003");
List<String> vhostStatsMessages = _monitor.findMatches("VHT-1004");
-
+
assertEquals("Incorrect number of broker data stats log messages", 2,
brokerStatsData.size());
assertEquals("Incorrect number of broker message stats log messages",
2, brokerStatsMessages.size());
assertEquals("Incorrect number of virtualhost data stats log
messages", 6, vhostStatsData.size());
@@ -126,14 +119,14 @@ public class MessageStatisticsReportingT
sendUsing(_test, 10, 100);
sendUsing(_dev, 20, 100);
sendUsing(_local, 15, 100);
-
+
Thread.sleep(10 * 1000); // 15s
-
+
List<String> brokerStatsData = _monitor.findMatches("BRK-1008");
List<String> brokerStatsMessages = _monitor.findMatches("BRK-1009");
List<String> vhostStatsData = _monitor.findMatches("VHT-1003");
List<String> vhostStatsMessages = _monitor.findMatches("VHT-1004");
-
+
assertEquals("Incorrect number of broker data stats log messages", 0,
brokerStatsData.size());
assertEquals("Incorrect number of broker message stats log messages",
0, brokerStatsMessages.size());
assertEquals("Incorrect number of virtualhost data stats log
messages", 0, vhostStatsData.size());
Modified:
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/BrokerClosesClientConnectionTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/BrokerClosesClientConnectionTest.java?rev=1354897&r1=1354896&r2=1354897&view=diff
==============================================================================
---
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/BrokerClosesClientConnectionTest.java
(original)
+++
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/test/unit/client/connection/BrokerClosesClientConnectionTest.java
Thu Jun 28 10:17:05 2012
@@ -26,7 +26,6 @@ import java.util.concurrent.TimeUnit;
import org.apache.qpid.AMQConnectionClosedException;
import org.apache.qpid.AMQDisconnectedException;
import org.apache.qpid.client.AMQConnection;
-import org.apache.qpid.management.jmx.ManagedConnectionMBeanTest;
import org.apache.qpid.test.utils.QpidBrokerTestCase;
import org.apache.qpid.transport.ConnectionException;
Modified:
qpid/branches/java-config-and-management/qpid/java/test-profiles/CPPExcludes
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/test-profiles/CPPExcludes?rev=1354897&r1=1354896&r2=1354897&view=diff
==============================================================================
---
qpid/branches/java-config-and-management/qpid/java/test-profiles/CPPExcludes
(original)
+++
qpid/branches/java-config-and-management/qpid/java/test-profiles/CPPExcludes
Thu Jun 28 10:17:05 2012
@@ -101,7 +101,6 @@ org.apache.qpid.server.logging.subjects.
org.apache.qpid.server.logging.actors.*
// CPP Broker does not have a JMX interface to test
-org.apache.qpid.management.jmx.*
org.apache.qpid.server.jmx.mbeans.*
org.apache.qpid.systest.management.jmx.*
@@ -157,8 +156,6 @@ org.apache.qpid.test.unit.transacted.Tra
org.apache.qpid.test.unit.transacted.TransactionTimeoutTest#*
// Java broker only
-org.apache.qpid.server.logging.management.LoggingManagementMBeanTest#*
-org.apache.qpid.server.management.AMQUserManagementMBeanTest#*
org.apache.qpid.server.SupportedProtocolVersionsTest#*
Modified:
qpid/branches/java-config-and-management/qpid/java/test-profiles/Excludes
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/test-profiles/Excludes?rev=1354897&r1=1354896&r2=1354897&view=diff
==============================================================================
--- qpid/branches/java-config-and-management/qpid/java/test-profiles/Excludes
(original)
+++ qpid/branches/java-config-and-management/qpid/java/test-profiles/Excludes
Thu Jun 28 10:17:05 2012
@@ -38,8 +38,3 @@ org.apache.qpid.systest.disttest.control
org.apache.qpid.systest.disttest.controllerandclient.*
org.apache.qpid.systest.disttest.endtoend.*
-
-//Temp Excludes for branch
-org.apache.qpid.management.jmx.ManagementActorLoggingTest#*
-# Expects management log messages in SystemOut that arent present anymore due
to move to plugin
-org.apache.qpid.server.logging.ManagementLoggingTest#*
Modified:
qpid/branches/java-config-and-management/qpid/java/test-profiles/JavaPre010Excludes
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/test-profiles/JavaPre010Excludes?rev=1354897&r1=1354896&r2=1354897&view=diff
==============================================================================
---
qpid/branches/java-config-and-management/qpid/java/test-profiles/JavaPre010Excludes
(original)
+++
qpid/branches/java-config-and-management/qpid/java/test-profiles/JavaPre010Excludes
Thu Jun 28 10:17:05 2012
@@ -71,7 +71,7 @@ org.apache.qpid.ra.QpidRAConnectionTest#
org.apache.qpid.ra.QpidRAXAResourceTest#*
// These tests rely on new address syntax
-org.apache.qpid.management.jmx.ManagedQueueMBeanTest#testGetSetAlternateExchange
-org.apache.qpid.management.jmx.ManagedQueueMBeanTest#testRemoveAlternateExchange
-org.apache.qpid.management.jmx.ManagedQueueMBeanTest#testAlternateExchangeSurvivesRestart
+org.apache.qpid.systest.management.jmx.QueueManagementTest#testGetSetAlternateExchange
+org.apache.qpid.systest.management.jmx.QueueManagementTest#testRemoveAlternateExchange
+org.apache.qpid.systest.management.jmx.QueueManagementTest#testAlternateExchangeSurvivesRestart
Modified:
qpid/branches/java-config-and-management/qpid/java/test-profiles/JavaTransientExcludes
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/test-profiles/JavaTransientExcludes?rev=1354897&r1=1354896&r2=1354897&view=diff
==============================================================================
---
qpid/branches/java-config-and-management/qpid/java/test-profiles/JavaTransientExcludes
(original)
+++
qpid/branches/java-config-and-management/qpid/java/test-profiles/JavaTransientExcludes
Thu Jun 28 10:17:05 2012
@@ -43,5 +43,5 @@ org.apache.qpid.server.store.berkeleydb.
org.apache.qpid.server.store.DurableConfigurationStoreTest#*
-org.apache.qpid.management.jmx.ManagedQueueMBeanTest#testAlternateExchangeSurvivesRestart
-org.apache.qpid.management.jmx.ManagedQueueMBeanTest#testQueueDescriptionSurvivesRestart
+org.apache.qpid.systest.management.jmx.QueueManagementTest#testAlternateExchangeSurvivesRestart
+org.apache.qpid.systest.management.jmx.QueueManagementTest#testQueueDescriptionSurvivesRestart
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
