Author: kwall
Date: Fri Jun 15 11:15:07 2012
New Revision: 1350577
URL: http://svn.apache.org/viewvc?rev=1350577&view=rev
Log:
NO-JIRA: Remove remaining dead JMX implementation from beneath /broker; remove
old shutdown plug; remove dependencies on log4jmbean
Added:
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/MBeanInvocationHandlerImpl.java
- copied, changed from r1350312,
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanInvocationHandlerImpl.java
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/LoggingManagementMBeanTest.java
- copied, changed from r1350312,
qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/management/LoggingManagementMBeanTest.java
Removed:
qpid/branches/java-config-and-management/qpid/java/broker-plugins/experimental/shutdown/MANIFEST.MF
qpid/branches/java-config-and-management/qpid/java/broker-plugins/experimental/shutdown/build.xml
qpid/branches/java-config-and-management/qpid/java/broker-plugins/experimental/shutdown/src/main/java/org/apache/qpid/shutdown/Activator.java
qpid/branches/java-config-and-management/qpid/java/broker-plugins/experimental/shutdown/src/main/java/org/apache/qpid/shutdown/Shutdown.java
qpid/branches/java-config-and-management/qpid/java/broker-plugins/experimental/shutdown/src/main/java/org/apache/qpid/shutdown/ShutdownMBean.java
qpid/branches/java-config-and-management/qpid/java/broker-plugins/experimental/shutdown/src/main/java/shutdown.bnd
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/management/AMQManagedObject.java
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/management/DefaultManagedObject.java
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/management/LoggingManagementMBean.java
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanIntrospector.java
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanInvocationHandlerImpl.java
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/management/Managable.java
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ManagedObject.java
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ManagedObjectRegistry.java
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/management/NoopManagedObjectRegistry.java
qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/log4j/xml/QpidLog4JConfiguratorTest.java
qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/management/LoggingManagementMBeanTest.java
Modified:
qpid/branches/java-config-and-management/qpid/java/broker-plugins/access-control/MANIFEST.MF
qpid/branches/java-config-and-management/qpid/java/broker-plugins/firewall/MANIFEST.MF
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/MANIFEST.MF
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagedObjectRegistry.java
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/Shutdown.java
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/UserManagementMBean.java
qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/MANIFEST.MF
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/log4j/xml/QpidLog4JConfigurator.java
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/Broker.java
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.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/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/virtualhost/VirtualHost.java
qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java
qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/ExternalACLJMXTest.java
Modified:
qpid/branches/java-config-and-management/qpid/java/broker-plugins/access-control/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker-plugins/access-control/MANIFEST.MF?rev=1350577&r1=1350576&r2=1350577&view=diff
==============================================================================
---
qpid/branches/java-config-and-management/qpid/java/broker-plugins/access-control/MANIFEST.MF
(original)
+++
qpid/branches/java-config-and-management/qpid/java/broker-plugins/access-control/MANIFEST.MF
Fri Jun 15 11:15:07 2012
@@ -17,7 +17,6 @@ Import-Package: org.apache.qpid,
org.apache.qpid.server.configuration,
org.apache.qpid.server.configuration.plugins,
org.apache.qpid.server.exchange,
- org.apache.qpid.server.management,
org.apache.qpid.server.logging,
org.apache.qpid.server.logging.actors,
org.apache.qpid.server.logging.subjects,
Modified:
qpid/branches/java-config-and-management/qpid/java/broker-plugins/firewall/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker-plugins/firewall/MANIFEST.MF?rev=1350577&r1=1350576&r2=1350577&view=diff
==============================================================================
---
qpid/branches/java-config-and-management/qpid/java/broker-plugins/firewall/MANIFEST.MF
(original)
+++
qpid/branches/java-config-and-management/qpid/java/broker-plugins/firewall/MANIFEST.MF
Fri Jun 15 11:15:07 2012
@@ -16,7 +16,6 @@ Import-Package: org.apache.qpid,
org.apache.qpid.server.configuration,
org.apache.qpid.server.configuration.plugins,
org.apache.qpid.server.exchange,
- org.apache.qpid.server.management,
org.apache.qpid.server.plugins,
org.apache.qpid.server.queue,
org.apache.qpid.server.security,
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=1350577&r1=1350576&r2=1350577&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
Fri Jun 15 11:15:07 2012
@@ -32,7 +32,6 @@ Import-Package: org.apache.qpid,
org.apache.qpid.server.configuration,
org.apache.qpid.server.configuration.plugins,
org.apache.qpid.server.connection,
- org.apache.qpid.server.management,
org.apache.qpid.server.plugins,
org.apache.qpid.server.protocol,
org.apache.qpid.server.queue,
@@ -59,8 +58,7 @@ Import-Package: org.apache.qpid,
javax.management.monitor;version=1.0.0,
javax.management.openmbean;version=1.0.0,
javax.security.auth.login;version=1.0.0,
+ javax.security.auth;version=1.0.0,
org.osgi.util.tracker;version=1.0.0,
org.osgi.framework;version=1.3
-Private-Package: org.apache.qpid.server.management.plugin.impl
-Export-Package: org.apache.qpid.server.jmx,
- org.apache.qpid.server.management.plugin;uses:="org.osgi.framework"
+Export-Package: org.apache.qpid.server.jmx;uses:="org.osgi.framework"
Modified:
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagedObjectRegistry.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/JMXManagedObjectRegistry.java?rev=1350577&r1=1350576&r2=1350577&view=diff
==============================================================================
---
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagedObjectRegistry.java
(original)
+++
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagedObjectRegistry.java
Fri Jun 15 11:15:07 2012
@@ -25,7 +25,6 @@ import org.apache.log4j.Logger;
import org.apache.qpid.AMQException;
import org.apache.qpid.server.logging.actors.CurrentActor;
import org.apache.qpid.server.logging.messages.ManagementConsoleMessages;
-import org.apache.qpid.server.management.MBeanInvocationHandlerImpl;
import org.apache.qpid.server.registry.ApplicationRegistry;
import org.apache.qpid.server.registry.IApplicationRegistry;
Copied:
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/MBeanInvocationHandlerImpl.java
(from r1350312,
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/management/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?p2=qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/MBeanInvocationHandlerImpl.java&p1=qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanInvocationHandlerImpl.java&r1=1350312&r2=1350577&rev=1350577&view=diff
==============================================================================
---
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/management/MBeanInvocationHandlerImpl.java
(original)
+++
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/MBeanInvocationHandlerImpl.java
Fri Jun 15 11:15:07 2012
@@ -18,7 +18,7 @@
* under the License.
*
*/
-package org.apache.qpid.server.management;
+package org.apache.qpid.server.jmx;
import org.apache.log4j.Logger;
@@ -174,41 +174,41 @@ public class MBeanInvocationHandlerImpl
}
methodName = getMethodName(method, args);
- if (isAccessMethod(methodName) || impact ==
MBeanOperationInfo.INFO)
- {
- // Check for read-only method invocation
permission
+ if (isAccessMethod(methodName) || impact ==
MBeanOperationInfo.INFO)
+ {
+ // Check for read-only method invocation permission
if (!security.authoriseMethod(Operation.ACCESS, type,
methodName))
{
throw new SecurityException("Permission denied: Access " +
methodName);
}
- }
- else
- {
- // Check for setting properties permission
- if (!security.authoriseMethod(Operation.UPDATE,
type, methodName))
- {
- throw new SecurityException("Permission denied:
Update " + methodName);
- }
- }
-
- boolean oldAccessChecksDisabled = false;
- if(_managementRightsInferAllAccess)
- {
- oldAccessChecksDisabled =
SecurityManager.setAccessChecksDisabled(true);
- }
-
- try
- {
- // Actually invoke the method
- return method.invoke(_mbs, args);
- }
- finally
- {
- if(_managementRightsInferAllAccess)
- {
-
SecurityManager.setAccessChecksDisabled(oldAccessChecksDisabled);
- }
- }
+ }
+ else
+ {
+ // Check for setting properties permission
+ if (!security.authoriseMethod(Operation.UPDATE, type,
methodName))
+ {
+ throw new SecurityException("Permission denied: Update " +
methodName);
+ }
+ }
+
+ boolean oldAccessChecksDisabled = false;
+ if(_managementRightsInferAllAccess)
+ {
+ oldAccessChecksDisabled =
SecurityManager.setAccessChecksDisabled(true);
+ }
+
+ try
+ {
+ // Actually invoke the method
+ return method.invoke(_mbs, args);
+ }
+ finally
+ {
+ if(_managementRightsInferAllAccess)
+ {
+
SecurityManager.setAccessChecksDisabled(oldAccessChecksDisabled);
+ }
+ }
}
catch (InvocationTargetException e)
{
@@ -217,24 +217,24 @@ public class MBeanInvocationHandlerImpl
}
private String getType(Method method, Object[] args)
- {
- if (args[0] instanceof ObjectName)
- {
- ObjectName object = (ObjectName) args[0];
- String type = object.getKeyProperty("type");
-
- return type;
- }
- return null;
+ {
+ if (args[0] instanceof ObjectName)
+ {
+ ObjectName object = (ObjectName) args[0];
+ String type = object.getKeyProperty("type");
+
+ return type;
+ }
+ return null;
}
private String getVirtualHost(Method method, Object[] args)
- {
+ {
if (args[0] instanceof ObjectName)
{
ObjectName object = (ObjectName) args[0];
String vhost = object.getKeyProperty("VirtualHost");
-
+
if(vhost != null)
{
try
@@ -253,7 +253,7 @@ public class MBeanInvocationHandlerImpl
}
return null;
}
-
+
private String getMethodName(Method method, Object[] args)
{
String methodName = method.getName();
@@ -274,7 +274,7 @@ public class MBeanInvocationHandlerImpl
methodName = (String) args[1];
}
}
-
+
return methodName;
}
@@ -289,7 +289,7 @@ public class MBeanInvocationHandlerImpl
{
return -1;
}
-
+
try
{
//Get the impact attribute
Modified:
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/Shutdown.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/Shutdown.java?rev=1350577&r1=1350576&r2=1350577&view=diff
==============================================================================
---
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/Shutdown.java
(original)
+++
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/Shutdown.java
Fri Jun 15 11:15:07 2012
@@ -128,7 +128,7 @@ public class Shutdown extends DefaultMan
}
/**
- * @see
org.apache.qpid.server.management.ManagedObject#getObjectInstanceName()
+ * @see ManagedObject#getObjectInstanceName()
*/
public String getObjectInstanceName()
{
Modified:
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/UserManagementMBean.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/UserManagementMBean.java?rev=1350577&r1=1350576&r2=1350577&view=diff
==============================================================================
---
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/UserManagementMBean.java
(original)
+++
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/UserManagementMBean.java
Fri Jun 15 11:15:07 2012
@@ -29,7 +29,6 @@ import org.apache.qpid.server.jmx.AMQMan
import org.apache.qpid.server.jmx.ManagedObject;
import org.apache.qpid.server.jmx.ManagedObjectRegistry;
import
org.apache.qpid.server.model.PasswordCredentialManagingAuthenticationProvider;
-import org.apache.qpid.server.security.auth.database.PrincipalDatabase;
import javax.management.JMException;
import javax.management.openmbean.CompositeData;
Copied:
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/LoggingManagementMBeanTest.java
(from r1350312,
qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/management/LoggingManagementMBeanTest.java)
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/LoggingManagementMBeanTest.java?p2=qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/LoggingManagementMBeanTest.java&p1=qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/management/LoggingManagementMBeanTest.java&r1=1350312&r2=1350577&rev=1350577&view=diff
==============================================================================
---
qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/logging/management/LoggingManagementMBeanTest.java
(original)
+++
qpid/branches/java-config-and-management/qpid/java/broker-plugins/jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/LoggingManagementMBeanTest.java
Fri Jun 15 11:15:07 2012
@@ -14,16 +14,19 @@
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
- * under the License.
+ * under the License.
+ *
*
- *
*/
-package org.apache.qpid.server.logging.management;
+package org.apache.qpid.server.jmx.mbeans;
+
+import static org.mockito.Mockito.*;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
-import org.apache.qpid.server.management.LoggingManagementMBean;
+import org.apache.qpid.server.jmx.ManagedObject;
+import org.apache.qpid.server.jmx.ManagedObjectRegistry;
import org.apache.qpid.server.util.InternalBrokerBaseCase;
import static
org.apache.qpid.management.common.mbeans.LoggingManagement.LOGGER_LEVEL;
@@ -42,6 +45,7 @@ import java.util.Map;
public class LoggingManagementMBeanTest extends InternalBrokerBaseCase
{
+
private static final String TEST_LOGGER =
"LoggingManagementMBeanTestLogger";
private static final String TEST_LOGGER_CHILD1 =
"LoggingManagementMBeanTestLogger.child1";
private static final String TEST_LOGGER_CHILD2 =
"LoggingManagementMBeanTestLogger.child2";
@@ -54,13 +58,15 @@ public class LoggingManagementMBeanTest
private File _testConfigFile;
+ private ManagedObjectRegistry _registry =
mock(ManagedObjectRegistry.class);
+
@Override
public void setUp() throws Exception
{
super.setUp();
_testConfigFile = createTempTestLog4JConfig();
}
-
+
@Override
public void tearDown() throws Exception
{
@@ -69,9 +75,9 @@ public class LoggingManagementMBeanTest
{
oldTestConfigFile.delete();
}
-
+
_testConfigFile.delete();
-
+
super.tearDown();
}
@@ -90,7 +96,7 @@ public class LoggingManagementMBeanTest
writer.write("<!DOCTYPE log4j:configuration SYSTEM
\"log4j.dtd\">"+NEWLINE);
writer.write("<log4j:configuration
xmlns:log4j=\"http://jakarta.apache.org/log4j/\"; debug=\"null\" " +
-
"threshold=\"null\">"+NEWLINE);
+
"threshold=\"null\">"+NEWLINE);
writer.write(" <appender
class=\"org.apache.log4j.ConsoleAppender\" name=\"STDOUT\">"+NEWLINE);
writer.write(" <layout
class=\"org.apache.log4j.PatternLayout\">"+NEWLINE);
@@ -138,13 +144,13 @@ public class LoggingManagementMBeanTest
//******* Test Methods ******* //
-
+
public void testSetRuntimeLoggerLevel()
{
LoggingManagementMBean lm = null;
try
{
- lm = new LoggingManagementMBean(_testConfigFile.getAbsolutePath(),
0);
+ lm = new LoggingManagementMBean(_testConfigFile.getAbsolutePath(),
0, _registry);
}
catch (JMException e)
{
@@ -157,26 +163,26 @@ public class LoggingManagementMBeanTest
//create child1 test logger, check its *effective* level is the same
as the parent, "info"
Logger log1 = Logger.getLogger(TEST_LOGGER_CHILD1);
- assertTrue("Test logger's level was not the expected value",
+ assertTrue("Test logger's level was not the expected value",
log1.getEffectiveLevel().toString().equalsIgnoreCase("info"));
//now change its level to "warn"
assertTrue("Failed to set logger level",
lm.setRuntimeLoggerLevel(TEST_LOGGER_CHILD1, "warn"));
//check the change, see its actual level is "warn
- assertTrue("Test logger's level was not the expected value",
+ assertTrue("Test logger's level was not the expected value",
log1.getLevel().toString().equalsIgnoreCase("warn"));
//try an invalid level
assertFalse("Trying to set an invalid level succeded",
lm.setRuntimeLoggerLevel(TEST_LOGGER_CHILD1, "made.up.level"));
}
-
+
public void testSetRuntimeRootLoggerLevel()
{
LoggingManagementMBean lm = null;
try
{
- lm = new LoggingManagementMBean(_testConfigFile.getAbsolutePath(),
0);
+ lm = new LoggingManagementMBean(_testConfigFile.getAbsolutePath(),
0, _registry);
}
catch (JMException e)
{
@@ -184,27 +190,27 @@ public class LoggingManagementMBeanTest
}
Logger log = Logger.getRootLogger();
-
+
//get current root logger level
Level origLevel = log.getLevel();
-
+
//change level twice to ensure a new level is actually selected
-
+
//set root loggers level to info
assertTrue("Failed to set root logger level",
lm.setRuntimeRootLoggerLevel("debug"));
//check it is now actually info
Level currentLevel = log.getLevel();
assertTrue("Logger level was not expected value",
currentLevel.equals(Level.toLevel("debug")));
-
+
//try an invalid level
assertFalse("Trying to set an invalid level succeded",
lm.setRuntimeRootLoggerLevel("made.up.level"));
-
+
//set root loggers level to warn
assertTrue("Failed to set logger level",
lm.setRuntimeRootLoggerLevel("info"));
//check it is now actually warn
currentLevel = log.getLevel();
assertTrue("Logger level was not expected value",
currentLevel.equals(Level.toLevel("info")));
-
+
//restore original level
log.setLevel(origLevel);
}
@@ -214,7 +220,7 @@ public class LoggingManagementMBeanTest
LoggingManagementMBean lm = null;
try
{
- lm = new LoggingManagementMBean(_testConfigFile.getAbsolutePath(),
0);
+ lm = new LoggingManagementMBean(_testConfigFile.getAbsolutePath(),
0, _registry);
}
catch (JMException e)
{
@@ -222,18 +228,18 @@ public class LoggingManagementMBeanTest
}
Logger log = Logger.getRootLogger();
-
+
//get current root logger level
Level origLevel = log.getLevel();
-
+
//change level twice to ensure a new level is actually selected
-
+
//set root loggers level to debug
log.setLevel(Level.toLevel("debug"));
//check it is now actually debug
assertTrue("Logger level was not expected value",
lm.getRuntimeRootLoggerLevel().equalsIgnoreCase("debug"));
-
-
+
+
//set root loggers level to warn
log.setLevel(Level.toLevel("info"));
//check it is now actually warn
@@ -242,13 +248,13 @@ public class LoggingManagementMBeanTest
//restore original level
log.setLevel(origLevel);
}
-
+
public void testViewEffectiveRuntimeLoggerLevels()
{
LoggingManagementMBean lm = null;
try
{
- lm = new LoggingManagementMBean(_testConfigFile.getAbsolutePath(),
0);
+ lm = new LoggingManagementMBean(_testConfigFile.getAbsolutePath(),
0, _registry);
}
catch (JMException e)
{
@@ -258,7 +264,7 @@ public class LoggingManagementMBeanTest
//(re)create a parent test logger, set its level explicitly
Logger log = Logger.getLogger(TEST_LOGGER);
log.setLevel(Level.toLevel("info"));
-
+
//retrieve the current effective runtime logger level values
TabularDataSupport levels = (TabularDataSupport)
lm.viewEffectiveRuntimeLoggerLevels();
Collection<Object> records = levels.values();
@@ -268,13 +274,13 @@ public class LoggingManagementMBeanTest
CompositeData data = (CompositeData) o;
list.put(data.get(LOGGER_NAME).toString(),
data.get(LOGGER_LEVEL).toString());
}
-
+
//check child2 does not exist already
assertFalse("Did not expect this logger to exist already",
list.containsKey(TEST_LOGGER_CHILD2));
//create child2 test logger
Logger log2 = Logger.getLogger(TEST_LOGGER_CHILD2);
-
+
//retrieve the current effective runtime logger level values
levels = (TabularDataSupport) lm.viewEffectiveRuntimeLoggerLevels();
records = levels.values();
@@ -288,14 +294,14 @@ public class LoggingManagementMBeanTest
//verify the parent and child2 loggers are present in returned values
assertTrue(TEST_LOGGER + " logger was not in the returned list",
list.containsKey(TEST_LOGGER));
assertTrue(TEST_LOGGER_CHILD2 + " logger was not in the returned
list", list.containsKey(TEST_LOGGER_CHILD2));
-
+
//check child2's effective level is the same as the parent, "info"
- assertTrue("Test logger's level was not the expected value",
+ assertTrue("Test logger's level was not the expected value",
list.get(TEST_LOGGER_CHILD2).equalsIgnoreCase("info"));
//now change its level explicitly to "warn"
log2.setLevel(Level.toLevel("warn"));
-
+
//retrieve the current effective runtime logger level values
levels = (TabularDataSupport) lm.viewEffectiveRuntimeLoggerLevels();
records = levels.values();
@@ -307,7 +313,7 @@ public class LoggingManagementMBeanTest
}
//check child2's effective level is now "warn"
- assertTrue("Test logger's level was not the expected value",
+ assertTrue("Test logger's level was not the expected value",
list.get(TEST_LOGGER_CHILD2).equalsIgnoreCase("warn"));
}
@@ -316,7 +322,7 @@ public class LoggingManagementMBeanTest
LoggingManagementMBean lm =null;
try
{
- lm = new LoggingManagementMBean(_testConfigFile.getAbsolutePath(),
0);
+ lm = new LoggingManagementMBean(_testConfigFile.getAbsolutePath(),
0, _registry);
}
catch (JMException e)
{
@@ -379,13 +385,13 @@ public class LoggingManagementMBeanTest
assertTrue(TEST_CATEGORY_LEVEL + " logger's level was incorrect",
list.get(TEST_CATEGORY_LEVEL).equalsIgnoreCase("error"));
assertTrue(TEST_LOGGER_LEVEL + " logger's level was incorrect",
list.get(TEST_LOGGER_LEVEL).equalsIgnoreCase("trace"));
}
-
+
public void testGetAndSetConfigFileRootLoggerLevel() throws Exception
{
LoggingManagementMBean lm =null;
try
{
- lm = new LoggingManagementMBean(_testConfigFile.getAbsolutePath(),
0);
+ lm = new LoggingManagementMBean(_testConfigFile.getAbsolutePath(),
0, _registry);
}
catch (JMException e)
{
@@ -400,7 +406,7 @@ public class LoggingManagementMBeanTest
//try an invalid level
assertFalse("Use of an invalid RootLogger level was successfull",
lm.setConfigFileRootLoggerLevel("made.up.level"));
-
+
//change the level to warn
assertTrue("Failed to set new RootLogger level",
lm.setConfigFileRootLoggerLevel("warn"));
@@ -416,7 +422,7 @@ public class LoggingManagementMBeanTest
LoggingManagementMBean lm =null;
try
{
- lm = new LoggingManagementMBean(_testConfigFile.getAbsolutePath(),
5000);
+ lm = new LoggingManagementMBean(_testConfigFile.getAbsolutePath(),
5000, _registry);
}
catch (JMException e)
{
Modified:
qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/MANIFEST.MF
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/MANIFEST.MF?rev=1350577&r1=1350576&r2=1350577&view=diff
==============================================================================
---
qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/MANIFEST.MF
(original)
+++
qpid/branches/java-config-and-management/qpid/java/broker-plugins/management/MANIFEST.MF
Fri Jun 15 11:15:07 2012
@@ -27,7 +27,6 @@ Import-Package: org.apache.qpid,
org.apache.qpid.server.configuration,
org.apache.qpid.server.configuration.plugins,
org.apache.qpid.server.connection,
- org.apache.qpid.server.management,
org.apache.qpid.server.plugins,
org.apache.qpid.server.protocol,
org.apache.qpid.server.queue,
Modified:
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/log4j/xml/QpidLog4JConfigurator.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/log4j/xml/QpidLog4JConfigurator.java?rev=1350577&r1=1350576&r2=1350577&view=diff
==============================================================================
---
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/log4j/xml/QpidLog4JConfigurator.java
(original)
+++
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/log4j/xml/QpidLog4JConfigurator.java
Fri Jun 15 11:15:07 2012
@@ -22,7 +22,6 @@ package org.apache.log4j.xml;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
-import org.apache.qpid.server.management.LoggingManagementMBean;
import org.xml.sax.ErrorHandler;
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
@@ -64,7 +63,6 @@ public class QpidLog4JConfigurator
LOCK.lock();
parseXMLConfigFile(filename);
- checkLoggerLevels(filename);
DOMConfigurator.configure(filename);
@@ -83,7 +81,6 @@ public class QpidLog4JConfigurator
SAXException, IllegalLoggerLevelException
{
parseXMLConfigFile(filename);
- checkLoggerLevels(filename);
QpidLog4JXMLWatchdog watchdog = new QpidLog4JXMLWatchdog(filename);
watchdog.setDelay(delay);
@@ -199,23 +196,6 @@ public class QpidLog4JConfigurator
return;
}
- try
- {
- checkLoggerLevels(filename);
- }
- catch (Exception e)
- {
- //logger will be instantiated following first
configuration success, which has been pre-validated
- //and so the null check should never actually be required.
- if(_logger != null)
- {
- _logger.warn("Errors were found when validating the
logger level values in the " +
- "log4j XML configuration file. The new
configuration was not applied. " +
- "Correct the issues to prompt another update
attempt: " + e.getMessage());
- }
- return;
- }
-
//everything checked was ok, let the normal update process
proceed
super.doOnChange();
@@ -234,60 +214,7 @@ public class QpidLog4JConfigurator
}
}
-
- protected static void checkLoggerLevels(String filename) throws
IllegalLoggerLevelException, IOException
- {
- //check that the logger levels specified in the XML are actually valid
-
- try
- {
- LOCK.lock();
-
- //get the Logger levels to check
- Map<String, String> loggersLevels;
- loggersLevels =
LoggingManagementMBean.retrieveConfigFileLoggersLevels(filename);
- //add the RootLogger to the list too
- String rootLoggerlevelString =
LoggingManagementMBean.retrieveConfigFileRootLoggerLevel(filename);
- loggersLevels.put("Root", rootLoggerlevelString);
-
-
- for (Map.Entry<String, String> entry : loggersLevels.entrySet())
- {
- String loggerName = entry.getKey();
- String levelString = entry.getValue();
- //let log4j replace any properties in the string
- String log4jConfiguredString = domConfig.subst(levelString);
-
- if(log4jConfiguredString.equals("") && !
log4jConfiguredString.equals(levelString))
- {
- //log4j has returned an empty string but this isnt what we
gave it.
- //There may have been an undefined property. Unlike an
incorrect
- //literal value, we will allow this case to proceed, but
warn users.
-
- if(_logger != null)
- {
- _logger.warn("Unable to detect Level value from '" +
levelString
- +"' for logger '" + loggerName + "', Log4J
will default this to DEBUG");
- }
- else
- {
- System.err.println("Unable to detect Level value from
'" + levelString
- +"' for logger " + loggerName + ", Log4J will
default this to DEBUG");
- }
-
- continue;
- }
-
- checkLevel(loggerName,log4jConfiguredString);
- }
- }
- finally
- {
- LOCK.unlock();
- }
- }
-
private static void checkLevel(String loggerName, String levelString)
throws IllegalLoggerLevelException
{
if("null".equalsIgnoreCase(levelString) ||
"inherited".equalsIgnoreCase(levelString))
Modified:
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/Broker.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/Broker.java?rev=1350577&r1=1350576&r2=1350577&view=diff
==============================================================================
---
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/Broker.java
(original)
+++
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/Broker.java
Fri Jun 15 11:15:07 2012
@@ -37,7 +37,6 @@ import org.apache.qpid.server.logging.ac
import org.apache.qpid.server.logging.actors.CurrentActor;
import org.apache.qpid.server.logging.actors.GenericActor;
import org.apache.qpid.server.logging.messages.BrokerMessages;
-import org.apache.qpid.server.management.LoggingManagementMBean;
import org.apache.qpid.server.protocol.AmqpProtocolVersion;
import org.apache.qpid.server.protocol.MultiVersionProtocolEngineFactory;
import org.apache.qpid.server.registry.ApplicationRegistry;
@@ -129,8 +128,6 @@ public class Broker
try
{
- configureLoggingManagementMBean(logConfigFile,
options.getLogWatchFrequency());
-
Set<Integer> ports = new HashSet<Integer>(options.getPorts());
if(ports.isEmpty())
{
@@ -483,12 +480,6 @@ public class Broker
}
}
- private void configureLoggingManagementMBean(File logConfigFile, int
logWatchTime) throws Exception
- {
- LoggingManagementMBean blm = new
LoggingManagementMBean(logConfigFile.getPath(),logWatchTime);
-
- blm.register();
- }
private void addShutdownHook()
{
Modified:
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java?rev=1350577&r1=1350576&r2=1350577&view=diff
==============================================================================
---
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
(original)
+++
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/exchange/AbstractExchange.java
Fri Jun 15 11:15:07 2012
@@ -30,7 +30,6 @@ import org.apache.qpid.server.logging.Lo
import org.apache.qpid.server.logging.actors.CurrentActor;
import org.apache.qpid.server.logging.messages.ExchangeMessages;
import org.apache.qpid.server.logging.subjects.ExchangeLogSubject;
-import org.apache.qpid.server.management.Managable;
import org.apache.qpid.server.message.InboundMessage;
import org.apache.qpid.server.queue.AMQQueue;
import org.apache.qpid.server.queue.BaseQueue;
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=1350577&r1=1350576&r2=1350577&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
Fri Jun 15 11:15:07 2012
@@ -107,7 +107,6 @@ org.apache.qpid.server.logging.actors=0.
org.apache.qpid.server.logging.messages=0.0.0
org.apache.qpid.server.logging.subjects=0.0.0
org.apache.qpid.server.message=0.0.0
-org.apache.qpid.server.management=0.0.0
org.apache.qpid.server.persistent=0.0.0
org.apache.qpid.server.plugins=0.0.0
org.apache.qpid.server.protocol=0.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=1350577&r1=1350576&r2=1350577&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 Jun 15 11:15:07 2012
@@ -25,7 +25,6 @@ import org.apache.log4j.Logger;
import org.apache.qpid.server.logging.*;
import org.osgi.framework.BundleContext;
-import org.apache.qpid.AMQException;
import org.apache.qpid.common.Closeable;
import org.apache.qpid.common.QpidProperties;
import org.apache.qpid.qmf.QMFService;
@@ -41,8 +40,6 @@ import org.apache.qpid.server.logging.ac
import org.apache.qpid.server.logging.actors.CurrentActor;
import org.apache.qpid.server.logging.messages.BrokerMessages;
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;
@@ -81,8 +78,6 @@ public abstract class ApplicationRegistr
private final Map<InetSocketAddress, QpidAcceptor> _acceptors =
Collections.synchronizedMap(new HashMap<InetSocketAddress,
QpidAcceptor>());
- private ManagedObjectRegistry _managedObjectRegistry;
-
private IAuthenticationManagerRegistry _authenticationManagerRegistry;
private final VirtualHostRegistry _virtualHostRegistry = new
VirtualHostRegistry(this);
@@ -129,11 +124,6 @@ public abstract class ApplicationRegistr
}
}
- protected void setManagedObjectRegistry(ManagedObjectRegistry
managedObjectRegistry)
- {
- _managedObjectRegistry = managedObjectRegistry;
- }
-
protected void setSecurityManager(SecurityManager securityManager)
{
_securityManager = securityManager;
@@ -311,8 +301,6 @@ public abstract class ApplicationRegistr
_broker = new BrokerAdapter(this);
- initialiseManagedObjectRegistry();
-
configure();
_qmfService = new QMFService(getConfigStore(), this);
@@ -336,8 +324,6 @@ public abstract class ApplicationRegistr
}
_authManagerChangeListeners.clear();
}
-
- _managedObjectRegistry.start();
}
finally
{
@@ -372,11 +358,6 @@ public abstract class ApplicationRegistr
getVirtualHostRegistry().setDefaultVirtualHostName(_configuration.getDefaultVirtualHost());
}
- protected void initialiseManagedObjectRegistry() throws AMQException
- {
- _managedObjectRegistry = new NoopManagedObjectRegistry();
- }
-
public void initialiseStatisticsReporting()
{
long report = _configuration.getStatisticsReportingPeriod() * 1000; //
convert to ms
@@ -523,8 +504,6 @@ public abstract class ApplicationRegistr
close(_pluginManager);
- close(_managedObjectRegistry);
-
BrokerConfig broker = getBrokerConfig();
if(broker != null)
{
@@ -603,11 +582,6 @@ public abstract class ApplicationRegistr
return _securityManager;
}
- public ManagedObjectRegistry getManagedObjectRegistry()
- {
- return _managedObjectRegistry;
- }
-
@Override
public AuthenticationManager getAuthenticationManager(SocketAddress
address)
{
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=1350577&r1=1350576&r2=1350577&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 Jun 15 11:15:07 2012
@@ -25,7 +25,6 @@ import org.osgi.framework.BundleContext;
import org.apache.qpid.AMQException;
import org.apache.qpid.server.configuration.ServerConfiguration;
-import org.apache.qpid.server.management.NoopManagedObjectRegistry;
import java.io.File;
@@ -40,22 +39,4 @@ public class ConfigurationFileApplicatio
{
super(new ServerConfiguration(configurationURL), bundleContext);
}
-
- @Override
- protected void initialiseManagedObjectRegistry() throws AMQException
- {
- // TODO the following block was commented out to stop loading both
- // management implementations, this method should be removed as the
- // old management layer is extracted.
-
-// 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=1350577&r1=1350576&r2=1350577&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 Jun 15 11:15:07 2012
@@ -27,9 +27,7 @@ import org.apache.qpid.server.configurat
import org.apache.qpid.server.configuration.ServerConfiguration;
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.model.adapter.BrokerAdapter;
import org.apache.qpid.server.plugins.PluginManager;
import org.apache.qpid.server.security.SecurityManager;
import org.apache.qpid.server.security.auth.manager.AuthenticationManager;
@@ -65,8 +63,6 @@ public interface IApplicationRegistry ex
*/
ServerConfiguration getConfiguration();
- ManagedObjectRegistry getManagedObjectRegistry();
-
/**
* Get the AuthenticationManager for the given socket address
*
Modified:
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java?rev=1350577&r1=1350576&r2=1350577&view=diff
==============================================================================
---
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java
(original)
+++
qpid/branches/java-config-and-management/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java
Fri Jun 15 11:15:07 2012
@@ -32,7 +32,6 @@ import org.apache.qpid.server.connection
import org.apache.qpid.server.exchange.ExchangeFactory;
import org.apache.qpid.server.exchange.ExchangeRegistry;
import org.apache.qpid.server.federation.BrokerLink;
-import org.apache.qpid.server.management.ManagedObject;
import org.apache.qpid.server.protocol.v1_0.LinkRegistry;
import org.apache.qpid.server.queue.QueueRegistry;
import org.apache.qpid.server.registry.IApplicationRegistry;
Modified:
qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java?rev=1350577&r1=1350576&r2=1350577&view=diff
==============================================================================
---
qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java
(original)
+++
qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/queue/MockAMQQueue.java
Fri Jun 15 11:15:07 2012
@@ -29,7 +29,6 @@ import org.apache.qpid.server.configurat
import org.apache.qpid.server.configuration.plugins.ConfigurationPlugin;
import org.apache.qpid.server.exchange.Exchange;
import org.apache.qpid.server.logging.LogSubject;
-import org.apache.qpid.server.management.ManagedObject;
import org.apache.qpid.server.message.ServerMessage;
import org.apache.qpid.server.protocol.AMQSessionModel;
import org.apache.qpid.server.security.AuthorizationHolder;
@@ -513,11 +512,6 @@ public class MockAMQQueue implements AMQ
{
}
- public ManagedObject getManagedObject()
- {
- return null;
- }
-
public int compareTo(AMQQueue o)
{
return 0;
Modified:
qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java?rev=1350577&r1=1350576&r2=1350577&view=diff
==============================================================================
---
qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java
(original)
+++
qpid/branches/java-config-and-management/qpid/java/broker/src/test/java/org/apache/qpid/server/virtualhost/MockVirtualHost.java
Fri Jun 15 11:15:07 2012
@@ -32,7 +32,6 @@ import org.apache.qpid.server.connection
import org.apache.qpid.server.exchange.ExchangeFactory;
import org.apache.qpid.server.exchange.ExchangeRegistry;
import org.apache.qpid.server.federation.BrokerLink;
-import org.apache.qpid.server.management.ManagedObject;
import org.apache.qpid.server.protocol.v1_0.LinkRegistry;
import org.apache.qpid.server.queue.QueueRegistry;
import org.apache.qpid.server.registry.IApplicationRegistry;
@@ -141,11 +140,6 @@ public class MockVirtualHost implements
return 0;
}
- public ManagedObject getManagedObject()
- {
- return null;
- }
-
public MessageStore getMessageStore()
{
return null;
Modified:
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/ExternalACLJMXTest.java
URL:
http://svn.apache.org/viewvc/qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/ExternalACLJMXTest.java?rev=1350577&r1=1350576&r2=1350577&view=diff
==============================================================================
---
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/ExternalACLJMXTest.java
(original)
+++
qpid/branches/java-config-and-management/qpid/java/systests/src/main/java/org/apache/qpid/server/security/acl/ExternalACLJMXTest.java
Fri Jun 15 11:15:07 2012
@@ -19,7 +19,6 @@
package org.apache.qpid.server.security.acl;
import org.apache.qpid.management.common.mbeans.ServerInformation;
-import org.apache.qpid.server.management.ManagedObject;
import org.apache.qpid.server.security.access.ObjectType;
import org.apache.qpid.test.utils.JMXTestUtils;
@@ -30,7 +29,7 @@ import java.lang.management.RuntimeMXBea
* Tests that access to the JMX interface is governed only by {@link
ObjectType#METHOD}/{@link ObjectType#ALL}
* rules and AMQP rights have no effect.
*
- * Ensures that objects outside the Qpid domain ({@link ManagedObject#DOMAIN})
are not governed by the ACL model.
+ * Ensures that objects outside the Qpid domain are not governed by the ACL
model.
*/
public class ExternalACLJMXTest extends AbstractACLTestCase
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
