Merge #34 on JNDI changes
Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/46182e41 Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/46182e41 Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/46182e41 Branch: refs/heads/master Commit: 46182e4155dc2a4667359fb14996b9c63c3409bd Parents: e419feb 7cfd76d Author: Clebert Suconic <clebertsuco...@apache.org> Authored: Fri Dec 5 10:37:50 2014 -0500 Committer: Clebert Suconic <clebertsuco...@apache.org> Committed: Fri Dec 5 10:37:50 2014 -0500 ---------------------------------------------------------------------- .gitignore | 5 - .../org/apache/activemq/cli/commands/Run.java | 16 - .../java/org/apache/activemq/dto/BrokerDTO.java | 3 - .../java/org/apache/activemq/dto/NamingDTO.java | 39 - .../org/apache/activemq/dto/jaxb.index | 1 - .../jndi/ActiveMQInitialContextFactory.java | 496 +++++++++++++ .../apache/activemq/jndi/LazyCreateContext.java | 43 ++ .../apache/activemq/jndi/NameParserImpl.java | 30 + .../apache/activemq/jndi/ReadOnlyContext.java | 534 ++++++++++++++ activemq-jms-server/pom.xml | 4 - .../jms/server/JMSServerConfigParser.java | 9 - .../jms/server/embedded/EmbeddedJMS.java | 6 + .../server/impl/JMSServerConfigParserImpl.java | 339 +-------- .../jms/server/impl/JMSServerDeployer.java | 48 +- .../jms/server/impl/JMSServerManagerImpl.java | 14 +- .../jms/server/impl/StandaloneNamingServer.java | 170 ----- .../src/main/resources/schema/activemq-jms.xsd | 272 +------ activemq-ra/pom.xml | 7 + .../integration/EmbeddedRestActiveMQJMS.java | 4 + .../rest/queue/QueueDestinationsResource.java | 7 - .../rest/topic/TopicDestinationsResource.java | 7 - .../apache/activemq/rest/test/EmbeddedTest.java | 14 +- .../src/test/resources/activemq-jms.xml | 13 +- distribution/activemq/pom.xml | 5 - distribution/activemq/src/main/assembly/dep.xml | 1 - .../activemq/src/main/resources/bin/activemq | 4 +- .../src/main/resources/bin/activemq.cmd | 2 +- .../resources/config/clustered/activemq-jms.xml | 48 +- .../resources/config/clustered/jndi.properties | 2 - .../config/non-clustered/activemq-jms.xml | 48 +- .../config/non-clustered/jndi.properties | 2 - .../replicated/activemq-configuration.xml | 2 +- .../config/replicated/activemq-jms.xml | 48 +- .../resources/config/replicated/jndi.properties | 2 - .../shared-store/activemq-configuration.xml | 2 +- .../config/shared-store/activemq-jms.xml | 48 +- .../config/shared-store/jndi.properties | 2 - distribution/jnp-client/pom.xml | 75 -- distribution/pom.xml | 5 - docs/user-manual/en/appserver-integration.xml | 53 +- docs/user-manual/en/client-classpath.xml | 7 - docs/user-manual/en/client-reconnection.xml | 25 +- docs/user-manual/en/clusters.xml | 65 +- docs/user-manual/en/configuration-index.xml | 330 +-------- docs/user-manual/en/configuring-transports.xml | 29 +- docs/user-manual/en/flow-control.xml | 79 +- docs/user-manual/en/interoperability.xml | 5 +- docs/user-manual/en/large-messages.xml | 41 +- docs/user-manual/en/logging.xml | 18 +- docs/user-manual/en/message-grouping.xml | 37 +- docs/user-manual/en/pre-acknowledge.xml | 16 +- docs/user-manual/en/spring-integration.xml | 13 +- docs/user-manual/en/thread-pooling.xml | 22 +- docs/user-manual/en/using-jms.xml | 388 +++++----- examples/core/embedded-remote/pom.xml | 5 - examples/core/embedded/pom.xml | 5 - examples/core/perf/pom.xml | 10 - examples/core/vertx-connector/pom.xml | 10 - .../src/main/resources/server0/activemq-jms.xml | 13 +- .../config/server.properties | 2 +- .../common/example/ActiveMQExample.java | 5 +- examples/jms/aerogear/pom.xml | 7 +- .../activemq/jms/example/AerogearExample.java | 4 +- .../resources/hornetq/server0/activemq-jms.xml | 13 +- examples/jms/applet/pom.xml | 7 +- .../resources/hornetq/server0/activemq-jms.xml | 13 +- examples/jms/application-layer-failover/pom.xml | 9 +- .../ApplicationLayerFailoverExample.java | 4 +- .../resources/hornetq/server0/activemq-jms.xml | 13 +- .../resources/hornetq/server1/activemq-jms.xml | 13 +- examples/jms/bridge/pom.xml | 9 +- .../activemq/jms/example/BridgeExample.java | 8 +- .../resources/hornetq/server0/activemq-jms.xml | 13 +- .../resources/hornetq/server1/activemq-jms.xml | 13 +- examples/jms/browser/pom.xml | 7 +- .../jms/example/QueueBrowserExample.java | 4 +- .../resources/hornetq/server0/activemq-jms.xml | 13 +- examples/jms/client-kickoff/pom.xml | 7 +- .../jms/example/ClientKickoffExample.java | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 9 - .../jms/client-side-failoverlistener/pom.xml | 9 +- .../ClientSideFailoverListerExample.java | 4 +- .../resources/hornetq/server0/activemq-jms.xml | 27 +- .../resources/hornetq/server1/activemq-jms.xml | 26 +- examples/jms/client-side-load-balancing/pom.xml | 9 +- .../example/ClientSideLoadBalancingExample.java | 4 +- .../resources/hornetq/server0/activemq-jms.xml | 11 +- .../resources/hornetq/server1/activemq-jms.xml | 11 +- .../resources/hornetq/server2/activemq-jms.xml | 11 +- .../jms/clustered-durable-subscription/pom.xml | 9 +- .../ClusteredDurableSubscriptionExample.java | 6 +- .../resources/hornetq/server0/activemq-jms.xml | 13 +- .../resources/hornetq/server1/activemq-jms.xml | 13 +- examples/jms/clustered-grouping/pom.xml | 11 +- .../jms/example/ClusteredGroupingExample.java | 8 +- .../resources/hornetq/server0/activemq-jms.xml | 13 +- .../resources/hornetq/server1/activemq-jms.xml | 13 +- .../resources/hornetq/server2/activemq-jms.xml | 13 +- examples/jms/clustered-jgroups/pom.xml | 9 +- .../jms/example/ClusteredJgroupsExample.java | 6 +- .../resources/hornetq/server0/activemq-jms.xml | 13 +- .../hornetq/server0/client-jndi.properties | 5 +- .../resources/hornetq/server1/activemq-jms.xml | 13 +- .../hornetq/server1/client-jndi.properties | 5 +- examples/jms/clustered-queue/pom.xml | 9 +- .../jms/example/ClusteredQueueExample.java | 6 +- .../resources/hornetq/server0/activemq-jms.xml | 13 +- .../resources/hornetq/server1/activemq-jms.xml | 13 +- examples/jms/clustered-standalone/pom.xml | 11 +- .../jms/example/ClusteredStandaloneExample.java | 8 +- .../resources/hornetq/server0/activemq-jms.xml | 13 +- .../resources/hornetq/server1/activemq-jms.xml | 12 +- .../resources/hornetq/server2/activemq-jms.xml | 13 +- examples/jms/clustered-static-discovery/pom.xml | 13 +- .../example/StaticClusteredQueueExample.java | 4 +- .../resources/hornetq/server0/activemq-jms.xml | 25 +- .../resources/hornetq/server0/jndi.properties | 2 - .../resources/hornetq/server1/activemq-jms.xml | 25 +- .../resources/hornetq/server1/jndi.properties | 2 - .../resources/hornetq/server2/activemq-jms.xml | 26 +- .../resources/hornetq/server2/jndi.properties | 17 - .../resources/hornetq/server3/activemq-jms.xml | 26 +- .../resources/hornetq/server3/jndi.properties | 2 - examples/jms/clustered-static-oneway/pom.xml | 11 +- .../jms/example/ClusterStaticOnewayExample.java | 4 +- .../resources/hornetq/server0/activemq-jms.xml | 25 +- .../resources/hornetq/server0/jndi.properties | 2 - .../resources/hornetq/server1/activemq-jms.xml | 25 +- .../resources/hornetq/server1/jndi.properties | 2 - .../resources/hornetq/server2/activemq-jms.xml | 26 +- .../resources/hornetq/server2/jndi.properties | 18 - examples/jms/clustered-topic/pom.xml | 9 +- .../jms/example/ClusteredTopicExample.java | 6 +- .../resources/hornetq/server0/activemq-jms.xml | 13 +- .../resources/hornetq/server1/activemq-jms.xml | 13 +- .../jms/colocated-failover-scale-down/pom.xml | 9 +- .../ColocatedFailoverScaleDownExample.java | 6 +- .../resources/hornetq/server0/activemq-jms.xml | 24 +- .../resources/hornetq/server1/activemq-jms.xml | 24 +- examples/jms/colocated-failover/pom.xml | 9 +- .../jms/example/ColocatedFailoverExample.java | 6 +- .../resources/hornetq/server0/activemq-jms.xml | 24 +- .../resources/hornetq/server1/activemq-jms.xml | 25 +- examples/jms/consumer-rate-limit/pom.xml | 7 +- .../jms/example/ConsumerRateLimitExample.java | 4 +- .../resources/hornetq/server0/activemq-jms.xml | 18 +- .../hornetq/server0/client-jndi.properties | 5 +- examples/jms/dead-letter/pom.xml | 7 +- .../activemq/jms/example/DeadLetterExample.java | 6 +- .../resources/hornetq/server0/activemq-jms.xml | 17 +- .../hornetq/server0/client-jndi.properties | 5 +- examples/jms/delayed-redelivery/pom.xml | 7 +- .../jms/example/DelayedRedeliveryExample.java | 4 +- .../resources/hornetq/server0/activemq-jms.xml | 17 +- .../hornetq/server0/client-jndi.properties | 5 +- examples/jms/divert/pom.xml | 9 +- .../activemq/jms/example/DivertExample.java | 12 +- .../resources/hornetq/server0/activemq-jms.xml | 28 +- .../resources/hornetq/server1/activemq-jms.xml | 15 +- examples/jms/durable-subscription/pom.xml | 7 +- .../jms/example/DurableSubscriptionExample.java | 4 +- .../resources/hornetq/server0/activemq-jms.xml | 13 +- .../hornetq/server0/client-jndi.properties | 5 +- examples/jms/embedded-simple/pom.xml | 9 +- .../activemq/jms/example/EmbeddedExample.java | 2 +- .../src/main/resources/activemq-jms.xml | 13 +- examples/jms/embedded/pom.xml | 9 +- examples/jms/embedded/readme.html | 27 +- .../activemq/jms/example/EmbeddedExample.java | 4 +- examples/jms/expiry/pom.xml | 7 +- .../activemq/jms/example/ExpiryExample.java | 6 +- .../resources/hornetq/server0/activemq-jms.xml | 17 +- examples/jms/ha-policy-autobackup/pom.xml | 9 +- .../jms/example/HAPolicyAutoBackupExample.java | 6 +- .../resources/hornetq/server0/activemq-jms.xml | 24 +- examples/jms/http-transport/pom.xml | 7 +- .../jms/example/HttpTransportExample.java | 4 +- .../resources/hornetq/server0/activemq-jms.xml | 13 +- .../jms/instantiate-connection-factory/pom.xml | 7 +- examples/jms/interceptor/pom.xml | 7 +- .../jms/example/InterceptorExample.java | 4 +- .../resources/hornetq/server0/activemq-jms.xml | 13 +- examples/jms/jaas/pom.xml | 7 +- .../activemq/jms/example/JAASExample.java | 4 +- .../resources/hornetq/server0/activemq-jms.xml | 13 +- examples/jms/jms-auto-closeable/pom.xml | 7 +- .../jms/example/JMSAutoCloseableExample.java | 4 +- .../resources/hornetq/server0/activemq-jms.xml | 13 +- examples/jms/jms-bridge/pom.xml | 9 +- examples/jms/jms-bridge/readme.html | 20 +- .../activemq/jms/example/JMSBridgeExample.java | 15 +- .../resources/hornetq/server0/activemq-jms.xml | 22 +- .../resources/hornetq/server0/jndi.properties | 2 - .../resources/hornetq/server1/activemq-jms.xml | 22 +- .../resources/hornetq/server1/jndi.properties | 2 - examples/jms/jms-completion-listener/pom.xml | 7 +- .../example/JMSCompletionListenerExample.java | 4 +- .../resources/hornetq/server0/activemq-jms.xml | 13 +- examples/jms/jms-context/pom.xml | 7 +- .../activemq/jms/example/JMSContextExample.java | 4 +- examples/jms/jms-shared-consumer/pom.xml | 7 +- .../jms/example/JMSSharedConsumerExample.java | 4 +- .../resources/hornetq/server0/activemq-jms.xml | 13 +- examples/jms/jmx/pom.xml | 7 +- .../apache/activemq/jms/example/JMXExample.java | 4 +- .../resources/hornetq/server0/activemq-jms.xml | 12 +- examples/jms/large-message/pom.xml | 7 +- .../jms/example/LargeMessageExample.java | 8 +- .../resources/hornetq/server0/activemq-jms.xml | 14 +- examples/jms/last-value-queue/pom.xml | 7 +- .../jms/example/LastValueQueueExample.java | 4 +- .../resources/hornetq/server0/activemq-jms.xml | 14 +- examples/jms/management-notifications/pom.xml | 7 +- .../example/ManagementNotificationExample.java | 6 +- .../resources/hornetq/server0/activemq-jms.xml | 18 +- examples/jms/management/pom.xml | 7 +- .../activemq/jms/example/ManagementExample.java | 4 +- .../resources/hornetq/server0/activemq-jms.xml | 14 +- examples/jms/message-counters/pom.xml | 7 +- .../jms/example/MessageCounterExample.java | 4 +- .../resources/hornetq/server0/activemq-jms.xml | 17 +- examples/jms/message-group/pom.xml | 7 +- .../jms/example/MessageGroupExample.java | 4 +- .../resources/hornetq/server0/hornetq-jms.xml | 13 +- examples/jms/message-group2/pom.xml | 7 +- .../jms/example/MessageGroup2Example.java | 4 +- .../resources/hornetq/server0/activemq-jms.xml | 14 +- examples/jms/message-priority/pom.xml | 7 +- .../jms/example/MessagePriorityExample.java | 4 +- .../resources/hornetq/server0/activemq-jms.xml | 13 +- examples/jms/multiple-failover-failback/pom.xml | 11 +- .../MultipleFailoverFailbackExample.java | 4 +- .../resources/hornetq/server0/activemq-jms.xml | 27 +- .../resources/hornetq/server1/activemq-jms.xml | 26 +- .../resources/hornetq/server2/activemq-jms.xml | 26 +- examples/jms/multiple-failover/pom.xml | 11 +- .../jms/example/MultipleFailoverExample.java | 4 +- .../resources/hornetq/server0/activemq-jms.xml | 27 +- .../resources/hornetq/server1/activemq-jms.xml | 26 +- .../resources/hornetq/server2/activemq-jms.xml | 26 +- examples/jms/no-consumer-buffering/pom.xml | 7 +- .../jms/example/NoConsumerBufferingExample.java | 4 +- .../resources/hornetq/server0/activemq-jms.xml | 18 +- examples/jms/non-transaction-failover/pom.xml | 9 +- .../example/NonTransactionFailoverExample.java | 4 +- .../resources/hornetq/server0/activemq-jms.xml | 26 +- .../resources/hornetq/server1/activemq-jms.xml | 26 +- examples/jms/openwire/pom.xml | 7 +- .../resources/hornetq/server0/activemq-jms.xml | 13 +- examples/jms/paging/pom.xml | 7 +- .../activemq/jms/example/PagingExample.java | 4 +- .../resources/hornetq/server0/activemq-jms.xml | 17 +- examples/jms/perf/pom.xml | 10 - .../src/main/resources/client.jndi.properties | 5 +- .../resources/hornetq/server0/activemq-jms.xml | 15 +- examples/jms/pre-acknowledge/pom.xml | 7 +- .../jms/example/PreacknowledgeExample.java | 4 +- .../resources/hornetq/server0/activemq-jms.xml | 13 +- examples/jms/producer-rate-limit/pom.xml | 7 +- .../jms/example/ProducerRateLimitExample.java | 4 +- .../resources/hornetq/server0/activemq-jms.xml | 18 +- examples/jms/proton-cpp/pom.xml | 10 - examples/jms/proton-j/pom.xml | 7 +- examples/jms/proton-ruby/pom.xml | 5 - .../jms/queue-message-redistribution/pom.xml | 9 +- .../QueueMessageRedistributionExample.java | 6 +- .../resources/hornetq/server0/activemq-jms.xml | 13 +- .../resources/hornetq/server1/activemq-jms.xml | 13 +- examples/jms/queue-requestor/pom.xml | 7 +- .../jms/example/QueueRequestorExample.java | 4 +- .../resources/hornetq/server0/activemq-jms.xml | 13 +- examples/jms/queue-selector/pom.xml | 7 +- .../jms/example/QueueSelectorExample.java | 4 +- .../resources/hornetq/server0/activemq-jms.xml | 13 +- examples/jms/queue/pom.xml | 7 +- .../activemq/jms/example/QueueExample.java | 4 +- .../resources/hornetq/server0/activemq-jms.xml | 13 +- examples/jms/reattach-node/pom.xml | 7 +- .../activemq/jms/example/ReattachExample.java | 6 +- .../resources/hornetq/server0/activemq-jms.xml | 45 +- examples/jms/replicated-failback-static/pom.xml | 9 +- .../ReplicatedFailbackStaticExample.java | 4 +- .../resources/hornetq/server0/activemq-jms.xml | 27 +- .../resources/hornetq/server1/activemq-jms.xml | 26 +- examples/jms/replicated-failback/pom.xml | 9 +- .../jms/example/ReplicatedFailbackExample.java | 4 +- .../resources/hornetq/server0/activemq-jms.xml | 27 +- .../resources/hornetq/server1/activemq-jms.xml | 26 +- .../jms/replicated-multiple-failover/pom.xml | 11 +- .../ReplicatedMultipleFailoverExample.java | 4 +- .../resources/hornetq/server0/activemq-jms.xml | 27 +- .../resources/hornetq/server1/activemq-jms.xml | 26 +- .../resources/hornetq/server2/activemq-jms.xml | 26 +- .../jms/replicated-transaction-failover/pom.xml | 9 +- .../ReplicatedTransactionFailoverExample.java | 4 +- .../resources/hornetq/server0/activemq-jms.xml | 25 +- .../resources/hornetq/server1/activemq-jms.xml | 25 +- examples/jms/request-reply/pom.xml | 7 +- .../jms/example/RequestReplyExample.java | 8 +- .../resources/hornetq/server0/activemq-jms.xml | 13 +- .../src/main/resources/activemq-jms.xml | 13 +- .../src/main/resources/activemq-jms.xml | 13 +- .../src/main/resources/activemq-jms.xml | 13 +- .../push/src/main/resources/activemq-jms.xml | 19 +- examples/jms/scale-down/pom.xml | 9 +- .../activemq/jms/example/ScaleDownExample.java | 6 +- .../resources/hornetq/server0/activemq-jms.xml | 24 +- .../resources/hornetq/server1/activemq-jms.xml | 24 +- examples/jms/scheduled-message/pom.xml | 7 +- .../jms/example/ScheduledMessageExample.java | 4 +- .../resources/hornetq/server0/activemq-jms.xml | 13 +- examples/jms/security/pom.xml | 7 +- .../activemq/jms/example/SecurityExample.java | 8 +- .../resources/hornetq/server0/activemq-jms.xml | 23 +- examples/jms/send-acknowledgements/pom.xml | 7 +- .../example/SendAcknowledgementsExample.java | 4 +- .../resources/hornetq/server0/activemq-jms.xml | 14 +- examples/jms/spring-integration/pom.xml | 7 +- .../src/main/resources/activemq-jms.xml | 13 +- examples/jms/ssl-enabled/pom.xml | 7 +- .../apache/activemq/jms/example/SSLExample.java | 4 +- .../resources/hornetq/server0/activemq-jms.xml | 13 +- examples/jms/static-selector-jms/pom.xml | 7 +- .../jms/example/StaticSelectorJMSExample.java | 4 +- .../resources/hornetq/server0/activemq-jms.xml | 12 +- examples/jms/static-selector/pom.xml | 7 +- .../jms/example/StaticSelectorExample.java | 4 +- .../resources/hornetq/server0/activemq-jms.xml | 13 +- examples/jms/stomp-websockets/pom.xml | 7 +- .../jms/example/StompWebSocketExample.java | 4 +- .../resources/hornetq/server0/activemq-jms.xml | 13 +- examples/jms/stomp/pom.xml | 7 +- .../activemq/jms/example/StompExample.java | 4 +- .../resources/hornetq/server0/activemq-jms.xml | 13 +- examples/jms/stomp1.1/pom.xml | 7 +- .../activemq/jms/example/StompExample.java | 4 +- .../resources/hornetq/server0/activemq-jms.xml | 13 +- examples/jms/stomp1.2/pom.xml | 7 +- .../activemq/jms/example/StompExample.java | 4 +- .../resources/hornetq/server0/activemq-jms.xml | 13 +- examples/jms/stop-server-failover/pom.xml | 9 +- .../jms/example/StopServerFailoverExample.java | 4 +- .../resources/hornetq/server0/activemq-jms.xml | 26 +- .../resources/hornetq/server1/activemq-jms.xml | 26 +- examples/jms/symmetric-cluster/pom.xml | 17 +- .../resources/hornetq/server0/activemq-jms.xml | 17 +- .../resources/hornetq/server1/activemq-jms.xml | 17 +- .../resources/hornetq/server2/activemq-jms.xml | 17 +- .../resources/hornetq/server3/activemq-jms.xml | 17 +- .../resources/hornetq/server4/activemq-jms.xml | 17 +- .../resources/hornetq/server5/activemq-jms.xml | 17 +- examples/jms/temp-queue/pom.xml | 7 +- .../jms/example/TemporaryQueueExample.java | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 13 +- examples/jms/topic-hierarchies/pom.xml | 7 +- .../jms/example/TopicHierarchyExample.java | 2 +- .../resources/hornetq/server0/activemq-jms.xml | 33 +- examples/jms/topic-selector-example1/pom.xml | 7 +- .../jms/example/TopicSelectorExample1.java | 4 +- .../resources/hornetq/server0/activemq-jms.xml | 13 +- examples/jms/topic-selector-example2/pom.xml | 7 +- .../jms/example/TopicSelectorExample2.java | 4 +- .../resources/hornetq/server0/activemq-jms.xml | 13 +- examples/jms/topic/pom.xml | 7 +- .../activemq/jms/example/TopicExample.java | 4 +- .../resources/hornetq/server0/activemq-jms.xml | 13 +- .../hornetq/server0/client-jndi.properties | 5 +- examples/jms/transaction-failover/pom.xml | 9 +- .../jms/example/TransactionFailoverExample.java | 4 +- .../resources/hornetq/server0/activemq-jms.xml | 25 +- .../resources/hornetq/server1/activemq-jms.xml | 25 +- examples/jms/transactional/pom.xml | 7 +- .../jms/example/TransactionalExample.java | 4 +- .../resources/hornetq/server0/activemq-jms.xml | 13 +- examples/jms/xa-heuristic/pom.xml | 7 +- .../jms/example/XAHeuristicExample.java | 4 +- .../resources/hornetq/server0/activemq-jms.xml | 14 +- examples/jms/xa-receive/pom.xml | 7 +- .../activemq/jms/example/XAReceiveExample.java | 4 +- .../resources/hornetq/server0/activemq-jms.xml | 14 +- examples/jms/xa-send/pom.xml | 7 +- .../activemq/jms/example/XASendExample.java | 4 +- .../resources/hornetq/server0/activemq-jms.xml | 14 +- examples/jms/xa-with-jta/pom.xml | 7 +- .../activemq/jms/example/XAwithJTAExample.java | 4 +- .../resources/hornetq/server0/activemq-jms.xml | 14 +- examples/soak/normal/pom.xml | 13 +- examples/soak/normal/server0/activemq-jms.xml | 18 +- .../activemq/jms/soak/example/SoakReceiver.java | 5 +- .../activemq/jms/soak/example/SoakSender.java | 5 +- pom.xml | 11 - tests/byteman-tests/pom.xml | 4 - .../server-start-stop-backup-jms-config1.xml | 11 +- .../server-start-stop-live-jms-config1.xml | 13 +- tests/integration-tests/pom.xml | 7 + .../tests/integration/client/PagingTest.java | 2 +- .../integration/jms/SimpleJNDIClientTest.java | 722 +++++++++++++++++++ .../jms/server/JMSServerDeployerTest.java | 207 +----- .../config/JMSServerConfigParserTest.java | 35 - .../management/JMSServerControl2Test.java | 4 +- .../integration/ra/ActiveMQRATestBase.java | 9 + .../integration/ra/ResourceAdapterTest.java | 2 +- .../spring/SpringIntegrationTest.java | 17 +- .../tests/integration/stomp/ExtraStompTest.java | 2 +- .../tests/util/NonSerializableFactory.java | 84 ++- .../activemq-jms-for-JMSServerDeployerTest.xml | 48 +- .../activemq-jms-for-JMSServerDeployerTest2.xml | 48 +- .../colocated-server-start-stop-jms-config1.xml | 13 +- .../colocated-server-start-stop-jms-config2.xml | 13 +- .../resources/server-start-stop-jms-config1.xml | 13 +- .../src/test/resources/spring-activemq-jms.xml | 13 +- .../src/test/resources/spring-jms-beans.xml | 21 +- tests/jms-tests/pom.xml | 4 - .../jms/tests/ActiveMQServerTestCase.java | 14 + .../jms/tests/ConnectionFactoryTest.java | 49 ++ .../apache/activemq/jms/tests/SessionTest.java | 2 + .../tests/message/SimpleJMSStreamMessage.java | 4 +- .../jms/tests/tools/WrappedJNDIServer.java | 92 --- .../jms/tests/tools/container/InVMContext.java | 1 - .../container/InVMInitialContextFactory.java | 2 - .../tests/tools/container/LocalTestServer.java | 32 +- .../tools/container/NonSerializableFactory.java | 85 ++- .../jms/tests/tools/container/Server.java | 6 + .../src/test/resources/activemq-jms.xml | 120 --- .../src/test/resources/jndi.properties | 3 +- tests/joram-tests/pom.xml | 4 - .../org/apache/activemq/jms/AbstractAdmin.java | 13 +- .../org/apache/activemq/jms/ActiveMQAdmin.java | 339 +++++++++ .../org/apache/activemq/jms/ActiveMQQAdmin.java | 340 --------- .../apache/activemq/jms/SpawnedJMSServer.java | 25 - .../jtests/jms/admin/AdminFactory.java | 8 +- .../message/headers/MessageHeaderTest.java | 10 +- .../jms/conform/queue/QueueBrowserTest.java | 3 +- .../jms/conform/session/UnifiedSessionTest.java | 3 +- .../jtests/jms/framework/PTPTestCase.java | 15 +- .../jtests/jms/framework/PubSubTestCase.java | 15 +- .../jtests/jms/framework/UnifiedTestCase.java | 17 +- .../src/test/resources/provider.properties | 2 +- tests/performance-tests/pom.xml | 4 - tests/soak-tests/pom.xml | 4 - tests/stress-tests/pom.xml | 4 - tests/timing-tests/pom.xml | 4 - .../activemq/tests/unit/util/InVMContext.java | 1 - .../tests/unit/util/InVMNamingContext.java | 1 - .../tests/unit/util/NonSerializableFactory.java | 81 +-- 445 files changed, 3476 insertions(+), 6323 deletions(-) ----------------------------------------------------------------------
