You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2014/12/31 16:45:02 UTC
[4/4] activemq-6 git commit: Merge #48 more JNDI removal
Merge #48 more JNDI removal
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/1b791ef9
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/1b791ef9
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/1b791ef9
Branch: refs/heads/master
Commit: 1b791ef9e6ec1724c24e5642f36ef7f2050b6ab6
Parents: 2e14352 2514611
Author: jbertram <jb...@redhat.com>
Authored: Wed Dec 31 09:43:24 2014 -0600
Committer: jbertram <jb...@redhat.com>
Committed: Wed Dec 31 09:43:24 2014 -0600
----------------------------------------------------------------------
.../management/ConnectionFactoryControl.java | 16 +-
.../api/jms/management/JMSQueueControl.java | 10 +-
.../api/jms/management/TopicControl.java | 12 +-
.../impl/JMSConnectionFactoryControlImpl.java | 12 +-
.../management/impl/JMSQueueControlImpl.java | 12 +-
.../management/impl/JMSServerControlImpl.java | 36 +-
.../management/impl/JMSTopicControlImpl.java | 8 +-
.../jms/persistence/JMSStorageManager.java | 10 +-
.../persistence/config/PersistedBindings.java | 171 +++++++++
.../jms/persistence/config/PersistedJNDI.java | 171 ---------
.../journal/JMSJournalStorageManagerImpl.java | 66 ++--
.../impl/nullpm/NullJMSStorageManagerImpl.java | 10 +-
.../jms/server/ActiveMQJMSServerBundle.java | 4 +-
.../jms/server/ActiveMQJMSServerLogger.java | 4 +-
.../activemq/jms/server/JMSServerManager.java | 64 ++--
.../jms/server/config/JMSConfiguration.java | 6 -
.../config/impl/JMSConfigurationImpl.java | 15 -
.../jms/server/impl/JMSServerDeployer.java | 4 +-
.../jms/server/impl/JMSServerManagerImpl.java | 368 +++++++++----------
.../ServletContextBindingRegistry.java | 10 -
.../core/registry/JndiBindingRegistry.java | 16 -
.../core/registry/MapBindingRegistry.java | 11 -
.../spi/core/naming/BindingRegistry.java | 11 -
.../apache/activemq/tools/XmlDataExporter.java | 18 +-
.../spring/SpringBindingRegistry.java | 12 -
.../byteman/tests/StartStopDeadlockTest.java | 3 +-
.../integration/client/FailureDeadlockTest.java | 3 +-
.../integration/client/PagingOrderTest.java | 9 +-
.../tests/integration/jms/FloodServerTest.java | 3 +-
.../ManualReconnectionToSingleServerTest.java | 8 +-
.../integration/jms/bridge/BridgeTestBase.java | 5 +-
.../jms/bridge/ClusteredBridgeTestBase.java | 5 +-
.../jms/client/RemoteConnectionStressTest.java | 3 +-
.../integration/jms/client/StoreConfigTest.java | 26 +-
.../jms/cluster/JMSFailoverListenerTest.java | 5 +-
.../jms/cluster/JMSFailoverTest.java | 5 +-
.../jms/cluster/ReplicatedJMSFailoverTest.java | 5 +-
.../jms/connection/ExceptionListenerTest.java | 3 +-
.../jms/server/JMSServerDeployerTest.java | 3 +-
.../jms/server/JMSServerStartStopTest.java | 2 +-
.../jms/server/config/JMSConfigurationTest.java | 4 +-
.../ConnectionFactoryControlTest.java | 3 +-
.../server/management/JMSQueueControlTest.java | 11 +-
.../management/JMSQueueControlUsingJMSTest.java | 6 +-
.../management/JMSServerControl2Test.java | 3 +-
.../management/JMSServerControlRestartTest.java | 3 +-
.../server/management/JMSServerControlTest.java | 21 +-
.../jms/server/management/TopicControlTest.java | 5 +-
.../management/TopicControlUsingJMSTest.java | 6 +-
.../management/ManagementActivationTest.java | 7 +-
.../integration/openwire/OpenWireTestBase.java | 3 +-
.../persistence/JMSDynamicConfigTest.java | 2 +-
.../persistence/JMSStorageManagerTest.java | 12 +-
.../persistence/XmlImportExportTest.java | 3 +-
.../tests/integration/stomp/ExtraStompTest.java | 5 +-
.../tests/integration/stomp/StompTestBase.java | 3 +-
.../integration/stomp/StompWebSocketTest.java | 2 +-
.../integration/stomp/v11/StompV11TestBase.java | 3 +-
.../tests/util/JMSClusteredTestBase.java | 5 +-
.../apache/activemq/tests/util/JMSTestBase.java | 5 +-
.../jms/tests/ActiveMQServerTestCase.java | 1 -
.../tests/tools/container/LocalTestServer.java | 2 +
.../jms/bridge/impl/JMSBridgeImplTest.java | 3 +-
63 files changed, 600 insertions(+), 683 deletions(-)
----------------------------------------------------------------------