You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by or...@apache.org on 2015/12/08 01:28:12 UTC
svn commit: r1718497 [1/3] - in /qpid/java/trunk: ./ bdbstore/ bdbstore/jmx/
bdbstore/jmx/src/main/java/org/apache/qpid/server/store/berkeleydb/jmx/
bdbstore/jmx/src/main/resources/META-INF/services/
bdbstore/jmx/src/test/java/org/apache/qpid/server/st...
Author: orudyy
Date: Tue Dec 8 00:28:09 2015
New Revision: 1718497
URL: http://svn.apache.org/viewvc?rev=1718497&view=rev
Log:
QPID-6915: Remove JMX support
Removed:
qpid/java/trunk/bdbstore/jmx/pom.xml
qpid/java/trunk/bdbstore/jmx/src/main/java/org/apache/qpid/server/store/berkeleydb/jmx/BDBHAMessageStoreManagerMBean.java
qpid/java/trunk/bdbstore/jmx/src/main/java/org/apache/qpid/server/store/berkeleydb/jmx/BDBHAMessageStoreManagerMBeanProvider.java
qpid/java/trunk/bdbstore/jmx/src/main/java/org/apache/qpid/server/store/berkeleydb/jmx/ManagedBDBHAMessageStore.java
qpid/java/trunk/bdbstore/jmx/src/main/resources/META-INF/services/org.apache.qpid.server.jmx.MBeanProvider
qpid/java/trunk/bdbstore/jmx/src/test/java/org/apache/qpid/server/store/berkeleydb/jmx/BDBHAMessageStoreManagerMBeanTest.java
qpid/java/trunk/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/JMXManagementTest.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/port/JmxPort.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/port/JmxPortImpl.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/port/RmiPort.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/port/RmiPortImpl.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/jmx/JMXConnectionPrincipal.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/security/auth/jmx/JMXPasswordAuthenticator.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/security/auth/jmx/JMXPasswordAuthenticatorTest.java
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementjmx.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/js/qpid/management/plugin/managementjmx/edit.js
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/plugin/managementjmx/edit.html
qpid/java/trunk/broker-plugins/management-http/src/main/java/resources/plugin/showManagementJmx.html
qpid/java/trunk/broker-plugins/management-jmx/pom.xml
qpid/java/trunk/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/AMQManagedObject.java
qpid/java/trunk/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/DefaultManagedObject.java
qpid/java/trunk/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagedObjectRegistry.java
qpid/java/trunk/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPlugin.java
qpid/java/trunk/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/JMXManagementPluginImpl.java
qpid/java/trunk/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/MBeanIntrospector.java
qpid/java/trunk/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/MBeanInvocationHandlerImpl.java
qpid/java/trunk/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/MBeanProvider.java
qpid/java/trunk/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/ManagedObject.java
qpid/java/trunk/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/ManagedObjectRegistry.java
qpid/java/trunk/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/ManagementLogonLogoffReporter.java
qpid/java/trunk/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/QpidRMIServerSocketFactory.java
qpid/java/trunk/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/QpidSslRMIServerSocketFactory.java
qpid/java/trunk/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/RegistryProtectingRMIServerSocketFactory.java
qpid/java/trunk/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/UsernameAccessor.java
qpid/java/trunk/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/UsernameCachingRMIJRMPServer.java
qpid/java/trunk/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/AbstractStatisticsGatheringMBean.java
qpid/java/trunk/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/ConnectionMBean.java
qpid/java/trunk/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/ExchangeMBean.java
qpid/java/trunk/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/LoggingManagementMBean.java
qpid/java/trunk/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/QueueMBean.java
qpid/java/trunk/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/ServerInformationMBean.java
qpid/java/trunk/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/Shutdown.java
qpid/java/trunk/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/ShutdownMBean.java
qpid/java/trunk/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/UserManagementMBean.java
qpid/java/trunk/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/VirtualHostMBean.java
qpid/java/trunk/broker-plugins/management-jmx/src/main/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBean.java
qpid/java/trunk/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/ManagementLogonLogoffReporterTest.java
qpid/java/trunk/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/NoopManagedObjectRegistry.java
qpid/java/trunk/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/ConnectionMBeanTest.java
qpid/java/trunk/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/ExchangeMBeanTest.java
qpid/java/trunk/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/LoggingManagementMBeanTest.java
qpid/java/trunk/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/MBeanTestUtils.java
qpid/java/trunk/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/QueueMBeanTest.java
qpid/java/trunk/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/ServerInformationMBeanTest.java
qpid/java/trunk/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/UserManagementMBeanTest.java
qpid/java/trunk/broker-plugins/management-jmx/src/test/java/org/apache/qpid/server/jmx/mbeans/VirtualHostManagerMBeanTest.java
qpid/java/trunk/doc/book/src/java-broker/management/channels/Java-Broker-Management-Channel-JMX.xml
qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Plugins-JMX.xml
qpid/java/trunk/management/common/pom.xml
qpid/java/trunk/management/common/src/main/java/management-common.bnd
qpid/java/trunk/management/common/src/main/java/org/apache/qpid/management/common/JMXConnnectionFactory.java
qpid/java/trunk/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java
qpid/java/trunk/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java
qpid/java/trunk/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java
qpid/java/trunk/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java
qpid/java/trunk/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java
qpid/java/trunk/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ServerInformation.java
qpid/java/trunk/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java
qpid/java/trunk/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java
qpid/java/trunk/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java
qpid/java/trunk/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java
qpid/java/trunk/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java
qpid/java/trunk/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java
qpid/java/trunk/management/common/src/main/java/org/apache/qpid/management/common/sasl/CRAMMD5HashedSaslClientFactory.java
qpid/java/trunk/management/common/src/main/java/org/apache/qpid/management/common/sasl/ClientSaslFactory.java
qpid/java/trunk/management/common/src/main/java/org/apache/qpid/management/common/sasl/Constants.java
qpid/java/trunk/management/common/src/main/java/org/apache/qpid/management/common/sasl/JCAProvider.java
qpid/java/trunk/management/common/src/main/java/org/apache/qpid/management/common/sasl/PlainSaslClient.java
qpid/java/trunk/management/common/src/main/java/org/apache/qpid/management/common/sasl/SaslProvider.java
qpid/java/trunk/management/common/src/main/java/org/apache/qpid/management/common/sasl/UserPasswordCallbackHandler.java
qpid/java/trunk/management/common/src/main/java/org/apache/qpid/management/common/sasl/UsernameHashedPasswordCallbackHandler.java
qpid/java/trunk/management/common/src/test/java/org/apache/qpid/management/common/mbeans/ManagedQueueTest.java
qpid/java/trunk/management/example/pom.xml
qpid/java/trunk/management/example/src/main/java/org/apache/qpid/example/jmxexample/AddQueue.java
qpid/java/trunk/management/example/src/main/java/org/apache/qpid/example/jmxexample/DeleteMessagesFromTopOfTmp.java
qpid/java/trunk/management/example/src/main/java/org/apache/qpid/example/jmxexample/QueueInformation.java
qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/JMXTestUtils.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/security/acl/ExternalACLJMXTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/management/jmx/BrokerManagementTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/management/jmx/ConnectionManagementTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/management/jmx/ExchangeManagementTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/management/jmx/MBeanLifeCycleTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/management/jmx/ManagementActorLoggingTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/management/jmx/ManagementLoggingTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/management/jmx/QueueManagementTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/management/jmx/StatisticsTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/management/jmx/UserManagementTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/management/jmx/UserManagementWithBase64MD5PasswordsTest.java
qpid/java/trunk/tools/src/main/java/org/apache/qpid/tools/JMXStressTestClient.java
Modified:
qpid/java/trunk/bdbstore/pom.xml
qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgradeTestPreparer.java
qpid/java/trunk/bdbstore/systests/pom.xml
qpid/java/trunk/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java
qpid/java/trunk/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/GroupCreator.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/BrokerOptions.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/configuration/BrokerProperties.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandler.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractSystemConfig.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/BrokerModel.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Port.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Protocol.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/SystemConfig.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/stats/StatisticsGatherer.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecoverer.java
qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/VirtualHostStoreUpgraderAndRecoverer.java
qpid/java/trunk/broker-core/src/main/resources/initial-config.json
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/BrokerOptionsTest.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandlerTest.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessagesTest.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java
qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecovererTest.java
qpid/java/trunk/broker/etc/broker_example.acl
qpid/java/trunk/broker/pom.xml
qpid/java/trunk/broker/src/main/assembly/dependency-verification/DEPENDENCIES_REFERENCE
qpid/java/trunk/broker/src/main/java/org/apache/qpid/server/Main.java
qpid/java/trunk/broker/src/test/java/org/apache/qpid/server/MainTest.java
qpid/java/trunk/doc/book/src/java-broker/Java-Broker-Appendix-Operational-Logging-Messages.xml
qpid/java/trunk/doc/book/src/java-broker/Java-Broker-Appendix-System-Properties.xml
qpid/java/trunk/doc/book/src/java-broker/Java-Broker-Getting-Started.xml
qpid/java/trunk/doc/book/src/java-broker/Java-Broker-High-Availability.xml
qpid/java/trunk/doc/book/src/java-broker/Java-Broker-Initial-Configuration.xml
qpid/java/trunk/doc/book/src/java-broker/Java-Broker-Introduction.xml
qpid/java/trunk/doc/book/src/java-broker/Java-Broker-Management-Channels.xml
qpid/java/trunk/doc/book/src/java-broker/Java-Broker-Management-Managing-Entities.xml
qpid/java/trunk/doc/book/src/java-broker/commonEntities.xml
qpid/java/trunk/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Ports.xml
qpid/java/trunk/doc/book/src/java-broker/concepts/Java-Broker-Concepts-Queues.xml
qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Entities-Matrix.xml
qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Exchanges.xml
qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Ports.xml
qpid/java/trunk/doc/book/src/java-broker/management/managing/Java-Broker-Management-Managing-Queues.xml
qpid/java/trunk/doc/book/src/java-broker/security/Java-Broker-Security-ACLs.xml
qpid/java/trunk/doc/book/src/java-broker/security/Java-Broker-Security-Authentication-Providers-External.xml
qpid/java/trunk/doc/book/src/java-broker/security/Java-Broker-Security-Authentication-Providers-Kerberos.xml
qpid/java/trunk/doc/book/src/java-broker/security/Java-Broker-Security-Authentication-Providers-LDAP.xml
qpid/java/trunk/doc/book/src/jms-client-0-8/JMS-Client-Appendix-Exceptions.xml
qpid/java/trunk/doc/book/src/jms-client-0-8/JMS-Client-JMS-Extensions.xml
qpid/java/trunk/pom.xml
qpid/java/trunk/systests/etc/config-systests.json
qpid/java/trunk/systests/pom.xml
qpid/java/trunk/systests/src/main/java/org/apache/qpid/systest/rest/QpidRestTestCase.java
qpid/java/trunk/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java
qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
qpid/java/trunk/systests/src/main/java/org/apache/qpid/test/utils/TestBrokerConfiguration.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/BrokerStartupTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/logging/AlertingTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/ModelTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/MultipleTransactedBatchProducerTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/queue/ProducerFlowControlTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/security/acl/AbstractACLTestCase.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/server/security/auth/manager/ExternalAuthenticationTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/PortRestTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/client/message/JMSDestinationTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/client/DynamicQueueExchangeCreateTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/client/MaxDeliveryCountTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/client/connection/BrokerClosesClientConnectionTest.java
qpid/java/trunk/systests/src/test/java/org/apache/qpid/test/unit/topic/DurableSubscriptionTest.java
qpid/java/trunk/test-profiles/CPPExcludes
qpid/java/trunk/test-profiles/Java010Excludes
qpid/java/trunk/test-profiles/JavaExcludes
qpid/java/trunk/test-profiles/JavaPre010Excludes
qpid/java/trunk/test-profiles/JavaTransientExcludes
qpid/java/trunk/test-profiles/cpp.excludes
Modified: qpid/java/trunk/bdbstore/pom.xml
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/pom.xml?rev=1718497&r1=1718496&r2=1718497&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/pom.xml (original)
+++ qpid/java/trunk/bdbstore/pom.xml Tue Dec 8 00:28:09 2015
@@ -131,7 +131,6 @@
<configuration>
<excludes>
<exclude>systests/**</exclude>
- <exclude>jmx/**</exclude>
</excludes>
</configuration>
</plugin>
Modified: qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgradeTestPreparer.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgradeTestPreparer.java?rev=1718497&r1=1718496&r2=1718497&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgradeTestPreparer.java (original)
+++ qpid/java/trunk/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBStoreUpgradeTestPreparer.java Tue Dec 8 00:28:09 2015
@@ -38,11 +38,6 @@ import javax.jms.TopicConnection;
import javax.jms.TopicPublisher;
import javax.jms.TopicSession;
import javax.jms.TopicSubscriber;
-import javax.management.MBeanServerConnection;
-import javax.management.ObjectName;
-import javax.management.remote.JMXConnector;
-import javax.management.remote.JMXConnectorFactory;
-import javax.management.remote.JMXServiceURL;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -193,10 +188,7 @@ public class BDBStoreUpgradeTestPreparer
sendMessages(session, dlqMessageProducer, dlq, DeliveryMode.PERSISTENT, 1*1024, 1);
session.commit();
- // Create a queue with JMX specifying an owner, so it can later be moved into description
- createAndBindQueueOnBrokerWithJMX(NONEXCLUSIVE_WITH_ERRONEOUS_OWNER, MISUSED_OWNER, priorityQueueArguments);
-
- createExchange(TEST_EXCHANGE_NAME, "direct");
+ ((AMQSession<?,?>) session).declareExchange(TEST_EXCHANGE_NAME, "direct", false);
Queue customQueue = createAndBindQueueOnBroker(session, TEST_QUEUE_NAME, null, TEST_EXCHANGE_NAME, "direct");
MessageProducer customQueueMessageProducer = session.createProducer(customQueue);
sendMessages(session, customQueueMessageProducer, customQueue, DeliveryMode.PERSISTENT, 1*1024, 1);
@@ -222,53 +214,6 @@ public class BDBStoreUpgradeTestPreparer
return queue;
}
- private void createAndBindQueueOnBrokerWithJMX(String queueName, String owner, final Map<String, Object> arguments) throws Exception
- {
- JMXConnector jmxConnector = createJMXConnector();
- try
- {
- MBeanServerConnection mbsc = jmxConnector.getMBeanServerConnection();
- ObjectName virtualHost = new ObjectName("org.apache.qpid:type=VirtualHost.VirtualHostManager,VirtualHost=\"" + VIRTUAL_HOST_NAME + "\"");
-
- Object[] params = new Object[] {queueName, owner, true, arguments};
- String[] signature = new String[] {String.class.getName(), String.class.getName(), boolean.class.getName(), Map.class.getName()};
- mbsc.invoke(virtualHost, "createNewQueue", params, signature);
-
- ObjectName directExchange = new ObjectName("org.apache.qpid:type=VirtualHost.Exchange,VirtualHost=\"" + VIRTUAL_HOST_NAME + "\",name=\"amq.direct\",ExchangeType=direct");
- mbsc.invoke(directExchange, "createNewBinding", new Object[] {queueName, queueName}, new String[] {String.class.getName(), String.class.getName()});
- }
- finally
- {
- jmxConnector.close();
- }
- }
-
- private void createExchange(String exchangeName, String exchangeType) throws Exception
- {
- JMXConnector jmxConnector = createJMXConnector();
- try
- {
- MBeanServerConnection mbsc = jmxConnector.getMBeanServerConnection();
- ObjectName virtualHost = new ObjectName("org.apache.qpid:type=VirtualHost.VirtualHostManager,VirtualHost=\"" + VIRTUAL_HOST_NAME + "\"");
-
- Object[] params = new Object[]{exchangeName, exchangeType, true};
- String[] signature = new String[]{String.class.getName(), String.class.getName(), boolean.class.getName()};
- mbsc.invoke(virtualHost, "createNewExchange", params, signature);
- }
- finally
- {
- jmxConnector.close();
- }
- }
-
- private JMXConnector createJMXConnector() throws Exception
- {
- Map<String, Object> environment = new HashMap<>();
- environment.put(JMXConnector.CREDENTIALS, new String[] {"admin", "admin"});
- JMXServiceURL url = new JMXServiceURL("service:jmx:rmi:///jndi/rmi://localhost:8999/jmxrmi");
- return JMXConnectorFactory.connect(url, environment);
- }
-
private void prepareSortedQueue(Session session, String queueName, String sortKey) throws Exception
{
final Map<String, Object> arguments = new HashMap<String, Object>();
Modified: qpid/java/trunk/bdbstore/systests/pom.xml
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/systests/pom.xml?rev=1718497&r1=1718496&r2=1718497&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/systests/pom.xml (original)
+++ qpid/java/trunk/bdbstore/systests/pom.xml Tue Dec 8 00:28:09 2015
@@ -57,12 +57,6 @@
</dependency>
<dependency>
- <groupId>org.apache.qpid</groupId>
- <artifactId>qpid-bdbstore-jmx</artifactId>
- <version>${project.version}</version>
- </dependency>
-
- <dependency>
<groupId>com.sleepycat</groupId>
<artifactId>je</artifactId>
<version>${bdb-version}</version>
Modified: qpid/java/trunk/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java?rev=1718497&r1=1718496&r2=1718497&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java (original)
+++ qpid/java/trunk/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBUpgradeTest.java Tue Dec 8 00:28:09 2015
@@ -21,7 +21,10 @@
package org.apache.qpid.server.store.berkeleydb;
import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
import java.io.InputStream;
+import java.util.Collection;
import java.util.Map;
import javax.jms.Connection;
@@ -39,14 +42,16 @@ import javax.jms.TopicConnection;
import javax.jms.TopicPublisher;
import javax.jms.TopicSession;
import javax.jms.TopicSubscriber;
-import javax.management.openmbean.CompositeData;
-import javax.management.openmbean.TabularDataSupport;
-import org.apache.qpid.management.common.mbeans.ManagedExchange;
-import org.apache.qpid.management.common.mbeans.ManagedQueue;
+import org.apache.qpid.client.AMQDestination;
+import org.apache.qpid.client.AMQQueue;
+import org.apache.qpid.exchange.ExchangeDefaults;
+import org.apache.qpid.server.model.Binding;
+import org.apache.qpid.server.model.Exchange;
+import org.apache.qpid.server.model.ExclusivityPolicy;
import org.apache.qpid.server.model.VirtualHostNode;
import org.apache.qpid.server.virtualhostnode.berkeleydb.BDBVirtualHostNode;
-import org.apache.qpid.test.utils.JMXTestUtils;
+import org.apache.qpid.systest.rest.RestTestHelper;
import org.apache.qpid.test.utils.QpidBrokerTestCase;
import org.apache.qpid.test.utils.TestBrokerConfiguration;
import org.apache.qpid.util.FileUtils;
@@ -80,12 +85,15 @@ public class BDBUpgradeTest extends Qpid
private static final String QUEUE_WITH_DLQ_NAME="myQueueWithDLQ";
private String _storeLocation;
+ private RestTestHelper _restTestHelper = new RestTestHelper(findFreePort());
@Override
public void setUp() throws Exception
{
assertNotNull("QPID_WORK must be set", QPID_WORK_ORIG);
- Map<String, Object> virtualHostNodeAttributes = getBrokerConfiguration().getObjectAttributes(VirtualHostNode.class, TestBrokerConfiguration.ENTRY_NAME_VIRTUAL_HOST);
+ TestBrokerConfiguration brokerConfiguration = getBrokerConfiguration();
+ _restTestHelper.enableHttpManagement(brokerConfiguration);
+ Map<String, Object> virtualHostNodeAttributes = brokerConfiguration.getObjectAttributes(VirtualHostNode.class, TestBrokerConfiguration.ENTRY_NAME_VIRTUAL_HOST);
_storeLocation = Strings.expand((String)virtualHostNodeAttributes.get(BDBVirtualHostNode.STORE_PATH));
//Clear the two target directories if they exist.
@@ -100,67 +108,61 @@ public class BDBUpgradeTest extends Qpid
InputStream src = getClass().getClassLoader().getResourceAsStream("upgrade/bdbstore-v4/test-store/00000000.jdb");
FileUtils.copy(src, new File(_storeLocation, "00000000.jdb"));
- getBrokerConfiguration().addJmxManagementConfiguration();
super.setUp();
}
+ @Override
+ public void tearDown() throws Exception
+ {
+ try
+ {
+ _restTestHelper.tearDown();
+ }
+ finally
+ {
+ super.tearDown();
+ }
+ }
+
/**
* Test that the selector applied to the DurableSubscription was successfully
- * transfered to the new store, and functions as expected with continued use
+ * transferred to the new store, and functions as expected with continued use
* by monitoring message count while sending new messages to the topic and then
* consuming them.
*/
public void testSelectorDurability() throws Exception
{
- JMXTestUtils jmxUtils = null;
- try
- {
- jmxUtils = new JMXTestUtils(this, "guest", "guest");
- jmxUtils.open();
- }
- catch (Exception e)
- {
- fail("Unable to establish JMX connection, test cannot proceed");
- }
+ AMQDestination queue = new AMQQueue(ExchangeDefaults.DEFAULT_EXCHANGE_NAME, "clientid" + ":" + SELECTOR_SUB_NAME);
+ // Create a connection and start it
+ TopicConnection connection = (TopicConnection) getConnection();
+ connection.start();
- try
- {
- ManagedQueue dursubQueue = jmxUtils.getManagedQueue("clientid" + ":" + SELECTOR_SUB_NAME);
- assertEquals("DurableSubscription backing queue should have 1 message on it initially",
- new Integer(1), dursubQueue.getMessageCount());
-
- // Create a connection and start it
- TopicConnection connection = (TopicConnection) getConnection();
- connection.start();
-
- // Send messages which don't match and do match the selector, checking message count
- TopicSession pubSession = connection.createTopicSession(true, Session.SESSION_TRANSACTED);
- Topic topic = pubSession.createTopic(SELECTOR_TOPIC_NAME);
- TopicPublisher publisher = pubSession.createPublisher(topic);
-
- publishMessages(pubSession, publisher, topic, DeliveryMode.PERSISTENT, 1*1024, 1, "false");
- pubSession.commit();
- assertEquals("DurableSubscription backing queue should still have 1 message on it",
- Integer.valueOf(1), dursubQueue.getMessageCount());
-
- publishMessages(pubSession, publisher, topic, DeliveryMode.PERSISTENT, 1*1024, 1, "true");
- pubSession.commit();
- assertEquals("DurableSubscription backing queue should now have 2 messages on it",
- Integer.valueOf(2), dursubQueue.getMessageCount());
-
- TopicSubscriber durSub = pubSession.createDurableSubscriber(topic, SELECTOR_SUB_NAME,"testprop='true'", false);
- Message m = durSub.receive(2000);
- assertNotNull("Failed to receive an expected message", m);
- m = durSub.receive(2000);
- assertNotNull("Failed to receive an expected message", m);
- pubSession.commit();
+ // Send messages which don't match and do match the selector, checking message count
+ TopicSession pubSession = connection.createTopicSession(true, Session.SESSION_TRANSACTED);
+ assertEquals("DurableSubscription backing queue should have 1 message on it initially",
+ 1, getQueueDepth(queue.getQueueName()));
+
+ Topic topic = pubSession.createTopic(SELECTOR_TOPIC_NAME);
+ TopicPublisher publisher = pubSession.createPublisher(topic);
+
+ publishMessages(pubSession, publisher, topic, DeliveryMode.PERSISTENT, 1*1024, 1, "false");
+ pubSession.commit();
+ assertEquals("DurableSubscription backing queue should still have 1 message on it",
+ 1, getQueueDepth(queue.getQueueName()));
+
+ publishMessages(pubSession, publisher, topic, DeliveryMode.PERSISTENT, 1*1024, 1, "true");
+ pubSession.commit();
+ assertEquals("DurableSubscription backing queue should now have 2 messages on it",
+ 2, getQueueDepth(queue.getQueueName()));
+
+ TopicSubscriber durSub = pubSession.createDurableSubscriber(topic, SELECTOR_SUB_NAME,"testprop='true'", false);
+ Message m = durSub.receive(2000);
+ assertNotNull("Failed to receive an expected message", m);
+ m = durSub.receive(2000);
+ assertNotNull("Failed to receive an expected message", m);
+ pubSession.commit();
- pubSession.close();
- }
- finally
- {
- jmxUtils.close();
- }
+ pubSession.close();
}
/**
@@ -169,50 +171,32 @@ public class BDBUpgradeTest extends Qpid
*/
public void testDurableSubscriptionWithoutSelector() throws Exception
{
- JMXTestUtils jmxUtils = null;
- try
- {
- jmxUtils = new JMXTestUtils(this, "guest", "guest");
- jmxUtils.open();
- }
- catch (Exception e)
- {
- fail("Unable to establish JMX connection, test cannot proceed");
- }
+ AMQDestination queue = new AMQQueue(ExchangeDefaults.DEFAULT_EXCHANGE_NAME, "clientid" + ":" + SUB_NAME);
- try
- {
- ManagedQueue dursubQueue = jmxUtils.getManagedQueue("clientid" + ":" + SUB_NAME);
- assertEquals("DurableSubscription backing queue should have 1 message on it initially",
- new Integer(1), dursubQueue.getMessageCount());
-
- // Create a connection and start it
- TopicConnection connection = (TopicConnection) getConnection();
- connection.start();
-
- // Send new message matching the topic, checking message count
- TopicSession session = connection.createTopicSession(true, Session.SESSION_TRANSACTED);
- Topic topic = session.createTopic(TOPIC_NAME);
- TopicPublisher publisher = session.createPublisher(topic);
-
- publishMessages(session, publisher, topic, DeliveryMode.PERSISTENT, 1*1024, 1, "indifferent");
- session.commit();
- assertEquals("DurableSubscription backing queue should now have 2 messages on it",
- Integer.valueOf(2), dursubQueue.getMessageCount());
-
- TopicSubscriber durSub = session.createDurableSubscriber(topic, SUB_NAME);
- Message m = durSub.receive(2000);
- assertNotNull("Failed to receive an expected message", m);
- m = durSub.receive(2000);
- assertNotNull("Failed to receive an expected message", m);
+ // Create a connection and start it
+ TopicConnection connection = (TopicConnection) getConnection();
+ connection.start();
- session.commit();
- session.close();
- }
- finally
- {
- jmxUtils.close();
- }
+ // Send new message matching the topic, checking message count
+ TopicSession session = connection.createTopicSession(true, Session.SESSION_TRANSACTED);
+ assertEquals("DurableSubscription backing queue should have 1 message on it initially",
+ 1, getQueueDepth(queue.getQueueName()));
+ Topic topic = session.createTopic(TOPIC_NAME);
+ TopicPublisher publisher = session.createPublisher(topic);
+
+ publishMessages(session, publisher, topic, DeliveryMode.PERSISTENT, 1*1024, 1, "indifferent");
+ session.commit();
+ assertEquals("DurableSubscription backing queue should now have 2 messages on it",
+ 2, getQueueDepth(queue.getQueueName()));
+
+ TopicSubscriber durSub = session.createDurableSubscriber(topic, SUB_NAME);
+ Message m = durSub.receive(2000);
+ assertNotNull("Failed to receive an expected message", m);
+ m = durSub.receive(2000);
+ assertNotNull("Failed to receive an expected message", m);
+
+ session.commit();
+ session.close();
}
/**
@@ -222,29 +206,17 @@ public class BDBUpgradeTest extends Qpid
*/
public void testQueueExclusivity() throws Exception
{
- JMXTestUtils jmxUtils = null;
- try
- {
- jmxUtils = new JMXTestUtils(this, "guest", "guest");
- jmxUtils.open();
- }
- catch (Exception e)
- {
- fail("Unable to establish JMX connection, test cannot proceed");
- }
-
- try
- {
- ManagedQueue queue = jmxUtils.getManagedQueue(QUEUE_NAME);
- assertFalse("Queue should not have been marked as Exclusive during upgrade", queue.isExclusive());
-
- ManagedQueue dursubQueue = jmxUtils.getManagedQueue("clientid" + ":" + SUB_NAME);
- assertTrue("DurableSubscription backing queue should have been marked as Exclusive during upgrade", dursubQueue.isExclusive());
- }
- finally
- {
- jmxUtils.close();
- }
+ Map<String, Object> result = getQueueAttributes(QUEUE_NAME);
+ ExclusivityPolicy exclusivityPolicy =
+ ExclusivityPolicy.valueOf((String) result.get(org.apache.qpid.server.model.Queue.EXCLUSIVE));
+ assertEquals("Queue should not have been marked as Exclusive during upgrade",
+ ExclusivityPolicy.NONE, exclusivityPolicy);
+
+ result = getQueueAttributes("clientid" + ":" + SUB_NAME);
+ exclusivityPolicy =
+ ExclusivityPolicy.valueOf((String) result.get(org.apache.qpid.server.model.Queue.EXCLUSIVE));
+ assertTrue("DurableSubscription backing queue should have been marked as Exclusive during upgrade",
+ exclusivityPolicy != ExclusivityPolicy.NONE);
}
/**
@@ -369,53 +341,67 @@ public class BDBUpgradeTest extends Qpid
*/
public void testRecoveryOfQueueWithDLQ() throws Exception
{
- JMXTestUtils jmxUtils = null;
+ //verify the DLE exchange exists, has the expected type, and a single binding for the DLQ
+ Map<String, Object> exchangeAttributes = getExchangeAttributes(QUEUE_WITH_DLQ_NAME + "_DLE");
+ assertEquals("Wrong exchange type", "fanout", (String) exchangeAttributes.get(Exchange.TYPE));
+ Collection<Map<String, Object>> bindings = (Collection<Map<String, Object>>) exchangeAttributes.get("bindings");
+ assertEquals(1, bindings.size());
+ for(Map<String, Object> binding : bindings)
+ {
+ String bindingKey = (String) binding.get(Binding.NAME);
+ String queueName = (String) binding.get(Binding.QUEUE);
+
+ //Because its a fanout exchange, we just return a single '*' key with all bound queues
+ assertEquals("unexpected binding key", "dlq", bindingKey);
+ assertEquals("unexpected queue name", QUEUE_WITH_DLQ_NAME + "_DLQ", queueName);
+ }
+
+ //verify the queue exists, has the expected alternate exchange and max delivery count
+ Map<String, Object> queueAttributes = getQueueAttributes(QUEUE_WITH_DLQ_NAME);
+ assertEquals("Queue does not have the expected AlternateExchange", QUEUE_WITH_DLQ_NAME + "_DLE",
+ (String) queueAttributes.get(org.apache.qpid.server.model.Queue.ALTERNATE_EXCHANGE));
+ assertEquals("Unexpected maximum delivery count", 2,
+ ((Number) queueAttributes.get(org.apache.qpid.server.model.Queue.MAXIMUM_DELIVERY_ATTEMPTS)).intValue());
+
+ Map<String, Object> dlQueueAttributes = getQueueAttributes(QUEUE_WITH_DLQ_NAME + "_DLQ");
+ assertNull("Queue should not have an AlternateExchange",
+ dlQueueAttributes.get(org.apache.qpid.server.model.Queue.ALTERNATE_EXCHANGE));
+ assertEquals("Unexpected maximum delivery count", 0,
+ ((Number) dlQueueAttributes.get(org.apache.qpid.server.model.Queue.MAXIMUM_DELIVERY_ATTEMPTS)).intValue());
+
try
{
- jmxUtils = new JMXTestUtils(this, "guest", "guest");
- jmxUtils.open();
+ String queueName = QUEUE_WITH_DLQ_NAME + "_DLQ_DLQ";
+ getQueueAttributes(queueName);
+ fail("A DLQ should not exist for the DLQ itself");
}
- catch (Exception e)
+ catch (FileNotFoundException e)
{
- fail("Unable to establish JMX connection, test cannot proceed");
+ // pass
}
+ }
- try
- {
- //verify the DLE exchange exists, has the expected type, and a single binding for the DLQ
- ManagedExchange exchange = jmxUtils.getManagedExchange(QUEUE_WITH_DLQ_NAME + "_DLE");
- assertEquals("Wrong exchange type", "fanout", exchange.getExchangeType());
- TabularDataSupport bindings = (TabularDataSupport) exchange.bindings();
- assertEquals(1, bindings.size());
- for(Object o : bindings.values())
- {
- CompositeData binding = (CompositeData) o;
-
- String bindingKey = (String) binding.get(ManagedExchange.BINDING_KEY);
- String[] queueNames = (String[]) binding.get(ManagedExchange.QUEUE_NAMES);
-
- //Because its a fanout exchange, we just return a single '*' key with all bound queues
- assertEquals("unexpected binding key", "*", bindingKey);
- assertEquals("unexpected number of queues bound", 1, queueNames.length);
- assertEquals("unexpected queue name", QUEUE_WITH_DLQ_NAME + "_DLQ", queueNames[0]);
- }
-
- //verify the queue exists, has the expected alternate exchange and max delivery count
- ManagedQueue queue = jmxUtils.getManagedQueue(QUEUE_WITH_DLQ_NAME);
- assertEquals("Queue does not have the expected AlternateExchange", QUEUE_WITH_DLQ_NAME + "_DLE", queue.getAlternateExchange());
- assertEquals("Unexpected maximum delivery count", Integer.valueOf(2), queue.getMaximumDeliveryCount());
-
- ManagedQueue dlQqueue = jmxUtils.getManagedQueue(QUEUE_WITH_DLQ_NAME + "_DLQ");
- assertNull("Queue should not have an AlternateExchange", dlQqueue.getAlternateExchange());
- assertEquals("Unexpected maximum delivery count", Integer.valueOf(0), dlQqueue.getMaximumDeliveryCount());
+ private Map<String, Object> getExchangeAttributes(final String exchangeName) throws IOException
+ {
+ String exchangeUrl = String.format("exchange/%1$s/%1$s/%2$s",
+ TestBrokerConfiguration.ENTRY_NAME_VIRTUAL_HOST,
+ exchangeName);
+ return _restTestHelper.getJsonAsSingletonList(exchangeUrl);
+ }
- String dlqDlqObjectNameString = jmxUtils.getQueueObjectNameString("test", QUEUE_WITH_DLQ_NAME + "_DLQ" + "_DLQ");
- assertFalse("a DLQ should not exist for the DLQ itself", jmxUtils.doesManagedObjectExist(dlqDlqObjectNameString));
- }
- finally
- {
- jmxUtils.close();
- }
+ private Map<String, Object> getQueueAttributes(final String queueName) throws IOException
+ {
+ String queueUrl = String.format("queue/%1$s/%1$s/%2$s",
+ TestBrokerConfiguration.ENTRY_NAME_VIRTUAL_HOST,
+ queueName);
+ return _restTestHelper.getJsonAsSingletonList(queueUrl);
+ }
+
+ private long getQueueDepth(final String queueName) throws org.apache.qpid.QpidException, IOException
+ {
+ Map<String, Object> queueAttributes = getQueueAttributes(queueName);
+ Map<String, Object> statistics = (Map<String, Object>) queueAttributes.get("statistics");
+ return ((Number) statistics.get("queueDepthMessages")).longValue();
}
private void consumeDurableSubscriptionMessages(Connection connection, boolean selector) throws Exception
Modified: qpid/java/trunk/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/GroupCreator.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/GroupCreator.java?rev=1718497&r1=1718496&r2=1718497&view=diff
==============================================================================
--- qpid/java/trunk/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/GroupCreator.java (original)
+++ qpid/java/trunk/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/GroupCreator.java Tue Dec 8 00:28:09 2015
@@ -155,7 +155,6 @@ public class GroupCreator
virtualHostNodeAttributes.put(BDBHAVirtualHostNode.CONTEXT, context);
TestBrokerConfiguration brokerConfiguration = _testcase.getBrokerConfiguration(brokerPort);
- brokerConfiguration.addJmxManagementConfiguration();
brokerConfiguration.addHttpManagementConfiguration();
brokerConfiguration.setObjectAttribute(Plugin.class, TestBrokerConfiguration.ENTRY_NAME_HTTP_MANAGEMENT, HttpManagement.HTTP_BASIC_AUTHENTICATION_ENABLED, true);
brokerConfiguration.setObjectAttribute(Port.class, TestBrokerConfiguration.ENTRY_NAME_HTTP_PORT, Port.PORT, _testcase.getHttpManagementPort(brokerPort));
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/BrokerOptions.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/BrokerOptions.java?rev=1718497&r1=1718496&r2=1718497&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/BrokerOptions.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/BrokerOptions.java Tue Dec 8 00:28:09 2015
@@ -66,8 +66,6 @@ public class BrokerOptions
private boolean _managementMode;
private boolean _managementModeQuiesceVhosts;
- private int _managementModeRmiPortOverride;
- private int _managementModeJmxPortOverride;
private int _managementModeHttpPortOverride;
private String _managementModePassword;
private boolean _overwriteConfigurationStore;
@@ -84,8 +82,6 @@ public class BrokerOptions
attributes.put(SystemConfig.MANAGEMENT_MODE, _managementMode);
attributes.put(SystemConfig.MANAGEMENT_MODE_QUIESCE_VIRTUAL_HOSTS, _managementModeQuiesceVhosts);
- attributes.put(SystemConfig.MANAGEMENT_MODE_RMI_PORT_OVERRIDE, _managementModeRmiPortOverride);
- attributes.put(SystemConfig.MANAGEMENT_MODE_JMX_PORT_OVERRIDE, _managementModeJmxPortOverride);
attributes.put(SystemConfig.MANAGEMENT_MODE_HTTP_PORT_OVERRIDE, _managementModeHttpPortOverride);
attributes.put(SystemConfig.MANAGEMENT_MODE_PASSWORD, _managementModePassword);
attributes.put(SystemConfig.INITIAL_CONFIGURATION_LOCATION, getInitialConfigurationLocation());
@@ -123,26 +119,6 @@ public class BrokerOptions
_managementModeQuiesceVhosts = managementModeQuiesceVhosts;
}
- public int getManagementModeRmiPortOverride()
- {
- return _managementModeRmiPortOverride;
- }
-
- public void setManagementModeRmiPortOverride(int managementModeRmiPortOverride)
- {
- _managementModeRmiPortOverride = managementModeRmiPortOverride;
- }
-
- public int getManagementModeJmxPortOverride()
- {
- return _managementModeJmxPortOverride;
- }
-
- public void setManagementModeJmxPortOverride(int managementModeJmxPortOverride)
- {
- _managementModeJmxPortOverride = managementModeJmxPortOverride;
- }
-
public int getManagementModeHttpPortOverride()
{
return _managementModeHttpPortOverride;
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/configuration/BrokerProperties.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/configuration/BrokerProperties.java?rev=1718497&r1=1718496&r2=1718497&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/configuration/BrokerProperties.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/configuration/BrokerProperties.java Tue Dec 8 00:28:09 2015
@@ -39,9 +39,6 @@ public class BrokerProperties
public static final String PROPERTY_DEFAULT_SUPPORTED_PROTOCOL_REPLY = "qpid.broker_default_supported_protocol_version_reply";
public static final String PROPERTY_DISABLED_FEATURES = "qpid.broker_disabled_features";
- public static final String PROPERTY_MANAGEMENT_RIGHTS_INFER_ALL_ACCESS = "qpid.broker_jmx_method_rights_infer_all_access";
- public static final String PROPERTY_USE_CUSTOM_RMI_SOCKET_FACTORY = "qpid.broker_jmx_use_custom_rmi_socket_factory";
-
public static final String PROPERTY_QPID_HOME = "QPID_HOME";
public static final String PROPERTY_QPID_WORK = "QPID_WORK";
public static final String POSIX_FILE_PERMISSIONS = "qpid.default_posix_file_permissions";
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandler.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandler.java?rev=1718497&r1=1718496&r2=1718497&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandler.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandler.java Tue Dec 8 00:28:09 2015
@@ -90,8 +90,6 @@ public class ManagementModeStoreHandler
final ConfiguredObjectRecordHandler localRecoveryHandler = new ConfiguredObjectRecordHandler()
{
private int _version;
- private boolean _quiesceRmiPort = _systemConfig.getManagementModeRmiPortOverride() > 0;
- private boolean _quiesceJmxPort = _systemConfig.getManagementModeJmxPortOverride() > 0;
private boolean _quiesceHttpPort = _systemConfig.getManagementModeHttpPortOverride() > 0;
@Override
@@ -126,12 +124,6 @@ public class ManagementModeStoreHandler
{
switch (protocol)
{
- case JMX_RMI:
- quiesce = _quiesceJmxPort || _quiesceRmiPort ;
- break;
- case RMI:
- quiesce = _quiesceRmiPort;
- break;
case HTTP:
quiesce = _quiesceHttpPort;
break;
@@ -293,37 +285,12 @@ public class ManagementModeStoreHandler
private Map<UUID, ConfiguredObjectRecord> createPortsFromCommandLineOptions(SystemConfig<?> options)
{
- int managementModeRmiPortOverride = options.getManagementModeRmiPortOverride();
- if (managementModeRmiPortOverride < 0)
- {
- throw new IllegalConfigurationException("Invalid rmi port is specified: " + managementModeRmiPortOverride);
- }
- int managementModeJmxPortOverride = options.getManagementModeJmxPortOverride();
- if (managementModeJmxPortOverride < 0)
- {
- throw new IllegalConfigurationException("Invalid jmx port is specified: " + managementModeJmxPortOverride);
- }
int managementModeHttpPortOverride = options.getManagementModeHttpPortOverride();
if (managementModeHttpPortOverride < 0)
{
throw new IllegalConfigurationException("Invalid http port is specified: " + managementModeHttpPortOverride);
}
Map<UUID, ConfiguredObjectRecord> cliEntries = new HashMap<UUID, ConfiguredObjectRecord>();
- if (managementModeRmiPortOverride != 0)
- {
- ConfiguredObjectRecord entry = createCLIPortEntry(managementModeRmiPortOverride, Protocol.RMI);
- cliEntries.put(entry.getId(), entry);
- if (managementModeJmxPortOverride == 0)
- {
- ConfiguredObjectRecord connectorEntry = createCLIPortEntry(managementModeRmiPortOverride + 100, Protocol.JMX_RMI);
- cliEntries.put(connectorEntry.getId(), connectorEntry);
- }
- }
- if (managementModeJmxPortOverride != 0)
- {
- ConfiguredObjectRecord entry = createCLIPortEntry(managementModeJmxPortOverride, Protocol.JMX_RMI);
- cliEntries.put(entry.getId(), entry);
- }
if (managementModeHttpPortOverride != 0)
{
ConfiguredObjectRecord entry = createCLIPortEntry(managementModeHttpPortOverride, Protocol.HTTP);
@@ -340,10 +307,7 @@ public class ManagementModeStoreHandler
attributes.put(Port.PORT, port);
attributes.put(Port.PROTOCOLS, Collections.singleton(protocol));
attributes.put(Port.NAME, MANAGEMENT_MODE_PORT_PREFIX + protocol.name());
- if (protocol != Protocol.RMI)
- {
- attributes.put(Port.AUTHENTICATION_PROVIDER, BrokerAdapter.MANAGEMENT_MODE_AUTHENTICATION);
- }
+ attributes.put(Port.AUTHENTICATION_PROVIDER, BrokerAdapter.MANAGEMENT_MODE_AUTHENTICATION);
ConfiguredObjectRecord portEntry = new ConfiguredObjectRecordImpl(UUID.randomUUID(), PORT_TYPE, attributes,
Collections.singletonMap(parent.getType(),parent.getId()));
if (LOGGER.isDebugEnabled())
@@ -370,8 +334,6 @@ public class ManagementModeStoreHandler
private Map<UUID, Object> quiesceEntries(final SystemConfig<?> options)
{
final Map<UUID, Object> quiescedEntries = new HashMap<UUID, Object>();
- final int managementModeRmiPortOverride = options.getManagementModeRmiPortOverride();
- final int managementModeJmxPortOverride = options.getManagementModeJmxPortOverride();
final int managementModeHttpPortOverride = options.getManagementModeHttpPortOverride();
_store.visitConfiguredObjectRecords(new ConfiguredObjectRecordHandler()
@@ -409,12 +371,6 @@ public class ManagementModeStoreHandler
{
switch (protocol)
{
- case JMX_RMI:
- quiesce = managementModeJmxPortOverride > 0 || managementModeRmiPortOverride > 0;
- break;
- case RMI:
- quiesce = managementModeRmiPortOverride > 0;
- break;
case HTTP:
quiesce = managementModeHttpPortOverride > 0;
break;
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractSystemConfig.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractSystemConfig.java?rev=1718497&r1=1718496&r2=1718497&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractSystemConfig.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/AbstractSystemConfig.java Tue Dec 8 00:28:09 2015
@@ -73,12 +73,6 @@ public abstract class AbstractSystemConf
private boolean _managementMode;
@ManagedAttributeField
- private int _managementModeRmiPortOverride;
-
- @ManagedAttributeField
- private int _managementModeJmxPortOverride;
-
- @ManagedAttributeField
private int _managementModeHttpPortOverride;
@ManagedAttributeField
@@ -316,18 +310,6 @@ public abstract class AbstractSystemConf
}
@Override
- public int getManagementModeRmiPortOverride()
- {
- return _managementModeRmiPortOverride;
- }
-
- @Override
- public int getManagementModeJmxPortOverride()
- {
- return _managementModeJmxPortOverride;
- }
-
- @Override
public int getManagementModeHttpPortOverride()
{
return _managementModeHttpPortOverride;
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java?rev=1718497&r1=1718496&r2=1718497&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Broker.java Tue Dec 8 00:28:09 2015
@@ -57,8 +57,6 @@ public interface Broker<X extends Broker
String STORE_FILESYSTEM_MAX_USAGE_PERCENT = "store.filesystem.maxUsagePercent";
String QPID_AMQP_PORT = "qpid.amqp_port";
String QPID_HTTP_PORT = "qpid.http_port";
- String QPID_RMI_PORT = "qpid.rmi_port";
- String QPID_JMX_PORT = "qpid.jmx_port";
String NETWORK_BUFFER_SIZE = "qpid.broker.networkBufferSize";
// network buffer should at least hold a SSL/TLS frame which in jdk1.8 is 33305 bytes
@@ -73,10 +71,6 @@ public interface Broker<X extends Broker
String DEFAULT_AMQP_PORT_NUMBER = "5672";
@ManagedContextDefault(name = QPID_HTTP_PORT)
String DEFAULT_HTTP_PORT_NUMBER = "8080";
- @ManagedContextDefault(name = QPID_RMI_PORT)
- String DEFAULT_RMI_PORT_NUMBER = "8999";
- @ManagedContextDefault(name = QPID_JMX_PORT)
- String DEFAULT_JMX_PORT_NUMBER = "9099";
@ManagedContextDefault(name = BROKER_FLOW_TO_DISK_THRESHOLD)
long DEFAULT_FLOW_TO_DISK_THRESHOLD = (long)(0.4 * (double) BrokerAdapter.getMaxDirectMemorySize());
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/BrokerModel.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/BrokerModel.java?rev=1718497&r1=1718496&r2=1718497&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/BrokerModel.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/BrokerModel.java Tue Dec 8 00:28:09 2015
@@ -50,9 +50,10 @@ public final class BrokerModel extends M
* Replace the defaultVirtualHost (at Broker) with defaultVirtualHostNode flag (at VHN)
* Make Connections children of Ports instead of VHosts
* Bring model version and Qpid version into sync
+ * 6.1 Remove JMX
*/
public static final int MODEL_MAJOR_VERSION = 6;
- public static final int MODEL_MINOR_VERSION = 0;
+ public static final int MODEL_MINOR_VERSION = 1;
public static final String MODEL_VERSION = MODEL_MAJOR_VERSION + "." + MODEL_MINOR_VERSION;
private static final Model MODEL_INSTANCE = new BrokerModel();
private final Map<Class<? extends ConfiguredObject>, Collection<Class<? extends ConfiguredObject>>> _parents =
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Port.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Port.java?rev=1718497&r1=1718496&r2=1718497&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Port.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Port.java Tue Dec 8 00:28:09 2015
@@ -29,7 +29,7 @@ import com.google.common.util.concurrent
public interface Port<X extends Port<X>> extends ConfiguredObject<X>
{
String CLASS_DESCRIPTION = "<p>The Broker supports configuration of Ports to specify the particular AMQP messaging "
- + "and HTTP/JMX management connectivity it offers for use.</p>"
+ + "and HTTP management connectivity it offers for use.</p>"
+ "<p>Each Port is configured with the particular Protocols and Transports it supports, "
+ "as well as the Authentication Provider to be used to authenticate connections. Where "
+ "SSL is in use, the Port configuration also defines which Keystore to use and (where "
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Protocol.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Protocol.java?rev=1718497&r1=1718496&r2=1718497&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Protocol.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/Protocol.java Tue Dec 8 00:28:09 2015
@@ -27,9 +27,7 @@ public enum Protocol
AMQP_0_9_1(ProtocolType.AMQP, "0-9-1"),
AMQP_0_10(ProtocolType.AMQP, "0-10"),
AMQP_1_0(ProtocolType.AMQP, "1.0"),
- JMX_RMI(ProtocolType.JMX),
- HTTP(ProtocolType.HTTP),
- RMI(ProtocolType.RMI);
+ HTTP(ProtocolType.HTTP);
private final ProtocolType _protocolType;
@@ -63,6 +61,6 @@ public enum Protocol
public enum ProtocolType
{
- AMQP, HTTP, JMX, RMI
+ AMQP, HTTP
}
}
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/SystemConfig.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/SystemConfig.java?rev=1718497&r1=1718496&r2=1718497&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/SystemConfig.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/SystemConfig.java Tue Dec 8 00:28:09 2015
@@ -30,8 +30,6 @@ public interface SystemConfig<X extends
String MANAGEMENT_MODE = "managementMode";
String MANAGEMENT_MODE_QUIESCE_VIRTUAL_HOSTS = "managementModeQuiesceVirtualHosts";
- String MANAGEMENT_MODE_RMI_PORT_OVERRIDE = "managementModeRmiPortOverride";
- String MANAGEMENT_MODE_JMX_PORT_OVERRIDE = "managementModeJmxPortOverride";
String MANAGEMENT_MODE_HTTP_PORT_OVERRIDE = "managementModeHttpPortOverride";
String MANAGEMENT_MODE_PASSWORD = "managementModePassword";
String INITIAL_CONFIGURATION_LOCATION = "initialConfigurationLocation";
@@ -44,12 +42,6 @@ public interface SystemConfig<X extends
boolean isManagementMode();
@ManagedAttribute(defaultValue = "0")
- int getManagementModeRmiPortOverride();
-
- @ManagedAttribute(defaultValue = "0")
- int getManagementModeJmxPortOverride();
-
- @ManagedAttribute(defaultValue = "0")
int getManagementModeHttpPortOverride();
@ManagedAttribute(defaultValue = "false")
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java?rev=1718497&r1=1718496&r2=1718497&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/model/port/AbstractPort.java Tue Dec 8 00:28:09 2015
@@ -198,12 +198,6 @@ abstract public class AbstractPort<X ext
throw new IllegalConfigurationException("Can't create port which requires SSL but has no key store configured.");
}
}
-
- if (protocols != null && protocols.contains(Protocol.RMI) && usesSsl)
- {
- throw new IllegalConfigurationException("Can't create RMI Registry port which requires SSL.");
- }
-
}
@Override
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/stats/StatisticsGatherer.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/stats/StatisticsGatherer.java?rev=1718497&r1=1718496&r2=1718497&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/stats/StatisticsGatherer.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/stats/StatisticsGatherer.java Tue Dec 8 00:28:09 2015
@@ -22,7 +22,7 @@ package org.apache.qpid.server.stats;
* This interface is to be implemented by any broker business object that
* wishes to gather statistics about messages delivered through it.
*
- * These statistics are exposed using a separate JMX Mbean interface, which
+ * These statistics are exposed using a management interface, which
* calls these methods to retrieve the underlying {@link StatisticsCounter}s
* and return their attributes. This interface gives a standard way for
* parts of the broker to set up and configure statistics generation.
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecoverer.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecoverer.java?rev=1718497&r1=1718496&r2=1718497&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecoverer.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/BrokerStoreUpgraderAndRecoverer.java Tue Dec 8 00:28:09 2015
@@ -64,6 +64,7 @@ public class BrokerStoreUpgraderAndRecov
register(new Upgrader_2_0_to_3_0());
register(new Upgrader_3_0_to_6_0());
+ register(new Upgrader_6_0_to_6_1());
}
private void register(StoreUpgraderPhase upgrader)
@@ -461,6 +462,60 @@ public class BrokerStoreUpgraderAndRecov
getNextUpgrader().complete();
}
+ }
+
+ private class Upgrader_6_0_to_6_1 extends StoreUpgraderPhase
+ {
+ public Upgrader_6_0_to_6_1()
+ {
+ super("modelVersion", "6.0", "6.1");
+ }
+
+ @Override
+ public void configuredObject(ConfiguredObjectRecord record)
+ {
+ if (record.getType().equals("Broker"))
+ {
+ record = upgradeRootRecord(record);
+
+ getNextUpgrader().configuredObject(record);
+ }
+ else
+ {
+ Map<String, Object> attributes = record.getAttributes();
+ String type = (String)attributes.get("type");
+ if (record.getType().equals("Plugin") && "MANAGEMENT-JMX".equals(type))
+ {
+ getDeleteMap().put(record.getId(), record);
+ }
+ else if (record.getType().equals("Port"))
+ {
+ Object protocols = attributes.get("protocols");
+ if ((protocols instanceof Collection && (((Collection) protocols).contains("RMI")
+ || ((Collection) protocols).contains("JMX_RMI")))
+ || "JMX".equals(type)
+ || "RMI".equals(type))
+ {
+ getDeleteMap().put(record.getId(), record);
+ }
+ else
+ {
+ getNextUpgrader().configuredObject(record);
+ }
+ }
+ else
+ {
+ getNextUpgrader().configuredObject(record);
+ }
+ }
+ }
+
+ @Override
+ public void complete()
+ {
+ getNextUpgrader().complete();
+ }
+
}
private static class VirtualHostEntryUpgrader
Modified: qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/VirtualHostStoreUpgraderAndRecoverer.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/VirtualHostStoreUpgraderAndRecoverer.java?rev=1718497&r1=1718496&r2=1718497&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/VirtualHostStoreUpgraderAndRecoverer.java (original)
+++ qpid/java/trunk/broker-core/src/main/java/org/apache/qpid/server/store/VirtualHostStoreUpgraderAndRecoverer.java Tue Dec 8 00:28:09 2015
@@ -72,6 +72,7 @@ public class VirtualHostStoreUpgraderAnd
register(new Upgrader_0_4_to_2_0());
register(new Upgrader_2_0_to_3_0());
register(new Upgrader_3_0_to_6_0());
+ register(new Upgrader_6_0_to_6_1());
Map<String, UUID> defaultExchangeIds = new HashMap<String, UUID>();
for (String exchangeName : DEFAULT_EXCHANGES.keySet())
@@ -524,6 +525,32 @@ public class VirtualHostStoreUpgraderAnd
}
@Override
+ public void configuredObject(ConfiguredObjectRecord record)
+ {
+
+ if("VirtualHost".equals(record.getType()))
+ {
+ record = upgradeRootRecord(record);
+ }
+ getNextUpgrader().configuredObject(record);
+ }
+
+ @Override
+ public void complete()
+ {
+ getNextUpgrader().complete();
+ }
+
+ }
+
+ private class Upgrader_6_0_to_6_1 extends StoreUpgraderPhase
+ {
+ public Upgrader_6_0_to_6_1()
+ {
+ super("modelVersion", "6.0", "6.1");
+ }
+
+ @Override
public void configuredObject(ConfiguredObjectRecord record)
{
Modified: qpid/java/trunk/broker-core/src/main/resources/initial-config.json
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/main/resources/initial-config.json?rev=1718497&r1=1718496&r2=1718497&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/main/resources/initial-config.json (original)
+++ qpid/java/trunk/broker-core/src/main/resources/initial-config.json Tue Dec 8 00:28:09 2015
@@ -100,8 +100,5 @@
"plugins" : [ {
"type" : "MANAGEMENT-HTTP",
"name" : "httpManagement"
- }, {
- "type" : "MANAGEMENT-JMX",
- "name" : "jmxManagement"
} ]
}
Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/BrokerOptionsTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/BrokerOptionsTest.java?rev=1718497&r1=1718496&r2=1718497&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/BrokerOptionsTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/BrokerOptionsTest.java Tue Dec 8 00:28:09 2015
@@ -117,28 +117,6 @@ public class BrokerOptionsTest extends Q
assertEquals(true, _options.isManagementModeQuiesceVirtualHosts());
}
- public void testDefaultManagementModeRmiPortOverride()
- {
- assertEquals(0, _options.getManagementModeRmiPortOverride());
- }
-
- public void testOverriddenManagementModeRmiPort()
- {
- _options.setManagementModeRmiPortOverride(5555);
- assertEquals(5555, _options.getManagementModeRmiPortOverride());
- }
-
- public void testDefaultManagementModeJmxPortOverride()
- {
- assertEquals(0, _options.getManagementModeJmxPortOverride());
- }
-
- public void testOverriddenManagementModeJmxPort()
- {
- _options.setManagementModeJmxPortOverride(5555);
- assertEquals(5555, _options.getManagementModeJmxPortOverride());
- }
-
public void testDefaultManagementModeHttpPortOverride()
{
assertEquals(0, _options.getManagementModeHttpPortOverride());
Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandlerTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandlerTest.java?rev=1718497&r1=1718496&r2=1718497&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandlerTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/configuration/store/ManagementModeStoreHandlerTest.java Tue Dec 8 00:28:09 2015
@@ -194,44 +194,16 @@ public class ManagementModeStoreHandlerT
assertTrue("Store port entry id is not found", childrenIds.contains(_portEntryId));
}
- public void testGetRootEntryWithRmiPortOverriden()
- {
- _options.setManagementModeRmiPortOverride(9090);
- _handler = createManagementModeStoreHandler();
- _handler.openConfigurationStore(_systemConfig, false);
-
- ConfiguredObjectRecord root = getRootEntry();
- assertEquals("Unexpected root id", _rootId, root.getId());
- Collection<UUID> childrenIds = getChildrenIds(root);
- assertEquals("Unexpected children size", 3, childrenIds.size());
- assertTrue("Store port entry id is not found", childrenIds.contains(_portEntryId));
- }
-
- public void testGetRootEntryWithConnectorPortOverriden()
- {
- _options.setManagementModeJmxPortOverride(9090);
- _handler = createManagementModeStoreHandler();
- _handler.openConfigurationStore(_systemConfig, false);
-
- ConfiguredObjectRecord root = getRootEntry();
- assertEquals("Unexpected root id", _rootId, root.getId());
- Collection<UUID> childrenIds = getChildrenIds(root);
- assertEquals("Unexpected children size", 2, childrenIds.size());
- assertTrue("Store port entry id is not found", childrenIds.contains(_portEntryId));
- }
-
public void testGetRootEntryWithManagementPortsOverriden()
{
_options.setManagementModeHttpPortOverride(1000);
- _options.setManagementModeRmiPortOverride(2000);
- _options.setManagementModeJmxPortOverride(3000);
_handler = createManagementModeStoreHandler();
_handler.openConfigurationStore(_systemConfig, false);
ConfiguredObjectRecord root = getRootEntry();
assertEquals("Unexpected root id", _rootId, root.getId());
Collection<UUID> childrenIds = getChildrenIds(root);
- assertEquals("Unexpected children size", 4, childrenIds.size());
+ assertEquals("Unexpected children size", 2, childrenIds.size());
assertTrue("Store port entry id is not found", childrenIds.contains(_portEntryId));
}
@@ -250,18 +222,6 @@ public class ManagementModeStoreHandlerT
assertEquals("Unexpected state", State.QUIESCED, portEntry.getAttributes().get(Port.STATE));
}
- public void testGetEntryByCLIConnectorPortId()
- {
- _options.setManagementModeJmxPortOverride(9090);
- _handler = createManagementModeStoreHandler();
- _handler.openConfigurationStore(_systemConfig, false);
-
-
- UUID optionsPort = getOptionsPortId();
- ConfiguredObjectRecord portEntry = getEntry(optionsPort);
- assertCLIPortEntry(portEntry, optionsPort, Protocol.JMX_RMI);
- }
-
public void testGetEntryByCLIHttpPortId()
{
_options.setManagementModeHttpPortOverride(9090);
@@ -288,34 +248,6 @@ public class ManagementModeStoreHandlerT
assertEquals("Unexpected state", State.QUIESCED, portEntry.getAttributes().get(Port.STATE));
}
- public void testRmiPortEntryIsQuiesced()
- {
- Map<String, Object> attributes = new HashMap<String, Object>();
- attributes.put(Port.PROTOCOLS, Collections.singleton(Protocol.RMI));
- when(_portEntry.getAttributes()).thenReturn(attributes);
- _options.setManagementModeRmiPortOverride(9090);
- _handler = createManagementModeStoreHandler();
- _handler.openConfigurationStore(_systemConfig, false);
-
-
- ConfiguredObjectRecord portEntry = getEntry(_portEntryId);
- assertEquals("Unexpected state", State.QUIESCED, portEntry.getAttributes().get(Port.STATE));
- }
-
- public void testConnectorPortEntryIsQuiesced()
- {
- Map<String, Object> attributes = new HashMap<String, Object>();
- attributes.put(Port.PROTOCOLS, Collections.singleton(Protocol.JMX_RMI));
- when(_portEntry.getAttributes()).thenReturn(attributes);
- _options.setManagementModeRmiPortOverride(9090);
- _handler = createManagementModeStoreHandler();
- _handler.openConfigurationStore(_systemConfig, false);
-
-
- ConfiguredObjectRecord portEntry = getEntry(_portEntryId);
- assertEquals("Unexpected state", State.QUIESCED, portEntry.getAttributes().get(Port.STATE));
- }
-
public void testVirtualHostEntryIsNotQuiescedByDefault()
{
virtualHostEntryQuiescedStatusTestImpl(false);
@@ -383,8 +315,6 @@ public class ManagementModeStoreHandlerT
public void testSavePort()
{
_options.setManagementModeHttpPortOverride(1000);
- _options.setManagementModeRmiPortOverride(2000);
- _options.setManagementModeJmxPortOverride(3000);
_handler = createManagementModeStoreHandler();
_handler.openConfigurationStore(_systemConfig, false);
@@ -400,8 +330,6 @@ public class ManagementModeStoreHandlerT
public void testSaveRoot()
{
_options.setManagementModeHttpPortOverride(1000);
- _options.setManagementModeRmiPortOverride(2000);
- _options.setManagementModeJmxPortOverride(3000);
_handler = createManagementModeStoreHandler();
_handler.openConfigurationStore(_systemConfig, false);
Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessagesTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessagesTest.java?rev=1718497&r1=1718496&r2=1718497&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessagesTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/logging/messages/ManagementConsoleMessagesTest.java Tue Dec 8 00:28:09 2015
@@ -41,7 +41,7 @@ public class ManagementConsoleMessagesTe
public void testManagementListening()
{
- String management = "JMX";
+ String management = "HTTP";
Integer port = 8889;
_logMessage = ManagementConsoleMessages.LISTENING(management, Transport.TCP.name(), port);
@@ -54,7 +54,7 @@ public class ManagementConsoleMessagesTe
public void testManagementShuttingDown()
{
- String transport = "JMX";
+ String transport = "HTTP";
Integer port = 8889;
_logMessage = ManagementConsoleMessages.SHUTTING_DOWN(transport, port);
Modified: qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java?rev=1718497&r1=1718496&r2=1718497&view=diff
==============================================================================
--- qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java (original)
+++ qpid/java/trunk/broker-core/src/test/java/org/apache/qpid/server/model/adapter/PortFactoryTest.java Tue Dec 8 00:28:09 2015
@@ -293,12 +293,12 @@ public class PortFactoryTest extends Qpi
assertEquals("Unexpected binding", "127.0.0.1", _port.getAttribute(Port.BINDING_ADDRESS));
}
- public void testCreateNonAmqpPort()
+ public void testCreateHttpPort()
{
- Set<Protocol> nonAmqpProtocolSet = Collections.singleton(Protocol.RMI);
- Set<String> nonAmqpStringSet = Collections.singleton(Protocol.RMI.name());
- _attributes = new HashMap<String, Object>();
- _attributes.put(Port.PROTOCOLS, nonAmqpStringSet);
+ Set<Protocol> httpProtocolSet = Collections.singleton(Protocol.HTTP);
+ Set<String> httpStringSet = Collections.singleton(Protocol.HTTP.name());
+ _attributes = new HashMap<>();
+ _attributes.put(Port.PROTOCOLS, httpStringSet);
_attributes.put(Port.AUTHENTICATION_PROVIDER, _authProviderName);
_attributes.put(Port.PORT, _portNumber);
_attributes.put(Port.TRANSPORTS, _tcpStringSet);
@@ -312,15 +312,15 @@ public class PortFactoryTest extends Qpi
assertEquals(_portId, _port.getId());
assertEquals(_portNumber, _port.getPort());
assertEquals(_tcpTransports, _port.getTransports());
- assertEquals(nonAmqpProtocolSet, _port.getProtocols());
+ assertEquals(httpProtocolSet, _port.getProtocols());
}
- public void testCreateNonAmqpPortWithPartiallySetAttributes()
+ public void testCreateHttpPortWithPartiallySetAttributes()
{
- Set<Protocol> nonAmqpProtocolSet = Collections.singleton(Protocol.RMI);
- Set<String> nonAmqpStringSet = Collections.singleton(Protocol.RMI.name());
- _attributes = new HashMap<String, Object>();
- _attributes.put(Port.PROTOCOLS, nonAmqpStringSet);
+ Set<Protocol> httpProtocolSet = Collections.singleton(Protocol.HTTP);
+ Set<String> httpStringSet = Collections.singleton(Protocol.HTTP.name());
+ _attributes = new HashMap<>();
+ _attributes.put(Port.PROTOCOLS, httpStringSet);
_attributes.put(Port.AUTHENTICATION_PROVIDER, _authProviderName);
_attributes.put(Port.PORT, _portNumber);
_attributes.put(Port.NAME, getName());
@@ -333,13 +333,13 @@ public class PortFactoryTest extends Qpi
assertEquals(_portId, _port.getId());
assertEquals(_portNumber, _port.getPort());
assertEquals(Collections.singleton(PortFactory.DEFAULT_TRANSPORT), _port.getTransports());
- assertEquals(nonAmqpProtocolSet, _port.getProtocols());
+ assertEquals(httpProtocolSet, _port.getProtocols());
}
public void testCreateMixedAmqpAndNonAmqpThrowsException()
{
- Set<String> mixedProtocolSet = new HashSet<String>(Arrays.asList(Protocol.AMQP_0_10.name(), Protocol.JMX_RMI.name()));
+ Set<String> mixedProtocolSet = new HashSet<>(Arrays.asList(Protocol.AMQP_0_10.name(), Protocol.HTTP.name()));
_attributes.put(Port.PROTOCOLS, mixedProtocolSet);
try
@@ -351,51 +351,6 @@ public class PortFactoryTest extends Qpi
{
// pass
}
- }
-
- public void testCreateRMIPortWhenAnotherRMIPortAlreadyExists()
- {
- Map<String, Object> attributes = new HashMap<String, Object>();
- attributes.put(Port.PORT, 1);
- attributes.put(Port.NAME, getName());
- attributes.put(Port.TRANSPORTS, Collections.singleton(Transport.TCP));
- attributes.put(Port.PROTOCOLS, Collections.singleton(Protocol.RMI));
-
- Port rmiPort = mock(Port.class);
- when(rmiPort.getProtocols()).thenReturn(Collections.singleton(Protocol.RMI));
- when(_broker.getPorts()).thenReturn(Collections.singletonList(rmiPort));
-
- try
- {
- _port = _factory.create(Port.class, attributes, _broker);
- fail("RMI port creation should fail as another one already exist");
- }
- catch(IntegrityViolationException e)
- {
- // pass
- }
- }
-
- public void testCreateRMIPortRequestingSslFails()
- {
- String keyStoreName = "myKeyStore";
-
- Map<String, Object> attributes = new HashMap<String, Object>();
- attributes.put(Port.PORT, 1);
- attributes.put(Port.NAME, getName());
- attributes.put(Port.TRANSPORTS, Collections.singleton(Transport.SSL));
- attributes.put(Port.PROTOCOLS, Collections.singleton(Protocol.RMI));
- _attributes.put(Port.KEY_STORE, keyStoreName);
-
- try
- {
- _port = _factory.create(Port.class, attributes, _broker);
- fail("RMI port creation should fail due to requesting SSL");
- }
- catch(IllegalConfigurationException e)
- {
- // pass
- }
}
public void testCreatePortWithoutAuthenticationMechanism()
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org