Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderFactoryTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderFactoryTest.java?rev=1587123&r1=1587122&r2=1587123&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderFactoryTest.java (original) +++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderFactoryTest.java Sun Apr 13 23:41:53 2014 @@ -131,7 +131,8 @@ public class FileSystemPreferencesProvid assertNotNull("Preferences provider was not recovered", provider); assertEquals("Unexpected name", "test-provider", provider.getName()); assertEquals("Unexpected id", id, provider.getId()); - assertEquals("Unexpected path", file.getAbsolutePath(), provider.getAttribute(FileSystemPreferencesProvider.PATH)); + assertEquals("Unexpected path", file.getAbsolutePath(), provider.getAttribute( + FileSystemPreferencesProvider.PATH)); assertTrue("Preferences store file should exist", file.exists()); } finally
Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderTest.java?rev=1587123&r1=1587122&r2=1587123&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderTest.java (original) +++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/FileSystemPreferencesProviderTest.java Sun Apr 13 23:41:53 2014 @@ -34,6 +34,7 @@ import java.util.UUID; import org.apache.qpid.server.configuration.updater.TaskExecutor; import org.apache.qpid.server.model.AuthenticationProvider; import org.apache.qpid.server.model.Broker; +import org.apache.qpid.server.model.ConfiguredObject; import org.apache.qpid.server.model.State; import org.apache.qpid.server.util.BrokerTestHelper; import org.apache.qpid.test.utils.QpidTestCase; @@ -43,7 +44,7 @@ public class FileSystemPreferencesProvid { private static final String TEST_PREFERENCES = "{\"user1\":{\"pref1\":\"pref1User1Value\", \"pref2\": true, \"pref3\": 1.0, \"pref4\": 2}," + "\"user2\":{\"pref1\":\"pref1User2Value\", \"pref2\": false, \"pref3\": 2.0, \"pref4\": 3}}"; - private FileSystemPreferencesProvider _preferencesProvider; + private FileSystemPreferencesProviderImpl _preferencesProvider; private AuthenticationProvider _authenticationProvider; private Broker _broker; private String _user1, _user2; @@ -96,8 +97,8 @@ public class FileSystemPreferencesProvid { Map<String, Object> attributes = new HashMap<String, Object>(); attributes.put(FileSystemPreferencesProvider.PATH, nonExistingFile.getAbsolutePath()); - attributes.put(FileSystemPreferencesProvider.NAME, getTestName()); - _preferencesProvider = new FileSystemPreferencesProvider(UUID.randomUUID(), attributes, _authenticationProvider); + attributes.put(ConfiguredObject.NAME, getTestName()); + _preferencesProvider = new FileSystemPreferencesProviderImpl(UUID.randomUUID(), attributes, _authenticationProvider); _preferencesProvider.createStoreIfNotExist(); assertEquals(State.INITIALISING, _preferencesProvider.getState()); assertTrue("Preferences file was not created", nonExistingFile.exists()); @@ -116,9 +117,9 @@ public class FileSystemPreferencesProvid try { Map<String, Object> attributes = new HashMap<String, Object>(); - attributes.put(FileSystemPreferencesProvider.NAME, getTestName()); + attributes.put(ConfiguredObject.NAME, getTestName()); attributes.put(FileSystemPreferencesProvider.PATH, emptyPrefsFile.getAbsolutePath()); - _preferencesProvider = new FileSystemPreferencesProvider(UUID.randomUUID(), attributes, _authenticationProvider); + _preferencesProvider = new FileSystemPreferencesProviderImpl(UUID.randomUUID(), attributes, _authenticationProvider); assertEquals(State.INITIALISING, _preferencesProvider.getState()); } finally @@ -273,12 +274,12 @@ public class FileSystemPreferencesProvid assertEquals("Unexpected user names", new HashSet<String>(Arrays.asList("user1", "user2")), userNames); } - private FileSystemPreferencesProvider createPreferencesProvider() + private FileSystemPreferencesProviderImpl createPreferencesProvider() { Map<String, Object> attributes = new HashMap<String, Object>(); attributes.put(FileSystemPreferencesProvider.PATH, _preferencesFile.getAbsolutePath()); - attributes.put(FileSystemPreferencesProvider.NAME, "test"); - return _preferencesProvider = new FileSystemPreferencesProvider(UUID.randomUUID(), attributes, _authenticationProvider); + attributes.put(ConfiguredObject.NAME, "test"); + return _preferencesProvider = new FileSystemPreferencesProviderImpl(UUID.randomUUID(), attributes, _authenticationProvider); } private void assertUser1Preferences(Map<String, Object> preferences1) Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java?rev=1587123&r1=1587122&r2=1587123&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java (original) +++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java Sun Apr 13 23:41:53 2014 @@ -320,7 +320,7 @@ public class PortFactoryTest extends Qpi Port port = _portFactory.createPort(_portId, _broker, _attributes); assertNotNull(port); - assertFalse("Port should be a PortAdapter, not its AMQP-specific subclass", port instanceof AmqpPort); + assertFalse("Port should not be an AMQP-specific subclass", port instanceof AmqpPort); assertEquals(_portId, port.getId()); assertEquals(_portNumber, port.getPort()); assertEquals(_tcpTransports, port.getTransports()); @@ -345,7 +345,7 @@ public class PortFactoryTest extends Qpi Port port = _portFactory.createPort(_portId, _broker, _attributes); assertNotNull(port); - assertFalse("Port should be a PortAdapter, not its AMQP-specific subclass", port instanceof AmqpPort); + assertFalse("Port not be an AMQP-specific port subclass", port instanceof AmqpPort); assertEquals(_portId, port.getId()); assertEquals(_portNumber, port.getPort()); assertEquals(Collections.singleton(PortFactory.DEFAULT_TRANSPORT), port.getTransports()); Modified: qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManagerTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManagerTest.java?rev=1587123&r1=1587122&r2=1587123&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManagerTest.java (original) +++ qpid/trunk/qpid/java/broker-core/src/test/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationManagerTest.java Sun Apr 13 23:41:53 2014 @@ -48,13 +48,13 @@ public class ExternalAuthenticationManag attrs.put(AuthenticationProvider.ID, UUID.randomUUID()); attrs.put(AuthenticationProvider.NAME, getTestName()); attrs.put("useFullDN",false); - _manager = new ExternalAuthenticationManager(mock(Broker.class), attrs); + _manager = new ExternalAuthenticationManagerImpl(mock(Broker.class), attrs); _manager.open(); HashMap<String, Object> attrsFullDN = new HashMap<String, Object>(); attrsFullDN.put(AuthenticationProvider.ID, UUID.randomUUID()); attrsFullDN.put(AuthenticationProvider.NAME, getTestName()+"FullDN"); attrsFullDN.put("useFullDN",true); - _managerUsingFullDN = new ExternalAuthenticationManager(mock(Broker.class), attrsFullDN); + _managerUsingFullDN = new ExternalAuthenticationManagerImpl(mock(Broker.class), attrsFullDN); _managerUsingFullDN.open(); } @@ -198,7 +198,7 @@ public class ExternalAuthenticationManag assertNull(saslServer.getAuthorizationID()); } - private void createSaslServerTestImpl(AuthenticationManager manager) throws Exception + private void createSaslServerTestImpl(AuthenticationProvider<?> manager) throws Exception { SaslServer server = manager.createSaslServer("EXTERNAL", "example.example.com", null); Added: qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProvider.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProvider.java?rev=1587123&view=auto ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProvider.java (added) +++ qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProvider.java Sun Apr 13 23:41:53 2014 @@ -0,0 +1,32 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "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. + * + */ +package org.apache.qpid.server.security.access.plugins; + +import org.apache.qpid.server.model.AccessControlProvider; +import org.apache.qpid.server.model.ManagedAttribute; +import org.apache.qpid.server.model.ManagedObject; + +@ManagedObject( category = false, type="AclFile" ) +public interface ACLFileAccessControlProvider<X extends ACLFileAccessControlProvider<X>> extends AccessControlProvider<X> +{ + @ManagedAttribute( automate = true, mandatory = true ) + String getPath(); +} Modified: qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderFactory.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderFactory.java?rev=1587123&r1=1587122&r2=1587123&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderFactory.java (original) +++ qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderFactory.java Sun Apr 13 23:41:53 2014 @@ -20,21 +20,21 @@ */ package org.apache.qpid.server.security.access.plugins; +import java.util.Map; + import org.apache.qpid.server.model.AbstractConfiguredObjectTypeFactory; import org.apache.qpid.server.model.Broker; import org.apache.qpid.server.model.ConfiguredObject; import org.apache.qpid.server.plugin.AccessControlProviderFactory; import org.apache.qpid.server.util.ResourceBundleLoader; -import java.util.Map; - -public class ACLFileAccessControlProviderFactory extends AbstractConfiguredObjectTypeFactory<ACLFileAccessControlProvider> implements AccessControlProviderFactory<ACLFileAccessControlProvider> +public class ACLFileAccessControlProviderFactory extends AbstractConfiguredObjectTypeFactory<ACLFileAccessControlProviderImpl> implements AccessControlProviderFactory<ACLFileAccessControlProviderImpl> { public static final String RESOURCE_BUNDLE = "org.apache.qpid.server.security.access.plugins.FileAccessControlProviderAttributeDescriptions"; public ACLFileAccessControlProviderFactory() { - super(ACLFileAccessControlProvider.class); + super(ACLFileAccessControlProviderImpl.class); } @Override @@ -44,10 +44,10 @@ public class ACLFileAccessControlProvide } @Override - public ACLFileAccessControlProvider createInstance(final Map<String, Object> attributes, + public ACLFileAccessControlProviderImpl createInstance(final Map<String, Object> attributes, final ConfiguredObject<?>... parents) { - return new ACLFileAccessControlProvider(getParent(Broker.class,parents), attributes); + return new ACLFileAccessControlProviderImpl(getParent(Broker.class,parents), attributes); } } Copied: qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImpl.java (from r1586910, qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProvider.java) URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImpl.java?p2=qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImpl.java&p1=qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProvider.java&r1=1586910&r2=1587123&rev=1587123&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProvider.java (original) +++ qpid/trunk/qpid/java/broker-plugins/access-control/src/main/java/org/apache/qpid/server/security/access/plugins/ACLFileAccessControlProviderImpl.java Sun Apr 13 23:41:53 2014 @@ -24,22 +24,29 @@ import java.security.AccessControlExcept import java.util.Collection; import java.util.Collections; import java.util.Map; +import java.util.Set; import java.util.concurrent.atomic.AtomicReference; import org.apache.log4j.Logger; -import org.apache.qpid.server.model.*; + import org.apache.qpid.server.model.AbstractConfiguredObject; +import org.apache.qpid.server.model.AccessControlProvider; +import org.apache.qpid.server.model.Broker; +import org.apache.qpid.server.model.ConfiguredObject; +import org.apache.qpid.server.model.IllegalStateTransitionException; +import org.apache.qpid.server.model.LifetimePolicy; +import org.apache.qpid.server.model.ManagedAttributeField; +import org.apache.qpid.server.model.State; import org.apache.qpid.server.plugin.AccessControlProviderFactory; import org.apache.qpid.server.security.AccessControl; import org.apache.qpid.server.security.access.Operation; import org.apache.qpid.server.util.MapValueConverter; -@ManagedObject( category = false, type="AclFile" ) -public class ACLFileAccessControlProvider - extends AbstractConfiguredObject<ACLFileAccessControlProvider> - implements AccessControlProvider<ACLFileAccessControlProvider> +public class ACLFileAccessControlProviderImpl + extends AbstractConfiguredObject<ACLFileAccessControlProviderImpl> + implements ACLFileAccessControlProvider<ACLFileAccessControlProviderImpl> { - private static final Logger LOGGER = Logger.getLogger(ACLFileAccessControlProvider.class); + private static final Logger LOGGER = Logger.getLogger(ACLFileAccessControlProviderImpl.class); protected DefaultAccessControl _accessControl; protected final Broker _broker; @@ -50,8 +57,8 @@ public class ACLFileAccessControlProvide @ManagedAttributeField private String _path; - public ACLFileAccessControlProvider(Broker broker, - Map<String, Object> attributes) + public ACLFileAccessControlProviderImpl(Broker broker, + Map<String, Object> attributes) { super(parentsMap(broker), attributes, broker.getTaskExecutor()); @@ -71,7 +78,7 @@ public class ACLFileAccessControlProvide _accessControl = new DefaultAccessControl(getPath(), _broker); } - @ManagedAttribute( automate = true, mandatory = true ) + @Override public String getPath() { return _path; @@ -219,16 +226,7 @@ public class ACLFileAccessControlProvide } @Override - protected void authoriseSetAttribute(String name, Object expected, Object desired) throws AccessControlException - { - if (!_broker.getSecurityManager().authoriseConfiguringBroker(getName(), AccessControlProvider.class, Operation.UPDATE)) - { - throw new AccessControlException("Setting of AccessControlProvider attributes is denied"); - } - } - - @Override - protected void authoriseSetAttributes(Map<String, Object> attributes) throws AccessControlException + protected void authoriseSetAttributes(ConfiguredObject<?> modified, Set<String> attributes) throws AccessControlException { if (!_broker.getSecurityManager().authoriseConfiguringBroker(getName(), AccessControlProvider.class, Operation.UPDATE)) { Modified: qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java?rev=1587123&r1=1587122&r2=1587123&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java (original) +++ qpid/trunk/qpid/java/broker-plugins/management-http/src/main/java/org/apache/qpid/server/management/plugin/HttpManagement.java Sun Apr 13 23:41:53 2014 @@ -69,7 +69,7 @@ import org.apache.qpid.server.management import org.apache.qpid.server.management.plugin.servlet.rest.UserPreferencesServlet; import org.apache.qpid.server.model.*; import org.apache.qpid.server.model.adapter.AbstractPluginAdapter; -import org.apache.qpid.server.model.port.PortWithAuthProvider; +import org.apache.qpid.server.model.port.AbstractPortWithAuthProvider; import org.apache.qpid.server.util.MapValueConverter; import org.apache.qpid.server.util.ServerScopedRuntimeException; import org.apache.qpid.transport.network.security.ssl.QpidMultipleTrustManager; @@ -218,8 +218,10 @@ public class HttpManagement extends Abst throw new IllegalConfigurationException("Key store is not configured. Cannot start management on HTTPS port without keystore"); } SslContextFactory factory = new SslContextFactory(); - final boolean needClientAuth = port instanceof PortWithAuthProvider && ((PortWithAuthProvider)port).getNeedClientAuth(); - final boolean wantClientAuth = port instanceof PortWithAuthProvider && ((PortWithAuthProvider)port).getWantClientAuth(); + final boolean needClientAuth = port instanceof AbstractPortWithAuthProvider + && ((AbstractPortWithAuthProvider)port).getNeedClientAuth(); + final boolean wantClientAuth = port instanceof AbstractPortWithAuthProvider + && ((AbstractPortWithAuthProvider)port).getWantClientAuth(); boolean needClientCert = needClientAuth || wantClientAuth; if (needClientCert && trustStores.isEmpty()) { Modified: qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagedObjectRegistry.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagedObjectRegistry.java?rev=1587123&r1=1587122&r2=1587123&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagedObjectRegistry.java (original) +++ qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagedObjectRegistry.java Sun Apr 13 23:41:53 2014 @@ -81,13 +81,13 @@ public class JMXManagedObjectRegistry im public JMXManagedObjectRegistry( Broker broker, Port connectorPort, Port registryPort, - JMXManagement jmxManagement) + JMXManagementPlugin jmxManagement) { _broker = broker; _registryPort = registryPort; _connectorPort = connectorPort; - boolean usePlatformServer = (Boolean)jmxManagement.getAttribute(JMXManagement.USE_PLATFORM_MBEAN_SERVER); + boolean usePlatformServer = (Boolean)jmxManagement.getAttribute(JMXManagementPlugin.USE_PLATFORM_MBEAN_SERVER); _mbeanServer = usePlatformServer ? ManagementFactory.getPlatformMBeanServer() Modified: qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementFactory.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementFactory.java?rev=1587123&r1=1587122&r2=1587123&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementFactory.java (original) +++ qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementFactory.java Sun Apr 13 23:41:53 2014 @@ -18,27 +18,27 @@ */ package org.apache.qpid.server.jmx; -import org.apache.qpid.server.model.AbstractConfiguredObjectTypeFactory; -import org.apache.qpid.server.model.Broker; -import org.apache.qpid.server.model.ConfiguredObject; - import java.util.HashMap; import java.util.Map; import java.util.UUID; -public class JMXManagementFactory extends AbstractConfiguredObjectTypeFactory<JMXManagement> +import org.apache.qpid.server.model.AbstractConfiguredObjectTypeFactory; +import org.apache.qpid.server.model.Broker; +import org.apache.qpid.server.model.ConfiguredObject; + +public class JMXManagementFactory extends AbstractConfiguredObjectTypeFactory<JMXManagementPluginImpl> { public JMXManagementFactory() { - super(JMXManagement.class); + super(JMXManagementPluginImpl.class); } @Override - public JMXManagement createInstance(final Map<String, Object> attributes, final ConfiguredObject<?>... parents) + public JMXManagementPluginImpl createInstance(final Map<String, Object> attributes, final ConfiguredObject<?>... parents) { Map<String,Object> attributesWithoutId = new HashMap<String, Object>(attributes); Object idObj = attributesWithoutId.remove(ConfiguredObject.ID); UUID id = idObj == null ? UUID.randomUUID() : idObj instanceof UUID ? (UUID) idObj : UUID.fromString(idObj.toString()); - return new JMXManagement(id, getParent(Broker.class,parents),attributes); + return new JMXManagementPluginImpl(id, getParent(Broker.class,parents),attributes); } } Added: qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPlugin.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPlugin.java?rev=1587123&view=auto ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPlugin.java (added) +++ qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPlugin.java Sun Apr 13 23:41:53 2014 @@ -0,0 +1,35 @@ +/* + * + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "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. + * + */ +package org.apache.qpid.server.jmx; + +import org.apache.qpid.server.model.*; + [email protected]( category = false , type = "MANAGEMENT-JMX" ) +public interface JMXManagementPlugin<X extends JMXManagementPlugin<X>> extends Plugin<X> +{ + String PLUGIN_TYPE = "MANAGEMENT-JMX"; + // attributes + String USE_PLATFORM_MBEAN_SERVER = "usePlatformMBeanServer"; + String DEFAULT_USE_PLATFORM_MBEAN_SERVER = "true"; + + @ManagedAttribute( automate = true, defaultValue = DEFAULT_USE_PLATFORM_MBEAN_SERVER ) + boolean getUsePlatformMBeanServer(); +} Copied: qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPluginImpl.java (from r1586908, qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagement.java) URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPluginImpl.java?p2=qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPluginImpl.java&p1=qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagement.java&r1=1586908&r2=1587123&rev=1587123&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagement.java (original) +++ qpid/trunk/qpid/java/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPluginImpl.java Sun Apr 13 23:41:53 2014 @@ -43,9 +43,7 @@ import org.apache.qpid.server.model.Auth import org.apache.qpid.server.model.Broker; import org.apache.qpid.server.model.ConfigurationChangeListener; import org.apache.qpid.server.model.ConfiguredObject; -import org.apache.qpid.server.model.ManagedAttribute; import org.apache.qpid.server.model.ManagedAttributeField; -import org.apache.qpid.server.model.ManagedObject; import org.apache.qpid.server.model.PasswordCredentialManagingAuthenticationProvider; import org.apache.qpid.server.model.Port; import org.apache.qpid.server.model.Protocol; @@ -56,20 +54,16 @@ import org.apache.qpid.server.plugin.Qpi import org.apache.qpid.server.util.MapValueConverter; import org.apache.qpid.server.util.ServerScopedRuntimeException; -@ManagedObject( category = false , type = "MANAGEMENT-JMX" ) -public class JMXManagement extends AbstractPluginAdapter<JMXManagement> implements ConfigurationChangeListener +public class JMXManagementPluginImpl + extends AbstractPluginAdapter<JMXManagementPluginImpl> implements ConfigurationChangeListener, + JMXManagementPlugin<JMXManagementPluginImpl> { - private static final Logger LOGGER = Logger.getLogger(JMXManagement.class); + private static final Logger LOGGER = Logger.getLogger(JMXManagementPluginImpl.class); - public static final String PLUGIN_TYPE = "MANAGEMENT-JMX"; - - // attributes - public static final String USE_PLATFORM_MBEAN_SERVER = "usePlatformMBeanServer"; public static final String NAME = "name"; // default values public static final String DEFAULT_NAME = "JMXManagement"; - public static final boolean DEFAULT_USE_PLATFORM_MBEAN_SERVER = true; @SuppressWarnings("serial") private static final Map<String, Type> ATTRIBUTE_TYPES = new HashMap<String, Type>(){{ @@ -86,7 +80,7 @@ public class JMXManagement extends Abstr @ManagedAttributeField private boolean _usePlatformMBeanServer; - public JMXManagement(UUID id, Broker broker, Map<String, Object> attributes) + public JMXManagementPluginImpl(UUID id, Broker broker, Map<String, Object> attributes) { super(id, attributes, broker); } @@ -321,7 +315,7 @@ public class JMXManagement extends Abstr @Override public Collection<String> getAttributeNames() { - return getAttributeNames(JMXManagement.class); + return getAttributeNames(JMXManagementPluginImpl.class); } @Override @@ -335,9 +329,9 @@ public class JMXManagement extends Abstr private void validateAttributes(Map<String, Object> convertedAttributes) { - if(convertedAttributes.containsKey(JMXManagement.NAME)) + if(convertedAttributes.containsKey(JMXManagementPluginImpl.NAME)) { - String newName = (String) convertedAttributes.get(JMXManagement.NAME); + String newName = (String) convertedAttributes.get(JMXManagementPluginImpl.NAME); if(!getName().equals(newName)) { throw new IllegalConfigurationException("Changing the name of jmx management plugin is not allowed"); @@ -360,7 +354,7 @@ public class JMXManagement extends Abstr } } - @ManagedAttribute( automate = true, defaultValue = "true" ) + @Override public boolean getUsePlatformMBeanServer() { return _usePlatformMBeanServer; Modified: qpid/trunk/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/JMXManagementFactoryTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/JMXManagementFactoryTest.java?rev=1587123&r1=1587122&r2=1587123&view=diff ============================================================================== --- qpid/trunk/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/JMXManagementFactoryTest.java (original) +++ qpid/trunk/qpid/java/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/JMXManagementFactoryTest.java Sun Apr 13 23:41:53 2014 @@ -38,14 +38,14 @@ public class JMXManagementFactoryTest ex public void testJMXConfigured() throws Exception { _attributes.put(ConfiguredObject.ID,UUID.randomUUID()); - _attributes.put(ConfiguredObject.TYPE, JMXManagement.PLUGIN_TYPE); + _attributes.put(ConfiguredObject.TYPE, JMXManagementPlugin.PLUGIN_TYPE); _attributes.put(ConfiguredObject.NAME, getName()); - JMXManagement jmxManagement = _jmxManagementFactory.createInstance( _attributes, _broker); + JMXManagementPlugin jmxManagement = _jmxManagementFactory.createInstance( _attributes, _broker); jmxManagement.open(); assertNotNull(jmxManagement); - assertEquals("Unexpected plugin type", JMXManagement.PLUGIN_TYPE, jmxManagement.getType()); - assertEquals("Unexpected default mbean platform", JMXManagement.DEFAULT_USE_PLATFORM_MBEAN_SERVER, jmxManagement.getAttribute(JMXManagement.USE_PLATFORM_MBEAN_SERVER)); + assertEquals("Unexpected plugin type", JMXManagementPlugin.PLUGIN_TYPE, jmxManagement.getType()); + assertEquals("Unexpected default mbean platform", Boolean.parseBoolean(JMXManagementPlugin.DEFAULT_USE_PLATFORM_MBEAN_SERVER), jmxManagement.getUsePlatformMBeanServer()); } Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QueueRestTest.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QueueRestTest.java?rev=1587123&r1=1587122&r2=1587123&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QueueRestTest.java (original) +++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/QueueRestTest.java Sun Apr 13 23:41:53 2014 @@ -147,7 +147,7 @@ public class QueueRestTest extends QpidR attributes.put(Queue.MAXIMUM_DELIVERY_ATTEMPTS, 10); responseCode = getRestTestHelper().submitRequest("/rest/queue/test/" + queueName, "PUT", attributes); - assertEquals("Setting of queue attribites should be allowed", 200, responseCode); + assertEquals("Setting of queue attributes should be allowed", 200, responseCode); Map<String, Object> queueData = getRestTestHelper().getJsonAsSingletonList("/rest/queue/test/" + queueName); assertEquals("Unexpected " + Queue.QUEUE_FLOW_CONTROL_SIZE_BYTES, 100000, queueData.get(Queue.QUEUE_FLOW_CONTROL_SIZE_BYTES) ); Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java?rev=1587123&r1=1587122&r2=1587123&view=diff ============================================================================== --- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java (original) +++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java Sun Apr 13 23:41:53 2014 @@ -42,7 +42,7 @@ import org.apache.qpid.server.model.Grou import org.apache.qpid.server.model.Model; import org.apache.qpid.server.model.Plugin; import org.apache.qpid.server.model.PreferencesProvider; -import org.apache.qpid.server.model.SystemContext; +import org.apache.qpid.server.model.SystemContextImpl; import org.apache.qpid.server.model.UUIDGenerator; import org.apache.qpid.server.security.access.FileAccessControlProviderConstants; import org.apache.qpid.server.security.group.FileGroupManagerFactory; @@ -75,7 +75,7 @@ public class TestBrokerConfiguration public TestBrokerConfiguration(String storeType, String intialStoreLocation) { - _store = new MemoryConfigurationEntryStore(new SystemContext(new TaskExecutor(), new ConfiguredObjectFactory( + _store = new MemoryConfigurationEntryStore(new SystemContextImpl(new TaskExecutor(), new ConfiguredObjectFactory( Model.getInstance()), mock(EventLogger.class), mock(LogRecorder.class), mock(BrokerOptions.class)), --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
