You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by cl...@apache.org on 2015/02/12 21:01:48 UTC

[8/8] activemq-6 git commit: This closes #93 on URI work and connection factory serialization

This closes #93 on URI work and connection factory serialization


Project: http://git-wip-us.apache.org/repos/asf/activemq-6/repo
Commit: http://git-wip-us.apache.org/repos/asf/activemq-6/commit/87966029
Tree: http://git-wip-us.apache.org/repos/asf/activemq-6/tree/87966029
Diff: http://git-wip-us.apache.org/repos/asf/activemq-6/diff/87966029

Branch: refs/heads/master
Commit: 87966029c759bdb58e85f3d68e332495b1705f73
Parents: b8db8b0 3b76ccc
Author: Clebert Suconic <cl...@apache.org>
Authored: Thu Feb 12 15:01:12 2015 -0500
Committer: Clebert Suconic <cl...@apache.org>
Committed: Thu Feb 12 15:01:12 2015 -0500

----------------------------------------------------------------------
 activemq-commons/pom.xml                        |   4 +
 .../activemq/utils/uri/SchemaConstants.java     |  31 ++
 .../apache/activemq/utils/uri/URIFactory.java   | 151 +++++++
 .../apache/activemq/utils/uri/URISchema.java    | 272 ++++++++++++
 .../apache/activemq/utils/URIParserTest.java    | 249 +++++++++++
 .../api/core/BroadcastEndpointFactory.java      |   2 +-
 .../BroadcastEndpointFactoryConfiguration.java  |  28 --
 .../api/core/BroadcastGroupConfiguration.java   |  18 +-
 .../core/ChannelBroadcastEndpointFactory.java   |  41 ++
 .../api/core/DiscoveryGroupConfiguration.java   |  67 +--
 ...ryGroupConfigurationCompatibilityHelper.java |  45 --
 .../api/core/JGroupsBroadcastEndpoint.java      | 281 +++++++++++++
 .../JGroupsBroadcastGroupConfiguration.java     | 404 ------------------
 .../core/JGroupsChannelBroadcastEndpoint.java   |  39 ++
 .../api/core/JGroupsFileBroadcastEndpoint.java  |  49 +++
 .../JGroupsFileBroadcastEndpointFactory.java    |  55 +++
 .../JGroupsPropertiesBroadcastEndpoint.java     |  43 ++
 ...roupsPropertiesBroadcastEndpointFactory.java |  55 +++
 .../api/core/UDPBroadcastEndpointFactory.java   | 330 +++++++++++++++
 .../core/UDPBroadcastGroupConfiguration.java    | 339 ---------------
 .../api/core/client/ActiveMQClient.java         |  14 +
 .../api/core/client/TopologyMember.java         |   4 +-
 .../core/client/ActiveMQClientLogger.java       |   4 +
 .../client/impl/ClientSessionFactoryImpl.java   |  14 -
 .../core/client/impl/ServerLocatorImpl.java     |   9 +-
 .../remoting/impl/netty/NettyConnector.java     |  58 +--
 .../impl/netty/NettyConnectorFactory.java       |   6 -
 .../remoting/impl/netty/TransportConstants.java |  67 +--
 .../remoting/ClientProtocolManagerFactory.java  |   4 +-
 .../spi/core/remoting/ConnectorFactory.java     |  10 -
 .../uri/AbstractServerLocatorSchema.java        |  34 ++
 .../apache/activemq/uri/ConnectionOptions.java  |  75 ++++
 .../activemq/uri/InVMServerLocatorSchema.java   |  73 ++++
 .../uri/JGroupsServerLocatorSchema.java         | 102 +++++
 .../activemq/uri/ServerLocatorParser.java       |  33 ++
 .../activemq/uri/TCPServerLocatorSchema.java    | 160 +++++++
 .../activemq/uri/UDPServerLocatorSchema.java    |  89 ++++
 activemq-jms-client/pom.xml                     |  14 +
 .../activemq/api/jms/ActiveMQJMSClient.java     |  13 +
 .../jms/client/ActiveMQConnectionFactory.java   |  70 +++-
 .../client/ActiveMQJMSConnectionFactory.java    |   1 -
 .../jndi/ActiveMQInitialContextFactory.java     | 363 ++--------------
 .../apache/activemq/uri/AbstractCFSchema.java   |  45 ++
 .../activemq/uri/ConnectionFactoryParser.java   |  36 ++
 .../org/apache/activemq/uri/InVMSchema.java     |  51 +++
 .../org/apache/activemq/uri/JGroupsSchema.java  |  86 ++++
 .../activemq/uri/JMSConnectionOptions.java      |  79 ++++
 .../java/org/apache/activemq/uri/TCPSchema.java |  67 +++
 .../java/org/apache/activemq/uri/UDPSchema.java |  70 ++++
 .../activemq/uri/ConnectionFactoryURITest.java  | 414 +++++++++++++++++++
 .../activemq/ra/ActiveMQResourceAdapter.java    |  33 +-
 .../activemq/core/config/Configuration.java     |   3 +-
 .../core/config/impl/ConfigurationImpl.java     |   3 +-
 .../deployers/impl/FileConfigurationParser.java |  26 +-
 .../impl/BroadcastGroupControlImpl.java         |  14 +-
 .../remoting/impl/invm/InVMAcceptorFactory.java |   7 -
 .../impl/invm/InVMConnectorFactory.java         |   6 -
 .../remoting/impl/invm/TransportConstants.java  |  30 +-
 .../impl/netty/NettyAcceptorFactory.java        |   6 -
 .../server/impl/RemotingServiceImpl.java        |  15 -
 .../core/server/cluster/ClusterManager.java     |   2 +-
 .../spi/core/remoting/AcceptorFactory.java      |   9 -
 .../core/config/impl/FileConfigurationTest.java |  16 +-
 docs/user-manual/en/using-jms.md                | 105 ++---
 .../aerogear/src/main/resources/jndi.properties |   2 +-
 .../ApplicationLayerFailoverExample.java        |   2 +-
 .../activemq/jms/example/BridgeExample.java     |   4 +-
 .../browser/src/main/resources/jndi.properties  |   2 +-
 .../src/main/resources/jndi.properties          |   2 +-
 .../src/main/resources/jndi.properties          |   6 +-
 .../src/main/resources/jndi.properties          |   2 +-
 .../ClusteredDurableSubscriptionExample.java    |   4 +-
 .../jms/example/ClusteredGroupingExample.java   |   6 +-
 .../jms/example/ClusteredJgroupsExample.java    |   4 +-
 .../activemq/server0/client-jndi.properties     |   2 +-
 .../jms/example/ClusteredQueueExample.java      |   4 +-
 .../jms/example/ClusteredStandaloneExample.java |   6 +-
 .../example/StaticClusteredQueueExample.java    |   2 +-
 .../jms/example/ClusterStaticOnewayExample.java |   2 +-
 .../jms/example/ClusteredTopicExample.java      |   4 +-
 .../ColocatedFailoverScaleDownExample.java      |   8 +-
 .../jms/example/ColocatedFailoverExample.java   |   8 +-
 .../src/main/resources/jndi.properties          |   3 +-
 .../src/main/resources/jndi.properties          |   2 +-
 .../src/main/resources/jndi.properties          |   2 +-
 .../activemq/jms/example/DivertExample.java     |   4 +-
 .../src/main/resources/jndi.properties          |   2 +-
 .../expiry/src/main/resources/jndi.properties   |   2 +-
 .../jms/example/HAPolicyAutoBackupExample.java  |  12 +-
 .../src/main/resources/jndi.properties          |   2 +-
 .../src/main/resources/jndi.properties          |   2 +-
 .../src/main/resources/jndi.properties          |   2 +-
 .../activemq/jms/example/JMSBridgeExample.java  |   2 +-
 .../src/main/resources/jndi.properties          |   2 +-
 .../src/main/resources/jndi.properties          |   2 +-
 .../src/main/resources/jndi.properties          |   2 +-
 .../jms/jmx/src/main/resources/jndi.properties  |   2 +-
 .../src/main/resources/jndi.properties          |   2 +-
 .../src/main/resources/jndi.properties          |   2 +-
 .../src/main/resources/jndi.properties          |   2 +-
 .../src/main/resources/jndi.properties          |   2 +-
 .../src/main/resources/jndi.properties          |   2 +-
 .../src/main/resources/jndi.properties          |   2 +-
 .../src/main/resources/jndi.properties          |   3 +-
 .../src/main/resources/jndi.properties          |   2 +-
 .../src/main/resources/jndi.properties          |   6 +-
 .../src/main/resources/jndi.properties          |   6 +-
 .../src/main/resources/jndi.properties          |   3 +-
 .../src/main/resources/jndi.properties          |   6 +-
 .../paging/src/main/resources/jndi.properties   |   2 +-
 .../jms/perf/src/main/resources/jndi.properties |   2 +-
 .../src/main/resources/jndi.properties          |   2 +-
 .../src/main/resources/jndi.properties          |   3 +-
 .../QueueMessageRedistributionExample.java      |   4 +-
 .../src/main/resources/jndi.properties          |   2 +-
 .../src/main/resources/jndi.properties          |   2 +-
 .../queue/src/main/resources/jndi.properties    |   2 +-
 .../activemq/jms/example/ReattachExample.java   |   2 +-
 .../src/main/resources/jndi.properties          |   7 +-
 .../src/main/resources/jndi.properties          |   6 +-
 .../src/main/resources/jndi.properties          |   6 +-
 .../src/main/resources/jndi.properties          |   6 +-
 .../src/main/resources/jndi.properties          |   6 +-
 .../src/main/resources/jndi.properties          |   6 +-
 .../activemq/jms/example/ScaleDownExample.java  |  12 +-
 .../src/main/resources/jndi.properties          |   2 +-
 .../security/src/main/resources/jndi.properties |   2 +-
 .../src/main/resources/jndi.properties          |   3 +-
 .../src/main/resources/jndi.properties          |   2 +-
 .../src/main/resources/jndi.properties          |   2 +-
 .../src/main/resources/jndi.properties          |   2 +-
 .../src/main/resources/jndi.properties          |   2 +-
 .../stomp/src/main/resources/jndi.properties    |   2 +-
 .../stomp1.1/src/main/resources/jndi.properties |   2 +-
 .../stomp1.2/src/main/resources/jndi.properties |   2 +-
 .../src/main/resources/jndi.properties          |   6 +-
 .../jms/example/SymmetricClusterExample.java    |   7 +-
 .../src/main/resources/jndi.properties          |   2 +-
 .../src/main/resources/jndi.properties          |   2 +-
 .../src/main/resources/jndi.properties          |   2 +-
 .../src/main/resources/jndi.properties          |   2 +-
 .../topic/src/main/resources/jndi.properties    |   2 +-
 .../src/main/resources/jndi.properties          |   6 +-
 .../src/main/resources/jndi.properties          |   2 +-
 .../src/main/resources/jndi.properties          |   2 +-
 .../src/main/resources/jndi.properties          |   2 +-
 .../xa-send/src/main/resources/jndi.properties  |   2 +-
 .../activemq/jms/soak/example/SoakReceiver.java |   2 +-
 .../activemq/jms/soak/example/SoakSender.java   |   2 +-
 pom.xml                                         |   7 +
 .../client/ServerLocatorSerializationTest.java  | 131 ------
 .../integration/client/SessionFactoryTest.java  |  48 +--
 .../BridgeWithDiscoveryGroupStartTest.java      |   8 +-
 .../cluster/distribution/ClusterTestBase.java   |  14 +-
 .../HAClientTopologyWithDiscoveryTest.java      |   8 +-
 .../discovery/DiscoveryBaseTest.java            |  12 +-
 .../discovery/DiscoveryStayAliveTest.java       |  10 +-
 .../integration/discovery/DiscoveryTest.java    |  67 ++-
 .../jms/ActiveMQConnectionFactoryTest.java      |  16 +-
 .../integration/jms/SimpleJNDIClientTest.java   | 383 ++++-------------
 .../ConnectionFactorySerializationTest.java     | 325 +++++++++++++--
 ...tionFactoryWithJGroupsSerializationTest.java |  19 +-
 .../jms/server/JMSServerDeployerTest.java       |  10 +-
 .../management/ActiveMQServerControlTest.java   |   3 +-
 .../management/BroadcastGroupControlTest.java   |  12 +-
 .../ClusterConnectionControl2Test.java          |  14 +-
 .../ClusterConnectionControlTest.java           |   8 +-
 .../ra/ActiveMQRAClusteredTestBase.java         |   5 +-
 .../integration/ra/ResourceAdapterTest.java     |   8 +-
 .../src/test/resources/jndi.properties          |   3 +-
 .../jtests/jms/framework/PTPTestCase.java       |   3 +-
 .../jtests/jms/framework/PubSubTestCase.java    |   3 +-
 .../jtests/jms/framework/UnifiedTestCase.java   |   5 +-
 .../tests/unit/ra/ResourceAdapterTest.java      |   4 +-
 174 files changed, 3924 insertions(+), 2328 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/activemq-6/blob/87966029/activemq-core-client/src/main/java/org/apache/activemq/core/remoting/impl/netty/NettyConnector.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/activemq-6/blob/87966029/pom.xml
----------------------------------------------------------------------