[hornetq-commits] JBoss hornetq SVN: r8723 - in trunk: examples/core and 73 other directories.

Author: ataylor Date: 2010-01-06 03:57:20 -0500 (Wed, 06 Jan 2010) New Revision: 8723 Added: trunk/src/main/org/hornetq/api/core/client/HornetQClient.java trunk/src/main/org/hornetq/api/jms/HornetQJMSClient.java trunk/src/main/org/hornetq/jms/HornetQConnectionFactory.java trunk/src/main/org/hornetq/jms/HornetQDestination.java trunk/src/main/org/hornetq/jms/HornetQQueue.java trunk/src/main/org/hornetq/jms/HornetQTemporaryQueue.java trunk/src/main/org/hornetq/jms/HornetQTemporaryTopic.java trunk/src/main/org/hornetq/jms/HornetQTopic.java Removed: trunk/src/main/org/hornetq/api/jms/HornetQConnectionFactory.java trunk/src/main/org/hornetq/api/jms/HornetQDestination.java trunk/src/main/org/hornetq/api/jms/HornetQQueue.java trunk/src/main/org/hornetq/api/jms/HornetQTemporaryQueue.java trunk/src/main/org/hornetq/api/jms/HornetQTemporaryTopic.java trunk/src/main/org/hornetq/api/jms/HornetQTopic.java Modified: trunk/docs/user-manual/en/clusters.xml trunk/docs/user-manual/en/configuring-transports.xml trunk/docs/user-manual/en/connection-ttl.xml trunk/docs/user-manual/en/embedding-hornetq.xml trunk/docs/user-manual/en/large-messages.xml trunk/docs/user-manual/en/management.xml trunk/docs/user-manual/en/thread-pooling.xml trunk/docs/user-manual/en/using-core.xml trunk/docs/user-manual/en/using-jms.xml trunk/examples/core/embedded-remote/readme.html trunk/examples/core/embedded-remote/src/org/hornetq/core/example/EmbeddedRemoteExample.java trunk/examples/core/embedded/readme.html trunk/examples/core/embedded/src/org/hornetq/core/example/EmbeddedExample.java trunk/examples/core/hornetq-core-examples.iml trunk/examples/core/microcontainer/readme.html trunk/examples/core/microcontainer/src/org/hornetq/core/example/EmbeddedMicroContainerExample.java trunk/examples/core/perf/src/org/hornetq/core/example/PerfBase.java trunk/examples/javaee/jca-config/src/org/hornetq/javaee/example/server2/StatelessSender.java trunk/examples/jms/applet/src/org/hornetq/jms/example/AppletExample.java trunk/examples/jms/clustered-grouping/src/org/hornetq/jms/example/ClusteredGroupingExample.java trunk/examples/jms/instantiate-connection-factory/readme.html trunk/examples/jms/instantiate-connection-factory/src/org/hornetq/jms/example/InstantiateConnectionFactoryExample.java trunk/examples/jms/management/src/org/hornetq/jms/example/ManagementExample.java trunk/examples/jms/pre-acknowledge/src/org/hornetq/jms/example/PreacknowledgeExample.java trunk/examples/jms/reattach-node/src/org/hornetq/jms/example/ReattachExample.java trunk/examples/jms/symmetric-cluster/readme.html trunk/examples/jms/symmetric-cluster/src/org/hornetq/jms/example/SymmetricClusterExample.java trunk/examples/jms/topic-hierarchies/readme.html trunk/examples/jms/topic-hierarchies/src/org/hornetq/jms/example/TopicHierarchyExample.java trunk/src/main/org/hornetq/api/core/client/ClientSessionFactory.java trunk/src/main/org/hornetq/api/core/client/ClientSessionFactoryImpl.java trunk/src/main/org/hornetq/core/config/impl/FileConfiguration.java trunk/src/main/org/hornetq/core/remoting/server/impl/RemotingServiceImpl.java trunk/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java trunk/src/main/org/hornetq/jms/client/HornetQMessage.java trunk/src/main/org/hornetq/jms/client/HornetQMessageConsumer.java trunk/src/main/org/hornetq/jms/client/HornetQMessageProducer.java trunk/src/main/org/hornetq/jms/client/HornetQQueueBrowser.java trunk/src/main/org/hornetq/jms/client/HornetQSession.java trunk/src/main/org/hornetq/jms/client/package-info.java trunk/src/main/org/hornetq/jms/management/impl/JMSConnectionFactoryControlImpl.java trunk/src/main/org/hornetq/jms/management/impl/JMSQueueControlImpl.java trunk/src/main/org/hornetq/jms/management/impl/JMSTopicControlImpl.java trunk/src/main/org/hornetq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java trunk/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java trunk/src/main/org/hornetq/jms/server/management/JMSManagementService.java trunk/src/main/org/hornetq/jms/server/management/impl/JMSManagementServiceImpl.java trunk/src/main/org/hornetq/jms/server/recovery/HornetQXAResourceWrapper.java trunk/src/main/org/hornetq/ra/HornetQRAManagedConnectionFactory.java trunk/src/main/org/hornetq/ra/HornetQResourceAdapter.java trunk/src/main/org/hornetq/ra/inflow/HornetQActivation.java trunk/src/main/org/hornetq/ra/inflow/HornetQMessageHandler.java trunk/tests/jms-tests/src/org/hornetq/jms/tests/CTSMiscellaneousTest.java trunk/tests/jms-tests/src/org/hornetq/jms/tests/JMSTestCase.java trunk/tests/jms-tests/src/org/hornetq/jms/tests/MessageProducerTest.java trunk/tests/jms-tests/src/org/hornetq/jms/tests/ReferenceableTest.java trunk/tests/jms-tests/src/org/hornetq/jms/tests/message/MessageHeaderTestBase.java trunk/tests/jms-tests/src/org/hornetq/jms/tests/tools/container/LocalTestServer.java trunk/tests/joram-tests/config/provider.properties trunk/tests/joram-tests/src/org/hornetq/jms/HornetQAdmin.java trunk/tests/joram-tests/src/org/hornetq/jms/SpawnedJMSServer.java trunk/tests/src/org/hornetq/tests/integration/DuplicateDetectionTest.java trunk/tests/src/org/hornetq/tests/integration/String64KLimitTest.java trunk/tests/src/org/hornetq/tests/integration/client/ConsumerCloseTest.java trunk/tests/src/org/hornetq/tests/integration/client/CoreClientTest.java trunk/tests/src/org/hornetq/tests/integration/client/DeadLetterAddressTest.java trunk/tests/src/org/hornetq/tests/integration/client/DurableQueueTest.java trunk/tests/src/org/hornetq/tests/integration/client/ExpiryAddressTest.java trunk/tests/src/org/hornetq/tests/integration/client/FailureDeadlockTest.java trunk/tests/src/org/hornetq/tests/integration/client/HornetQCrashTest.java trunk/tests/src/org/hornetq/tests/integration/client/IncompatibleVersionTest.java trunk/tests/src/org/hornetq/tests/integration/client/LargeMessageTest.java trunk/tests/src/org/hornetq/tests/integration/client/MessageGroupingConnectionFactoryTest.java trunk/tests/src/org/hornetq/tests/integration/client/MessageGroupingTest.java trunk/tests/src/org/hornetq/tests/integration/client/MessagePriorityTest.java trunk/tests/src/org/hornetq/tests/integration/client/NewDeadLetterAddressTest.java trunk/tests/src/org/hornetq/tests/integration/client/ProducerCloseTest.java trunk/tests/src/org/hornetq/tests/integration/client/QueueBrowserTest.java trunk/tests/src/org/hornetq/tests/integration/client/ReceiveImmediateTest.java trunk/tests/src/org/hornetq/tests/integration/client/RequestorTest.java trunk/tests/src/org/hornetq/tests/integration/client/SessionCloseTest.java trunk/tests/src/org/hornetq/tests/integration/client/SessionClosedOnRemotingConnectionFailureTest.java trunk/tests/src/org/hornetq/tests/integration/client/SessionFactoryTest.java trunk/tests/src/org/hornetq/tests/integration/client/TemporaryQueueTest.java trunk/tests/src/org/hornetq/tests/integration/client/TransactionDurabilityTest.java trunk/tests/src/org/hornetq/tests/integration/client/WildCardRoutingTest.java trunk/tests/src/org/hornetq/tests/integration/clientcrash/ClientCrashTest.java trunk/tests/src/org/hornetq/tests/integration/clientcrash/ClientExitTest.java trunk/tests/src/org/hornetq/tests/integration/clientcrash/CrashClient.java trunk/tests/src/org/hornetq/tests/integration/clientcrash/GracefulClient.java trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeReconnectTest.java trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeStartTest.java trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeTest.java trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTest.java trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java trunk/tests/src/org/hornetq/tests/integration/cluster/failover/LargeMessageFailoverTest.java trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/MultiThreadRandomReattachTestBase.java trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/NettyMultiThreadRandomReattachTest.java trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/RandomReattachTest.java trunk/tests/src/org/hornetq/tests/integration/divert/DivertTest.java trunk/tests/src/org/hornetq/tests/integration/divert/PersistentDivertTest.java trunk/tests/src/org/hornetq/tests/integration/http/CoreClientOverHttpTest.java trunk/tests/src/org/hornetq/tests/integration/jms/FloodServerTest.java trunk/tests/src/org/hornetq/tests/integration/jms/HornetQConnectionFactoryTest.java trunk/tests/src/org/hornetq/tests/integration/jms/bridge/BridgeTestBase.java trunk/tests/src/org/hornetq/tests/integration/jms/client/PreACKJMSTest.java trunk/tests/src/org/hornetq/tests/integration/jms/client/ReSendLargeMessageTest.java trunk/tests/src/org/hornetq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java trunk/tests/src/org/hornetq/tests/integration/jms/client/TextMessageTest.java trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSFailoverTest.java trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSReconnectTest.java trunk/tests/src/org/hornetq/tests/integration/jms/connection/CloseConnectionOnGCTest.java trunk/tests/src/org/hornetq/tests/integration/jms/connection/CloseDestroyedConnectionTest.java trunk/tests/src/org/hornetq/tests/integration/jms/connection/ExceptionListenerTest.java trunk/tests/src/org/hornetq/tests/integration/jms/consumer/ConsumerTest.java trunk/tests/src/org/hornetq/tests/integration/jms/divert/DivertAndACKClientTest.java trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerDeployerTest.java trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerStartStopTest.java trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSQueueControlTest.java trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlTest.java trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSUtil.java trunk/tests/src/org/hornetq/tests/integration/jms/server/management/TopicControlTest.java trunk/tests/src/org/hornetq/tests/integration/jms/server/management/TopicControlUsingJMSTest.java trunk/tests/src/org/hornetq/tests/integration/largemessage/ServerLargeMessageTest.java trunk/tests/src/org/hornetq/tests/integration/management/AcceptorControlTest.java trunk/tests/src/org/hornetq/tests/integration/management/AcceptorControlUsingCoreTest.java trunk/tests/src/org/hornetq/tests/integration/management/AddressControlTest.java trunk/tests/src/org/hornetq/tests/integration/management/AddressControlUsingCoreTest.java trunk/tests/src/org/hornetq/tests/integration/management/BridgeControlTest.java trunk/tests/src/org/hornetq/tests/integration/management/BridgeControlUsingCoreTest.java trunk/tests/src/org/hornetq/tests/integration/management/BroadcastGroupControlUsingCoreTest.java trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControl2Test.java trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControlUsingCoreTest.java trunk/tests/src/org/hornetq/tests/integration/management/DiscoveryGroupControlUsingCoreTest.java trunk/tests/src/org/hornetq/tests/integration/management/DivertControlUsingCoreTest.java trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlUsingCoreTest.java trunk/tests/src/org/hornetq/tests/integration/management/NotificationTest.java trunk/tests/src/org/hornetq/tests/integration/management/QueueControlTest.java trunk/tests/src/org/hornetq/tests/integration/management/QueueControlUsingCoreTest.java trunk/tests/src/org/hornetq/tests/integration/management/SecurityManagementTestBase.java trunk/tests/src/org/hornetq/tests/integration/management/SecurityNotificationTest.java trunk/tests/src/org/hornetq/tests/integration/remoting/NetworkAddressTestBase.java trunk/tests/src/org/hornetq/tests/integration/remoting/PingTest.java trunk/tests/src/org/hornetq/tests/integration/remoting/SynchronousCloseTest.java trunk/tests/src/org/hornetq/tests/integration/replication/ReplicationOrderTest.java trunk/tests/src/org/hornetq/tests/integration/replication/ReplicationTest.java trunk/tests/src/org/hornetq/tests/integration/security/SimpleClient.java trunk/tests/src/org/hornetq/tests/integration/server/ExpiryRunnerTest.java trunk/tests/src/org/hornetq/tests/integration/server/LVQRecoveryTest.java trunk/tests/src/org/hornetq/tests/integration/server/LVQTest.java trunk/tests/src/org/hornetq/tests/integration/server/PredefinedQueueTest.java trunk/tests/src/org/hornetq/tests/integration/ssl/CoreClientOverSSLTest.java trunk/tests/src/org/hornetq/tests/integration/xa/XaTimeoutTest.java trunk/tests/src/org/hornetq/tests/opt/SendTest.java trunk/tests/src/org/hornetq/tests/stress/remote/PingStressTest.java trunk/tests/src/org/hornetq/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java trunk/tests/src/org/hornetq/tests/unit/jms/HornetQDestinationTest.java trunk/tests/src/org/hornetq/tests/unit/jms/HornetQQueueTest.java trunk/tests/src/org/hornetq/tests/unit/jms/HornetQTopicTest.java trunk/tests/src/org/hornetq/tests/unit/jms/referenceable/DestinationObjectFactoryTest.java trunk/tests/src/org/hornetq/tests/unit/ra/ResourceAdapterTest.java trunk/tests/src/org/hornetq/tests/util/JMSTestBase.java trunk/tests/src/org/hornetq/tests/util/ServiceTestBase.java Log: refactored client api for CLientSessionFactory, ConnectionFactory, HornetQQueue and HornetQTopic Modified: trunk/docs/user-manual/en/clusters.xml =================================================================== --- trunk/docs/user-manual/en/clusters.xml 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/docs/user-manual/en/clusters.xml 2010-01-06 08:57:20 UTC (rev 8723) @@ -242,7 +242,7 @@ final int groupPort = 9876; ConnectionFactory jmsConnectionFactory = - new HornetQConnectionFactory(groupAddress, groupPort); + HornetQJMSClient.createConnectionFactory(groupAddress, groupPort); Connection jmsConnection1 = jmsConnectionFactory.createConnection(); @@ -264,7 +264,7 @@ discovery group parameters directly when creating the session factory. Here's an example:final String groupAddress = "231.7.7.7"; final int groupPort = 9876; - SessionFactory factory = new ClientSessionFactoryImpl(groupAddress, groupPort); + SessionFactory factory = HornetQClient.createClientSessionFactory(groupAddress, groupPort); ClientSession session1 = factory.createClientSession(...); ClientSession session2 = factory.createClientSession(...); </para> <para>The <literal>refresh-timeout</literal> can be set directly on the session @@ -464,13 +464,13 @@ client side then you can set the load balancing policy using the setter on the <literal <programlisting> -ConnectionFactory jmsConnectionFactory = new HornetQConnectionFactory(...); +ConnectionFactory jmsConnectionFactory = HornetQJMSClient.createConnectionFactory(...); jmsConnectionFactory.setLoadBalancingPolicyClassName("com.acme.MyLoadBalancingPolicy"); </programlisting></para> <para>If you're using the core API, you can set the load balancing policy directly on the <literal>ClientSessionFactory</literal> instance you are using: <programlisting> -ClientSessionFactory factory = new ClientSessionFactoryImpl(...); +ClientSessionFactory factory = HornetQClient.createClientSessionFactory(...); factory.setLoadBalancingPolicyClassName("com.acme.MyLoadBalancingPolicy"); </programlisting></para> <para>The set of servers over which the factory load balances can be determined in one of @@ -539,7 +539,7 @@ serverList.add(new Pair&lt;TransportConfiguration, TransportConfiguration>(liveTC2, backupTC2)); -ConnectionFactory jmsConnectionFactory = new HornetQConnectionFactory(serverList); +ConnectionFactory jmsConnectionFactory = HornetQJMSClient.createConnectionFactory(serverList); Connection jmsConnection1 = jmsConnectionFactory.createConnection(); @@ -568,7 +568,7 @@ serverList.add(new Pair&lt;TransportConfiguration, TransportConfiguration>(liveTC2, backupTC2)); -ClientSessionFactory factory = new ClientSessionFactoryImpl(serverList); +ClientSessionFactory factory = HornetQClient.createClientSessionFactory(serverList); ClientSession sesison1 = factory.createClientSession(...); Modified: trunk/docs/user-manual/en/configuring-transports.xml =================================================================== --- trunk/docs/user-manual/en/configuring-transports.xml 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/docs/user-manual/en/configuring-transports.xml 2010-01-06 08:57:20 UTC (rev 8723) @@ -138,7 +138,7 @@ "org.hornetq.integration.transports.netty.NettyConnectorFactory", connectionParams); -ClientSessionFactory sessionFactory = new ClientSessionFactoryImpl(transportConfiguration); +ClientSessionFactory sessionFactory = HornetQClient.createClientSessionFactory(transportConfiguration); ClientSession session = sessionFactory.createSession(...); @@ -157,7 +157,7 @@ "org.hornetq.integration.transports.netty.NettyConnectorFactory", connectionParams); -ConnectionFactory connectionFactory = new HornetQConnectionFactory(transportConfiguration); +ConnectionFactory connectionFactory = HornetQJMSClient.createConnectionFactory(transportConfiguration); Connection jmsConnection = connectionFactory.createConnection(); Modified: trunk/docs/user-manual/en/connection-ttl.xml =================================================================== --- trunk/docs/user-manual/en/connection-ttl.xml 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/docs/user-manual/en/connection-ttl.xml 2010-01-06 08:57:20 UTC (rev 8723) @@ -34,7 +34,7 @@ try { - sf = new ClientSessionFactoryImpl(...); + sf = HornetQClient.createClientSessionFactory(...); session = sf.createSession(...); @@ -59,7 +59,7 @@ try { - ConnectionFactory jmsConnectionFactory = new HornetQConnectionFactory(...); + ConnectionFactory jmsConnectionFactory = HornetQJMSClient.createConnectionFactory(...); jmsConnection = jmsConnectionFactory.createConnection(); Modified: trunk/docs/user-manual/en/embedding-hornetq.xml =================================================================== --- trunk/docs/user-manual/en/embedding-hornetq.xml 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/docs/user-manual/en/embedding-hornetq.xml 2010-01-06 08:57:20 UTC (rev 8723) @@ -125,7 +125,7 @@ <title>Core API</title> <para>If using the core API, just create the <literal>ClientSessionFactory</literal> and use the regular core API.</para> - <programlisting>ClientSessionFactory nettyFactory = new ClientSessionFactoryImpl( + <programlisting>ClientSessionFactory nettyFactory = HornetQClient.createClientSessionFactory( new TransportConfiguration( InVMConnectorFactory.class.getName())); @@ -154,10 +154,10 @@ <section> <title>JMS API</title> <para>Connection on an Embedded HornetQ through JMS is also simple. Just instantiate - <literal>HornetQConnectionFactory</literal> directly. The following example + <literal>ConnectionFactory</literal> directly. The following example illustrates that.</para> - <programlisting>HornetQConnectionFactory cf = - new HornetQConnectionFactory( + <programlisting>ConnectionFactory cf = + HornetQJMSClient.createConnectionFactory( new TransportConfiguration(InVMConnectorFactory.class.getName())); Connection conn = cf.createConnection(); Modified: trunk/docs/user-manual/en/large-messages.xml =================================================================== --- trunk/docs/user-manual/en/large-messages.xml 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/docs/user-manual/en/large-messages.xml 2010-01-06 08:57:20 UTC (rev 8723) @@ -66,7 +66,7 @@ <para>If the HornetQ Core API is used, the minimal large message size is specified by <literal>ClientSessionFactory.setMinLargeMessageSize</literal>.</para> <programlisting>ClientSessionFactory factory = - new ClientSessionFactoryImpl(new + HornetQClient.createClientSessionFactory(new TransportConfiguration(NettyConnectorFactory.class.getName()), null); factory.setMinLargeMessageSize(25 * 1024);</programlisting> <para><xref linkend="configuring-transports.client.side"/> will provide more information Modified: trunk/docs/user-manual/en/management.xml =================================================================== --- trunk/docs/user-manual/en/management.xml 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/docs/user-manual/en/management.xml 2010-01-06 08:57:20 UTC (rev 8723) @@ -660,7 +660,7 @@ <para>The <emphasis>management queue</emphasis> is a special queue and needs to be instantiated directly by the client:</para> <programlisting> - Queue managementQueue = new HornetQQueue("hornetq.management", "hornetq.management"); + Queue managementQueue = HornetQJMSClient.createHornetQQueue("hornetq.management", "hornetq.management"); </programlisting> <para>All the other steps are the same than for the Core API but they use JMS API instead:</para> @@ -689,7 +689,7 @@ <para>For example, to know the number of messages in the JMS queue <literal <programlisting> - Queue managementQueue = new HornetQQueue("hornetq.management", "hornetq.management"); + Queue managementQueue = HornetQJMSClient.createHornetQQueue("hornetq.management", "hornetq.management"); QueueSession session = ... QueueRequestor requestor = new QueueRequestor(session, managementQueue); @@ -800,12 +800,12 @@ is that JMS requires a JMS Destination to receive the messages (preferably a Topic):</para> <programlisting> - Topic notificationsTopic = new HornetQTopic("hornetq.notifications", "hornetq.notifications"); + Topic notificationsTopic = HornetQJMSClient.createHornetQTopic("hornetq.notifications", "hornetq.notifications"); </programlisting> <para>Once the notification topic is created, you can receive messages from it or set a <literal>MessageListener</literal>:</para> <programlisting> - Topic notificationsTopic = new HornetQTopic("hornetq.notifications", "hornetq.notifications"); + Topic notificationsTopic = HornetQJMSClient.createHornetQTopic("hornetq.notifications", "hornetq.notifications"); Session session = ... MessageConsumer notificationConsumer = session.createConsumer(notificationsTopic); Modified: trunk/docs/user-manual/en/thread-pooling.xml =================================================================== --- trunk/docs/user-manual/en/thread-pooling.xml 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/docs/user-manual/en/thread-pooling.xml 2010-01-06 08:57:20 UTC (rev 8723) @@ -99,16 +99,13 @@ <para>To configure a <literal>ClientSessionFactory</literal> instance to use its own pools, simply use the appropriate setter methods immediately after creation, for example:</para> - <programlisting>ClientSessionFactory myFactory = new ClientSessionFactory(...); + <programlisting>ClientSessionFactory myFactory = HornetQClient.createClientSessionFactory(...); myFactory.setUseGlobalPools(false); myFactory.setScheduledThreadPoolMaxSize(10); myFactory.setThreadPoolMaxSize(-1); </programlisting> - <para>If you're using the JMS API, you can set the same parameters directly on the <literal - >HornetQConnectionFactory</literal> instance, for example:</para> - <programlisting>HornetQConnectionFactory myFactory = new HornetQConnectionFactory(...); -myFactory.setUseGlobalPools(false); -myFactory.setScheduledThreadPoolMaxSize(10); -myFactory.setThreadPoolMaxSize(-1); </programlisting> + <para>If you're using the JMS API, you can set the same parameters on the ClientSessionFactory and use it to create the <literal + >ConnectionFactory</literal> instance, for example:</para> + <programlisting>ConnectionFactory myConnectionFactory = HornetQJMSClient.createConnectionFactory(myFactory); </programlisting> <para>If you're using JNDI to instantiate <literal>HornetQConnectionFactory</literal> instances, you can also set these parameters in the <literal>hornetq-jms.xml</literal> file where you describe your connection factory, for example:</para> Modified: trunk/docs/user-manual/en/using-core.xml =================================================================== --- trunk/docs/user-manual/en/using-core.xml 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/docs/user-manual/en/using-core.xml 2010-01-06 08:57:20 UTC (rev 8723) @@ -125,7 +125,7 @@ <para>Here's a very simple program using the core messaging API to send and receive a message:</para> <programlisting> -ClientSessionFactory factory = new ClientSessionFactoryImpl( +ClientSessionFactory factory = HornetQClient.createClientSessionFactory( new TransportConfiguration( InVMConnectorFactory.class.getName())); Modified: trunk/docs/user-manual/en/using-jms.xml =================================================================== --- trunk/docs/user-manual/en/using-jms.xml 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/docs/user-manual/en/using-jms.xml 2010-01-06 08:57:20 UTC (rev 8723) @@ -179,10 +179,10 @@ <programlisting> TransportConfiguration transportConfiguration = new TransportConfiguration(NettyConnectorFactory.class.getName()); -ConnectionFactory cf = new HornetQConnectionFactory(transportConfiguration); +ConnectionFactory cf = HornetQJMSClient.createConnectionFactory(transportConfiguration); </programlisting> <para>We create the JMS Queue Object directly:</para> - <programlisting>Queue orderQueue = new HornetQQueue("OrderQueue");</programlisting> + <programlisting>Queue orderQueue = HornetQJMSClient.createHornetQQueue("OrderQueue");</programlisting> <para>Next we create a JMS connection using the connection factory:</para> <programlisting>Connection connection = cf.createConnection();</programlisting> <para>And we create a non transacted JMS Session, with AUTO_ACKNOWLEDGE acknowledge Modified: trunk/examples/core/embedded/readme.html =================================================================== --- trunk/examples/core/embedded/readme.html 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/examples/core/embedded/readme.html 2010-01-06 08:57:20 UTC (rev 8723) @@ -35,7 +35,7 @@ <li>As we are not using a JNDI environment we instantiate the objects directly</li> <pre class="prettyprint"> - ClientSessionFactory sf = new ClientSessionFactoryImpl (new TransportConfiguration(InVMConnectorFactory.class.getName())); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); </pre> <li>Create a Core Queue</li> Modified: trunk/examples/core/embedded/src/org/hornetq/core/example/EmbeddedExample.java =================================================================== --- trunk/examples/core/embedded/src/org/hornetq/core/example/EmbeddedExample.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/examples/core/embedded/src/org/hornetq/core/example/EmbeddedExample.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -15,12 +15,7 @@ import java.util.Date; import java.util.HashMap; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.*; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; @@ -56,7 +51,7 @@ server.start(); // Step 3. As we are not using a JNDI environment we instantiate the objects directly - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); // Step 4. Create a core queue ClientSession coreSession = sf.createSession(false, false, false); @@ -120,7 +115,7 @@ map.put("host", "localhost"); map.put("port", 5445); TransportConfiguration config = new TransportConfiguration(InVMConnectorFactory.class.getName(), map); - ClientSessionFactory sf = new ClientSessionFactoryImpl(config); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(config); } } Modified: trunk/examples/core/embedded-remote/readme.html =================================================================== --- trunk/examples/core/embedded-remote/readme.html 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/examples/core/embedded-remote/readme.html 2010-01-06 08:57:20 UTC (rev 8723) @@ -54,7 +54,7 @@ <li>As we are not using a JNDI environment we instantiate the objects directly</li> <pre class="prettyprint"> - ClientSessionFactory sf = new ClientSessionFactoryImpl (new TransportConfiguration(NettyConnectorFactory.class.getName())); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(NettyConnectorFactory.class.getName())); </pre> <li>Create a Core Queue</li> Modified: trunk/examples/core/embedded-remote/src/org/hornetq/core/example/EmbeddedRemoteExample.java =================================================================== --- trunk/examples/core/embedded-remote/src/org/hornetq/core/example/EmbeddedRemoteExample.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/examples/core/embedded-remote/src/org/hornetq/core/example/EmbeddedRemoteExample.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -14,12 +14,7 @@ import java.util.Date; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.*; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.common.example.SpawnedVMSupport; import org.hornetq.integration.transports.netty.NettyConnectorFactory; @@ -47,7 +42,7 @@ process = EmbeddedRemoteExample.startRemoteEmbedded(); // Step 4. As we are not using a JNDI environment we instantiate the objects directly - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(NettyConnectorFactory.class.getName())); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(NettyConnectorFactory.class.getName())); // Step 5. Create a core queue ClientSession coreSession = sf.createSession(false, false, false); Modified: trunk/examples/core/hornetq-core-examples.iml =================================================================== --- trunk/examples/core/hornetq-core-examples.iml 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/examples/core/hornetq-core-examples.iml 2010-01-06 08:57:20 UTC (rev 8723) @@ -5,11 +5,14 @@ <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/embedded/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/perf/src" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/embedded-remote/src" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/microcontainer/src" isTestSource="false" /> </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="hornetq" /> <orderEntry type="library" name="messaging_jars" level="project" /> + <orderEntry type="module" module-name="hornetq-jms-examples" /> </component> </module> Modified: trunk/examples/core/microcontainer/readme.html =================================================================== --- trunk/examples/core/microcontainer/readme.html 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/examples/core/microcontainer/readme.html 2010-01-06 08:57:20 UTC (rev 8723) @@ -24,7 +24,7 @@ <li>As we are not using a JNDI environment we instantiate the objects directly</li> <pre class="prettyprint"> - ClientSessionFactory sf = new ClientSessionFactoryImpl (new TransportConfiguration(NettyConnectorFactory.class.getName())); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory (new TransportConfiguration(NettyConnectorFactory.class.getName())); </pre> <li>Create a Core Queue</li> Modified: trunk/examples/core/microcontainer/src/org/hornetq/core/example/EmbeddedMicroContainerExample.java =================================================================== --- trunk/examples/core/microcontainer/src/org/hornetq/core/example/EmbeddedMicroContainerExample.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/examples/core/microcontainer/src/org/hornetq/core/example/EmbeddedMicroContainerExample.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -14,12 +14,7 @@ import java.util.Date; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.*; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.integration.bootstrap.HornetQBootstrapServer; import org.hornetq.integration.transports.netty.NettyConnectorFactory; @@ -47,7 +42,7 @@ hornetQ.run(); // Step 2. As we are not using a JNDI environment we instantiate the objects directly - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(NettyConnectorFactory.class.getName())); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(NettyConnectorFactory.class.getName())); // Step 3. Create a core queue ClientSession coreSession = sf.createSession(false, false, false); Modified: trunk/examples/core/perf/src/org/hornetq/core/example/PerfBase.java =================================================================== --- trunk/examples/core/perf/src/org/hornetq/core/example/PerfBase.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/examples/core/perf/src/org/hornetq/core/example/PerfBase.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -22,14 +22,7 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.logging.Logger; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; -import org.hornetq.api.core.client.MessageHandler; -import org.hornetq.api.core.client.SendAcknowledgementHandler; +import org.hornetq.api.core.client.*; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.message.Message; import org.hornetq.integration.transports.netty.NettyConnectorFactory; @@ -202,7 +195,7 @@ params.put(TransportConstants.HOST_PROP_NAME, perfParams.getHost()); params.put(TransportConstants.PORT_PROP_NAME, perfParams.getPort()); - factory = new ClientSessionFactoryImpl(new TransportConfiguration(NettyConnectorFactory.class.getName(), params)); + factory = HornetQClient.createClientSessionFactory(new TransportConfiguration(NettyConnectorFactory.class.getName(), params)); factory.setPreAcknowledge(perfParams.isPreAck()); factory.setConfirmationWindowSize(perfParams.getConfirmationWindow()); factory.setProducerWindowSize(perfParams.getProducerWindow()); Modified: trunk/examples/javaee/jca-config/src/org/hornetq/javaee/example/server2/StatelessSender.java =================================================================== --- trunk/examples/javaee/jca-config/src/org/hornetq/javaee/example/server2/StatelessSender.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/examples/javaee/jca-config/src/org/hornetq/javaee/example/server2/StatelessSender.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -16,15 +16,12 @@ -import org.hornetq.api.jms.HornetQQueue; +import org.hornetq.api.jms.HornetQJMSClient; import javax.annotation.Resource; import javax.ejb.Remote; import javax.ejb.Stateless; -import javax.jms.Connection; -import javax.jms.ConnectionFactory; -import javax.jms.MessageProducer; -import javax.jms.Session; +import javax.jms.*; /** * A Stateless Bean that will connect to a remote JBM. @@ -51,8 +48,8 @@ public void sendHello(String message) throws Exception { // Step 4. Define the destinations that will receive the message (instead of using JNDI to the remote server) - HornetQQueue destQueueA = new HornetQQueue("A"); - HornetQQueue destQueueB = new HornetQQueue("B"); + Queue destQueueA = HornetQJMSClient.createHornetQQueue("A"); + Queue destQueueB = HornetQJMSClient.createHornetQQueue("B"); // Step 5. Create a connection to a remote server using a connection-factory (look at the deployed file jms-remote-ds.xml) Connection conn = connectionFactory.createConnection("guest", "guest"); Modified: trunk/examples/jms/applet/src/org/hornetq/jms/example/AppletExample.java =================================================================== --- trunk/examples/jms/applet/src/org/hornetq/jms/example/AppletExample.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/examples/jms/applet/src/org/hornetq/jms/example/AppletExample.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -43,10 +43,10 @@ import javax.swing.SwingConstants; import javax.swing.SwingUtilities; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.ClientSessionFactory; +import org.hornetq.api.core.client.HornetQClient; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.jms.HornetQConnectionFactory; -import org.hornetq.api.jms.HornetQTopic; +import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.integration.transports.netty.NettyConnectorFactory; /** @@ -108,9 +108,9 @@ Map<String, Object> params = new HashMap<String, Object>(); TransportConfiguration connector = new TransportConfiguration(NettyConnectorFactory.class.getName(), params); - ClientSessionFactoryImpl sf = new ClientSessionFactoryImpl(connector); - ConnectionFactory cf = new HornetQConnectionFactory(sf); - destination = new HornetQTopic("exampleTopic"); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(connector); + ConnectionFactory cf = HornetQJMSClient.createConnectionFactory(sf); + destination = HornetQJMSClient.createHornetQTopic("exampleTopic"); try { Modified: trunk/examples/jms/clustered-grouping/src/org/hornetq/jms/example/ClusteredGroupingExample.java =================================================================== --- trunk/examples/jms/clustered-grouping/src/org/hornetq/jms/example/ClusteredGroupingExample.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/examples/jms/clustered-grouping/src/org/hornetq/jms/example/ClusteredGroupingExample.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -118,7 +118,7 @@ { TextMessage message = session0.createTextMessage("This is text message " + i); - message.setStringProperty(HornetQMessage.JMSXGROUPID, "Group-0"); + message.setStringProperty("JMSXGroupID", "Group-0"); producer0.send(message); @@ -129,7 +129,7 @@ { TextMessage message = session1.createTextMessage("This is text message " + (i + 10)); - message.setStringProperty(HornetQMessage.JMSXGROUPID, "Group-0"); + message.setStringProperty("JMSXGroupID", "Group-0"); producer1.send(message); @@ -141,7 +141,7 @@ { TextMessage message = session2.createTextMessage("This is text message " + (i + 20)); - message.setStringProperty(HornetQMessage.JMSXGROUPID, "Group-0"); + message.setStringProperty("JMSXGroupID", "Group-0"); producer2.send(message); Modified: trunk/examples/jms/instantiate-connection-factory/readme.html =================================================================== --- trunk/examples/jms/instantiate-connection-factory/readme.html 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/examples/jms/instantiate-connection-factory/readme.html 2010-01-06 08:57:20 UTC (rev 8723) @@ -56,7 +56,7 @@ <li>Directly instantiate the JMS ConnectionFactory object using that TransportConfiguration.</li> <pre class="prettyprint"> <code> - ConnectionFactory cf = new HornetQConnectionFactory(transportConfiguration); + ConnectionFactory cf = HornetQJMSClient.createConnectionFactory(transportConfiguration); </code> </pre> Modified: trunk/examples/jms/instantiate-connection-factory/src/org/hornetq/jms/example/InstantiateConnectionFactoryExample.java =================================================================== --- trunk/examples/jms/instantiate-connection-factory/src/org/hornetq/jms/example/InstantiateConnectionFactoryExample.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/examples/jms/instantiate-connection-factory/src/org/hornetq/jms/example/InstantiateConnectionFactoryExample.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -24,8 +24,7 @@ import javax.jms.TextMessage; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.jms.HornetQConnectionFactory; -import org.hornetq.api.jms.HornetQQueue; +import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.common.example.HornetQExample; import org.hornetq.integration.transports.netty.NettyConnectorFactory; import org.hornetq.integration.transports.netty.TransportConstants; @@ -54,7 +53,7 @@ try { // Step 1. Directly instantiate the JMS Queue object. - Queue queue = new HornetQQueue("exampleQueue"); + Queue queue = HornetQJMSClient.createHornetQQueue("exampleQueue"); // Step 2. Instantiate the TransportConfiguration object which contains the knowledge of what transport to use, // The server port etc. @@ -66,7 +65,7 @@ connectionParams); // Step 3 Directly instantiate the JMS ConnectionFactory object using that TransportConfiguration - ConnectionFactory cf = new HornetQConnectionFactory(transportConfiguration); + ConnectionFactory cf = HornetQJMSClient.createConnectionFactory(transportConfiguration); // Step 4.Create a JMS Connection connection = cf.createConnection(); Modified: trunk/examples/jms/management/src/org/hornetq/jms/example/ManagementExample.java =================================================================== --- trunk/examples/jms/management/src/org/hornetq/jms/example/ManagementExample.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/examples/jms/management/src/org/hornetq/jms/example/ManagementExample.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -24,7 +24,7 @@ import javax.jms.TextMessage; import javax.naming.InitialContext; -import org.hornetq.api.jms.HornetQQueue; +import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.api.jms.management.JMSManagementHelper; import org.hornetq.common.example.HornetQExample; @@ -74,7 +74,7 @@ // Step 9. create the JMS management queue. // It is a "special" queue and it is not looked up from JNDI but constructed directly - Queue managementQueue = new HornetQQueue("hornetq.management", "hornetq.management"); + Queue managementQueue = HornetQJMSClient.createHornetQQueue("hornetq.management", "hornetq.management"); // Step 10. Create a QueueRequestor for the management queue (see queue-requestor example) QueueRequestor requestor = new QueueRequestor(session, managementQueue); Modified: trunk/examples/jms/pre-acknowledge/src/org/hornetq/jms/example/PreacknowledgeExample.java =================================================================== --- trunk/examples/jms/pre-acknowledge/src/org/hornetq/jms/example/PreacknowledgeExample.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/examples/jms/pre-acknowledge/src/org/hornetq/jms/example/PreacknowledgeExample.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -25,7 +25,7 @@ import javax.jms.TextMessage; import javax.naming.InitialContext; -import org.hornetq.api.jms.HornetQQueue; +import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.api.jms.management.JMSManagementHelper; import org.hornetq.common.example.HornetQExample; import org.hornetq.jms.client.HornetQSession; @@ -128,7 +128,7 @@ { QueueSession session = ((QueueConnection)connection).createQueueSession(false, Session.AUTO_ACKNOWLEDGE); - Queue managementQueue = new HornetQQueue("hornetq.management", "hornetq.management"); + Queue managementQueue = HornetQJMSClient.createHornetQQueue("hornetq.management", "hornetq.management"); QueueRequestor requestor = new QueueRequestor(session, managementQueue); Modified: trunk/examples/jms/reattach-node/src/org/hornetq/jms/example/ReattachExample.java =================================================================== --- trunk/examples/jms/reattach-node/src/org/hornetq/jms/example/ReattachExample.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/examples/jms/reattach-node/src/org/hornetq/jms/example/ReattachExample.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -22,7 +22,7 @@ import javax.jms.TextMessage; import javax.naming.InitialContext; -import org.hornetq.api.jms.HornetQQueue; +import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.api.jms.management.JMSManagementHelper; import org.hornetq.common.example.HornetQExample; @@ -141,7 +141,7 @@ Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); - Queue managementQueue = new HornetQQueue("hornetq.management", "hornetq.management"); + Queue managementQueue = HornetQJMSClient.createHornetQQueue("hornetq.management", "hornetq.management"); MessageProducer producer = session.createProducer(managementQueue); Modified: trunk/examples/jms/symmetric-cluster/readme.html =================================================================== --- trunk/examples/jms/symmetric-cluster/readme.html 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/examples/jms/symmetric-cluster/readme.html 2010-01-06 08:57:20 UTC (rev 8723) @@ -62,7 +62,7 @@ <pre class="prettyprint"> <code> - ConnectionFactory cf = new HornetQConnectionFactory("231.7.7.7", 9876); + ConnectionFactory cf = HornetQJMSClient.createConnectionFactory("231.7.7.7", 9876); </code> </pre> @@ -71,7 +71,7 @@ <code> Queue queue = new HornetQQueue("exampleQueue"); - Topic topic = new HornetQTopic("exampleTopic"); + Topic topic = HornetQJMSClient.createHornetQTopic("exampleTopic"); </code> </pre> Modified: trunk/examples/jms/symmetric-cluster/src/org/hornetq/jms/example/SymmetricClusterExample.java =================================================================== --- trunk/examples/jms/symmetric-cluster/src/org/hornetq/jms/example/SymmetricClusterExample.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/examples/jms/symmetric-cluster/src/org/hornetq/jms/example/SymmetricClusterExample.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -21,9 +21,7 @@ import javax.jms.TextMessage; import javax.jms.Topic; -import org.hornetq.api.jms.HornetQConnectionFactory; -import org.hornetq.api.jms.HornetQQueue; -import org.hornetq.api.jms.HornetQTopic; +import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.common.example.HornetQExample; /** @@ -81,15 +79,15 @@ // connection factory directly we avoid having to worry about a JNDI look-up. // In an app server environment you could use HA-JNDI to lookup from the clustered JNDI servers without // having to know about a specific one. - ConnectionFactory cf = new HornetQConnectionFactory("231.7.7.7", 9876); + ConnectionFactory cf = HornetQJMSClient.createConnectionFactory("231.7.7.7", 9876); // We give a little while for each server to broadcast its whereabouts to the client Thread.sleep(2000); // Step 2. Directly instantiate JMS Queue and Topic objects - Queue queue = new HornetQQueue("exampleQueue"); + Queue queue = HornetQJMSClient.createHornetQQueue("exampleQueue"); - Topic topic = new HornetQTopic("exampleTopic"); + Topic topic = HornetQJMSClient.createHornetQTopic("exampleTopic"); // Step 3. We create six connections, they should be to different nodes of the cluster in a round-robin fashion // and start them Modified: trunk/examples/jms/topic-hierarchies/readme.html =================================================================== --- trunk/examples/jms/topic-hierarchies/readme.html 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/examples/jms/topic-hierarchies/readme.html 2010-01-06 08:57:20 UTC (rev 8723) @@ -75,7 +75,7 @@ <li>Instantiate a topic representing the wildcard we're going to subscribe to.</li> <pre class="prettyprint"> - <code>Topic topicSubscribe = new HornetQTopic("news.europe.#");</code> + <code>Topic topicSubscribe = HornetQJMSClient.createHornetQTopic("news.europe.#");</code> </pre> <li>Create a consumer (topic subscriber) that will consume using that wildcard. @@ -93,11 +93,11 @@ we're going to send messages to. You could look these up from JNDI if you wanted to.</li> <pre class="prettyprint"> <code> - Topic topicNewsUsaWrestling = new HornetQTopic("news.usa.wrestling"); + Topic topicNewsUsaWrestling = HornetQJMSClient.createHornetQTopic("news.usa.wrestling"); - Topic topicNewsEuropeSport = new HornetQTopic("news.europe.sport"); + Topic topicNewsEuropeSport = HornetQJMSClient.createHornetQTopic("news.europe.sport"); - Topic topicNewsEuropeEntertainment = new HornetQTopic("news.europe.entertainment");</code> + Topic topicNewsEuropeEntertainment = HornetQJMSClient.createHornetQTopic("news.europe.entertainment");</code> </pre> <li>Send a message destined for the usa wrestling topic.</li> Modified: trunk/examples/jms/topic-hierarchies/src/org/hornetq/jms/example/TopicHierarchyExample.java =================================================================== --- trunk/examples/jms/topic-hierarchies/src/org/hornetq/jms/example/TopicHierarchyExample.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/examples/jms/topic-hierarchies/src/org/hornetq/jms/example/TopicHierarchyExample.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -22,7 +22,7 @@ import javax.jms.Topic; import javax.naming.InitialContext; -import org.hornetq.api.jms.HornetQTopic; +import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.common.example.HornetQExample; /** @@ -59,7 +59,7 @@ Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); // Step 6. Instantiate a topic representing the wildcard we're going to subscribe to - Topic topicSubscribe = new HornetQTopic("news.europe.#"); + Topic topicSubscribe = HornetQJMSClient.createHornetQTopic("news.europe.#"); // Step 7. Create a consumer (topic subscriber) that will consume using that wildcard // The consumer will receive any messages sent to any topic that starts with news.europe @@ -70,11 +70,11 @@ // Step 9. Instantiate some more topic objects corresponding to the individual topics // we're going to send messages to - Topic topicNewsUsaWrestling = new HornetQTopic("news.usa.wrestling"); + Topic topicNewsUsaWrestling = HornetQJMSClient.createHornetQTopic("news.usa.wrestling"); - Topic topicNewsEuropeSport = new HornetQTopic("news.europe.sport"); + Topic topicNewsEuropeSport = HornetQJMSClient.createHornetQTopic("news.europe.sport"); - Topic topicNewsEuropeEntertainment = new HornetQTopic("news.europe.entertainment"); + Topic topicNewsEuropeEntertainment = HornetQJMSClient.createHornetQTopic("news.europe.entertainment"); // Step 10. Send a message destined for the usa wrestling topic TextMessage messageWrestlingNews = session.createTextMessage("Hulk Hogan starts ballet classes"); Modified: trunk/src/main/org/hornetq/api/core/client/ClientSessionFactory.java =================================================================== --- trunk/src/main/org/hornetq/api/core/client/ClientSessionFactory.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/src/main/org/hornetq/api/core/client/ClientSessionFactory.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -163,7 +163,7 @@ /** * Returns the period used to check if a client has failed to receive pings from the server. * - * Period is in milliseconds, default value is {@value org.hornetq.api.core.client.ClientSessionFactoryImpl#DEFAULT_CLIENT_FAILURE_CHECK_PERIOD}. + * Period is in milliseconds, default value is {@value HornetQClient#DEFAULT_CLIENT_FAILURE_CHECK_PERIOD}. * * @return the period used to check if a client has failed to receive pings from the server */ @@ -183,7 +183,7 @@ * * There is 1 temporary file created for each large message. * - * Default value is {@value org.hornetq.api.core.client.ClientSessionFactoryImpl#DEFAULT_CACHE_LARGE_MESSAGE_CLIENT}. + * Default value is {@value HornetQClient#DEFAULT_CACHE_LARGE_MESSAGE_CLIENT}. * * @return <code>true</code> if consumers created through this factory will cache large messages in temporary files, <code>false</code> else */ @@ -200,7 +200,7 @@ * Returns the connection <em>time-to-live</em>. * This TTL determines how long the server will keep a connection alive in the absence of any data arriving from the client. * - * Value is in milliseconds, default value is {@value org.hornetq.api.core.client.ClientSessionFactoryImpl#DEFAULT_CONNECTION_TTL}. + * Value is in milliseconds, default value is {@value HornetQClient#DEFAULT_CONNECTION_TTL}. * * @return the connection time-to-live in milliseconds */ @@ -219,7 +219,7 @@ * Returns the blocking calls timeout. * * If client's blocking calls to the server take more than this timeout, the call will throw a {@link HornetQException} with the code {@link HornetQException#CONNECTION_TIMEDOUT}. - * Value is in milliseconds, default value is {@value org.hornetq.api.core.client.ClientSessionFactoryImpl#DEFAULT_CALL_TIMEOUT}. + * Value is in milliseconds, default value is {@value HornetQClient#DEFAULT_CALL_TIMEOUT}. * * @return the blocking calls timeout */ @@ -239,7 +239,7 @@ * * Messages whose size is if greater than this value will be handled as <em>large messages</em>. * - * Value is in bytes, default value is {@value org.hornetq.api.core.client.ClientSessionFactoryImpl#DEFAULT_MIN_LARGE_MESSAGE_SIZE}. + * Value is in bytes, default value is {@value HornetQClient#DEFAULT_MIN_LARGE_MESSAGE_SIZE}. * * @return the message size threshold to treat messages as large messages. */ @@ -257,7 +257,7 @@ /** * Returns the window size for flow control of the consumers created through this factory. * - * Value is in bytes, default value is {@value org.hornetq.api.core.client.ClientSessionFactoryImpl#DEFAULT_CONSUMER_WINDOW_SIZE}. + * Value is in bytes, default value is {@value HornetQClient#DEFAULT_CONSUMER_WINDOW_SIZE}. * * @return the window size used for consumer flow control */ @@ -278,7 +278,7 @@ * This value controls the rate at which a consumer can consume messages. A consumer will never consume messages at a rate faster than the rate specified. * * Value is -1 (to disable) or a positive integer corresponding to the maximum desired message consumption rate specified in units of messages per second. - * Default value is {@value org.hornetq.api.core.client.ClientSessionFactoryImpl#DEFAULT_CONSUMER_MAX_RATE}. + * Default value is {@value HornetQClient#DEFAULT_CONSUMER_MAX_RATE}. * * @return the consumer max rate */ @@ -296,7 +296,7 @@ /** * Returns the size for the confirmation window of clients using this factory. * - * Value is in bytes or -1 (to disable the window). Default value is {@value org.hornetq.api.core.client.ClientSessionFactoryImpl#DEFAULT_CONFIRMATION_WINDOW_SIZE}. + * Value is in bytes or -1 (to disable the window). Default value is {@value HornetQClient#DEFAULT_CONFIRMATION_WINDOW_SIZE}. * * @return the size for the confirmation window of clients using this factory */ @@ -315,7 +315,7 @@ * Returns the window size for flow control of the producers created through this factory. * * Value must be -1 (to disable flow control) or greater than 0 to determine the maximum amount of bytes at any give time (to prevent overloading the connection). - * Default value is {@value org.hornetq.api.core.client.ClientSessionFactoryImpl#DEFAULT_PRODUCER_WINDOW_SIZE}. + * Default value is {@value HornetQClient#DEFAULT_PRODUCER_WINDOW_SIZE}. * * @return the window size for flow control of the producers created through this factory. */ @@ -336,7 +336,7 @@ * This value controls the rate at which a producer can produce messages. A producer will never produce messages at a rate faster than the rate specified. * * Value is -1 (to disable) or a positive integer corresponding to the maximum desired message production rate specified in units of messages per second. - * Default value is {@value org.hornetq.api.core.client.ClientSessionFactoryImpl#DEFAULT_PRODUCER_MAX_RATE}. + * Default value is {@value HornetQClient#DEFAULT_PRODUCER_MAX_RATE}. * * @return maximum rate of message production (in messages per seconds) */ @@ -354,7 +354,7 @@ /** * Returns whether consumers created through this factory will block while sending message acknowledgements or do it asynchronously. * - * Default value is {@value org.hornetq.api.core.client.ClientSessionFactoryImpl#DEFAULT_BLOCK_ON_ACKNOWLEDGE}. + * Default value is {@value HornetQClient#DEFAULT_BLOCK_ON_ACKNOWLEDGE}. * * @return whether consumers will block while sending message acknowledgements or do it asynchronously */ @@ -373,7 +373,7 @@ * If the session is configured to send durable message asynchronously, the client can set a SendAcknowledgementHandler on the ClientSession * to be notified once the message has been handled by the server. * - * Default value is {@value org.hornetq.api.core.client.ClientSessionFactoryImpl#DEFAULT_BLOCK_ON_DURABLE_SEND}. + * Default value is {@value HornetQClient#DEFAULT_BLOCK_ON_DURABLE_SEND}. * * @return whether producers will block while sending persistent messages or do it asynchronously */ @@ -392,7 +392,7 @@ * If the session is configured to send non-durable message asynchronously, the client can set a SendAcknowledgementHandler on the ClientSession * to be notified once the message has been handled by the server. * - * Default value is {@value org.hornetq.api.core.client.ClientSessionFactoryImpl#DEFAULT_BLOCK_ON_NON_DURABLE_SEND}. + * Default value is {@value HornetQClient#DEFAULT_BLOCK_ON_NON_DURABLE_SEND}. * * @return whether producers will block while sending non-durable messages or do it asynchronously */ @@ -411,7 +411,7 @@ * * if <code>true</code>, a random unique group ID is created and set on each message for the property * {@link org.hornetq.api.core.message.Message#HDR_GROUP_ID}. - * Default value is {@value org.hornetq.api.core.client.ClientSessionFactoryImpl#DEFAULT_AUTO_GROUP}. + * Default value is {@value HornetQClient#DEFAULT_AUTO_GROUP}. * * @return whether producers will automatically assign a group ID to their messages */ @@ -444,7 +444,7 @@ /** * Returns whether messages will pre-acknowledged on the server before they are sent to the consumers or not. * - * Default value is {@value org.hornetq.api.core.client.ClientSessionFactoryImpl#DEFAULT_PRE_ACKNOWLEDGE} + * Default value is {@value HornetQClient#DEFAULT_PRE_ACKNOWLEDGE} */ boolean isPreAcknowledge(); @@ -459,7 +459,7 @@ /** * Returns the acknowledgements batch size. * - * Default value is {@value org.hornetq.api.core.client.ClientSessionFactoryImpl#DEFAULT_ACK_BATCH_SIZE}. + * Default value is {@value HornetQClient#DEFAULT_ACK_BATCH_SIZE}. * * @return the acknowledgements batch size */ @@ -511,7 +511,7 @@ * If this factory uses discovery to find HornetQ servers, the list of discovered servers * will be refreshed according to this timeout. * - * Value is in milliseconds, default value is {@value org.hornetq.api.core.client.ClientSessionFactoryImpl#DEFAULT_DISCOVERY_REFRESH_TIMEOUT}. + * Value is in milliseconds, default value is {@value HornetQClient#DEFAULT_DISCOVERY_REFRESH_TIMEOUT}. * * @return the refresh timeout for discovered HornetQ servers */ @@ -529,7 +529,7 @@ /** * Returns the initial wait timeout if this factory is configured to use discovery. * - * Value is in milliseconds, default value is {@value org.hornetq.api.core.client.ClientSessionFactoryImpl#DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT}. + * Value is in milliseconds, default value is {@value HornetQClient#DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT}. * * @return the initial wait timeout if this factory is configured to use discovery */ @@ -548,7 +548,7 @@ * Returns whether this factory will use global thread pools (shared among all the factories in the same JVM) * or its own pools. * - * Default value is {@value org.hornetq.api.core.client.ClientSessionFactoryImpl#DEFAULT_USE_GLOBAL_POOLS}. + * Default value is {@value HornetQClient#DEFAULT_USE_GLOBAL_POOLS}. * * @return <code>true</code> if this factory uses global thread pools, <code>false</code> else */ @@ -565,7 +565,7 @@ /** * Returns the maximum size of the scheduled thread pool. * - * Default value is {@value org.hornetq.api.core.client.ClientSessionFactoryImpl#DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE}. + * Default value is {@value HornetQClient#DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE}. * * @return the maximum size of the scheduled thread pool. */ @@ -584,7 +584,7 @@ /** * Returns the maximum size of the thread pool. * - * Default value is {@value org.hornetq.api.core.client.ClientSessionFactoryImpl#DEFAULT_THREAD_POOL_MAX_SIZE}. + * Default value is {@value HornetQClient#DEFAULT_THREAD_POOL_MAX_SIZE}. * * @return the maximum size of the thread pool. */ @@ -603,7 +603,7 @@ /** * Returns the time to retry connections created by this factory after failure. * - * Value is in milliseconds, default is {@value org.hornetq.api.core.client.ClientSessionFactoryImpl#DEFAULT_RETRY_INTERVAL}. + * Value is in milliseconds, default is {@value HornetQClient#DEFAULT_RETRY_INTERVAL}. * * @return the time to retry connections created by this factory after failure */ @@ -621,7 +621,7 @@ /** * Returns the multiplier to apply to successive retry intervals. * - * Default value is {@value org.hornetq.api.core.client.ClientSessionFactoryImpl#DEFAULT_RETRY_INTERVAL_MULTIPLIER}. + * Default value is {@value HornetQClient#DEFAULT_RETRY_INTERVAL_MULTIPLIER}. * * @return the multiplier to apply to successive retry intervals */ @@ -639,7 +639,7 @@ /** * Returns the maximum retry interval (in the case a retry interval multiplier has been specified). * - * Value is in milliseconds, default value is {@value org.hornetq.api.core.client.ClientSessionFactoryImpl#DEFAULT_MAX_RETRY_INTERVAL}. + * Value is in milliseconds, default value is {@value HornetQClient#DEFAULT_MAX_RETRY_INTERVAL}. * * @return the maximum retry interval */ @@ -657,7 +657,7 @@ /** * Returns the maximum number of attempts to retry connection in case of failure. * - * Default value is {@value org.hornetq.api.core.client.ClientSessionFactoryImpl#DEFAULT_RECONNECT_ATTEMPTS}. + * Default value is {@value HornetQClient#DEFAULT_RECONNECT_ATTEMPTS}. * * @return the maximum number of attempts to retry connection in case of failure. */ @@ -676,7 +676,7 @@ * Returns whether connections created by this factory must failover in case the server they are * connected to <em>has normally shut down</em>. * - * Default value is {@value org.hornetq.api.core.client.ClientSessionFactoryImpl#DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN}. + * Default value is {@value HornetQClient#DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN}. * * @return <code>true</code> if connections must failover if the server has normally shut down, else <code>false</code> */ @@ -711,7 +711,7 @@ /** * Returns the initial size of messages created through this factory. * - * Value is in bytes, default value is {@value org.hornetq.api.core.client.ClientSessionFactoryImpl#DEFAULT_INITIAL_MESSAGE_PACKET_SIZE}. + * Value is in bytes, default value is {@value HornetQClient#DEFAULT_INITIAL_MESSAGE_PACKET_SIZE}. * * @return the initial size of messages created through this factory */ Modified: trunk/src/main/org/hornetq/api/core/client/ClientSessionFactoryImpl.java =================================================================== --- trunk/src/main/org/hornetq/api/core/client/ClientSessionFactoryImpl.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/src/main/org/hornetq/api/core/client/ClientSessionFactoryImpl.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -30,7 +30,6 @@ import org.hornetq.api.Pair; import org.hornetq.api.core.client.loadbalance.ConnectionLoadBalancingPolicy; -import org.hornetq.api.core.client.loadbalance.RoundRobinConnectionLoadBalancingPolicy; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; import org.hornetq.api.core.interceptor.Interceptor; @@ -62,64 +61,6 @@ private static final Logger log = Logger.getLogger(ClientSessionFactoryImpl.class); - public static final String DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME = RoundRobinConnectionLoadBalancingPolicy.class.getCanonicalName(); - - public static final long DEFAULT_CLIENT_FAILURE_CHECK_PERIOD = 30000; - - // 1 minute - this should be higher than ping period - public static final long DEFAULT_CONNECTION_TTL = 1 * 60 * 1000; - - // Any message beyond this size is considered a large message (to be sent in chunks) - public static final int DEFAULT_MIN_LARGE_MESSAGE_SIZE = 100 * 1024; - - public static final int DEFAULT_CONSUMER_WINDOW_SIZE = 1024 * 1024; - - public static final int DEFAULT_CONSUMER_MAX_RATE = -1; - - public static final int DEFAULT_CONFIRMATION_WINDOW_SIZE = -1; - - public static final int DEFAULT_PRODUCER_WINDOW_SIZE = 1024 * 1024; - - public static final int DEFAULT_PRODUCER_MAX_RATE = -1; - - public static final boolean DEFAULT_BLOCK_ON_ACKNOWLEDGE = false; - - public static final boolean DEFAULT_BLOCK_ON_DURABLE_SEND = true; - - public static final boolean DEFAULT_BLOCK_ON_NON_DURABLE_SEND = false; - - public static final boolean DEFAULT_AUTO_GROUP = false; - - public static final long DEFAULT_CALL_TIMEOUT = 30000; - - public static final int DEFAULT_ACK_BATCH_SIZE = 1024 * 1024; - - public static final boolean DEFAULT_PRE_ACKNOWLEDGE = false; - - public static final long DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT = 2000; - - public static final long DEFAULT_DISCOVERY_REFRESH_TIMEOUT = 10000; - - public static final long DEFAULT_RETRY_INTERVAL = 2000; - - public static final double DEFAULT_RETRY_INTERVAL_MULTIPLIER = 1d; - - public static final long DEFAULT_MAX_RETRY_INTERVAL = 2000; - - public static final int DEFAULT_RECONNECT_ATTEMPTS = 0; - - public static final boolean DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN = false; - - public static final boolean DEFAULT_USE_GLOBAL_POOLS = true; - - public static final int DEFAULT_THREAD_POOL_MAX_SIZE = -1; - - public static final int DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE = 5; - - public static final boolean DEFAULT_CACHE_LARGE_MESSAGE_CLIENT = false; - - public static final int DEFAULT_INITIAL_MESSAGE_PACKET_SIZE = 1500; - // Attributes // ----------------------------------------------------------------------------------- @@ -141,7 +82,7 @@ // Settable attributes: - private boolean cacheLargeMessagesClient = ClientSessionFactoryImpl.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT; + private boolean cacheLargeMessagesClient = HornetQClient.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT; private List<Pair<TransportConfiguration, TransportConfiguration>> staticConnectors; @@ -231,7 +172,7 @@ { ThreadFactory factory = new HornetQThreadFactory("HornetQ-client-global-scheduled-threads", true); - ClientSessionFactoryImpl.globalScheduledThreadPool = Executors.newScheduledThreadPool(ClientSessionFactoryImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, + ClientSessionFactoryImpl.globalScheduledThreadPool = Executors.newScheduledThreadPool(HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, factory); } @@ -396,61 +337,61 @@ public ClientSessionFactoryImpl() { - discoveryRefreshTimeout = ClientSessionFactoryImpl.DEFAULT_DISCOVERY_REFRESH_TIMEOUT; + discoveryRefreshTimeout = HornetQClient.DEFAULT_DISCOVERY_REFRESH_TIMEOUT; - clientFailureCheckPeriod = ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD; + clientFailureCheckPeriod = HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD; - connectionTTL = ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL; + connectionTTL = HornetQClient.DEFAULT_CONNECTION_TTL; - callTimeout = ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT; + callTimeout = HornetQClient.DEFAULT_CALL_TIMEOUT; - minLargeMessageSize = ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE; + minLargeMessageSize = HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE; - consumerWindowSize = ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE; + consumerWindowSize = HornetQClient.DEFAULT_CONSUMER_WINDOW_SIZE; - consumerMaxRate = ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE; + consumerMaxRate = HornetQClient.DEFAULT_CONSUMER_MAX_RATE; - confirmationWindowSize = ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE; + confirmationWindowSize = HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE; - producerWindowSize = ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE; + producerWindowSize = HornetQClient.DEFAULT_PRODUCER_WINDOW_SIZE; - producerMaxRate = ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE; + producerMaxRate = HornetQClient.DEFAULT_PRODUCER_MAX_RATE; - blockOnAcknowledge = ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE; + blockOnAcknowledge = HornetQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE; - blockOnDurableSend = ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND; + blockOnDurableSend = HornetQClient.DEFAULT_BLOCK_ON_DURABLE_SEND; - blockOnNonDurableSend = ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND; + blockOnNonDurableSend = HornetQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND; - autoGroup = ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP; + autoGroup = HornetQClient.DEFAULT_AUTO_GROUP; - preAcknowledge = ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE; + preAcknowledge = HornetQClient.DEFAULT_PRE_ACKNOWLEDGE; - ackBatchSize = ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE; + ackBatchSize = HornetQClient.DEFAULT_ACK_BATCH_SIZE; - connectionLoadBalancingPolicyClassName = ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME; + connectionLoadBalancingPolicyClassName = HornetQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME; - discoveryInitialWaitTimeout = ClientSessionFactoryImpl.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT; + discoveryInitialWaitTimeout = HornetQClient.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT; - useGlobalPools = ClientSessionFactoryImpl.DEFAULT_USE_GLOBAL_POOLS; + useGlobalPools = HornetQClient.DEFAULT_USE_GLOBAL_POOLS; - scheduledThreadPoolMaxSize = ClientSessionFactoryImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE; + scheduledThreadPoolMaxSize = HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE; - threadPoolMaxSize = ClientSessionFactoryImpl.DEFAULT_THREAD_POOL_MAX_SIZE; + threadPoolMaxSize = HornetQClient.DEFAULT_THREAD_POOL_MAX_SIZE; - retryInterval = ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL; + retryInterval = HornetQClient.DEFAULT_RETRY_INTERVAL; - retryIntervalMultiplier = ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER; + retryIntervalMultiplier = HornetQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER; - maxRetryInterval = ClientSessionFactoryImpl.DEFAULT_MAX_RETRY_INTERVAL; + maxRetryInterval = HornetQClient.DEFAULT_MAX_RETRY_INTERVAL; - reconnectAttempts = ClientSessionFactoryImpl.DEFAULT_RECONNECT_ATTEMPTS; + reconnectAttempts = HornetQClient.DEFAULT_RECONNECT_ATTEMPTS; - failoverOnServerShutdown = ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN; + failoverOnServerShutdown = HornetQClient.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN; - cacheLargeMessagesClient = ClientSessionFactoryImpl.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT; + cacheLargeMessagesClient = HornetQClient.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT; - initialMessagePacketSize = ClientSessionFactoryImpl.DEFAULT_INITIAL_MESSAGE_PACKET_SIZE; + initialMessagePacketSize = HornetQClient.DEFAULT_INITIAL_MESSAGE_PACKET_SIZE; } public ClientSessionFactoryImpl(final String discoveryAddress, final int discoveryPort) Added: trunk/src/main/org/hornetq/api/core/client/HornetQClient.java =================================================================== --- trunk/src/main/org/hornetq/api/core/client/HornetQClient.java (rev 0) +++ trunk/src/main/org/hornetq/api/core/client/HornetQClient.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -0,0 +1,158 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ +package org.hornetq.api.core.client; + +import org.hornetq.api.Pair; +import org.hornetq.api.core.client.loadbalance.RoundRobinConnectionLoadBalancingPolicy; +import org.hornetq.api.core.config.TransportConfiguration; + +import java.util.List; + +/** + * A utility class for creating core HornetQ ClientSessionFactory's. + * + * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a> + * Created Jan 5, 2010 + */ +public class HornetQClient +{ + public static final String DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME = RoundRobinConnectionLoadBalancingPolicy.class.getCanonicalName(); + + public static final long DEFAULT_CLIENT_FAILURE_CHECK_PERIOD = 30000; + + // 1 minute - this should be higher than ping period + + public static final long DEFAULT_CONNECTION_TTL = 1 * 60 * 1000; + + // Any message beyond this size is considered a large message (to be sent in chunks) + + public static final int DEFAULT_MIN_LARGE_MESSAGE_SIZE = 100 * 1024; + + public static final int DEFAULT_CONSUMER_WINDOW_SIZE = 1024 * 1024; + + public static final int DEFAULT_CONSUMER_MAX_RATE = -1; + + public static final int DEFAULT_CONFIRMATION_WINDOW_SIZE = -1; + + public static final int DEFAULT_PRODUCER_WINDOW_SIZE = 1024 * 1024; + + public static final int DEFAULT_PRODUCER_MAX_RATE = -1; + + public static final boolean DEFAULT_BLOCK_ON_ACKNOWLEDGE = false; + + public static final boolean DEFAULT_BLOCK_ON_DURABLE_SEND = true; + + public static final boolean DEFAULT_BLOCK_ON_NON_DURABLE_SEND = false; + + public static final boolean DEFAULT_AUTO_GROUP = false; + + public static final long DEFAULT_CALL_TIMEOUT = 30000; + + public static final int DEFAULT_ACK_BATCH_SIZE = 1024 * 1024; + + public static final boolean DEFAULT_PRE_ACKNOWLEDGE = false; + + public static final long DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT = 2000; + + public static final long DEFAULT_DISCOVERY_REFRESH_TIMEOUT = 10000; + + public static final long DEFAULT_RETRY_INTERVAL = 2000; + + public static final double DEFAULT_RETRY_INTERVAL_MULTIPLIER = 1d; + + public static final long DEFAULT_MAX_RETRY_INTERVAL = 2000; + + public static final int DEFAULT_RECONNECT_ATTEMPTS = 0; + + public static final boolean DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN = false; + + public static final boolean DEFAULT_USE_GLOBAL_POOLS = true; + + public static final int DEFAULT_THREAD_POOL_MAX_SIZE = -1; + + public static final int DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE = 5; + + public static final boolean DEFAULT_CACHE_LARGE_MESSAGE_CLIENT = false; + + public static final int DEFAULT_INITIAL_MESSAGE_PACKET_SIZE = 1500; + + /** + * Creates a ClientSessionFactory using all the defaults. + * + * @return the ClientSessionFactory. + */ + public static ClientSessionFactory createClientSessionFactory() + { + return new ClientSessionFactoryImpl(); + } + + /** + * Creates a new CLientSessionFactory using the same settings as the one passed in. + * + * @param other The ClientSessionFactory to copy + * @return The new ClientSessionFactory + */ + public static ClientSessionFactory createClientSessionFactory(final ClientSessionFactory other) + { + return new ClientSessionFactoryImpl(other); + } + + /** + * Create a ClientSessionFactory that uses discovery to connect to the server. + * + * @param discoveryAddress The address to use for discovery + * @param discoveryPort The port to use for discovery. + * @return The ClientSessionFactory. + */ + public static ClientSessionFactory createClientSessionFactory(final String discoveryAddress, final int discoveryPort) + { + return new ClientSessionFactoryImpl(discoveryAddress, discoveryPort); + } + + /** + * Creates a ClientSessionFactory using a List of TransportConfigurations and backups. + * + * @param staticConnectors The list of TransportConfiguration's to use. + * @return The ClientSessionFactory. + */ + public static ClientSessionFactory createClientSessionFactory(final List<Pair<TransportConfiguration, TransportConfiguration>> staticConnectors) + { + return new ClientSessionFactoryImpl(staticConnectors); + } + + /** + * Create a ClientConnectionFactory using a TransportConfiguration of the server and a backup if needed. + * + * @param connectorConfig The TransportConfiguration of the server to connect to. + * @param backupConnectorConfig The TransportConfiguration of the backup server to connect to. can be null. + * @return The ClientSessionFactory. + */ + public static ClientSessionFactory createClientSessionFactory(final TransportConfiguration connectorConfig, + final TransportConfiguration backupConnectorConfig) + { + return new ClientSessionFactoryImpl(connectorConfig, backupConnectorConfig); + } + + /** + * Create a ClientSessionFactory using the TransportConfiguration of the server to connect to. + * + * @param connectorConfig The TransportConfiguration of the server. + * @return The ClientSessionFactory. + */ + public static ClientSessionFactory createClientSessionFactory(final TransportConfiguration connectorConfig) + { + return new ClientSessionFactoryImpl(connectorConfig); + } + + +} Deleted: trunk/src/main/org/hornetq/api/jms/HornetQConnectionFactory.java =================================================================== --- trunk/src/main/org/hornetq/api/jms/HornetQConnectionFactory.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/src/main/org/hornetq/api/jms/HornetQConnectionFactory.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -1,632 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat licenses this file to you under the Apache License, version - * 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied. See the License for the specific language governing - * permissions and limitations under the License. - */ - -package org.hornetq.api.jms; - -import java.io.Serializable; -import java.util.List; - -import javax.jms.Connection; -import javax.jms.ConnectionFactory; -import javax.jms.JMSException; -import javax.jms.QueueConnection; -import javax.jms.QueueConnectionFactory; -import javax.jms.TopicConnection; -import javax.jms.TopicConnectionFactory; -import javax.jms.XAConnection; -import javax.jms.XAConnectionFactory; -import javax.jms.XAQueueConnection; -import javax.jms.XAQueueConnectionFactory; -import javax.jms.XATopicConnection; -import javax.jms.XATopicConnectionFactory; -import javax.naming.NamingException; -import javax.naming.Reference; -import javax.naming.Referenceable; - -import org.hornetq.api.Pair; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; -import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.core.logging.Logger; -import org.hornetq.jms.client.HornetQConnection; -import org.hornetq.jms.referenceable.ConnectionFactoryObjectFactory; -import org.hornetq.jms.referenceable.SerializableObjectRefAddr; - -/** - * HornetQ implementation of a JMS ConnectionFactory. - * - * @author <a href="mailto:ovidiu@feodorov.com">Ovidiu Feodorov</a> - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * @version <tt>$Revision$</tt> $Id$ - */ -public class HornetQConnectionFactory implements ConnectionFactory, QueueConnectionFactory, TopicConnectionFactory, - XAConnectionFactory, XAQueueConnectionFactory, XATopicConnectionFactory, Serializable, Referenceable -{ - // Constants ------------------------------------------------------------------------------------ - - private final static long serialVersionUID = -2810634789345348326L; - - private static final Logger log = Logger.getLogger(HornetQConnectionFactory.class); - - // Static --------------------------------------------------------------------------------------- - - // Attributes ----------------------------------------------------------------------------------- - - private final ClientSessionFactory sessionFactory; - - private String clientID; - - private int dupsOKBatchSize = ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE; - - private int transactionBatchSize = ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE; - - private boolean readOnly; - - // Constructors --------------------------------------------------------------------------------- - - public HornetQConnectionFactory() - { - sessionFactory = new ClientSessionFactoryImpl(); - } - - public HornetQConnectionFactory(final ClientSessionFactory sessionFactory) - { - this.sessionFactory = sessionFactory; - } - - public HornetQConnectionFactory(final String discoveryAddress, final int discoveryPort) - { - sessionFactory = new ClientSessionFactoryImpl(discoveryAddress, discoveryPort); - } - - public HornetQConnectionFactory(final List<Pair<TransportConfiguration, TransportConfiguration>> staticConnectors) - { - sessionFactory = new ClientSessionFactoryImpl(staticConnectors); - } - - public HornetQConnectionFactory(final TransportConfiguration connectorConfig, - final TransportConfiguration backupConnectorConfig) - { - sessionFactory = new ClientSessionFactoryImpl(connectorConfig, backupConnectorConfig); - } - - public HornetQConnectionFactory(final TransportConfiguration connectorConfig) - { - this(connectorConfig, null); - } - - // ConnectionFactory implementation ------------------------------------------------------------- - - public Connection createConnection() throws JMSException - { - return createConnection(null, null); - } - - public Connection createConnection(final String username, final String password) throws JMSException - { - return createConnectionInternal(username, password, false, HornetQConnection.TYPE_GENERIC_CONNECTION); - } - - // QueueConnectionFactory implementation -------------------------------------------------------- - - public QueueConnection createQueueConnection() throws JMSException - { - return createQueueConnection(null, null); - } - - public QueueConnection createQueueConnection(final String username, final String password) throws JMSException - { - return createConnectionInternal(username, password, false, HornetQConnection.TYPE_QUEUE_CONNECTION); - } - - // TopicConnectionFactory implementation -------------------------------------------------------- - - public TopicConnection createTopicConnection() throws JMSException - { - return createTopicConnection(null, null); - } - - public TopicConnection createTopicConnection(final String username, final String password) throws JMSException - { - return createConnectionInternal(username, password, false, HornetQConnection.TYPE_TOPIC_CONNECTION); - } - - // XAConnectionFactory implementation ----------------------------------------------------------- - - public XAConnection createXAConnection() throws JMSException - { - return createXAConnection(null, null); - } - - public XAConnection createXAConnection(final String username, final String password) throws JMSException - { - return createConnectionInternal(username, password, true, HornetQConnection.TYPE_GENERIC_CONNECTION); - } - - // XAQueueConnectionFactory implementation ------------------------------------------------------ - - public XAQueueConnection createXAQueueConnection() throws JMSException - { - return createXAQueueConnection(null, null); - } - - public XAQueueConnection createXAQueueConnection(final String username, final String password) throws JMSException - { - return createConnectionInternal(username, password, true, HornetQConnection.TYPE_QUEUE_CONNECTION); - } - - // XATopicConnectionFactory implementation ------------------------------------------------------ - - public XATopicConnection createXATopicConnection() throws JMSException - { - return createXATopicConnection(null, null); - } - - public XATopicConnection createXATopicConnection(final String username, final String password) throws JMSException - { - return createConnectionInternal(username, password, true, HornetQConnection.TYPE_TOPIC_CONNECTION); - } - - // Referenceable implementation ----------------------------------------------------------------- - - public Reference getReference() throws NamingException - { - return new Reference(this.getClass().getCanonicalName(), - new SerializableObjectRefAddr("HornetQ-CF", this), - ConnectionFactoryObjectFactory.class.getCanonicalName(), - null); - } - - // Public --------------------------------------------------------------------------------------- - - public synchronized String getConnectionLoadBalancingPolicyClassName() - { - return sessionFactory.getConnectionLoadBalancingPolicyClassName(); - } - - public synchronized void setConnectionLoadBalancingPolicyClassName(final String connectionLoadBalancingPolicyClassName) - { - checkWrite(); - sessionFactory.setConnectionLoadBalancingPolicyClassName(connectionLoadBalancingPolicyClassName); - } - - public synchronized List<Pair<TransportConfiguration, TransportConfiguration>> getStaticConnectors() - { - return sessionFactory.getStaticConnectors(); - } - - public synchronized void setStaticConnectors(final List<Pair<TransportConfiguration, TransportConfiguration>> staticConnectors) - { - checkWrite(); - sessionFactory.setStaticConnectors(staticConnectors); - } - - public synchronized String getDiscoveryAddress() - { - return sessionFactory.getDiscoveryAddress(); - } - - public synchronized void setDiscoveryAddress(final String discoveryAddress) - { - checkWrite(); - sessionFactory.setDiscoveryAddress(discoveryAddress); - } - - public synchronized int getDiscoveryPort() - { - return sessionFactory.getDiscoveryPort(); - } - - public synchronized void setDiscoveryPort(final int discoveryPort) - { - checkWrite(); - sessionFactory.setDiscoveryPort(discoveryPort); - } - - public synchronized long getDiscoveryRefreshTimeout() - { - return sessionFactory.getDiscoveryRefreshTimeout(); - } - - public synchronized void setDiscoveryRefreshTimeout(final long discoveryRefreshTimeout) - { - checkWrite(); - sessionFactory.setDiscoveryRefreshTimeout(discoveryRefreshTimeout); - } - - public synchronized long getDiscoveryInitialWaitTimeout() - { - return sessionFactory.getDiscoveryInitialWaitTimeout(); - } - - public synchronized void setDiscoveryInitialWaitTimeout(final long discoveryInitialWaitTimeout) - { - checkWrite(); - sessionFactory.setDiscoveryInitialWaitTimeout(discoveryInitialWaitTimeout); - } - - public synchronized String getClientID() - { - return clientID; - } - - public synchronized void setClientID(final String clientID) - { - checkWrite(); - this.clientID = clientID; - } - - public synchronized int getDupsOKBatchSize() - { - return dupsOKBatchSize; - } - - public synchronized void setDupsOKBatchSize(final int dupsOKBatchSize) - { - checkWrite(); - this.dupsOKBatchSize = dupsOKBatchSize; - } - - public synchronized int getTransactionBatchSize() - { - return transactionBatchSize; - } - - public synchronized void setTransactionBatchSize(final int transactionBatchSize) - { - checkWrite(); - this.transactionBatchSize = transactionBatchSize; - } - - public synchronized long getClientFailureCheckPeriod() - { - return sessionFactory.getClientFailureCheckPeriod(); - } - - public synchronized void setClientFailureCheckPeriod(final long clientFailureCheckPeriod) - { - checkWrite(); - sessionFactory.setClientFailureCheckPeriod(clientFailureCheckPeriod); - } - - public synchronized long getConnectionTTL() - { - return sessionFactory.getConnectionTTL(); - } - - public synchronized void setConnectionTTL(final long connectionTTL) - { - checkWrite(); - sessionFactory.setConnectionTTL(connectionTTL); - } - - public synchronized long getCallTimeout() - { - return sessionFactory.getCallTimeout(); - } - - public synchronized void setCallTimeout(final long callTimeout) - { - checkWrite(); - sessionFactory.setCallTimeout(callTimeout); - } - - public synchronized int getConsumerWindowSize() - { - return sessionFactory.getConsumerWindowSize(); - } - - public synchronized void setConsumerWindowSize(final int consumerWindowSize) - { - checkWrite(); - sessionFactory.setConsumerWindowSize(consumerWindowSize); - } - - public synchronized int getConsumerMaxRate() - { - return sessionFactory.getConsumerMaxRate(); - } - - public synchronized void setConsumerMaxRate(final int consumerMaxRate) - { - checkWrite(); - sessionFactory.setConsumerMaxRate(consumerMaxRate); - } - - public synchronized int getConfirmationWindowSize() - { - return sessionFactory.getConfirmationWindowSize(); - } - - public synchronized void setConfirmationWindowSize(final int confirmationWindowSize) - { - checkWrite(); - sessionFactory.setConfirmationWindowSize(confirmationWindowSize); - } - - public synchronized int getProducerMaxRate() - { - return sessionFactory.getProducerMaxRate(); - } - - public synchronized void setProducerMaxRate(final int producerMaxRate) - { - checkWrite(); - sessionFactory.setProducerMaxRate(producerMaxRate); - } - - public synchronized int getProducerWindowSize() - { - return sessionFactory.getProducerWindowSize(); - } - - public synchronized void setProducerWindowSize(final int producerWindowSize) - { - checkWrite(); - sessionFactory.setProducerWindowSize(producerWindowSize); - } - - /** - * @param cacheLargeMessagesClient - */ - public synchronized void setCacheLargeMessagesClient(final boolean cacheLargeMessagesClient) - { - checkWrite(); - sessionFactory.setCacheLargeMessagesClient(cacheLargeMessagesClient); - } - - public synchronized boolean isCacheLargeMessagesClient() - { - return sessionFactory.isCacheLargeMessagesClient(); - } - - public synchronized int getMinLargeMessageSize() - { - return sessionFactory.getMinLargeMessageSize(); - } - - public synchronized void setMinLargeMessageSize(final int minLargeMessageSize) - { - checkWrite(); - sessionFactory.setMinLargeMessageSize(minLargeMessageSize); - } - - public synchronized boolean isBlockOnAcknowledge() - { - return sessionFactory.isBlockOnAcknowledge(); - } - - public synchronized void setBlockOnAcknowledge(final boolean blockOnAcknowledge) - { - checkWrite(); - sessionFactory.setBlockOnAcknowledge(blockOnAcknowledge); - } - - public synchronized boolean isBlockOnNonDurableSend() - { - return sessionFactory.isBlockOnNonDurableSend(); - } - - public synchronized void setBlockOnNonDurableSend(final boolean blockOnNonDurableSend) - { - checkWrite(); - sessionFactory.setBlockOnNonDurableSend(blockOnNonDurableSend); - } - - public synchronized boolean isBlockOnDurableSend() - { - return sessionFactory.isBlockOnDurableSend(); - } - - public synchronized void setBlockOnDurableSend(final boolean blockOnDurableSend) - { - checkWrite(); - sessionFactory.setBlockOnDurableSend(blockOnDurableSend); - } - - public synchronized boolean isAutoGroup() - { - return sessionFactory.isAutoGroup(); - } - - public synchronized void setAutoGroup(final boolean autoGroup) - { - checkWrite(); - sessionFactory.setAutoGroup(autoGroup); - } - - public synchronized boolean isPreAcknowledge() - { - return sessionFactory.isPreAcknowledge(); - } - - public synchronized void setPreAcknowledge(final boolean preAcknowledge) - { - checkWrite(); - sessionFactory.setPreAcknowledge(preAcknowledge); - } - - public synchronized long getRetryInterval() - { - return sessionFactory.getRetryInterval(); - } - - public synchronized void setRetryInterval(final long retryInterval) - { - checkWrite(); - sessionFactory.setRetryInterval(retryInterval); - } - - public synchronized long getMaxRetryInterval() - { - return sessionFactory.getMaxRetryInterval(); - } - - public synchronized void setMaxRetryInterval(final long retryInterval) - { - checkWrite(); - sessionFactory.setMaxRetryInterval(retryInterval); - } - - public synchronized double getRetryIntervalMultiplier() - { - return sessionFactory.getRetryIntervalMultiplier(); - } - - public synchronized void setRetryIntervalMultiplier(final double retryIntervalMultiplier) - { - checkWrite(); - sessionFactory.setRetryIntervalMultiplier(retryIntervalMultiplier); - } - - public synchronized int getReconnectAttempts() - { - return sessionFactory.getReconnectAttempts(); - } - - public synchronized void setReconnectAttempts(final int reconnectAttempts) - { - checkWrite(); - sessionFactory.setReconnectAttempts(reconnectAttempts); - } - - public synchronized boolean isFailoverOnServerShutdown() - { - return sessionFactory.isFailoverOnServerShutdown(); - } - - public synchronized void setFailoverOnServerShutdown(final boolean failoverOnServerShutdown) - { - checkWrite(); - sessionFactory.setFailoverOnServerShutdown(failoverOnServerShutdown); - } - - public synchronized boolean isUseGlobalPools() - { - return sessionFactory.isUseGlobalPools(); - } - - public synchronized void setUseGlobalPools(final boolean useGlobalPools) - { - checkWrite(); - sessionFactory.setUseGlobalPools(useGlobalPools); - } - - public synchronized int getScheduledThreadPoolMaxSize() - { - return sessionFactory.getScheduledThreadPoolMaxSize(); - } - - public synchronized void setScheduledThreadPoolMaxSize(final int scheduledThreadPoolMaxSize) - { - checkWrite(); - sessionFactory.setScheduledThreadPoolMaxSize(scheduledThreadPoolMaxSize); - } - - public synchronized int getThreadPoolMaxSize() - { - return sessionFactory.getThreadPoolMaxSize(); - } - - public synchronized void setThreadPoolMaxSize(final int threadPoolMaxSize) - { - checkWrite(); - sessionFactory.setThreadPoolMaxSize(threadPoolMaxSize); - } - - public synchronized int getInitialMessagePacketSize() - { - return sessionFactory.getInitialMessagePacketSize(); - } - - public synchronized void setInitialMessagePacketSize(final int size) - { - checkWrite(); - sessionFactory.setInitialMessagePacketSize(size); - } - - public ClientSessionFactory getCoreFactory() - { - return sessionFactory; - } - - public void setGroupID(final String groupID) - { - sessionFactory.setGroupID(groupID); - } - - public String getGroupID() - { - return sessionFactory.getGroupID(); - } - - public void close() - { - sessionFactory.close(); - } - - // Package protected ---------------------------------------------------------------------------- - - // Protected ------------------------------------------------------------------------------------ - - protected synchronized HornetQConnection createConnectionInternal(final String username, - final String password, - final boolean isXA, - final int type) throws JMSException - { - readOnly = true; - - // Note that each JMS connection gets it's own copy of the connection factory - // This means there is one underlying remoting connection per jms connection (if not load balanced) - ClientSessionFactory factory = sessionFactory.copy(); - - HornetQConnection connection = new HornetQConnection(username, - password, - type, - clientID, - dupsOKBatchSize, - transactionBatchSize, - factory); - - try - { - connection.authorize(); - } - catch (JMSException e) - { - try - { - connection.close(); - } - catch (JMSException me) - { - } - throw e; - } - - return connection; - } - - // Private -------------------------------------------------------------------------------------- - - private void checkWrite() - { - if (readOnly) - { - throw new IllegalStateException("Cannot set attribute on HornetQConnectionFactory after it has been used"); - } - } - - // Inner classes -------------------------------------------------------------------------------- - -} Deleted: trunk/src/main/org/hornetq/api/jms/HornetQDestination.java =================================================================== --- trunk/src/main/org/hornetq/api/jms/HornetQDestination.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/src/main/org/hornetq/api/jms/HornetQDestination.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -1,167 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat licenses this file to you under the Apache License, version - * 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied. See the License for the specific language governing - * permissions and limitations under the License. - */ - -package org.hornetq.api.jms; - -import java.io.Serializable; - -import javax.jms.Destination; -import javax.naming.NamingException; -import javax.naming.Reference; -import javax.naming.Referenceable; - -import org.hornetq.api.SimpleString; -import org.hornetq.jms.referenceable.DestinationObjectFactory; -import org.hornetq.jms.referenceable.SerializableObjectRefAddr; - -/** - * HornetQ implementation of a JMS Destination. - * - * @author <a href="mailto:ovidiu@feodorov.com">Ovidiu Feodorov</a> - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * @version <tt>$Revision$</tt> - * - * $Id$ - */ -public abstract class HornetQDestination implements Destination, Serializable, Referenceable -{ - // Constants ----------------------------------------------------- - - // Static -------------------------------------------------------- - - /** - * - */ - private static final long serialVersionUID = 5027962425462382883L; - - protected static String escape(final String input) - { - if (input == null) - { - return ""; - } - return input.replace("\\", "\\\\").replace(".", "\\."); - } - - public static HornetQDestination fromAddress(final String address) - { - if (address.startsWith(HornetQQueue.JMS_QUEUE_ADDRESS_PREFIX)) - { - String name = address.substring(HornetQQueue.JMS_QUEUE_ADDRESS_PREFIX.length()); - - return new HornetQQueue(address, name); - } - else if (address.startsWith(HornetQTopic.JMS_TOPIC_ADDRESS_PREFIX)) - { - String name = address.substring(HornetQTopic.JMS_TOPIC_ADDRESS_PREFIX.length()); - - return new HornetQTopic(address, name); - } - else if (address.startsWith(HornetQTemporaryQueue.JMS_TEMP_QUEUE_ADDRESS_PREFIX)) - { - String name = address.substring(HornetQTemporaryQueue.JMS_TEMP_QUEUE_ADDRESS_PREFIX.length()); - - return new HornetQTemporaryQueue(null, name); - } - else if (address.startsWith(HornetQTemporaryTopic.JMS_TEMP_TOPIC_ADDRESS_PREFIX)) - { - String name = address.substring(HornetQTemporaryTopic.JMS_TEMP_TOPIC_ADDRESS_PREFIX.length()); - - return new HornetQTemporaryTopic(null, name); - } - else - { - throw new IllegalArgumentException("Invalid address " + address); - } - } - - // Attributes ---------------------------------------------------- - - protected final String name; - - private final String address; - - private final SimpleString simpleAddress; - - // Constructors -------------------------------------------------- - - public HornetQDestination(final String address, final String name) - { - this.address = address; - - this.name = name; - - simpleAddress = new SimpleString(address); - } - - // Referenceable implementation --------------------------------------- - - public Reference getReference() throws NamingException - { - return new Reference(this.getClass().getCanonicalName(), - new SerializableObjectRefAddr("HornetQ-DEST", this), - DestinationObjectFactory.class.getCanonicalName(), - null); - } - - // Public -------------------------------------------------------- - - public String getAddress() - { - return address; - } - - public SimpleString getSimpleAddress() - { - return simpleAddress; - } - - public String getName() - { - return name; - } - - public abstract boolean isTemporary(); - - @Override - public boolean equals(final Object o) - { - if (this == o) - { - return true; - } - - if (!(o instanceof HornetQDestination)) - { - return false; - } - - HornetQDestination that = (HornetQDestination)o; - - return address.equals(that.address); - } - - @Override - public int hashCode() - { - return address.hashCode(); - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Added: trunk/src/main/org/hornetq/api/jms/HornetQJMSClient.java =================================================================== --- trunk/src/main/org/hornetq/api/jms/HornetQJMSClient.java (rev 0) +++ trunk/src/main/org/hornetq/api/jms/HornetQJMSClient.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -0,0 +1,148 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ +package org.hornetq.api.jms; + +import org.hornetq.api.Pair; +import org.hornetq.api.core.client.ClientSessionFactory; +import org.hornetq.api.core.config.TransportConfiguration; +import org.hornetq.jms.HornetQConnectionFactory; +import org.hornetq.jms.HornetQQueue; +import org.hornetq.jms.HornetQTopic; + +import javax.jms.ConnectionFactory; +import javax.jms.Queue; +import javax.jms.Topic; +import java.util.List; + +/** + * A utility class for creating HornetQ Client Side JMS Objects. + * + * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a> + * Created Jan 5, 2010 + */ +public class HornetQJMSClient +{ + /** + * Creates a ConnectionFactory using all the defaults. + * + * @return The ConnectionFactory. + */ + public static ConnectionFactory createConnectionFactory() + { + return new HornetQConnectionFactory(); + } + + /** + * Creates a ConnectionFactory using the ClientSessionFactory for its underlying connection. + * + * @param sessionFactory The underlying ClientSessionFactory to use. + * @return The ConnectionFactory. + */ + public static ConnectionFactory createConnectionFactory(final ClientSessionFactory sessionFactory) + { + return new HornetQConnectionFactory(sessionFactory); + } + + /** + * Creates a ConnectionFactory that will use discovery to connect to the server. + * + * @param discoveryAddress The address to use for discovery. + * @param discoveryPort The port to use for discovery. + * @return The ConnectionFactory. + */ + public static ConnectionFactory createConnectionFactory(final String discoveryAddress, final int discoveryPort) + { + return new HornetQConnectionFactory(discoveryAddress, discoveryPort); + } + + /** + * Creates a ClientSessionFactory using a List of TransportConfigurations and backups. + * + * @param staticConnectors The list of TransportConfiguration's to use. + * @return The ConnectionFactory. + */ + public static ConnectionFactory createConnectionFactory(final List<Pair<TransportConfiguration, TransportConfiguration>> staticConnectors) + { + return new HornetQConnectionFactory(staticConnectors); + } + + /** + * Creates a ConnectionFactory using a List of TransportConfigurations and backups. + * + * @param connectorConfig The TransportConfiguration of the server to connect to. + * @param backupConnectorConfig The TransportConfiguration of the backup server to connect to. can be null. + * @return The ConnectionFactory. + */ + public static ConnectionFactory createConnectionFactory(final TransportConfiguration connectorConfig, + final TransportConfiguration backupConnectorConfig) + { + return new HornetQConnectionFactory(connectorConfig, backupConnectorConfig); + } + + /** + * Create a ConnectionFactory using the TransportConfiguration of the server to connect to. + * + * @param connectorConfig The TransportConfiguration of the server. + * @return The ConnectionFactory. + */ + public static ConnectionFactory createConnectionFactory(final TransportConfiguration connectorConfig) + { + return new HornetQConnectionFactory(connectorConfig); + } + + /** + * Create a client side representation of a JMS Topic. + * + * @param name the name of the topic + * @return The Topic + */ + public static Topic createHornetQTopic(final String name) + { + return new HornetQTopic(name); + } + + /** + * Create a client side representation of a JMS Topic. + * + * @param address the address of the topic. + * @param name the name of the topic. + * @return The Topic. + */ + public static Topic createHornetQTopic(final String address, final String name) + { + return new HornetQTopic(address, name); + } + + /** + * Create a client side representation of a JMS Queue. + * + * @param name the name of the queue + * @return The Queue + */ + public static Queue createHornetQQueue(final String name) + { + return new HornetQQueue(name); + } + + /** + * Create a client side representation of a JMS Queue. + * + * @param address the address of the queue. + * @param name the name of the queue. + * @return The Queue. + */ + public static Queue createHornetQQueue(final String address, final String name) + { + return new HornetQQueue(address, name); + } +} Deleted: trunk/src/main/org/hornetq/api/jms/HornetQQueue.java =================================================================== --- trunk/src/main/org/hornetq/api/jms/HornetQQueue.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/src/main/org/hornetq/api/jms/HornetQQueue.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -1,92 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat licenses this file to you under the Apache License, version - * 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied. See the License for the specific language governing - * permissions and limitations under the License. - */ - -package org.hornetq.api.jms; - -import javax.jms.JMSException; -import javax.jms.Queue; - -import org.hornetq.api.SimpleString; -import org.hornetq.core.logging.Logger; - -/** - * HornetQ implementation of a JMS Queue. - * <br> - * This class can be instantiated directly. - * - * @author <a href="mailto:ovidiu@feodorov.com">Ovidiu Feodorov</a> - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * @version <tt>$Revision$</tt> - * - * $Id$ - */ -public class HornetQQueue extends HornetQDestination implements Queue -{ - // Constants ----------------------------------------------------- - - private static final Logger log = Logger.getLogger(HornetQQueue.class); - - private static final long serialVersionUID = -1106092883162295462L; - - public static final String JMS_QUEUE_ADDRESS_PREFIX = "jms.queue."; - - // Static -------------------------------------------------------- - - public static SimpleString createAddressFromName(final String name) - { - return new SimpleString(HornetQQueue.JMS_QUEUE_ADDRESS_PREFIX + name); - } - - // Attributes ---------------------------------------------------- - - // Constructors -------------------------------------------------- - - public HornetQQueue(final String name) - { - super(HornetQQueue.JMS_QUEUE_ADDRESS_PREFIX + name, name); - } - - public HornetQQueue(final String address, final String name) - { - super(address, name); - } - - // Queue implementation ------------------------------------------ - - public String getQueueName() throws JMSException - { - return name; - } - - // Public -------------------------------------------------------- - - @Override - public boolean isTemporary() - { - return false; - } - - @Override - public String toString() - { - return "HornetQQueue[" + name + "]"; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: trunk/src/main/org/hornetq/api/jms/HornetQTemporaryQueue.java =================================================================== --- trunk/src/main/org/hornetq/api/jms/HornetQTemporaryQueue.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/src/main/org/hornetq/api/jms/HornetQTemporaryQueue.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -1,82 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat licenses this file to you under the Apache License, version - * 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied. See the License for the specific language governing - * permissions and limitations under the License. - */ - -package org.hornetq.api.jms; - -import javax.jms.JMSException; -import javax.jms.TemporaryQueue; - -import org.hornetq.jms.client.HornetQSession; - -/** - * HornetQ implementation of a JMS TemporaryQueue. - * <br> - * This class can be instantiated directly. - * - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * @version <tt>$Revision: 3569 $</tt> - * - * $Id: HornetQQueue.java 3569 2008-01-15 21:14:04Z timfox $ - */ -public class HornetQTemporaryQueue extends HornetQQueue implements TemporaryQueue -{ - // Constants ----------------------------------------------------- - - private static final long serialVersionUID = -4624930377557954624L; - - public static final String JMS_TEMP_QUEUE_ADDRESS_PREFIX = "jms.tempqueue."; - - // Static -------------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private final transient HornetQSession session; - - // Constructors -------------------------------------------------- - - public HornetQTemporaryQueue(final HornetQSession session, final String name) - { - super(HornetQTemporaryQueue.JMS_TEMP_QUEUE_ADDRESS_PREFIX + name, name); - - this.session = session; - } - - // TemporaryQueue implementation ------------------------------------------ - - public void delete() throws JMSException - { - session.deleteTemporaryQueue(this); - } - - // Public -------------------------------------------------------- - - @Override - public boolean isTemporary() - { - return true; - } - - @Override - public String toString() - { - return "HornetQTemporaryQueue[" + name + "]"; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: trunk/src/main/org/hornetq/api/jms/HornetQTemporaryTopic.java =================================================================== --- trunk/src/main/org/hornetq/api/jms/HornetQTemporaryTopic.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/src/main/org/hornetq/api/jms/HornetQTemporaryTopic.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -1,82 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat licenses this file to you under the Apache License, version - * 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied. See the License for the specific language governing - * permissions and limitations under the License. - */ - -package org.hornetq.api.jms; - -import javax.jms.JMSException; -import javax.jms.TemporaryTopic; - -import org.hornetq.jms.client.HornetQSession; - -/** - * HornetQ implementation of a JMS TemporaryTopic. - * <br> - * This class can be instantiated directly. - * - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * @version <tt>$Revision: 3569 $</tt> - * - * $Id: HornetQQueue.java 3569 2008-01-15 21:14:04Z timfox $ - */ -public class HornetQTemporaryTopic extends HornetQTopic implements TemporaryTopic -{ - // Constants ----------------------------------------------------- - - private static final long serialVersionUID = 845450764835635266L; - - public static final String JMS_TEMP_TOPIC_ADDRESS_PREFIX = "jms.temptopic."; - - // Static -------------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private final transient HornetQSession session; - - // Constructors -------------------------------------------------- - - public HornetQTemporaryTopic(final HornetQSession session, final String name) - { - super(HornetQTemporaryTopic.JMS_TEMP_TOPIC_ADDRESS_PREFIX + name, name); - - this.session = session; - } - - // TemporaryTopic implementation ------------------------------------------ - - public void delete() throws JMSException - { - session.deleteTemporaryTopic(this); - } - - // Public -------------------------------------------------------- - - @Override - public boolean isTemporary() - { - return true; - } - - @Override - public String toString() - { - return "HornetQTemporaryTopic[" + name + "]"; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: trunk/src/main/org/hornetq/api/jms/HornetQTopic.java =================================================================== --- trunk/src/main/org/hornetq/api/jms/HornetQTopic.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/src/main/org/hornetq/api/jms/HornetQTopic.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -1,145 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat licenses this file to you under the Apache License, version - * 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied. See the License for the specific language governing - * permissions and limitations under the License. - */ - -package org.hornetq.api.jms; - -import javax.jms.JMSException; -import javax.jms.Topic; - -import org.hornetq.api.Pair; -import org.hornetq.api.SimpleString; - -/** - * HornetQ implementation of a JMS Topic. - * <br> - * This class can be instantiated directly. - * - * @author <a href="mailto:ovidiu@feodorov.com">Ovidiu Feodorov</a> - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * @version <tt>$Revision$</tt> - * - * $Id$ - */ -public class HornetQTopic extends HornetQDestination implements Topic -{ - // Constants ----------------------------------------------------- - - private static final long serialVersionUID = 7873614001276404156L; - - public static final String JMS_TOPIC_ADDRESS_PREFIX = "jms.topic."; - - private static final char SEPARATOR = '.'; - - // Static -------------------------------------------------------- - - public static String createQueueNameForDurableSubscription(final String clientID, final String subscriptionName) - { - return HornetQDestination.escape(clientID) + HornetQTopic.SEPARATOR + HornetQDestination.escape(subscriptionName); - } - - public static Pair<String, String> decomposeQueueNameForDurableSubscription(final String queueName) - { - StringBuffer[] parts = new StringBuffer[2]; - int currentPart = 0; - - parts[0] = new StringBuffer(); - parts[1] = new StringBuffer(); - - int pos = 0; - while (pos < queueName.length()) - { - char ch = queueName.charAt(pos); - pos++; - - if (ch == HornetQTopic.SEPARATOR) - { - currentPart++; - if (currentPart >= parts.length) - { - throw new IllegalArgumentException("Invalid message queue name: " + queueName); - } - - continue; - } - - if (ch == '\\') - { - if (pos >= queueName.length()) - { - throw new IllegalArgumentException("Invalid message queue name: " + queueName); - } - ch = queueName.charAt(pos); - pos++; - } - - parts[currentPart].append(ch); - } - - if (currentPart != 1) - { - throw new IllegalArgumentException("Invalid message queue name: " + queueName); - } - - Pair<String, String> pair = new Pair<String, String>(parts[0].toString(), parts[1].toString()); - - return pair; - } - - public static SimpleString createAddressFromName(final String name) - { - return new SimpleString(HornetQTopic.JMS_TOPIC_ADDRESS_PREFIX + name); - } - - // Attributes ---------------------------------------------------- - - // Constructors -------------------------------------------------- - - public HornetQTopic(final String name) - { - super(HornetQTopic.JMS_TOPIC_ADDRESS_PREFIX + name, name); - } - - public HornetQTopic(final String address, final String name) - { - super(address, name); - } - - // Topic implementation ------------------------------------------ - - public String getTopicName() throws JMSException - { - return name; - } - - // Public -------------------------------------------------------- - - @Override - public boolean isTemporary() - { - return false; - } - - @Override - public String toString() - { - return "HornetQTopic[" + name + "]"; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Modified: trunk/src/main/org/hornetq/core/config/impl/FileConfiguration.java =================================================================== --- trunk/src/main/org/hornetq/core/config/impl/FileConfiguration.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/src/main/org/hornetq/core/config/impl/FileConfiguration.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -1,14 +1,14 @@ /* * Copyright 2009 Red Hat, Inc. - * Red Hat licenses this file to you under the Apache License, version - * 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied. See the License for the specific language governing - * permissions and limitations under the License. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. */ package org.hornetq.core.config.impl; @@ -24,6 +24,7 @@ import org.hornetq.api.Pair; import org.hornetq.api.SimpleString; import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.HornetQClient; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.core.logging.Logger; import org.hornetq.core.server.JournalType; @@ -698,7 +699,7 @@ long retryInterval = XMLConfigurationUtil.getLong(brNode, "retry-interval", - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL, + HornetQClient.DEFAULT_RETRY_INTERVAL, Validators.GT_ZERO); // Default bridge conf @@ -709,7 +710,7 @@ double retryIntervalMultiplier = XMLConfigurationUtil.getDouble(brNode, "retry-interval-multiplier", - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER, + HornetQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER, Validators.GT_ZERO); int reconnectAttempts = XMLConfigurationUtil.getInteger(brNode, @@ -719,7 +720,7 @@ boolean failoverOnServerShutdown = XMLConfigurationUtil.getBoolean(brNode, "failover-on-server-shutdown", - ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); + HornetQClient.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); boolean useDuplicateDetection = XMLConfigurationUtil.getBoolean(brNode, "use-duplicate-detection", @@ -777,7 +778,7 @@ failoverOnServerShutdown, useDuplicateDetection, confirmationWindowSize, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, connectorPair); } else @@ -793,7 +794,7 @@ failoverOnServerShutdown, useDuplicateDetection, confirmationWindowSize, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, discoveryGroupName); } Modified: trunk/src/main/org/hornetq/core/remoting/server/impl/RemotingServiceImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/server/impl/RemotingServiceImpl.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/src/main/org/hornetq/core/remoting/server/impl/RemotingServiceImpl.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -23,7 +23,7 @@ import java.util.concurrent.ScheduledExecutorService; import org.hornetq.api.core.buffers.HornetQBuffer; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.HornetQClient; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; import org.hornetq.api.core.interceptor.Interceptor; @@ -323,7 +323,7 @@ channel1.setHandler(handler); - long ttl = ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL; + long ttl = HornetQClient.DEFAULT_CONNECTION_TTL; if (config.getConnectionTTLOverride() != -1) { Modified: trunk/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -22,13 +22,7 @@ import org.hornetq.api.Pair; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; -import org.hornetq.api.core.client.SendAcknowledgementHandler; -import org.hornetq.api.core.client.SessionFailureListener; +import org.hornetq.api.core.client.*; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; import org.hornetq.api.core.management.ManagementHelper; @@ -651,11 +645,11 @@ { if (discoveryAddress != null) { - csf = new ClientSessionFactoryImpl(discoveryAddress, discoveryPort); + csf = HornetQClient.createClientSessionFactory(discoveryAddress, discoveryPort); } else { - csf = new ClientSessionFactoryImpl(connectorPair.a, connectorPair.b); + csf = HornetQClient.createClientSessionFactory(connectorPair.a, connectorPair.b); } csf.setFailoverOnServerShutdown(failoverOnServerShutdown); Modified: trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -35,7 +35,7 @@ import org.hornetq.api.Pair; import org.hornetq.api.SimpleString; import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.HornetQClient; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.client.impl.FailoverManager; @@ -870,9 +870,9 @@ backupConnector, null, false, - ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL, + HornetQClient.DEFAULT_CALL_TIMEOUT, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CONNECTION_TTL, 0, 1.0d, 0, Copied: trunk/src/main/org/hornetq/jms/HornetQConnectionFactory.java (from rev 8721, trunk/src/main/org/hornetq/api/jms/HornetQConnectionFactory.java) =================================================================== --- trunk/src/main/org/hornetq/jms/HornetQConnectionFactory.java (rev 0) +++ trunk/src/main/org/hornetq/jms/HornetQConnectionFactory.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -0,0 +1,632 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package org.hornetq.jms; + +import java.io.Serializable; +import java.util.List; + +import javax.jms.Connection; +import javax.jms.ConnectionFactory; +import javax.jms.JMSException; +import javax.jms.QueueConnection; +import javax.jms.QueueConnectionFactory; +import javax.jms.TopicConnection; +import javax.jms.TopicConnectionFactory; +import javax.jms.XAConnection; +import javax.jms.XAConnectionFactory; +import javax.jms.XAQueueConnection; +import javax.jms.XAQueueConnectionFactory; +import javax.jms.XATopicConnection; +import javax.jms.XATopicConnectionFactory; +import javax.naming.NamingException; +import javax.naming.Reference; +import javax.naming.Referenceable; + +import org.hornetq.api.Pair; +import org.hornetq.api.core.client.ClientSessionFactory; +import org.hornetq.api.core.client.HornetQClient; +import org.hornetq.api.core.config.TransportConfiguration; +import org.hornetq.core.logging.Logger; +import org.hornetq.jms.client.HornetQConnection; +import org.hornetq.jms.referenceable.ConnectionFactoryObjectFactory; +import org.hornetq.jms.referenceable.SerializableObjectRefAddr; + +/** + * HornetQ implementation of a JMS ConnectionFactory. + * + * @author <a href="mailto:ovidiu@feodorov.com">Ovidiu Feodorov</a> + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * @version <tt>$Revision$</tt> $Id$ + */ +public class HornetQConnectionFactory implements ConnectionFactory, QueueConnectionFactory, TopicConnectionFactory, + XAConnectionFactory, XAQueueConnectionFactory, XATopicConnectionFactory, Serializable, Referenceable +{ + // Constants ------------------------------------------------------------------------------------ + + private final static long serialVersionUID = -2810634789345348326L; + + private static final Logger log = Logger.getLogger(HornetQConnectionFactory.class); + + // Static --------------------------------------------------------------------------------------- + + // Attributes ----------------------------------------------------------------------------------- + + private final ClientSessionFactory sessionFactory; + + private String clientID; + + private int dupsOKBatchSize = HornetQClient.DEFAULT_ACK_BATCH_SIZE; + + private int transactionBatchSize = HornetQClient.DEFAULT_ACK_BATCH_SIZE; + + private boolean readOnly; + + // Constructors --------------------------------------------------------------------------------- + + public HornetQConnectionFactory() + { + sessionFactory = HornetQClient.createClientSessionFactory(); + } + + public HornetQConnectionFactory(final ClientSessionFactory sessionFactory) + { + this.sessionFactory = sessionFactory; + } + + public HornetQConnectionFactory(final String discoveryAddress, final int discoveryPort) + { + sessionFactory = HornetQClient.createClientSessionFactory(discoveryAddress, discoveryPort); + } + + public HornetQConnectionFactory(final List<Pair<TransportConfiguration, TransportConfiguration>> staticConnectors) + { + sessionFactory = HornetQClient.createClientSessionFactory(staticConnectors); + } + + public HornetQConnectionFactory(final TransportConfiguration connectorConfig, + final TransportConfiguration backupConnectorConfig) + { + sessionFactory = HornetQClient.createClientSessionFactory(connectorConfig, backupConnectorConfig); + } + + public HornetQConnectionFactory(final TransportConfiguration connectorConfig) + { + this(connectorConfig, null); + } + + // ConnectionFactory implementation ------------------------------------------------------------- + + public Connection createConnection() throws JMSException + { + return createConnection(null, null); + } + + public Connection createConnection(final String username, final String password) throws JMSException + { + return createConnectionInternal(username, password, false, HornetQConnection.TYPE_GENERIC_CONNECTION); + } + + // QueueConnectionFactory implementation -------------------------------------------------------- + + public QueueConnection createQueueConnection() throws JMSException + { + return createQueueConnection(null, null); + } + + public QueueConnection createQueueConnection(final String username, final String password) throws JMSException + { + return createConnectionInternal(username, password, false, HornetQConnection.TYPE_QUEUE_CONNECTION); + } + + // TopicConnectionFactory implementation -------------------------------------------------------- + + public TopicConnection createTopicConnection() throws JMSException + { + return createTopicConnection(null, null); + } + + public TopicConnection createTopicConnection(final String username, final String password) throws JMSException + { + return createConnectionInternal(username, password, false, HornetQConnection.TYPE_TOPIC_CONNECTION); + } + + // XAConnectionFactory implementation ----------------------------------------------------------- + + public XAConnection createXAConnection() throws JMSException + { + return createXAConnection(null, null); + } + + public XAConnection createXAConnection(final String username, final String password) throws JMSException + { + return createConnectionInternal(username, password, true, HornetQConnection.TYPE_GENERIC_CONNECTION); + } + + // XAQueueConnectionFactory implementation ------------------------------------------------------ + + public XAQueueConnection createXAQueueConnection() throws JMSException + { + return createXAQueueConnection(null, null); + } + + public XAQueueConnection createXAQueueConnection(final String username, final String password) throws JMSException + { + return createConnectionInternal(username, password, true, HornetQConnection.TYPE_QUEUE_CONNECTION); + } + + // XATopicConnectionFactory implementation ------------------------------------------------------ + + public XATopicConnection createXATopicConnection() throws JMSException + { + return createXATopicConnection(null, null); + } + + public XATopicConnection createXATopicConnection(final String username, final String password) throws JMSException + { + return createConnectionInternal(username, password, true, HornetQConnection.TYPE_TOPIC_CONNECTION); + } + + // Referenceable implementation ----------------------------------------------------------------- + + public Reference getReference() throws NamingException + { + return new Reference(this.getClass().getCanonicalName(), + new SerializableObjectRefAddr("HornetQ-CF", this), + ConnectionFactoryObjectFactory.class.getCanonicalName(), + null); + } + + // Public --------------------------------------------------------------------------------------- + + public synchronized String getConnectionLoadBalancingPolicyClassName() + { + return sessionFactory.getConnectionLoadBalancingPolicyClassName(); + } + + public synchronized void setConnectionLoadBalancingPolicyClassName(final String connectionLoadBalancingPolicyClassName) + { + checkWrite(); + sessionFactory.setConnectionLoadBalancingPolicyClassName(connectionLoadBalancingPolicyClassName); + } + + public synchronized List<Pair<TransportConfiguration, TransportConfiguration>> getStaticConnectors() + { + return sessionFactory.getStaticConnectors(); + } + + public synchronized void setStaticConnectors(final List<Pair<TransportConfiguration, TransportConfiguration>> staticConnectors) + { + checkWrite(); + sessionFactory.setStaticConnectors(staticConnectors); + } + + public synchronized String getDiscoveryAddress() + { + return sessionFactory.getDiscoveryAddress(); + } + + public synchronized void setDiscoveryAddress(final String discoveryAddress) + { + checkWrite(); + sessionFactory.setDiscoveryAddress(discoveryAddress); + } + + public synchronized int getDiscoveryPort() + { + return sessionFactory.getDiscoveryPort(); + } + + public synchronized void setDiscoveryPort(final int discoveryPort) + { + checkWrite(); + sessionFactory.setDiscoveryPort(discoveryPort); + } + + public synchronized long getDiscoveryRefreshTimeout() + { + return sessionFactory.getDiscoveryRefreshTimeout(); + } + + public synchronized void setDiscoveryRefreshTimeout(final long discoveryRefreshTimeout) + { + checkWrite(); + sessionFactory.setDiscoveryRefreshTimeout(discoveryRefreshTimeout); + } + + public synchronized long getDiscoveryInitialWaitTimeout() + { + return sessionFactory.getDiscoveryInitialWaitTimeout(); + } + + public synchronized void setDiscoveryInitialWaitTimeout(final long discoveryInitialWaitTimeout) + { + checkWrite(); + sessionFactory.setDiscoveryInitialWaitTimeout(discoveryInitialWaitTimeout); + } + + public synchronized String getClientID() + { + return clientID; + } + + public synchronized void setClientID(final String clientID) + { + checkWrite(); + this.clientID = clientID; + } + + public synchronized int getDupsOKBatchSize() + { + return dupsOKBatchSize; + } + + public synchronized void setDupsOKBatchSize(final int dupsOKBatchSize) + { + checkWrite(); + this.dupsOKBatchSize = dupsOKBatchSize; + } + + public synchronized int getTransactionBatchSize() + { + return transactionBatchSize; + } + + public synchronized void setTransactionBatchSize(final int transactionBatchSize) + { + checkWrite(); + this.transactionBatchSize = transactionBatchSize; + } + + public synchronized long getClientFailureCheckPeriod() + { + return sessionFactory.getClientFailureCheckPeriod(); + } + + public synchronized void setClientFailureCheckPeriod(final long clientFailureCheckPeriod) + { + checkWrite(); + sessionFactory.setClientFailureCheckPeriod(clientFailureCheckPeriod); + } + + public synchronized long getConnectionTTL() + { + return sessionFactory.getConnectionTTL(); + } + + public synchronized void setConnectionTTL(final long connectionTTL) + { + checkWrite(); + sessionFactory.setConnectionTTL(connectionTTL); + } + + public synchronized long getCallTimeout() + { + return sessionFactory.getCallTimeout(); + } + + public synchronized void setCallTimeout(final long callTimeout) + { + checkWrite(); + sessionFactory.setCallTimeout(callTimeout); + } + + public synchronized int getConsumerWindowSize() + { + return sessionFactory.getConsumerWindowSize(); + } + + public synchronized void setConsumerWindowSize(final int consumerWindowSize) + { + checkWrite(); + sessionFactory.setConsumerWindowSize(consumerWindowSize); + } + + public synchronized int getConsumerMaxRate() + { + return sessionFactory.getConsumerMaxRate(); + } + + public synchronized void setConsumerMaxRate(final int consumerMaxRate) + { + checkWrite(); + sessionFactory.setConsumerMaxRate(consumerMaxRate); + } + + public synchronized int getConfirmationWindowSize() + { + return sessionFactory.getConfirmationWindowSize(); + } + + public synchronized void setConfirmationWindowSize(final int confirmationWindowSize) + { + checkWrite(); + sessionFactory.setConfirmationWindowSize(confirmationWindowSize); + } + + public synchronized int getProducerMaxRate() + { + return sessionFactory.getProducerMaxRate(); + } + + public synchronized void setProducerMaxRate(final int producerMaxRate) + { + checkWrite(); + sessionFactory.setProducerMaxRate(producerMaxRate); + } + + public synchronized int getProducerWindowSize() + { + return sessionFactory.getProducerWindowSize(); + } + + public synchronized void setProducerWindowSize(final int producerWindowSize) + { + checkWrite(); + sessionFactory.setProducerWindowSize(producerWindowSize); + } + + /** + * @param cacheLargeMessagesClient + */ + public synchronized void setCacheLargeMessagesClient(final boolean cacheLargeMessagesClient) + { + checkWrite(); + sessionFactory.setCacheLargeMessagesClient(cacheLargeMessagesClient); + } + + public synchronized boolean isCacheLargeMessagesClient() + { + return sessionFactory.isCacheLargeMessagesClient(); + } + + public synchronized int getMinLargeMessageSize() + { + return sessionFactory.getMinLargeMessageSize(); + } + + public synchronized void setMinLargeMessageSize(final int minLargeMessageSize) + { + checkWrite(); + sessionFactory.setMinLargeMessageSize(minLargeMessageSize); + } + + public synchronized boolean isBlockOnAcknowledge() + { + return sessionFactory.isBlockOnAcknowledge(); + } + + public synchronized void setBlockOnAcknowledge(final boolean blockOnAcknowledge) + { + checkWrite(); + sessionFactory.setBlockOnAcknowledge(blockOnAcknowledge); + } + + public synchronized boolean isBlockOnNonDurableSend() + { + return sessionFactory.isBlockOnNonDurableSend(); + } + + public synchronized void setBlockOnNonDurableSend(final boolean blockOnNonDurableSend) + { + checkWrite(); + sessionFactory.setBlockOnNonDurableSend(blockOnNonDurableSend); + } + + public synchronized boolean isBlockOnDurableSend() + { + return sessionFactory.isBlockOnDurableSend(); + } + + public synchronized void setBlockOnDurableSend(final boolean blockOnDurableSend) + { + checkWrite(); + sessionFactory.setBlockOnDurableSend(blockOnDurableSend); + } + + public synchronized boolean isAutoGroup() + { + return sessionFactory.isAutoGroup(); + } + + public synchronized void setAutoGroup(final boolean autoGroup) + { + checkWrite(); + sessionFactory.setAutoGroup(autoGroup); + } + + public synchronized boolean isPreAcknowledge() + { + return sessionFactory.isPreAcknowledge(); + } + + public synchronized void setPreAcknowledge(final boolean preAcknowledge) + { + checkWrite(); + sessionFactory.setPreAcknowledge(preAcknowledge); + } + + public synchronized long getRetryInterval() + { + return sessionFactory.getRetryInterval(); + } + + public synchronized void setRetryInterval(final long retryInterval) + { + checkWrite(); + sessionFactory.setRetryInterval(retryInterval); + } + + public synchronized long getMaxRetryInterval() + { + return sessionFactory.getMaxRetryInterval(); + } + + public synchronized void setMaxRetryInterval(final long retryInterval) + { + checkWrite(); + sessionFactory.setMaxRetryInterval(retryInterval); + } + + public synchronized double getRetryIntervalMultiplier() + { + return sessionFactory.getRetryIntervalMultiplier(); + } + + public synchronized void setRetryIntervalMultiplier(final double retryIntervalMultiplier) + { + checkWrite(); + sessionFactory.setRetryIntervalMultiplier(retryIntervalMultiplier); + } + + public synchronized int getReconnectAttempts() + { + return sessionFactory.getReconnectAttempts(); + } + + public synchronized void setReconnectAttempts(final int reconnectAttempts) + { + checkWrite(); + sessionFactory.setReconnectAttempts(reconnectAttempts); + } + + public synchronized boolean isFailoverOnServerShutdown() + { + return sessionFactory.isFailoverOnServerShutdown(); + } + + public synchronized void setFailoverOnServerShutdown(final boolean failoverOnServerShutdown) + { + checkWrite(); + sessionFactory.setFailoverOnServerShutdown(failoverOnServerShutdown); + } + + public synchronized boolean isUseGlobalPools() + { + return sessionFactory.isUseGlobalPools(); + } + + public synchronized void setUseGlobalPools(final boolean useGlobalPools) + { + checkWrite(); + sessionFactory.setUseGlobalPools(useGlobalPools); + } + + public synchronized int getScheduledThreadPoolMaxSize() + { + return sessionFactory.getScheduledThreadPoolMaxSize(); + } + + public synchronized void setScheduledThreadPoolMaxSize(final int scheduledThreadPoolMaxSize) + { + checkWrite(); + sessionFactory.setScheduledThreadPoolMaxSize(scheduledThreadPoolMaxSize); + } + + public synchronized int getThreadPoolMaxSize() + { + return sessionFactory.getThreadPoolMaxSize(); + } + + public synchronized void setThreadPoolMaxSize(final int threadPoolMaxSize) + { + checkWrite(); + sessionFactory.setThreadPoolMaxSize(threadPoolMaxSize); + } + + public synchronized int getInitialMessagePacketSize() + { + return sessionFactory.getInitialMessagePacketSize(); + } + + public synchronized void setInitialMessagePacketSize(final int size) + { + checkWrite(); + sessionFactory.setInitialMessagePacketSize(size); + } + + public ClientSessionFactory getCoreFactory() + { + return sessionFactory; + } + + public void setGroupID(final String groupID) + { + sessionFactory.setGroupID(groupID); + } + + public String getGroupID() + { + return sessionFactory.getGroupID(); + } + + public void close() + { + sessionFactory.close(); + } + + // Package protected ---------------------------------------------------------------------------- + + // Protected ------------------------------------------------------------------------------------ + + protected synchronized HornetQConnection createConnectionInternal(final String username, + final String password, + final boolean isXA, + final int type) throws JMSException + { + readOnly = true; + + // Note that each JMS connection gets it's own copy of the connection factory + // This means there is one underlying remoting connection per jms connection (if not load balanced) + ClientSessionFactory factory = sessionFactory.copy(); + + HornetQConnection connection = new HornetQConnection(username, + password, + type, + clientID, + dupsOKBatchSize, + transactionBatchSize, + factory); + + try + { + connection.authorize(); + } + catch (JMSException e) + { + try + { + connection.close(); + } + catch (JMSException me) + { + } + throw e; + } + + return connection; + } + + // Private -------------------------------------------------------------------------------------- + + private void checkWrite() + { + if (readOnly) + { + throw new IllegalStateException("Cannot set attribute on HornetQConnectionFactory after it has been used"); + } + } + + // Inner classes -------------------------------------------------------------------------------- + +} Property changes on: trunk/src/main/org/hornetq/jms/HornetQConnectionFactory.java ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: trunk/src/main/org/hornetq/jms/HornetQDestination.java (from rev 8720, trunk/src/main/org/hornetq/api/jms/HornetQDestination.java) =================================================================== --- trunk/src/main/org/hornetq/jms/HornetQDestination.java (rev 0) +++ trunk/src/main/org/hornetq/jms/HornetQDestination.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -0,0 +1,172 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package org.hornetq.jms; + +import java.io.Serializable; + +import javax.jms.Destination; +import javax.naming.NamingException; +import javax.naming.Reference; +import javax.naming.Referenceable; + +import org.hornetq.api.SimpleString; +import org.hornetq.api.jms.HornetQJMSClient; +import org.hornetq.jms.HornetQQueue; +import org.hornetq.jms.HornetQTemporaryQueue; +import org.hornetq.jms.HornetQTemporaryTopic; +import org.hornetq.jms.HornetQTopic; +import org.hornetq.jms.referenceable.DestinationObjectFactory; +import org.hornetq.jms.referenceable.SerializableObjectRefAddr; + +/** + * HornetQ implementation of a JMS Destination. + * + * @author <a href="mailto:ovidiu@feodorov.com">Ovidiu Feodorov</a> + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * @version <tt>$Revision$</tt> + * + * $Id$ + */ +public abstract class HornetQDestination implements Destination, Serializable, Referenceable +{ + // Constants ----------------------------------------------------- + + // Static -------------------------------------------------------- + + /** + * + */ + private static final long serialVersionUID = 5027962425462382883L; + + protected static String escape(final String input) + { + if (input == null) + { + return ""; + } + return input.replace("\\", "\\\\").replace(".", "\\."); + } + + public static Destination fromAddress(final String address) + { + if (address.startsWith(HornetQQueue.JMS_QUEUE_ADDRESS_PREFIX)) + { + String name = address.substring(HornetQQueue.JMS_QUEUE_ADDRESS_PREFIX.length()); + + return new HornetQQueue(address, name); + } + else if (address.startsWith(HornetQTopic.JMS_TOPIC_ADDRESS_PREFIX)) + { + String name = address.substring(HornetQTopic.JMS_TOPIC_ADDRESS_PREFIX.length()); + + return HornetQJMSClient.createHornetQTopic(address, name); + } + else if (address.startsWith(HornetQTemporaryQueue.JMS_TEMP_QUEUE_ADDRESS_PREFIX)) + { + String name = address.substring(HornetQTemporaryQueue.JMS_TEMP_QUEUE_ADDRESS_PREFIX.length()); + + return new HornetQTemporaryQueue(null, name); + } + else if (address.startsWith(HornetQTemporaryTopic.JMS_TEMP_TOPIC_ADDRESS_PREFIX)) + { + String name = address.substring(HornetQTemporaryTopic.JMS_TEMP_TOPIC_ADDRESS_PREFIX.length()); + + return new HornetQTemporaryTopic(null, name); + } + else + { + throw new IllegalArgumentException("Invalid address " + address); + } + } + + // Attributes ---------------------------------------------------- + + protected final String name; + + private final String address; + + private final SimpleString simpleAddress; + + // Constructors -------------------------------------------------- + + public HornetQDestination(final String address, final String name) + { + this.address = address; + + this.name = name; + + simpleAddress = new SimpleString(address); + } + + // Referenceable implementation --------------------------------------- + + public Reference getReference() throws NamingException + { + return new Reference(this.getClass().getCanonicalName(), + new SerializableObjectRefAddr("HornetQ-DEST", this), + DestinationObjectFactory.class.getCanonicalName(), + null); + } + + // Public -------------------------------------------------------- + + public String getAddress() + { + return address; + } + + public SimpleString getSimpleAddress() + { + return simpleAddress; + } + + public String getName() + { + return name; + } + + public abstract boolean isTemporary(); + + @Override + public boolean equals(final Object o) + { + if (this == o) + { + return true; + } + + if (!(o instanceof HornetQDestination)) + { + return false; + } + + HornetQDestination that = (HornetQDestination)o; + + return address.equals(that.address); + } + + @Override + public int hashCode() + { + return address.hashCode(); + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Property changes on: trunk/src/main/org/hornetq/jms/HornetQDestination.java ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: trunk/src/main/org/hornetq/jms/HornetQQueue.java (from rev 8720, trunk/src/main/org/hornetq/api/jms/HornetQQueue.java) =================================================================== --- trunk/src/main/org/hornetq/jms/HornetQQueue.java (rev 0) +++ trunk/src/main/org/hornetq/jms/HornetQQueue.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -0,0 +1,93 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package org.hornetq.jms; + +import javax.jms.JMSException; +import javax.jms.Queue; + +import org.hornetq.api.SimpleString; +import org.hornetq.jms.HornetQDestination; +import org.hornetq.core.logging.Logger; + +/** + * HornetQ implementation of a JMS Queue. + * <br> + * This class can be instantiated directly. + * + * @author <a href="mailto:ovidiu@feodorov.com">Ovidiu Feodorov</a> + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * @version <tt>$Revision$</tt> + * + * $Id$ + */ +public class HornetQQueue extends HornetQDestination implements Queue +{ + // Constants ----------------------------------------------------- + + private static final Logger log = Logger.getLogger(HornetQQueue.class); + + private static final long serialVersionUID = -1106092883162295462L; + + public static final String JMS_QUEUE_ADDRESS_PREFIX = "jms.queue."; + + // Static -------------------------------------------------------- + + public static SimpleString createAddressFromName(final String name) + { + return new SimpleString(HornetQQueue.JMS_QUEUE_ADDRESS_PREFIX + name); + } + + // Attributes ---------------------------------------------------- + + // Constructors -------------------------------------------------- + + public HornetQQueue(final String name) + { + super(HornetQQueue.JMS_QUEUE_ADDRESS_PREFIX + name, name); + } + + public HornetQQueue(final String address, final String name) + { + super(address, name); + } + + // Queue implementation ------------------------------------------ + + public String getQueueName() throws JMSException + { + return name; + } + + // Public -------------------------------------------------------- + + @Override + public boolean isTemporary() + { + return false; + } + + @Override + public String toString() + { + return "HornetQQueue[" + name + "]"; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Property changes on: trunk/src/main/org/hornetq/jms/HornetQQueue.java ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: trunk/src/main/org/hornetq/jms/HornetQTemporaryQueue.java (from rev 8720, trunk/src/main/org/hornetq/api/jms/HornetQTemporaryQueue.java) =================================================================== --- trunk/src/main/org/hornetq/jms/HornetQTemporaryQueue.java (rev 0) +++ trunk/src/main/org/hornetq/jms/HornetQTemporaryQueue.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -0,0 +1,82 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package org.hornetq.jms; + +import javax.jms.JMSException; +import javax.jms.TemporaryQueue; + +import org.hornetq.jms.client.HornetQSession; + +/** + * HornetQ implementation of a JMS TemporaryQueue. + * <br> + * This class can be instantiated directly. + * + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * @version <tt>$Revision: 3569 $</tt> + * + * $Id: HornetQQueue.java 3569 2008-01-15 21:14:04Z timfox $ + */ +public class HornetQTemporaryQueue extends HornetQQueue implements TemporaryQueue +{ + // Constants ----------------------------------------------------- + + private static final long serialVersionUID = -4624930377557954624L; + + public static final String JMS_TEMP_QUEUE_ADDRESS_PREFIX = "jms.tempqueue."; + + // Static -------------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private final transient HornetQSession session; + + // Constructors -------------------------------------------------- + + public HornetQTemporaryQueue(final HornetQSession session, final String name) + { + super(HornetQTemporaryQueue.JMS_TEMP_QUEUE_ADDRESS_PREFIX + name, name); + + this.session = session; + } + + // TemporaryQueue implementation ------------------------------------------ + + public void delete() throws JMSException + { + session.deleteTemporaryQueue(this); + } + + // Public -------------------------------------------------------- + + @Override + public boolean isTemporary() + { + return true; + } + + @Override + public String toString() + { + return "HornetQTemporaryQueue[" + name + "]"; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Copied: trunk/src/main/org/hornetq/jms/HornetQTemporaryTopic.java (from rev 8720, trunk/src/main/org/hornetq/api/jms/HornetQTemporaryTopic.java) =================================================================== --- trunk/src/main/org/hornetq/jms/HornetQTemporaryTopic.java (rev 0) +++ trunk/src/main/org/hornetq/jms/HornetQTemporaryTopic.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -0,0 +1,82 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package org.hornetq.jms; + +import javax.jms.JMSException; +import javax.jms.TemporaryTopic; + +import org.hornetq.jms.client.HornetQSession; + +/** + * HornetQ implementation of a JMS TemporaryTopic. + * <br> + * This class can be instantiated directly. + * + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * @version <tt>$Revision: 3569 $</tt> + * + * $Id: HornetQQueue.java 3569 2008-01-15 21:14:04Z timfox $ + */ +public class HornetQTemporaryTopic extends HornetQTopic implements TemporaryTopic +{ + // Constants ----------------------------------------------------- + + private static final long serialVersionUID = 845450764835635266L; + + public static final String JMS_TEMP_TOPIC_ADDRESS_PREFIX = "jms.temptopic."; + + // Static -------------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private final transient HornetQSession session; + + // Constructors -------------------------------------------------- + + public HornetQTemporaryTopic(final HornetQSession session, final String name) + { + super(HornetQTemporaryTopic.JMS_TEMP_TOPIC_ADDRESS_PREFIX + name, name); + + this.session = session; + } + + // TemporaryTopic implementation ------------------------------------------ + + public void delete() throws JMSException + { + session.deleteTemporaryTopic(this); + } + + // Public -------------------------------------------------------- + + @Override + public boolean isTemporary() + { + return true; + } + + @Override + public String toString() + { + return "HornetQTemporaryTopic[" + name + "]"; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Copied: trunk/src/main/org/hornetq/jms/HornetQTopic.java (from rev 8720, trunk/src/main/org/hornetq/api/jms/HornetQTopic.java) =================================================================== --- trunk/src/main/org/hornetq/jms/HornetQTopic.java (rev 0) +++ trunk/src/main/org/hornetq/jms/HornetQTopic.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -0,0 +1,146 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package org.hornetq.jms; + +import javax.jms.JMSException; +import javax.jms.Topic; + +import org.hornetq.api.Pair; +import org.hornetq.api.SimpleString; +import org.hornetq.jms.HornetQDestination; + +/** + * HornetQ implementation of a JMS Topic. + * <br> + * This class can be instantiated directly. + * + * @author <a href="mailto:ovidiu@feodorov.com">Ovidiu Feodorov</a> + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * @version <tt>$Revision$</tt> + * + * $Id$ + */ +public class HornetQTopic extends HornetQDestination implements Topic +{ + // Constants ----------------------------------------------------- + + private static final long serialVersionUID = 7873614001276404156L; + + public static final String JMS_TOPIC_ADDRESS_PREFIX = "jms.topic."; + + private static final char SEPARATOR = '.'; + + // Static -------------------------------------------------------- + + public static String createQueueNameForDurableSubscription(final String clientID, final String subscriptionName) + { + return HornetQDestination.escape(clientID) + HornetQTopic.SEPARATOR + HornetQDestination.escape(subscriptionName); + } + + public static Pair<String, String> decomposeQueueNameForDurableSubscription(final String queueName) + { + StringBuffer[] parts = new StringBuffer[2]; + int currentPart = 0; + + parts[0] = new StringBuffer(); + parts[1] = new StringBuffer(); + + int pos = 0; + while (pos < queueName.length()) + { + char ch = queueName.charAt(pos); + pos++; + + if (ch == HornetQTopic.SEPARATOR) + { + currentPart++; + if (currentPart >= parts.length) + { + throw new IllegalArgumentException("Invalid message queue name: " + queueName); + } + + continue; + } + + if (ch == '\\') + { + if (pos >= queueName.length()) + { + throw new IllegalArgumentException("Invalid message queue name: " + queueName); + } + ch = queueName.charAt(pos); + pos++; + } + + parts[currentPart].append(ch); + } + + if (currentPart != 1) + { + throw new IllegalArgumentException("Invalid message queue name: " + queueName); + } + + Pair<String, String> pair = new Pair<String, String>(parts[0].toString(), parts[1].toString()); + + return pair; + } + + public static SimpleString createAddressFromName(final String name) + { + return new SimpleString(HornetQTopic.JMS_TOPIC_ADDRESS_PREFIX + name); + } + + // Attributes ---------------------------------------------------- + + // Constructors -------------------------------------------------- + + public HornetQTopic(final String name) + { + super(HornetQTopic.JMS_TOPIC_ADDRESS_PREFIX + name, name); + } + + public HornetQTopic(final String address, final String name) + { + super(address, name); + } + + // Topic implementation ------------------------------------------ + + public String getTopicName() throws JMSException + { + return name; + } + + // Public -------------------------------------------------------- + + @Override + public boolean isTemporary() + { + return false; + } + + @Override + public String toString() + { + return "HornetQTopic[" + name + "]"; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Property changes on: trunk/src/main/org/hornetq/jms/HornetQTopic.java ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Modified: trunk/src/main/org/hornetq/jms/client/HornetQMessage.java =================================================================== --- trunk/src/main/org/hornetq/jms/client/HornetQMessage.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/src/main/org/hornetq/jms/client/HornetQMessage.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -39,7 +39,7 @@ import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.exception.HornetQException; import org.hornetq.api.core.message.PropertyConversionException; -import org.hornetq.api.jms.HornetQDestination; +import org.hornetq.jms.HornetQDestination; import org.hornetq.api.jms.HornetQMessageConstants; import org.hornetq.core.client.impl.ClientMessageImpl; import org.hornetq.core.logging.Logger; Modified: trunk/src/main/org/hornetq/jms/client/HornetQMessageConsumer.java =================================================================== --- trunk/src/main/org/hornetq/jms/client/HornetQMessageConsumer.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/src/main/org/hornetq/jms/client/HornetQMessageConsumer.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -29,7 +29,7 @@ import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.MessageHandler; import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.jms.HornetQDestination; +import org.hornetq.jms.HornetQDestination; import org.hornetq.core.logging.Logger; /** Modified: trunk/src/main/org/hornetq/jms/client/HornetQMessageProducer.java =================================================================== --- trunk/src/main/org/hornetq/jms/client/HornetQMessageProducer.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/src/main/org/hornetq/jms/client/HornetQMessageProducer.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -35,7 +35,7 @@ import org.hornetq.api.core.client.ClientProducer; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.jms.HornetQDestination; +import org.hornetq.jms.HornetQDestination; import org.hornetq.core.logging.Logger; import org.hornetq.utils.UUIDGenerator; Modified: trunk/src/main/org/hornetq/jms/client/HornetQQueueBrowser.java =================================================================== --- trunk/src/main/org/hornetq/jms/client/HornetQQueueBrowser.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/src/main/org/hornetq/jms/client/HornetQQueueBrowser.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -25,7 +25,7 @@ import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.jms.HornetQQueue; +import org.hornetq.jms.HornetQQueue; import org.hornetq.core.logging.Logger; /** Modified: trunk/src/main/org/hornetq/jms/client/HornetQSession.java =================================================================== --- trunk/src/main/org/hornetq/jms/client/HornetQSession.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/src/main/org/hornetq/jms/client/HornetQSession.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -57,13 +57,10 @@ import org.hornetq.api.core.client.ClientSession.BindingQuery; import org.hornetq.api.core.client.ClientSession.QueueQuery; import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.jms.HornetQDestination; -import org.hornetq.api.jms.HornetQQueue; -import org.hornetq.api.jms.HornetQTemporaryQueue; -import org.hornetq.api.jms.HornetQTemporaryTopic; -import org.hornetq.api.jms.HornetQTopic; +import org.hornetq.api.jms.*; import org.hornetq.core.filter.impl.FilterImpl; import org.hornetq.core.logging.Logger; +import org.hornetq.jms.*; /** * HornetQ implementation of a JMS Session. @@ -404,7 +401,7 @@ throw new IllegalStateException("Cannot create a queue using a TopicSession"); } - HornetQQueue queue = new HornetQQueue(queueName); + HornetQQueue queue = (HornetQQueue) HornetQJMSClient.createHornetQQueue(queueName); try { @@ -433,7 +430,7 @@ throw new IllegalStateException("Cannot create a topic on a QueueSession"); } - HornetQTopic topic = new HornetQTopic(topicName); + HornetQTopic topic = (HornetQTopic) HornetQJMSClient.createHornetQTopic(topicName); try { Modified: trunk/src/main/org/hornetq/jms/client/package-info.java =================================================================== --- trunk/src/main/org/hornetq/jms/client/package-info.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/src/main/org/hornetq/jms/client/package-info.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -15,7 +15,7 @@ * Implementation of the JMS API. * <br> * Classes in this package are not meant to be used directly - * except {@link org.hornetq.api.jms.HornetQConnectionFactory} which can be instantiated directly + * except {@link org.hornetq.jms.HornetQConnectionFactory} which can be instantiated directly * if JMS resources are not looked up in JNDI. * */ Modified: trunk/src/main/org/hornetq/jms/management/impl/JMSConnectionFactoryControlImpl.java =================================================================== --- trunk/src/main/org/hornetq/jms/management/impl/JMSConnectionFactoryControlImpl.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/src/main/org/hornetq/jms/management/impl/JMSConnectionFactoryControlImpl.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -19,9 +19,8 @@ import javax.management.NotCompliantMBeanException; import javax.management.StandardMBean; -import org.hornetq.api.jms.HornetQConnectionFactory; +import org.hornetq.jms.HornetQConnectionFactory; import org.hornetq.api.jms.management.ConnectionFactoryControl; -import org.hornetq.api.jms.management.JMSQueueControl; import org.hornetq.core.management.impl.MBeanInfoHelper; /** Modified: trunk/src/main/org/hornetq/jms/management/impl/JMSQueueControlImpl.java =================================================================== --- trunk/src/main/org/hornetq/jms/management/impl/JMSQueueControlImpl.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/src/main/org/hornetq/jms/management/impl/JMSQueueControlImpl.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -21,7 +21,8 @@ import org.hornetq.api.core.exception.HornetQException; import org.hornetq.api.core.management.MessageCounterInfo; import org.hornetq.api.core.management.QueueControl; -import org.hornetq.api.jms.HornetQQueue; +import org.hornetq.api.jms.HornetQJMSClient; +import org.hornetq.jms.HornetQQueue; import org.hornetq.api.jms.management.JMSQueueControl; import org.hornetq.core.logging.Logger; import org.hornetq.core.management.impl.MBeanInfoHelper; @@ -274,7 +275,7 @@ public boolean moveMessage(final String messageID, final String otherQueueName) throws Exception { String filter = JMSQueueControlImpl.createFilterForJMSMessageID(messageID); - HornetQQueue otherQueue = new HornetQQueue(otherQueueName); + HornetQQueue otherQueue = (HornetQQueue) HornetQJMSClient.createHornetQQueue(otherQueueName); int moved = coreQueueControl.moveMessages(filter, otherQueue.getAddress()); if (moved != 1) { @@ -287,7 +288,7 @@ public int moveMessages(final String filterStr, final String otherQueueName) throws Exception { String filter = JMSQueueControlImpl.createFilterFromJMSSelector(filterStr); - HornetQQueue otherQueue = new HornetQQueue(otherQueueName); + HornetQQueue otherQueue = (HornetQQueue) HornetQJMSClient.createHornetQQueue(otherQueueName); return coreQueueControl.moveMessages(filter, otherQueue.getAddress()); } Modified: trunk/src/main/org/hornetq/jms/management/impl/JMSTopicControlImpl.java =================================================================== --- trunk/src/main/org/hornetq/jms/management/impl/JMSTopicControlImpl.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/src/main/org/hornetq/jms/management/impl/JMSTopicControlImpl.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -27,8 +27,7 @@ import org.hornetq.api.core.management.HornetQServerControl; import org.hornetq.api.core.management.QueueControl; import org.hornetq.api.core.management.ResourceNames; -import org.hornetq.api.jms.HornetQTopic; -import org.hornetq.api.jms.management.JMSQueueControl; +import org.hornetq.jms.HornetQTopic; import org.hornetq.api.jms.management.TopicControl; import org.hornetq.core.logging.Logger; import org.hornetq.core.management.impl.MBeanInfoHelper; Modified: trunk/src/main/org/hornetq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/src/main/org/hornetq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -1,14 +1,14 @@ /* * Copyright 2009 Red Hat, Inc. - * Red Hat licenses this file to you under the Apache License, version - * 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied. See the License for the specific language governing - * permissions and limitations under the License. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. */ package org.hornetq.jms.server.config.impl; @@ -18,6 +18,7 @@ import org.hornetq.api.Pair; import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.HornetQClient; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.jms.server.config.ConnectionFactoryConfiguration; @@ -46,61 +47,61 @@ private String clientID = null; - private long discoveryRefreshTimeout = ClientSessionFactoryImpl.DEFAULT_DISCOVERY_REFRESH_TIMEOUT; + private long discoveryRefreshTimeout = HornetQClient.DEFAULT_DISCOVERY_REFRESH_TIMEOUT; - private long clientFailureCheckPeriod = ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD; + private long clientFailureCheckPeriod = HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD; - private long connectionTTL = ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL; + private long connectionTTL = HornetQClient.DEFAULT_CONNECTION_TTL; - private long callTimeout = ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT; + private long callTimeout = HornetQClient.DEFAULT_CALL_TIMEOUT; - private boolean cacheLargeMessagesClient = ClientSessionFactoryImpl.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT; + private boolean cacheLargeMessagesClient = HornetQClient.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT; - private int minLargeMessageSize = ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE; + private int minLargeMessageSize = HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE; - private int consumerWindowSize = ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE; + private int consumerWindowSize = HornetQClient.DEFAULT_CONSUMER_WINDOW_SIZE; - private int consumerMaxRate = ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE; + private int consumerMaxRate = HornetQClient.DEFAULT_CONSUMER_MAX_RATE; - private int confirmationWindowSize = ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE; + private int confirmationWindowSize = HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE; - private int producerWindowSize = ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE; + private int producerWindowSize = HornetQClient.DEFAULT_PRODUCER_WINDOW_SIZE; - private int producerMaxRate = ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE; + private int producerMaxRate = HornetQClient.DEFAULT_PRODUCER_MAX_RATE; - private boolean blockOnAcknowledge = ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE; + private boolean blockOnAcknowledge = HornetQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE; - private boolean blockOnDurableSend = ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND; + private boolean blockOnDurableSend = HornetQClient.DEFAULT_BLOCK_ON_DURABLE_SEND; - private boolean blockOnNonDurableSend = ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND; + private boolean blockOnNonDurableSend = HornetQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND; - private boolean autoGroup = ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP; + private boolean autoGroup = HornetQClient.DEFAULT_AUTO_GROUP; - private boolean preAcknowledge = ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE; + private boolean preAcknowledge = HornetQClient.DEFAULT_PRE_ACKNOWLEDGE; - private String loadBalancingPolicyClassName = ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME; + private String loadBalancingPolicyClassName = HornetQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME; - private int transactionBatchSize = ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE; + private int transactionBatchSize = HornetQClient.DEFAULT_ACK_BATCH_SIZE; - private int dupsOKBatchSize = ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE; + private int dupsOKBatchSize = HornetQClient.DEFAULT_ACK_BATCH_SIZE; - private long initialWaitTimeout = ClientSessionFactoryImpl.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT; + private long initialWaitTimeout = HornetQClient.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT; - private boolean useGlobalPools = ClientSessionFactoryImpl.DEFAULT_USE_GLOBAL_POOLS; + private boolean useGlobalPools = HornetQClient.DEFAULT_USE_GLOBAL_POOLS; - private int scheduledThreadPoolMaxSize = ClientSessionFactoryImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE; + private int scheduledThreadPoolMaxSize = HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE; - private int threadPoolMaxSize = ClientSessionFactoryImpl.DEFAULT_THREAD_POOL_MAX_SIZE; + private int threadPoolMaxSize = HornetQClient.DEFAULT_THREAD_POOL_MAX_SIZE; - private long retryInterval = ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL; + private long retryInterval = HornetQClient.DEFAULT_RETRY_INTERVAL; - private double retryIntervalMultiplier = ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER; + private double retryIntervalMultiplier = HornetQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER; - private long maxRetryInterval = ClientSessionFactoryImpl.DEFAULT_MAX_RETRY_INTERVAL; + private long maxRetryInterval = HornetQClient.DEFAULT_MAX_RETRY_INTERVAL; - private int reconnectAttempts = ClientSessionFactoryImpl.DEFAULT_RECONNECT_ATTEMPTS; + private int reconnectAttempts = HornetQClient.DEFAULT_RECONNECT_ATTEMPTS; - private boolean failoverOnServerShutdown = ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN; + private boolean failoverOnServerShutdown = HornetQClient.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN; private String groupID = null; Modified: trunk/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -17,7 +17,7 @@ import java.util.List; import org.hornetq.api.Pair; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.HornetQClient; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.Validators; @@ -121,104 +121,104 @@ long clientFailureCheckPeriod = XMLConfigurationUtil.getLong(e, "client-failure-check-period", - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, Validators.MINUS_ONE_OR_GT_ZERO); long connectionTTL = XMLConfigurationUtil.getLong(e, "connection-ttl", - ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL, + HornetQClient.DEFAULT_CONNECTION_TTL, Validators.MINUS_ONE_OR_GE_ZERO); long callTimeout = XMLConfigurationUtil.getLong(e, "call-timeout", - ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT, + HornetQClient.DEFAULT_CALL_TIMEOUT, Validators.GE_ZERO); String clientID = XMLConfigurationUtil.getString(e, "client-id", null, Validators.NO_CHECK); int dupsOKBatchSize = XMLConfigurationUtil.getInteger(e, "dups-ok-batch-size", - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, Validators.GT_ZERO); int transactionBatchSize = XMLConfigurationUtil.getInteger(e, "transaction-batch-size", - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, Validators.GT_ZERO); int consumerWindowSize = XMLConfigurationUtil.getInteger(e, "consumer-window-size", - ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE, + HornetQClient.DEFAULT_CONSUMER_WINDOW_SIZE, Validators.MINUS_ONE_OR_GE_ZERO); int producerWindowSize = XMLConfigurationUtil.getInteger(e, "producer-window-size", - ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_WINDOW_SIZE, Validators.MINUS_ONE_OR_GT_ZERO); int consumerMaxRate = XMLConfigurationUtil.getInteger(e, "consumer-max-rate", - ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE, + HornetQClient.DEFAULT_CONSUMER_MAX_RATE, Validators.MINUS_ONE_OR_GT_ZERO); int confirmationWindowSize = XMLConfigurationUtil.getInteger(e, "confirmation-window-size", - ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE, + HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE, Validators.MINUS_ONE_OR_GT_ZERO); int producerMaxRate = XMLConfigurationUtil.getInteger(e, "producer-max-rate", - ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE, + HornetQClient.DEFAULT_PRODUCER_MAX_RATE, Validators.MINUS_ONE_OR_GT_ZERO); boolean cacheLargeMessagesClient = XMLConfigurationUtil.getBoolean(e, "cache-large-message-client", - ClientSessionFactoryImpl.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT); + HornetQClient.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT); int minLargeMessageSize = XMLConfigurationUtil.getInteger(e, "min-large-message-size", - ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, Validators.GT_ZERO); boolean blockOnAcknowledge = XMLConfigurationUtil.getBoolean(e, "block-on-acknowledge", - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE); + HornetQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE); boolean blockOnNonDurableSend = XMLConfigurationUtil.getBoolean(e, "block-on-non-durable-send", - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND); + HornetQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND); boolean blockOnDurableSend = XMLConfigurationUtil.getBoolean(e, "block-on-durable-send", - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND); + HornetQClient.DEFAULT_BLOCK_ON_DURABLE_SEND); boolean autoGroup = XMLConfigurationUtil.getBoolean(e, "auto-group", - ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP); + HornetQClient.DEFAULT_AUTO_GROUP); boolean preAcknowledge = XMLConfigurationUtil.getBoolean(e, "pre-acknowledge", - ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE); + HornetQClient.DEFAULT_PRE_ACKNOWLEDGE); long retryInterval = XMLConfigurationUtil.getLong(e, "retry-interval", - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL, + HornetQClient.DEFAULT_RETRY_INTERVAL, Validators.GT_ZERO); double retryIntervalMultiplier = XMLConfigurationUtil.getDouble(e, "retry-interval-multiplier", - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER, + HornetQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER, Validators.GT_ZERO); long maxRetryInterval = XMLConfigurationUtil.getLong(e, "max-retry-interval", - ClientSessionFactoryImpl.DEFAULT_MAX_RETRY_INTERVAL, + HornetQClient.DEFAULT_MAX_RETRY_INTERVAL, Validators.GT_ZERO); int reconnectAttempts = XMLConfigurationUtil.getInteger(e, "reconnect-attempts", - ClientSessionFactoryImpl.DEFAULT_RECONNECT_ATTEMPTS, + HornetQClient.DEFAULT_RECONNECT_ATTEMPTS, Validators.MINUS_ONE_OR_GE_ZERO); boolean failoverOnServerShutdown = XMLConfigurationUtil.getBoolean(e, "failover-on-server-shutdown", - ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); + HornetQClient.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); boolean useGlobalPools = XMLConfigurationUtil.getBoolean(e, "use-global-pools", - ClientSessionFactoryImpl.DEFAULT_USE_GLOBAL_POOLS); + HornetQClient.DEFAULT_USE_GLOBAL_POOLS); int scheduledThreadPoolMaxSize = XMLConfigurationUtil.getInteger(e, "scheduled-thread-pool-max-size", - ClientSessionFactoryImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, Validators.MINUS_ONE_OR_GT_ZERO); int threadPoolMaxSize = XMLConfigurationUtil.getInteger(e, "thread-pool-max-size", - ClientSessionFactoryImpl.DEFAULT_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_THREAD_POOL_MAX_SIZE, Validators.MINUS_ONE_OR_GT_ZERO); String connectionLoadBalancingPolicyClassName = XMLConfigurationUtil.getString(e, "connection-load-balancing-policy-class-name", - ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, + HornetQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, Validators.NOT_NULL_OR_EMPTY); long discoveryInitialWaitTimeout = XMLConfigurationUtil.getLong(e, "discovery-initial-wait-timeout", - ClientSessionFactoryImpl.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT, + HornetQClient.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT, Validators.GT_ZERO); String groupid = XMLConfigurationUtil.getString(e, "group-id", null, Validators.NO_CHECK); List<String> jndiBindings = new ArrayList<String>(); Modified: trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -1,14 +1,14 @@ /* * Copyright 2009 Red Hat, Inc. - * Red Hat licenses this file to you under the Apache License, version - * 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied. See the License for the specific language governing - * permissions and limitations under the License. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. */ package org.hornetq.jms.server.impl; @@ -28,9 +28,10 @@ import org.hornetq.api.Pair; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.jms.HornetQConnectionFactory; -import org.hornetq.api.jms.HornetQQueue; -import org.hornetq.api.jms.HornetQTopic; +import org.hornetq.jms.HornetQConnectionFactory; +import org.hornetq.api.jms.HornetQJMSClient; +import org.hornetq.jms.HornetQQueue; +import org.hornetq.jms.HornetQTopic; import org.hornetq.core.deployers.DeploymentManager; import org.hornetq.core.deployers.impl.FileDeploymentManager; import org.hornetq.core.deployers.impl.XmlDeployer; @@ -357,7 +358,7 @@ HornetQConnectionFactory cf = connectionFactories.get(name); if (cf == null) { - cf = new HornetQConnectionFactory(connectorConfigs); + cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(connectorConfigs); } bindConnectionFactory(cf, name, jndiBindings); @@ -372,7 +373,7 @@ HornetQConnectionFactory cf = connectionFactories.get(name); if (cf == null) { - cf = new HornetQConnectionFactory(connectorConfigs); + cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(connectorConfigs); cf.setClientID(clientID); } @@ -415,7 +416,7 @@ HornetQConnectionFactory cf = connectionFactories.get(name); if (cf == null) { - cf = new HornetQConnectionFactory(connectorConfigs); + cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(connectorConfigs); cf.setClientID(clientID); cf.setClientFailureCheckPeriod(clientFailureCheckPeriod); cf.setConnectionTTL(connectionTTL); @@ -488,7 +489,7 @@ HornetQConnectionFactory cf = connectionFactories.get(name); if (cf == null) { - cf = new HornetQConnectionFactory(discoveryAddress, discoveryPort); + cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(discoveryAddress, discoveryPort); cf.setClientID(clientID); cf.setDiscoveryRefreshTimeout(discoveryRefreshTimeout); cf.setClientFailureCheckPeriod(clientFailureCheckPeriod); @@ -532,7 +533,7 @@ HornetQConnectionFactory cf = connectionFactories.get(name); if (cf == null) { - cf = new HornetQConnectionFactory(discoveryAddress, discoveryPort); + cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(discoveryAddress, discoveryPort); } bindConnectionFactory(cf, name, jndiBindings); @@ -548,7 +549,7 @@ HornetQConnectionFactory cf = connectionFactories.get(name); if (cf == null) { - cf = new HornetQConnectionFactory(discoveryAddress, discoveryPort); + cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(discoveryAddress, discoveryPort); cf.setClientID(clientID); } @@ -563,7 +564,7 @@ HornetQConnectionFactory cf = connectionFactories.get(name); if (cf == null) { - cf = new HornetQConnectionFactory(liveTC); + cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(liveTC); } bindConnectionFactory(cf, name, jndiBindings); @@ -578,7 +579,7 @@ HornetQConnectionFactory cf = connectionFactories.get(name); if (cf == null) { - cf = new HornetQConnectionFactory(liveTC); + cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(liveTC); cf.setClientID(clientID); } @@ -594,7 +595,7 @@ HornetQConnectionFactory cf = connectionFactories.get(name); if (cf == null) { - cf = new HornetQConnectionFactory(liveTC, backupTC); + cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(liveTC, backupTC); } bindConnectionFactory(cf, name, jndiBindings); @@ -610,7 +611,7 @@ HornetQConnectionFactory cf = connectionFactories.get(name); if (cf == null) { - cf = new HornetQConnectionFactory(liveTC, backupTC); + cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(liveTC, backupTC); cf.setClientID(clientID); } Modified: trunk/src/main/org/hornetq/jms/server/management/JMSManagementService.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/management/JMSManagementService.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/src/main/org/hornetq/jms/server/management/JMSManagementService.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -15,9 +15,9 @@ import java.util.List; -import org.hornetq.api.jms.HornetQConnectionFactory; -import org.hornetq.api.jms.HornetQQueue; -import org.hornetq.api.jms.HornetQTopic; +import org.hornetq.jms.HornetQConnectionFactory; +import org.hornetq.jms.HornetQQueue; +import org.hornetq.jms.HornetQTopic; import org.hornetq.api.jms.management.JMSServerControl; import org.hornetq.jms.server.JMSServerManager; Modified: trunk/src/main/org/hornetq/jms/server/management/impl/JMSManagementServiceImpl.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/management/impl/JMSManagementServiceImpl.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/src/main/org/hornetq/jms/server/management/impl/JMSManagementServiceImpl.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -20,9 +20,9 @@ import org.hornetq.api.core.management.AddressControl; import org.hornetq.api.core.management.QueueControl; import org.hornetq.api.core.management.ResourceNames; -import org.hornetq.api.jms.HornetQConnectionFactory; -import org.hornetq.api.jms.HornetQQueue; -import org.hornetq.api.jms.HornetQTopic; +import org.hornetq.jms.HornetQConnectionFactory; +import org.hornetq.jms.HornetQQueue; +import org.hornetq.jms.HornetQTopic; import org.hornetq.api.jms.management.ConnectionFactoryControl; import org.hornetq.api.jms.management.JMSQueueControl; import org.hornetq.api.jms.management.JMSServerControl; Modified: trunk/src/main/org/hornetq/jms/server/recovery/HornetQXAResourceWrapper.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/recovery/HornetQXAResourceWrapper.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/src/main/org/hornetq/jms/server/recovery/HornetQXAResourceWrapper.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -19,10 +19,7 @@ import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; -import org.hornetq.api.core.client.SessionFailureListener; +import org.hornetq.api.core.client.*; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.logging.Logger; @@ -277,7 +274,7 @@ } TransportConfiguration config = new TransportConfiguration(connectorFactoryClassName, connectorConfig); - csf = new ClientSessionFactoryImpl(config); + csf = HornetQClient.createClientSessionFactory(config); ClientSession cs = null; if (username == null) Modified: trunk/src/main/org/hornetq/ra/HornetQRAManagedConnectionFactory.java =================================================================== --- trunk/src/main/org/hornetq/ra/HornetQRAManagedConnectionFactory.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/src/main/org/hornetq/ra/HornetQRAManagedConnectionFactory.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -28,6 +28,7 @@ import javax.security.auth.Subject; import org.hornetq.core.logging.Logger; +import org.hornetq.jms.HornetQConnectionFactory; /** * HornetQ ManagedConectionFactory @@ -72,7 +73,7 @@ /** * Connection Factory used if properties are set */ - private org.hornetq.api.jms.HornetQConnectionFactory connectionFactory; + private HornetQConnectionFactory connectionFactory; /** * Constructor @@ -758,7 +759,7 @@ * * @return The factory */ - protected synchronized org.hornetq.api.jms.HornetQConnectionFactory getHornetQConnectionFactory() throws ResourceException + protected synchronized HornetQConnectionFactory getHornetQConnectionFactory() throws ResourceException { if (connectionFactory == null) Modified: trunk/src/main/org/hornetq/ra/HornetQResourceAdapter.java =================================================================== --- trunk/src/main/org/hornetq/ra/HornetQResourceAdapter.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/src/main/org/hornetq/ra/HornetQResourceAdapter.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -29,9 +29,11 @@ import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.HornetQClient; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; +import org.hornetq.jms.HornetQConnectionFactory; +import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.core.logging.Logger; import org.hornetq.ra.inflow.HornetQActivation; import org.hornetq.ra.inflow.HornetQActivationSpec; @@ -86,7 +88,7 @@ */ private final Map<ActivationSpec, HornetQActivation> activations; - private org.hornetq.api.jms.HornetQConnectionFactory defaultHornetQConnectionFactory; + private HornetQConnectionFactory defaultHornetQConnectionFactory; /** * Constructor @@ -1288,7 +1290,7 @@ if (deliveryTransacted || useLocalTx) { int actTxBatchSize = transactionBatchSize != null ? transactionBatchSize - : ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE; + : HornetQClient.DEFAULT_ACK_BATCH_SIZE; if (useLocalTx) { result = parameterFactory.createSession(user, pass, false, false, false, false, actTxBatchSize); @@ -1314,7 +1316,7 @@ break; case Session.DUPS_OK_ACKNOWLEDGE: int actDupsOkBatchSize = dupsOkBatchSize != null ? dupsOkBatchSize - : ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE; + : HornetQClient.DEFAULT_ACK_BATCH_SIZE; result = parameterFactory.createSession(user, pass, false, true, true, false, actDupsOkBatchSize); break; default: @@ -1353,7 +1355,7 @@ sessionFactory = defaultHornetQConnectionFactory.getCoreFactory(); } - public org.hornetq.api.jms.HornetQConnectionFactory getDefaultHornetQConnectionFactory() throws ResourceException + public HornetQConnectionFactory getDefaultHornetQConnectionFactory() throws ResourceException { if (!configured.getAndSet(true)) { @@ -1369,9 +1371,9 @@ return defaultHornetQConnectionFactory; } - public org.hornetq.api.jms.HornetQConnectionFactory createHornetQConnectionFactory(final ConnectionFactoryProperties overrideProperties) + public HornetQConnectionFactory createHornetQConnectionFactory(final ConnectionFactoryProperties overrideProperties) { - org.hornetq.api.jms.HornetQConnectionFactory cf; + HornetQConnectionFactory cf; String connectorClassName = overrideProperties.getConnectorClassName() != null ? overrideProperties.getConnectorClassName() : getConnectorClassName(); String discoveryAddress = overrideProperties.getDiscoveryAddress() != null ? overrideProperties.getDiscoveryAddress() @@ -1390,13 +1392,13 @@ : new TransportConfiguration(backUpCOnnectorClassname, backupConnectionParams); - cf = new org.hornetq.api.jms.HornetQConnectionFactory(transportConf, backup); + cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(transportConf, backup); } else if (discoveryAddress != null) { Integer discoveryPort = overrideProperties.getDiscoveryPort() != null ? overrideProperties.getDiscoveryPort() : getDiscoveryPort(); - cf = new org.hornetq.api.jms.HornetQConnectionFactory(discoveryAddress, discoveryPort); + cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(discoveryAddress, discoveryPort); } else { @@ -1406,7 +1408,7 @@ return cf; } - private void setParams(final org.hornetq.api.jms.HornetQConnectionFactory cf, + private void setParams(final HornetQConnectionFactory cf, final ConnectionFactoryProperties overrideProperties) { Boolean val = overrideProperties.isAutoGroup() != null ? overrideProperties.isAutoGroup() Modified: trunk/src/main/org/hornetq/ra/inflow/HornetQActivation.java =================================================================== --- trunk/src/main/org/hornetq/ra/inflow/HornetQActivation.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/src/main/org/hornetq/ra/inflow/HornetQActivation.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -31,9 +31,9 @@ import org.hornetq.api.SimpleString; import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.jms.HornetQDestination; -import org.hornetq.api.jms.HornetQQueue; -import org.hornetq.api.jms.HornetQTopic; +import org.hornetq.jms.HornetQConnectionFactory; +import org.hornetq.jms.HornetQDestination; +import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.core.logging.Logger; import org.hornetq.ra.HornetQResourceAdapter; import org.hornetq.ra.Util; @@ -97,7 +97,7 @@ private final List<HornetQMessageHandler> handlers = new ArrayList<HornetQMessageHandler>(); - private org.hornetq.api.jms.HornetQConnectionFactory factory; + private HornetQConnectionFactory factory; static { @@ -398,11 +398,11 @@ // If there is no binding on naming, we will just create a new instance if (isTopic) { - destination = new HornetQTopic(destinationName.substring(destinationName.lastIndexOf('/') + 1)); + destination = (HornetQDestination) HornetQJMSClient.createHornetQTopic(destinationName.substring(destinationName.lastIndexOf('/') + 1)); } else { - destination = new HornetQQueue(destinationName.substring(destinationName.lastIndexOf('/') + 1)); + destination = (HornetQDestination) HornetQJMSClient.createHornetQQueue(destinationName.substring(destinationName.lastIndexOf('/') + 1)); } } } @@ -424,11 +424,11 @@ { if (Topic.class.getName().equals(spec.getDestinationType())) { - destination = new HornetQTopic(spec.getDestination()); + destination = (HornetQDestination) HornetQJMSClient.createHornetQTopic(spec.getDestination()); } else { - destination = new HornetQQueue(spec.getDestination()); + destination = (HornetQDestination) HornetQJMSClient.createHornetQQueue(spec.getDestination()); } } Modified: trunk/src/main/org/hornetq/ra/inflow/HornetQMessageHandler.java =================================================================== --- trunk/src/main/org/hornetq/ra/inflow/HornetQMessageHandler.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/src/main/org/hornetq/ra/inflow/HornetQMessageHandler.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -27,7 +27,7 @@ import org.hornetq.api.core.client.MessageHandler; import org.hornetq.api.core.client.ClientSession.QueueQuery; import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.jms.HornetQTopic; +import org.hornetq.jms.HornetQTopic; import org.hornetq.core.logging.Logger; import org.hornetq.jms.client.HornetQMessage; Modified: trunk/tests/jms-tests/src/org/hornetq/jms/tests/CTSMiscellaneousTest.java =================================================================== --- trunk/tests/jms-tests/src/org/hornetq/jms/tests/CTSMiscellaneousTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/CTSMiscellaneousTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -22,9 +22,9 @@ import javax.jms.Session; import org.hornetq.api.Pair; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.HornetQClient; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.jms.HornetQConnectionFactory; +import org.hornetq.jms.HornetQConnectionFactory; /** * Safeguards for previously detected TCK failures. @@ -69,32 +69,32 @@ getJmsServerManager().createConnectionFactory("StrictTCKConnectionFactory", connectorConfigs, null, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL, - ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT, - ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CONNECTION_TTL, + HornetQClient.DEFAULT_CALL_TIMEOUT, + HornetQClient.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, + HornetQClient.DEFAULT_CONSUMER_WINDOW_SIZE, + HornetQClient.DEFAULT_CONSUMER_MAX_RATE, + HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_MAX_RATE, true, true, true, - ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP, - ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_USE_GLOBAL_POOLS, - ClientSessionFactoryImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL, - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER, - ClientSessionFactoryImpl.DEFAULT_MAX_RETRY_INTERVAL, - ClientSessionFactoryImpl.DEFAULT_RECONNECT_ATTEMPTS, - ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN, + HornetQClient.DEFAULT_AUTO_GROUP, + HornetQClient.DEFAULT_PRE_ACKNOWLEDGE, + HornetQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_USE_GLOBAL_POOLS, + HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_RETRY_INTERVAL, + HornetQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER, + HornetQClient.DEFAULT_MAX_RETRY_INTERVAL, + HornetQClient.DEFAULT_RECONNECT_ATTEMPTS, + HornetQClient.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN, null, jndiBindings); Modified: trunk/tests/jms-tests/src/org/hornetq/jms/tests/JMSTestCase.java =================================================================== --- trunk/tests/jms-tests/src/org/hornetq/jms/tests/JMSTestCase.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/JMSTestCase.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -19,9 +19,9 @@ import javax.naming.InitialContext; import org.hornetq.api.Pair; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.HornetQClient; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.jms.HornetQConnectionFactory; +import org.hornetq.jms.HornetQConnectionFactory; /** * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> @@ -65,32 +65,32 @@ getJmsServerManager().createConnectionFactory("testsuitecf", connectorConfigs, null, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL, - ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT, - ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CONNECTION_TTL, + HornetQClient.DEFAULT_CALL_TIMEOUT, + HornetQClient.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, + HornetQClient.DEFAULT_CONSUMER_WINDOW_SIZE, + HornetQClient.DEFAULT_CONSUMER_MAX_RATE, + HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_MAX_RATE, true, true, true, - ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP, - ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_USE_GLOBAL_POOLS, - ClientSessionFactoryImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL, - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER, - ClientSessionFactoryImpl.DEFAULT_MAX_RETRY_INTERVAL, - ClientSessionFactoryImpl.DEFAULT_RECONNECT_ATTEMPTS, - ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN, + HornetQClient.DEFAULT_AUTO_GROUP, + HornetQClient.DEFAULT_PRE_ACKNOWLEDGE, + HornetQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_USE_GLOBAL_POOLS, + HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_RETRY_INTERVAL, + HornetQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER, + HornetQClient.DEFAULT_MAX_RETRY_INTERVAL, + HornetQClient.DEFAULT_RECONNECT_ATTEMPTS, + HornetQClient.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN, null, jndiBindings); Modified: trunk/tests/jms-tests/src/org/hornetq/jms/tests/MessageProducerTest.java =================================================================== --- trunk/tests/jms-tests/src/org/hornetq/jms/tests/MessageProducerTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/MessageProducerTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -25,7 +25,7 @@ import javax.jms.Session; import javax.jms.TextMessage; -import org.hornetq.api.jms.HornetQTopic; +import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.jms.tests.message.SimpleJMSMessage; import org.hornetq.jms.tests.message.SimpleJMSTextMessage; import org.hornetq.jms.tests.util.ProxyAssertSupport; @@ -403,7 +403,7 @@ Session ps = pconn.createSession(false, Session.AUTO_ACKNOWLEDGE); try { - ps.createProducer(new HornetQTopic("NoSuchTopic")); + ps.createProducer(HornetQJMSClient.createHornetQTopic("NoSuchTopic")); ProxyAssertSupport.fail("should throw exception"); } catch (InvalidDestinationException e) Modified: trunk/tests/jms-tests/src/org/hornetq/jms/tests/ReferenceableTest.java =================================================================== --- trunk/tests/jms-tests/src/org/hornetq/jms/tests/ReferenceableTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/ReferenceableTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -25,9 +25,9 @@ import javax.naming.Reference; import javax.naming.Referenceable; -import org.hornetq.api.jms.HornetQConnectionFactory; -import org.hornetq.api.jms.HornetQQueue; -import org.hornetq.api.jms.HornetQTopic; +import org.hornetq.jms.HornetQConnectionFactory; +import org.hornetq.jms.HornetQQueue; +import org.hornetq.jms.HornetQTopic; import org.hornetq.jms.referenceable.ConnectionFactoryObjectFactory; import org.hornetq.jms.referenceable.DestinationObjectFactory; import org.hornetq.jms.tests.util.ProxyAssertSupport; Modified: trunk/tests/jms-tests/src/org/hornetq/jms/tests/message/MessageHeaderTestBase.java =================================================================== --- trunk/tests/jms-tests/src/org/hornetq/jms/tests/message/MessageHeaderTestBase.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/message/MessageHeaderTestBase.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -30,7 +30,7 @@ import javax.jms.StreamMessage; import javax.jms.TextMessage; -import org.hornetq.api.jms.HornetQQueue; +import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.jms.client.HornetQBytesMessage; import org.hornetq.jms.client.HornetQMapMessage; import org.hornetq.jms.client.HornetQMessage; @@ -62,8 +62,8 @@ m.setJMSMessageID("ID:messageID777"); m.setJMSTimestamp(123456789l); m.setJMSCorrelationID("correlationID777"); - m.setJMSReplyTo(new HornetQQueue("ReplyToQueue")); - m.setJMSDestination(new HornetQQueue("DestinationQueue")); + m.setJMSReplyTo(HornetQJMSClient.createHornetQQueue("ReplyToQueue")); + m.setJMSDestination(HornetQJMSClient.createHornetQQueue("DestinationQueue")); m.setJMSDeliveryMode(DeliveryMode.PERSISTENT); m.setJMSExpiration(987654321l); m.setJMSPriority(9); Modified: trunk/tests/jms-tests/src/org/hornetq/jms/tests/tools/container/LocalTestServer.java =================================================================== --- trunk/tests/jms-tests/src/org/hornetq/jms/tests/tools/container/LocalTestServer.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/tools/container/LocalTestServer.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -27,7 +27,7 @@ import javax.naming.InitialContext; import org.hornetq.api.Pair; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.HornetQClient; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.management.ObjectNameBuilder; import org.hornetq.api.core.management.ResourceNames; @@ -293,32 +293,32 @@ getJMSServerManager().createConnectionFactory(objectName, connectorConfigs, clientId, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL, - ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT, - ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CONNECTION_TTL, + HornetQClient.DEFAULT_CALL_TIMEOUT, + HornetQClient.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, prefetchSize, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE, + HornetQClient.DEFAULT_CONSUMER_MAX_RATE, + HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_MAX_RATE, blockOnAcknowledge, true, true, - ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP, - ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_AUTO_GROUP, + HornetQClient.DEFAULT_PRE_ACKNOWLEDGE, + HornetQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, dupsOkBatchSize, - ClientSessionFactoryImpl.DEFAULT_USE_GLOBAL_POOLS, - ClientSessionFactoryImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL, - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER, - ClientSessionFactoryImpl.DEFAULT_MAX_RETRY_INTERVAL, - ClientSessionFactoryImpl.DEFAULT_RECONNECT_ATTEMPTS, - ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN, + HornetQClient.DEFAULT_USE_GLOBAL_POOLS, + HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_RETRY_INTERVAL, + HornetQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER, + HornetQClient.DEFAULT_MAX_RETRY_INTERVAL, + HornetQClient.DEFAULT_RECONNECT_ATTEMPTS, + HornetQClient.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN, null, jndiBindings); } Modified: trunk/tests/joram-tests/config/provider.properties =================================================================== --- trunk/tests/joram-tests/config/provider.properties 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/joram-tests/config/provider.properties 2010-01-06 08:57:20 UTC (rev 8723) @@ -27,7 +27,7 @@ # Uncomment the chosen provider and comment the other ones ## -jms.provider.admin.class=org.hornetq.HornetQAdmin +jms.provider.admin.class=org.hornetq.jms.HornetQAdmin #jms.provider.admin.class = org.hornetq.api.jms.GenericAdmin #jms.provider.admin.class = org.objectweb.jtests.providers.admin.JoramAdmin #jms.provider.admin.class = org.objectweb.jtests.providers.admin.AshnaMQAdmin Modified: trunk/tests/joram-tests/src/org/hornetq/jms/HornetQAdmin.java =================================================================== --- trunk/tests/joram-tests/src/org/hornetq/jms/HornetQAdmin.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/joram-tests/src/org/hornetq/jms/HornetQAdmin.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -29,6 +29,7 @@ import org.hornetq.api.core.client.ClientRequestor; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.HornetQClient; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.management.ManagementHelper; import org.hornetq.api.core.management.ResourceNames; @@ -72,7 +73,7 @@ public void start() throws Exception { - ClientSessionFactoryImpl sf = new ClientSessionFactoryImpl(new TransportConfiguration(NettyConnectorFactory.class.getName())); + ClientSessionFactoryImpl sf = (ClientSessionFactoryImpl) HornetQClient.createClientSessionFactory(new TransportConfiguration(NettyConnectorFactory.class.getName())); clientSession = sf.createSession(ConfigurationImpl.DEFAULT_MANAGEMENT_CLUSTER_USER, ConfigurationImpl.DEFAULT_MANAGEMENT_CLUSTER_PASSWORD, false, @@ -207,7 +208,7 @@ public void startServer() throws Exception { - String[] vmArgs = new String[] { "-Dorg.hornetq.logger-delegate-factory-class-name=org.hornetq.api.jms.SysoutLoggerDelegateFactory" }; + String[] vmArgs = new String[] { "-Dorg.hornetq.logger-delegate-factory-class-name=org.hornetq.jms.SysoutLoggerDelegateFactory" }; serverProcess = SpawnedVMSupport.spawnVM(SpawnedJMSServer.class.getName(), vmArgs, false); InputStreamReader isr = new InputStreamReader(serverProcess.getInputStream()); Modified: trunk/tests/joram-tests/src/org/hornetq/jms/SpawnedJMSServer.java =================================================================== --- trunk/tests/joram-tests/src/org/hornetq/jms/SpawnedJMSServer.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/joram-tests/src/org/hornetq/jms/SpawnedJMSServer.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -107,8 +107,9 @@ } catch (Throwable t) { - String allStack = t.getMessage() + "|"; - StackTraceElement[] stackTrace = t.getStackTrace(); + t.printStackTrace(); + String allStack = t.getCause().getMessage() + "|"; + StackTraceElement[] stackTrace = t.getCause().getStackTrace(); for (StackTraceElement stackTraceElement : stackTrace) { allStack += stackTraceElement.toString() + "|"; Modified: trunk/tests/src/org/hornetq/tests/integration/DuplicateDetectionTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/DuplicateDetectionTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/DuplicateDetectionTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -19,12 +19,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.*; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.message.Message; import org.hornetq.core.config.Configuration; @@ -56,7 +51,7 @@ public void testSimpleDuplicateDetecion() throws Exception { - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(false, true, true); @@ -122,7 +117,7 @@ public void testSimpleDuplicateDetectionWithString() throws Exception { - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(false, true, true); @@ -188,7 +183,7 @@ public void testCacheSize() throws Exception { - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(false, true, true); @@ -343,7 +338,7 @@ public void testTransactedDuplicateDetection1() throws Exception { - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(false, false, false); @@ -391,7 +386,7 @@ public void testTransactedDuplicateDetection2() throws Exception { - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(false, false, false); @@ -433,7 +428,7 @@ public void testTransactedDuplicateDetection3() throws Exception { - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(false, false, false); @@ -491,7 +486,7 @@ */ public void testEntireTransactionRejected() throws Exception { - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(false, false, false); @@ -548,7 +543,7 @@ public void testXADuplicateDetection1() throws Exception { - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(true, false, false); @@ -623,7 +618,7 @@ public void testXADuplicateDetection2() throws Exception { - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(true, false, false); @@ -700,7 +695,7 @@ public void testXADuplicateDetection3() throws Exception { - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(true, false, false); @@ -776,7 +771,7 @@ public void testXADuplicateDetection4() throws Exception { - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(true, false, false); @@ -873,7 +868,7 @@ messagingService2.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(false, true, true); @@ -911,7 +906,7 @@ messagingService2.start(); - sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); session = sf.createSession(false, true, true); @@ -956,7 +951,7 @@ messagingService2.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(false, true, true); @@ -990,7 +985,7 @@ messagingService2.start(); - sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); session = sf.createSession(false, true, true); @@ -1034,7 +1029,7 @@ messagingService2.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(false, true, true); @@ -1070,7 +1065,7 @@ messagingService2.start(); - sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); session = sf.createSession(false, true, true); @@ -1123,7 +1118,7 @@ messagingService2.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(false, true, true); @@ -1169,7 +1164,7 @@ messagingService2.start(); - sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); session = sf.createSession(false, true, true); @@ -1221,7 +1216,7 @@ messagingService2.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(false, true, true); @@ -1259,7 +1254,7 @@ messagingService2.start(); - sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); session = sf.createSession(false, true, true); @@ -1304,7 +1299,7 @@ messagingService2.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(false, false, false); @@ -1344,7 +1339,7 @@ messagingService2.start(); - sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); session = sf.createSession(false, false, false); @@ -1389,7 +1384,7 @@ messagingService2.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(false, false, false); @@ -1433,7 +1428,7 @@ messagingService2.start(); - sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); session = sf.createSession(false, false, false); @@ -1480,7 +1475,7 @@ messagingService2.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(true, false, false); @@ -1522,7 +1517,7 @@ messagingService2.start(); - sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); session = sf.createSession(true, false, false); @@ -1579,7 +1574,7 @@ messagingService2.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(true, false, false); @@ -1619,7 +1614,7 @@ messagingService2.start(); - sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); session = sf.createSession(true, false, false); @@ -1676,7 +1671,7 @@ messagingService2.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(true, false, false); @@ -1718,7 +1713,7 @@ messagingService2.start(); - sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); session = sf.createSession(true, false, false); @@ -1775,7 +1770,7 @@ messagingService2.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(true, false, false); @@ -1816,7 +1811,7 @@ messagingService2.start(); - sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); session = sf.createSession(true, false, false); Modified: trunk/tests/src/org/hornetq/tests/integration/String64KLimitTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/String64KLimitTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/String64KLimitTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -16,12 +16,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.*; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; @@ -211,7 +206,7 @@ server = HornetQServers.newHornetQServer(config, false); server.start(); - sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); session = sf.createSession(); } Modified: trunk/tests/src/org/hornetq/tests/integration/client/ConsumerCloseTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/ConsumerCloseTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/client/ConsumerCloseTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -15,13 +15,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; -import org.hornetq.api.core.client.MessageHandler; +import org.hornetq.api.core.client.*; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.config.Configuration; @@ -162,7 +156,7 @@ address = RandomUtil.randomSimpleString(); queue = RandomUtil.randomSimpleString(); - sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); session = sf.createSession(false, true, true); session.createQueue(address, queue, false); Modified: trunk/tests/src/org/hornetq/tests/integration/client/CoreClientTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/CoreClientTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/client/CoreClientTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -17,12 +17,7 @@ import org.hornetq.api.SimpleString; import org.hornetq.api.core.buffers.HornetQBuffer; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.*; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; @@ -72,7 +67,7 @@ server.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(connectorFactoryClassName)); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(connectorFactoryClassName)); // sf.setConsumerWindowSize(0); ClientSession session = sf.createSession(false, true, true); Modified: trunk/tests/src/org/hornetq/tests/integration/client/DeadLetterAddressTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/DeadLetterAddressTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/client/DeadLetterAddressTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -18,12 +18,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.*; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; import org.hornetq.api.core.message.Message; @@ -152,7 +147,7 @@ SimpleString dlq = new SimpleString("DLQ1"); clientSession.createQueue(dla, dlq, null, false); clientSession.createQueue(qName, qName, null, false); - ClientSessionFactory sessionFactory = new ClientSessionFactoryImpl(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY)); + ClientSessionFactory sessionFactory = HornetQClient.createClientSessionFactory(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY)); ClientSession sendSession = sessionFactory.createSession(false, true, true); ClientProducer producer = sendSession.createProducer(qName); Map<String, Long> origIds = new HashMap<String, Long>(); @@ -375,7 +370,7 @@ // start the server server.start(); // then we create a client as normal - ClientSessionFactory sessionFactory = new ClientSessionFactoryImpl(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY)); + ClientSessionFactory sessionFactory = HornetQClient.createClientSessionFactory(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY)); clientSession = sessionFactory.createSession(false, true, false); } Modified: trunk/tests/src/org/hornetq/tests/integration/client/DurableQueueTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/DurableQueueTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/client/DurableQueueTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -16,12 +16,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.*; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.server.HornetQServer; @@ -89,7 +84,7 @@ server.stop(); server.start(); - sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); session = sf.createSession(false, true, true); session.start(); @@ -116,7 +111,7 @@ server.stop(); server.start(); - sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); session = sf.createSession(false, true, true); ClientProducer producer = session.createProducer(address); Modified: trunk/tests/src/org/hornetq/tests/integration/client/ExpiryAddressTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/ExpiryAddressTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/client/ExpiryAddressTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -15,12 +15,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.*; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; import org.hornetq.api.core.message.Message; @@ -174,7 +169,7 @@ SimpleString eq = new SimpleString("EA1"); clientSession.createQueue(ea, eq, null, false); clientSession.createQueue(qName, qName, null, false); - ClientSessionFactory sessionFactory = new ClientSessionFactoryImpl(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY)); + ClientSessionFactory sessionFactory = HornetQClient.createClientSessionFactory(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY)); ClientSession sendSession = sessionFactory.createSession(false, true, true); ClientProducer producer = sendSession.createProducer(qName); @@ -326,7 +321,7 @@ // start the server server.start(); // then we create a client as normal - ClientSessionFactory sessionFactory = new ClientSessionFactoryImpl(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY)); + ClientSessionFactory sessionFactory = HornetQClient.createClientSessionFactory(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY)); sessionFactory.setBlockOnAcknowledge(true); // There are assertions over sizes that needs to be done after the ACK // was received on server clientSession = sessionFactory.createSession(null, null, false, true, true, false, 0); Modified: trunk/tests/src/org/hornetq/tests/integration/client/FailureDeadlockTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/FailureDeadlockTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/client/FailureDeadlockTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -19,7 +19,8 @@ import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.jms.HornetQConnectionFactory; +import org.hornetq.jms.HornetQConnectionFactory; +import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.core.client.impl.ClientSessionInternal; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; @@ -65,9 +66,9 @@ jmsServer = new JMSServerManagerImpl(server); jmsServer.setContext(new NullInitialContext()); jmsServer.start(); - cf1 = new HornetQConnectionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + cf1 = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); - cf2 = new HornetQConnectionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + cf2 = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); } @Override Modified: trunk/tests/src/org/hornetq/tests/integration/client/HornetQCrashTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/HornetQCrashTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/client/HornetQCrashTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -3,12 +3,7 @@ import junit.framework.Assert; import junit.framework.TestCase; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; -import org.hornetq.api.core.client.SendAcknowledgementHandler; +import org.hornetq.api.core.client.*; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; import org.hornetq.api.core.interceptor.Interceptor; @@ -50,7 +45,7 @@ server.getRemotingService().addInterceptor(new AckInterceptor(server)); - ClientSessionFactory clientSessionFactory = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + ClientSessionFactory clientSessionFactory = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); // Force an ack at once - this means the send call will block clientSessionFactory.setConfirmationWindowSize(1); Modified: trunk/tests/src/org/hornetq/tests/integration/client/IncompatibleVersionTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/IncompatibleVersionTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/client/IncompatibleVersionTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -20,7 +20,7 @@ import java.util.concurrent.ScheduledExecutorService; import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.HornetQClient; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.client.impl.FailoverManagerImpl; @@ -67,20 +67,20 @@ server.start(); TransportConfiguration config = new TransportConfiguration(InVMConnectorFactory.class.getName()); - ClientSessionFactory csf = new ClientSessionFactoryImpl(config); + ClientSessionFactory csf = HornetQClient.createClientSessionFactory(config); ExecutorService executorService = Executors.newFixedThreadPool(1); ScheduledExecutorService scheduledexecutorService = Executors.newScheduledThreadPool(1); FailoverManagerImpl failoverManager = new FailoverManagerImpl(csf, config, null, - ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN, - ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN, + HornetQClient.DEFAULT_CALL_TIMEOUT, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, 500, - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL, - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER, - ClientSessionFactoryImpl.DEFAULT_MAX_RETRY_INTERVAL, - ClientSessionFactoryImpl.DEFAULT_RECONNECT_ATTEMPTS, + HornetQClient.DEFAULT_RETRY_INTERVAL, + HornetQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER, + HornetQClient.DEFAULT_MAX_RETRY_INTERVAL, + HornetQClient.DEFAULT_RECONNECT_ATTEMPTS, executorService, scheduledexecutorService, null); @@ -119,12 +119,12 @@ version, null, null, - ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, false, true, true, false, - ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE); + HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE); if (compatible) { Modified: trunk/tests/src/org/hornetq/tests/integration/client/LargeMessageTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/LargeMessageTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/client/LargeMessageTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -21,12 +21,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.*; import org.hornetq.api.core.message.Message; import org.hornetq.core.client.impl.ClientConsumerInternal; import org.hornetq.core.config.Configuration; @@ -75,7 +70,7 @@ public void testCloseConsumer() throws Exception { - final int messageSize = (int)(3.5 * ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE); + final int messageSize = (int)(3.5 * HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE); ClientSession session = null; @@ -144,7 +139,7 @@ public void testDLALargeMessage() throws Exception { - final int messageSize = (int)(3.5 * ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE); + final int messageSize = (int)(3.5 * HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE); ClientSession session = null; @@ -271,7 +266,7 @@ public void testDeliveryCount() throws Exception { - final int messageSize = (int)(3.5 * ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE); + final int messageSize = (int)(3.5 * HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE); ClientSession session = null; @@ -354,7 +349,7 @@ public void testDLAOnExpiryNonDurableMessage() throws Exception { - final int messageSize = (int)(3.5 * ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE); + final int messageSize = (int)(3.5 * HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE); ClientSession session = null; @@ -489,7 +484,7 @@ public void testDLAOnExpiry() throws Exception { - final int messageSize = (int)(3.5 * ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE); + final int messageSize = (int)(3.5 * HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE); ClientSession session = null; @@ -624,7 +619,7 @@ public void testExpiryLargeMessage() throws Exception { - final int messageSize = 3 * ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE; + final int messageSize = 3 * HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE; ClientSession session = null; Modified: trunk/tests/src/org/hornetq/tests/integration/client/MessageGroupingConnectionFactoryTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/MessageGroupingConnectionFactoryTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/client/MessageGroupingConnectionFactoryTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -19,13 +19,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; -import org.hornetq.api.core.client.MessageHandler; +import org.hornetq.api.core.client.*; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.config.impl.ConfigurationImpl; @@ -179,7 +173,7 @@ server.start(); // then we create a client as normal - ClientSessionFactory sessionFactory = new ClientSessionFactoryImpl(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY)); + ClientSessionFactory sessionFactory = HornetQClient.createClientSessionFactory(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY)); sessionFactory.setGroupID("grp1"); clientSession = sessionFactory.createSession(false, true, true); clientSession.createQueue(qName, qName, null, false); Modified: trunk/tests/src/org/hornetq/tests/integration/client/MessageGroupingTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/MessageGroupingTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/client/MessageGroupingTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -22,13 +22,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; -import org.hornetq.api.core.client.MessageHandler; +import org.hornetq.api.core.client.*; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; import org.hornetq.api.core.message.Message; @@ -259,7 +253,7 @@ private void doTestMultipleGroupingTXCommit(final boolean directDelivery) throws Exception { - ClientSessionFactory sessionFactory = new ClientSessionFactoryImpl(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY)); + ClientSessionFactory sessionFactory = HornetQClient.createClientSessionFactory(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY)); ClientSession clientSession = sessionFactory.createSession(false, false, false); ClientProducer clientProducer = this.clientSession.createProducer(qName); if (directDelivery) @@ -319,7 +313,7 @@ private void doTestMultipleGroupingTXRollback(final boolean directDelivery) throws Exception { - ClientSessionFactory sessionFactory = new ClientSessionFactoryImpl(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY)); + ClientSessionFactory sessionFactory = HornetQClient.createClientSessionFactory(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY)); sessionFactory.setBlockOnAcknowledge(true); ClientSession clientSession = sessionFactory.createSession(false, false, false); ClientProducer clientProducer = this.clientSession.createProducer(qName); @@ -395,7 +389,7 @@ private void dotestMultipleGroupingXACommit(final boolean directDelivery) throws Exception { - ClientSessionFactory sessionFactory = new ClientSessionFactoryImpl(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY)); + ClientSessionFactory sessionFactory = HornetQClient.createClientSessionFactory(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY)); ClientSession clientSession = sessionFactory.createSession(true, false, false); ClientProducer clientProducer = this.clientSession.createProducer(qName); ClientConsumer consumer = clientSession.createConsumer(qName); @@ -459,7 +453,7 @@ private void doTestMultipleGroupingXARollback(final boolean directDelivery) throws Exception { - ClientSessionFactory sessionFactory = new ClientSessionFactoryImpl(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY)); + ClientSessionFactory sessionFactory = HornetQClient.createClientSessionFactory(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY)); sessionFactory.setBlockOnAcknowledge(true); ClientSession clientSession = sessionFactory.createSession(true, false, false); ClientProducer clientProducer = this.clientSession.createProducer(qName); @@ -639,7 +633,7 @@ server.start(); // then we create a client as normal - ClientSessionFactory sessionFactory = new ClientSessionFactoryImpl(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY)); + ClientSessionFactory sessionFactory = HornetQClient.createClientSessionFactory(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY)); clientSession = sessionFactory.createSession(false, true, true); clientSession.createQueue(qName, qName, null, false); } Modified: trunk/tests/src/org/hornetq/tests/integration/client/MessagePriorityTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/MessagePriorityTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/client/MessagePriorityTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -16,12 +16,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.*; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; @@ -207,7 +202,7 @@ server = HornetQServers.newHornetQServer(config, false); server.start(); - sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); sf.setBlockOnNonDurableSend(true); sf.setBlockOnDurableSend(true); session = sf.createSession(false, true, true); Modified: trunk/tests/src/org/hornetq/tests/integration/client/NewDeadLetterAddressTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/NewDeadLetterAddressTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/client/NewDeadLetterAddressTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -15,12 +15,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.*; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.config.impl.ConfigurationImpl; @@ -76,7 +71,7 @@ // start the server server.start(); // then we create a client as normal - ClientSessionFactory sessionFactory = new ClientSessionFactoryImpl(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY)); + ClientSessionFactory sessionFactory = HornetQClient.createClientSessionFactory(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY)); clientSession = sessionFactory.createSession(false, true, false); } Modified: trunk/tests/src/org/hornetq/tests/integration/client/ProducerCloseTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/ProducerCloseTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/client/ProducerCloseTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -14,10 +14,7 @@ import junit.framework.Assert; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.*; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.config.Configuration; @@ -84,7 +81,7 @@ server = HornetQServers.newHornetQServer(config, false); server.start(); - sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); session = sf.createSession(false, true, true); } Modified: trunk/tests/src/org/hornetq/tests/integration/client/QueueBrowserTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/QueueBrowserTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/client/QueueBrowserTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -15,12 +15,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.*; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.core.logging.Logger; import org.hornetq.core.server.HornetQServer; @@ -63,7 +58,7 @@ public void testSimpleConsumerBrowser() throws Exception { - sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); sf.setBlockOnNonDurableSend(true); Modified: trunk/tests/src/org/hornetq/tests/integration/client/ReceiveImmediateTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/ReceiveImmediateTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/client/ReceiveImmediateTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -15,12 +15,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.*; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.core.config.Configuration; import org.hornetq.core.logging.Logger; @@ -88,7 +83,7 @@ public void testConsumerReceiveImmediateWithSessionStop() throws Exception { - sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); sf.setBlockOnNonDurableSend(true); sf.setBlockOnAcknowledge(true); sf.setAckBatchSize(0); @@ -121,7 +116,7 @@ private void doConsumerReceiveImmediateWithNoMessages(final boolean browser) throws Exception { - sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); sf.setBlockOnNonDurableSend(true); sf.setBlockOnAcknowledge(true); sf.setAckBatchSize(0); @@ -143,7 +138,7 @@ private void doConsumerReceiveImmediate(final boolean browser) throws Exception { - sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); sf.setBlockOnNonDurableSend(true); sf.setBlockOnAcknowledge(true); sf.setAckBatchSize(0); Modified: trunk/tests/src/org/hornetq/tests/integration/client/RequestorTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/RequestorTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/client/RequestorTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -16,14 +16,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientRequestor; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; -import org.hornetq.api.core.client.MessageHandler; +import org.hornetq.api.core.client.*; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.client.impl.ClientMessageImpl; @@ -92,7 +85,7 @@ SimpleString requestAddress = RandomUtil.randomSimpleString(); SimpleString requestQueue = RandomUtil.randomSimpleString(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); final ClientSession session = sf.createSession(false, true, true); session.start(); @@ -125,7 +118,7 @@ SimpleString requestAddress = RandomUtil.randomSimpleString(); SimpleString requestQueue = RandomUtil.randomSimpleString(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); final ClientSession session = sf.createSession(false, true, true); session.start(); @@ -155,7 +148,7 @@ { final SimpleString requestAddress = RandomUtil.randomSimpleString(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); final ClientSession session = sf.createSession(false, true, true); session.close(); @@ -178,7 +171,7 @@ SimpleString requestAddress = RandomUtil.randomSimpleString(); SimpleString requestQueue = RandomUtil.randomSimpleString(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); final ClientSession session = sf.createSession(false, true, true); session.start(); @@ -228,7 +221,7 @@ service = HornetQServers.newHornetQServer(conf, false); service.start(); - sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); } @Override Modified: trunk/tests/src/org/hornetq/tests/integration/client/SessionCloseTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/SessionCloseTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/client/SessionCloseTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -19,11 +19,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.*; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.config.Configuration; @@ -256,7 +252,7 @@ server.start(); - sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); } Modified: trunk/tests/src/org/hornetq/tests/integration/client/SessionClosedOnRemotingConnectionFailureTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/SessionClosedOnRemotingConnectionFailureTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/client/SessionClosedOnRemotingConnectionFailureTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -15,11 +15,7 @@ import junit.framework.Assert; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.*; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.client.impl.ClientSessionInternal; @@ -123,7 +119,7 @@ server.start(); - sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); } @Override Modified: trunk/tests/src/org/hornetq/tests/integration/client/SessionFactoryTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/SessionFactoryTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/client/SessionFactoryTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -27,6 +27,7 @@ import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.HornetQClient; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.config.Configuration; @@ -85,7 +86,7 @@ public void testSerializable() throws Exception { - ClientSessionFactory cf = new ClientSessionFactoryImpl(); + ClientSessionFactory cf = HornetQClient.createClientSessionFactory(); ByteArrayOutputStream baos = new ByteArrayOutputStream(); @@ -108,7 +109,7 @@ public void testCloseUnusedClientSessionFactoryWithoutGlobalPools() throws Exception { - ClientSessionFactoryImpl csf = new ClientSessionFactoryImpl(); + ClientSessionFactoryImpl csf = (ClientSessionFactoryImpl) HornetQClient.createClientSessionFactory(); csf.setUseGlobalPools(false); csf.close(); } @@ -118,35 +119,35 @@ try { startLiveAndBackup(); - ClientSessionFactory cf = new ClientSessionFactoryImpl(); + ClientSessionFactory cf = HornetQClient.createClientSessionFactory(); assertFactoryParams(cf, null, null, 0, - ClientSessionFactoryImpl.DEFAULT_DISCOVERY_REFRESH_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL, - ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP, - ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_USE_GLOBAL_POOLS, - ClientSessionFactoryImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL, - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER, - ClientSessionFactoryImpl.DEFAULT_RECONNECT_ATTEMPTS, - ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); + HornetQClient.DEFAULT_DISCOVERY_REFRESH_TIMEOUT, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CONNECTION_TTL, + HornetQClient.DEFAULT_CALL_TIMEOUT, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, + HornetQClient.DEFAULT_CONSUMER_WINDOW_SIZE, + HornetQClient.DEFAULT_CONSUMER_MAX_RATE, + HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_MAX_RATE, + HornetQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE, + HornetQClient.DEFAULT_BLOCK_ON_DURABLE_SEND, + HornetQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, + HornetQClient.DEFAULT_AUTO_GROUP, + HornetQClient.DEFAULT_PRE_ACKNOWLEDGE, + HornetQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT, + HornetQClient.DEFAULT_USE_GLOBAL_POOLS, + HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_RETRY_INTERVAL, + HornetQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER, + HornetQClient.DEFAULT_RECONNECT_ATTEMPTS, + HornetQClient.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); try { ClientSession session = cf.createSession(false, true, true); @@ -178,35 +179,35 @@ try { startLiveAndBackup(); - ClientSessionFactory cf = new ClientSessionFactoryImpl(groupAddress, groupPort); + ClientSessionFactory cf = HornetQClient.createClientSessionFactory(groupAddress, groupPort); assertFactoryParams(cf, null, groupAddress, groupPort, - ClientSessionFactoryImpl.DEFAULT_DISCOVERY_REFRESH_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL, - ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP, - ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_USE_GLOBAL_POOLS, - ClientSessionFactoryImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL, - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER, - ClientSessionFactoryImpl.DEFAULT_RECONNECT_ATTEMPTS, - ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); + HornetQClient.DEFAULT_DISCOVERY_REFRESH_TIMEOUT, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CONNECTION_TTL, + HornetQClient.DEFAULT_CALL_TIMEOUT, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, + HornetQClient.DEFAULT_CONSUMER_WINDOW_SIZE, + HornetQClient.DEFAULT_CONSUMER_MAX_RATE, + HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_MAX_RATE, + HornetQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE, + HornetQClient.DEFAULT_BLOCK_ON_DURABLE_SEND, + HornetQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, + HornetQClient.DEFAULT_AUTO_GROUP, + HornetQClient.DEFAULT_PRE_ACKNOWLEDGE, + HornetQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT, + HornetQClient.DEFAULT_USE_GLOBAL_POOLS, + HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_RETRY_INTERVAL, + HornetQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER, + HornetQClient.DEFAULT_RECONNECT_ATTEMPTS, + HornetQClient.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); ClientSession session = cf.createSession(false, true, true); Assert.assertNotNull(session); session.close(); @@ -228,35 +229,35 @@ backupTC); staticConnectors.add(pair0); - ClientSessionFactory cf = new ClientSessionFactoryImpl(staticConnectors); + ClientSessionFactory cf = HornetQClient.createClientSessionFactory(staticConnectors); assertFactoryParams(cf, staticConnectors, null, 0, - ClientSessionFactoryImpl.DEFAULT_DISCOVERY_REFRESH_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL, - ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP, - ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_USE_GLOBAL_POOLS, - ClientSessionFactoryImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL, - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER, - ClientSessionFactoryImpl.DEFAULT_RECONNECT_ATTEMPTS, - ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); + HornetQClient.DEFAULT_DISCOVERY_REFRESH_TIMEOUT, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CONNECTION_TTL, + HornetQClient.DEFAULT_CALL_TIMEOUT, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, + HornetQClient.DEFAULT_CONSUMER_WINDOW_SIZE, + HornetQClient.DEFAULT_CONSUMER_MAX_RATE, + HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_MAX_RATE, + HornetQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE, + HornetQClient.DEFAULT_BLOCK_ON_DURABLE_SEND, + HornetQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, + HornetQClient.DEFAULT_AUTO_GROUP, + HornetQClient.DEFAULT_PRE_ACKNOWLEDGE, + HornetQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT, + HornetQClient.DEFAULT_USE_GLOBAL_POOLS, + HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_RETRY_INTERVAL, + HornetQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER, + HornetQClient.DEFAULT_RECONNECT_ATTEMPTS, + HornetQClient.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); ClientSession session = cf.createSession(false, true, true); Assert.assertNotNull(session); session.close(); @@ -278,35 +279,35 @@ backupTC); staticConnectors.add(pair0); - ClientSessionFactory cf = new ClientSessionFactoryImpl(liveTC, backupTC); + ClientSessionFactory cf = HornetQClient.createClientSessionFactory(liveTC, backupTC); assertFactoryParams(cf, staticConnectors, null, 0, - ClientSessionFactoryImpl.DEFAULT_DISCOVERY_REFRESH_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL, - ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP, - ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_USE_GLOBAL_POOLS, - ClientSessionFactoryImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL, - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER, - ClientSessionFactoryImpl.DEFAULT_RECONNECT_ATTEMPTS, - ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); + HornetQClient.DEFAULT_DISCOVERY_REFRESH_TIMEOUT, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CONNECTION_TTL, + HornetQClient.DEFAULT_CALL_TIMEOUT, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, + HornetQClient.DEFAULT_CONSUMER_WINDOW_SIZE, + HornetQClient.DEFAULT_CONSUMER_MAX_RATE, + HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_MAX_RATE, + HornetQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE, + HornetQClient.DEFAULT_BLOCK_ON_DURABLE_SEND, + HornetQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, + HornetQClient.DEFAULT_AUTO_GROUP, + HornetQClient.DEFAULT_PRE_ACKNOWLEDGE, + HornetQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT, + HornetQClient.DEFAULT_USE_GLOBAL_POOLS, + HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_RETRY_INTERVAL, + HornetQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER, + HornetQClient.DEFAULT_RECONNECT_ATTEMPTS, + HornetQClient.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); ClientSession session = cf.createSession(false, true, true); Assert.assertNotNull(session); session.close(); @@ -328,35 +329,35 @@ null); staticConnectors.add(pair0); - ClientSessionFactory cf = new ClientSessionFactoryImpl(liveTC); + ClientSessionFactory cf = HornetQClient.createClientSessionFactory(liveTC); assertFactoryParams(cf, staticConnectors, null, 0, - ClientSessionFactoryImpl.DEFAULT_DISCOVERY_REFRESH_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL, - ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP, - ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_USE_GLOBAL_POOLS, - ClientSessionFactoryImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL, - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER, - ClientSessionFactoryImpl.DEFAULT_RECONNECT_ATTEMPTS, - ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); + HornetQClient.DEFAULT_DISCOVERY_REFRESH_TIMEOUT, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CONNECTION_TTL, + HornetQClient.DEFAULT_CALL_TIMEOUT, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, + HornetQClient.DEFAULT_CONSUMER_WINDOW_SIZE, + HornetQClient.DEFAULT_CONSUMER_MAX_RATE, + HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_MAX_RATE, + HornetQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE, + HornetQClient.DEFAULT_BLOCK_ON_DURABLE_SEND, + HornetQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, + HornetQClient.DEFAULT_AUTO_GROUP, + HornetQClient.DEFAULT_PRE_ACKNOWLEDGE, + HornetQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT, + HornetQClient.DEFAULT_USE_GLOBAL_POOLS, + HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_RETRY_INTERVAL, + HornetQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER, + HornetQClient.DEFAULT_RECONNECT_ATTEMPTS, + HornetQClient.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); ClientSession session = cf.createSession(false, true, true); Assert.assertNotNull(session); session.close(); @@ -370,7 +371,7 @@ public void testGettersAndSetters() { - ClientSessionFactory cf = new ClientSessionFactoryImpl(); + ClientSessionFactory cf = HornetQClient.createClientSessionFactory(); List<Pair<TransportConfiguration, TransportConfiguration>> staticConnectors = new ArrayList<Pair<TransportConfiguration, TransportConfiguration>>(); Pair<TransportConfiguration, TransportConfiguration> pair0 = new Pair<TransportConfiguration, TransportConfiguration>(liveTC, Modified: trunk/tests/src/org/hornetq/tests/integration/client/TemporaryQueueTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/TemporaryQueueTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/client/TemporaryQueueTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -20,12 +20,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.*; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; import org.hornetq.api.core.interceptor.Interceptor; @@ -235,7 +230,7 @@ } }); - sf = new ClientSessionFactoryImpl(new TransportConfiguration(ServiceTestBase.INVM_CONNECTOR_FACTORY)); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(ServiceTestBase.INVM_CONNECTOR_FACTORY)); sf.setConnectionTTL(TemporaryQueueTest.CONNECTION_TTL); session = sf.createSession(false, true, true); @@ -268,7 +263,7 @@ session.close(); sf.close(); - sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); session = sf.createSession(false, true, true); session.start(); @@ -299,7 +294,7 @@ server = createServer(false, configuration); server.start(); - sf = new ClientSessionFactoryImpl(new TransportConfiguration(ServiceTestBase.INVM_CONNECTOR_FACTORY)); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(ServiceTestBase.INVM_CONNECTOR_FACTORY)); sf.setConnectionTTL(TemporaryQueueTest.CONNECTION_TTL); session = sf.createSession(false, true, true); } Modified: trunk/tests/src/org/hornetq/tests/integration/client/TransactionDurabilityTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/TransactionDurabilityTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/client/TransactionDurabilityTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -15,12 +15,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.*; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.core.config.Configuration; import org.hornetq.core.logging.Logger; @@ -70,7 +65,7 @@ server.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session1 = sf.createSession(false, true, true); @@ -118,7 +113,7 @@ server.start(); - sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); session1 = sf.createSession(false, true, true); @@ -150,7 +145,7 @@ server.start(); - sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); session1 = sf.createSession(false, true, true); Modified: trunk/tests/src/org/hornetq/tests/integration/client/WildCardRoutingTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/WildCardRoutingTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/client/WildCardRoutingTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -15,12 +15,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.*; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.config.impl.ConfigurationImpl; @@ -768,7 +763,7 @@ server.start(); server.getManagementService().enableNotifications(false); // then we create a client as normal - ClientSessionFactory sessionFactory = new ClientSessionFactoryImpl(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY)); + ClientSessionFactory sessionFactory = HornetQClient.createClientSessionFactory(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY)); clientSession = sessionFactory.createSession(false, true, true); } Modified: trunk/tests/src/org/hornetq/tests/integration/clientcrash/ClientCrashTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/clientcrash/ClientCrashTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/clientcrash/ClientCrashTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -16,12 +16,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.*; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.message.Message; import org.hornetq.core.logging.Logger; @@ -123,7 +118,7 @@ { super.setUp(); - sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.integration.transports.netty.NettyConnectorFactory")); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.integration.transports.netty.NettyConnectorFactory")); sf.setClientFailureCheckPeriod(ClientCrashTest.PING_PERIOD); sf.setConnectionTTL(ClientCrashTest.CONNECTION_TTL); Modified: trunk/tests/src/org/hornetq/tests/integration/clientcrash/ClientExitTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/clientcrash/ClientExitTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/clientcrash/ClientExitTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -16,10 +16,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.*; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.message.Message; import org.hornetq.core.logging.Logger; @@ -104,7 +101,7 @@ { super.setUp(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(NettyConnectorFactory.class.getName())); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(NettyConnectorFactory.class.getName())); session = sf.createSession(false, true, true); session.createQueue(ClientExitTest.QUEUE, ClientExitTest.QUEUE, null, false); consumer = session.createConsumer(ClientExitTest.QUEUE); Modified: trunk/tests/src/org/hornetq/tests/integration/clientcrash/CrashClient.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/clientcrash/CrashClient.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/clientcrash/CrashClient.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -15,11 +15,7 @@ import java.util.Arrays; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.*; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.core.logging.Logger; import org.hornetq.jms.client.HornetQTextMessage; @@ -48,7 +44,7 @@ { CrashClient.log.debug("args = " + Arrays.asList(args)); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.integration.transports.netty.NettyConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.integration.transports.netty.NettyConnectorFactory")); sf.setClientFailureCheckPeriod(ClientCrashTest.PING_PERIOD); sf.setConnectionTTL(ClientCrashTest.CONNECTION_TTL); Modified: trunk/tests/src/org/hornetq/tests/integration/clientcrash/GracefulClient.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/clientcrash/GracefulClient.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/clientcrash/GracefulClient.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -13,12 +13,7 @@ package org.hornetq.tests.integration.clientcrash; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.*; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.core.logging.Logger; import org.hornetq.integration.transports.netty.NettyConnectorFactory; @@ -53,7 +48,7 @@ try { - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(NettyConnectorFactory.class.getName())); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(NettyConnectorFactory.class.getName())); ClientSession session = sf.createSession(false, true, true); ClientProducer producer = session.createProducer(queueName); ClientConsumer consumer = session.createConsumer(queueName); Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeReconnectTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeReconnectTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeReconnectTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -22,12 +22,7 @@ import org.hornetq.api.Pair; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.*; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.logging.Logger; @@ -126,7 +121,7 @@ true, false, confirmationWindowSize, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, connectorPair); List<BridgeConfiguration> bridgeConfigs = new ArrayList<BridgeConfiguration>(); @@ -148,10 +143,10 @@ server1.start(); server0.start(); - ClientSessionFactory csf0 = new ClientSessionFactoryImpl(server0tc); + ClientSessionFactory csf0 = HornetQClient.createClientSessionFactory(server0tc); ClientSession session0 = csf0.createSession(false, true, true); - ClientSessionFactory csf2 = new ClientSessionFactoryImpl(server2tc); + ClientSessionFactory csf2 = HornetQClient.createClientSessionFactory(server2tc); ClientSession session2 = csf2.createSession(false, true, true); ClientProducer prod0 = session0.createProducer(testAddress); @@ -249,7 +244,7 @@ true, false, confirmationWindowSize, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, connectorPair); List<BridgeConfiguration> bridgeConfigs = new ArrayList<BridgeConfiguration>(); @@ -271,10 +266,10 @@ server1.start(); server0.start(); - ClientSessionFactory csf0 = new ClientSessionFactoryImpl(server0tc); + ClientSessionFactory csf0 = HornetQClient.createClientSessionFactory(server0tc); ClientSession session0 = csf0.createSession(false, true, true); - ClientSessionFactory csf2 = new ClientSessionFactoryImpl(server2tc); + ClientSessionFactory csf2 = HornetQClient.createClientSessionFactory(server2tc); ClientSession session2 = csf2.createSession(false, true, true); ClientProducer prod0 = session0.createProducer(testAddress); @@ -367,7 +362,7 @@ true, false, confirmationWindowSize, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, connectorPair); List<BridgeConfiguration> bridgeConfigs = new ArrayList<BridgeConfiguration>(); @@ -387,10 +382,10 @@ server1.start(); server0.start(); - ClientSessionFactory csf0 = new ClientSessionFactoryImpl(server0tc); + ClientSessionFactory csf0 = HornetQClient.createClientSessionFactory(server0tc); ClientSession session0 = csf0.createSession(false, true, true); - ClientSessionFactory csf1 = new ClientSessionFactoryImpl(server1tc); + ClientSessionFactory csf1 = HornetQClient.createClientSessionFactory(server1tc); ClientSession session1 = csf1.createSession(false, true, true); ClientProducer prod0 = session0.createProducer(testAddress); @@ -513,7 +508,7 @@ server1.start(); server0.start(); - ClientSessionFactory csf0 = new ClientSessionFactoryImpl(server0tc); + ClientSessionFactory csf0 = HornetQClient.createClientSessionFactory(server0tc); ClientSession session0 = csf0.createSession(false, true, true); ClientProducer prod0 = session0.createProducer(testAddress); @@ -530,7 +525,7 @@ server1.start(); BridgeReconnectTest.log.info("server 1 restarted"); - ClientSessionFactory csf1 = new ClientSessionFactoryImpl(server1tc); + ClientSessionFactory csf1 = HornetQClient.createClientSessionFactory(server1tc); ClientSession session1 = csf1.createSession(false, true, true); ClientConsumer cons1 = session1.createConsumer(queueName0); @@ -612,7 +607,7 @@ true, false, confirmationWindowSize, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, connectorPair); List<BridgeConfiguration> bridgeConfigs = new ArrayList<BridgeConfiguration>(); @@ -632,10 +627,10 @@ server1.start(); server0.start(); - ClientSessionFactory csf0 = new ClientSessionFactoryImpl(server0tc); + ClientSessionFactory csf0 = HornetQClient.createClientSessionFactory(server0tc); ClientSession session0 = csf0.createSession(false, true, true); - ClientSessionFactory csf1 = new ClientSessionFactoryImpl(server1tc); + ClientSessionFactory csf1 = HornetQClient.createClientSessionFactory(server1tc); ClientSession session1 = csf1.createSession(false, true, true); ClientProducer prod0 = session0.createProducer(testAddress); Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeStartTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeStartTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeStartTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -22,12 +22,7 @@ import org.hornetq.api.Pair; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.*; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.impl.invm.TransportConstants; @@ -111,7 +106,7 @@ true, true, 1024, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, connectorPair); List<BridgeConfiguration> bridgeConfigs = new ArrayList<BridgeConfiguration>(); @@ -131,9 +126,9 @@ server1.start(); server0.start(); - ClientSessionFactory sf0 = new ClientSessionFactoryImpl(server0tc); + ClientSessionFactory sf0 = HornetQClient.createClientSessionFactory(server0tc); - ClientSessionFactory sf1 = new ClientSessionFactoryImpl(server1tc); + ClientSessionFactory sf1 = HornetQClient.createClientSessionFactory(server1tc); ClientSession session0 = sf0.createSession(false, true, true); @@ -261,7 +256,7 @@ true, true, 1024, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, connectorPair); List<BridgeConfiguration> bridgeConfigs = new ArrayList<BridgeConfiguration>(); @@ -284,7 +279,7 @@ server0.start(); - ClientSessionFactory sf0 = new ClientSessionFactoryImpl(server0tc); + ClientSessionFactory sf0 = HornetQClient.createClientSessionFactory(server0tc); ClientSession session0 = sf0.createSession(false, true, true); @@ -308,7 +303,7 @@ server1.start(); - ClientSessionFactory sf1 = new ClientSessionFactoryImpl(server1tc); + ClientSessionFactory sf1 = HornetQClient.createClientSessionFactory(server1tc); ClientSession session1 = sf1.createSession(false, true, true); @@ -376,7 +371,7 @@ BridgeStartTest.log.info("started server1"); - sf1 = new ClientSessionFactoryImpl(server1tc); + sf1 = HornetQClient.createClientSessionFactory(server1tc); session1 = sf1.createSession(false, true, true); @@ -458,7 +453,7 @@ false, false, 1024, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, connectorPair); List<BridgeConfiguration> bridgeConfigs = new ArrayList<BridgeConfiguration>(); @@ -479,7 +474,7 @@ server0.start(); - ClientSessionFactory sf0 = new ClientSessionFactoryImpl(server0tc); + ClientSessionFactory sf0 = HornetQClient.createClientSessionFactory(server0tc); ClientSession session0 = sf0.createSession(false, true, true); @@ -505,7 +500,7 @@ server1.start(); - ClientSessionFactory sf1 = new ClientSessionFactoryImpl(server1tc); + ClientSessionFactory sf1 = HornetQClient.createClientSessionFactory(server1tc); ClientSession session1 = sf1.createSession(false, true, true); @@ -593,7 +588,7 @@ false, true, 1024, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, connectorPair); List<BridgeConfiguration> bridgeConfigs = new ArrayList<BridgeConfiguration>(); @@ -614,7 +609,7 @@ server0.start(); - ClientSessionFactory sf0 = new ClientSessionFactoryImpl(server0tc); + ClientSessionFactory sf0 = HornetQClient.createClientSessionFactory(server0tc); ClientSession session0 = sf0.createSession(false, true, true); @@ -633,7 +628,7 @@ producer0.send(message); } - ClientSessionFactory sf1 = new ClientSessionFactoryImpl(server1tc); + ClientSessionFactory sf1 = HornetQClient.createClientSessionFactory(server1tc); ClientSession session1 = sf1.createSession(false, true, true); Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -22,12 +22,7 @@ import org.hornetq.api.Pair; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.*; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.impl.invm.TransportConstants; @@ -134,7 +129,7 @@ // Choose confirmation size to make sure acks // are sent numMessages * messageSize / 2, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, connectorPair); List<BridgeConfiguration> bridgeConfigs = new ArrayList<BridgeConfiguration>(); @@ -154,9 +149,9 @@ server1.start(); server0.start(); - ClientSessionFactory sf0 = new ClientSessionFactoryImpl(server0tc); + ClientSessionFactory sf0 = HornetQClient.createClientSessionFactory(server0tc); - ClientSessionFactory sf1 = new ClientSessionFactoryImpl(server1tc); + ClientSessionFactory sf1 = HornetQClient.createClientSessionFactory(server1tc); ClientSession session0 = sf0.createSession(false, true, true); @@ -326,7 +321,7 @@ true, false, 1024, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, connectorPair); List<BridgeConfiguration> bridgeConfigs = new ArrayList<BridgeConfiguration>(); @@ -346,9 +341,9 @@ server1.start(); server0.start(); - ClientSessionFactory sf0 = new ClientSessionFactoryImpl(server0tc); + ClientSessionFactory sf0 = HornetQClient.createClientSessionFactory(server0tc); - ClientSessionFactory sf1 = new ClientSessionFactoryImpl(server1tc); + ClientSessionFactory sf1 = HornetQClient.createClientSessionFactory(server1tc); ClientSession session0 = sf0.createSession(false, true, true); @@ -493,7 +488,7 @@ true, false, 1024, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, connectorPair); List<BridgeConfiguration> bridgeConfigs = new ArrayList<BridgeConfiguration>(); @@ -513,9 +508,9 @@ server1.start(); server0.start(); - ClientSessionFactory sf0 = new ClientSessionFactoryImpl(server0tc); + ClientSessionFactory sf0 = HornetQClient.createClientSessionFactory(server0tc); - ClientSessionFactory sf1 = new ClientSessionFactoryImpl(server1tc); + ClientSessionFactory sf1 = HornetQClient.createClientSessionFactory(server1tc); ClientSession session0 = sf0.createSession(false, true, true); @@ -620,7 +615,7 @@ true, false, 1024, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, connectorPair); List<BridgeConfiguration> bridgeConfigs = new ArrayList<BridgeConfiguration>(); @@ -640,9 +635,9 @@ server1.start(); server0.start(); - ClientSessionFactory sf0 = new ClientSessionFactoryImpl(server0tc); + ClientSessionFactory sf0 = HornetQClient.createClientSessionFactory(server0tc); - ClientSessionFactory sf1 = new ClientSessionFactoryImpl(server1tc); + ClientSessionFactory sf1 = HornetQClient.createClientSessionFactory(server1tc); ClientSession session0 = sf0.createSession(false, true, true); Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -22,12 +22,7 @@ import org.hornetq.api.Pair; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.*; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.server.HornetQServer; @@ -117,7 +112,7 @@ true, true, 1024, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, "dg1"); List<BridgeConfiguration> bridgeConfigs = new ArrayList<BridgeConfiguration>(); @@ -137,9 +132,9 @@ server1.start(); server0.start(); - ClientSessionFactory sf0 = new ClientSessionFactoryImpl(server0tc); + ClientSessionFactory sf0 = HornetQClient.createClientSessionFactory(server0tc); - ClientSessionFactory sf1 = new ClientSessionFactoryImpl(server1tc); + ClientSessionFactory sf1 = HornetQClient.createClientSessionFactory(server1tc); ClientSession session0 = sf0.createSession(false, true, true); Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -26,12 +26,7 @@ import org.hornetq.api.Pair; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.*; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.message.Message; import org.hornetq.core.config.Configuration; @@ -1102,7 +1097,7 @@ serverTotc = new TransportConfiguration(ServiceTestBase.INVM_CONNECTOR_FACTORY, params); } - ClientSessionFactory sf = new ClientSessionFactoryImpl(serverTotc); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(serverTotc); sf.setBlockOnNonDurableSend(true); sf.setBlockOnDurableSend(true); @@ -1146,7 +1141,7 @@ } } - ClientSessionFactory sf = new ClientSessionFactoryImpl(serverTotc, serverBackuptc); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(serverTotc, serverBackuptc); sf.setFailoverOnServerShutdown(false); sf.setRetryInterval(100); Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -27,13 +27,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; -import org.hornetq.api.core.client.SessionFailureListener; +import org.hornetq.api.core.client.*; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; import org.hornetq.api.core.interceptor.Interceptor; @@ -1377,7 +1371,7 @@ session.close(); - sf = new ClientSessionFactoryImpl(getConnectorTransportConfiguration(false)); + sf = (ClientSessionFactoryInternal) HornetQClient.createClientSessionFactory(getConnectorTransportConfiguration(false)); session = sendAndConsume(sf, false); Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -20,6 +20,7 @@ import org.hornetq.api.SimpleString; import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.HornetQClient; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.core.client.impl.ClientSessionFactoryInternal; import org.hornetq.core.config.Configuration; @@ -227,8 +228,7 @@ protected ClientSessionFactoryInternal getSessionFactory() { - return new ClientSessionFactoryImpl(getConnectorTransportConfiguration(true), - getConnectorTransportConfiguration(false)); + return (ClientSessionFactoryInternal) HornetQClient.createClientSessionFactory(getConnectorTransportConfiguration(true), getConnectorTransportConfiguration(false)); } // Private ------------------------------------------------------- Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/LargeMessageFailoverTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/LargeMessageFailoverTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/LargeMessageFailoverTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -18,7 +18,7 @@ import org.hornetq.api.core.buffers.HornetQBuffer; import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.HornetQClient; import org.hornetq.tests.util.UnitTestCase; /** @@ -100,7 +100,7 @@ { HornetQBuffer buffer = message.getBodyBuffer(); - for (int j = 0; j < ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE * 3; j++) + for (int j = 0; j < HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE * 3; j++) { Assert.assertEquals(buffer.readByte(), UnitTestCase.getSamplebyte(j)); } @@ -113,7 +113,7 @@ @Override protected void setBody(final int i, final ClientMessage message) throws Exception { - message.setBodyInputStream(UnitTestCase.createFakeLargeStream(ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE * 3)); + message.setBodyInputStream(UnitTestCase.createFakeLargeStream(HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE * 3)); } // Private ------------------------------------------------------- Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/MultiThreadRandomReattachTestBase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/MultiThreadRandomReattachTestBase.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/MultiThreadRandomReattachTestBase.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -23,13 +23,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; -import org.hornetq.api.core.client.MessageHandler; +import org.hornetq.api.core.client.*; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.client.impl.ClientSessionFactoryInternal; @@ -1221,7 +1215,7 @@ @Override protected ClientSessionFactoryInternal createSessionFactory() { - final ClientSessionFactoryInternal sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + final ClientSessionFactoryInternal sf = (ClientSessionFactoryInternal) HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); sf.setReconnectAttempts(-1); sf.setConfirmationWindowSize(1024 * 1024); Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/NettyMultiThreadRandomReattachTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/NettyMultiThreadRandomReattachTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/NettyMultiThreadRandomReattachTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -14,6 +14,7 @@ package org.hornetq.tests.integration.cluster.reattach; import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.HornetQClient; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.core.client.impl.ClientSessionFactoryInternal; import org.hornetq.core.config.Configuration; @@ -47,7 +48,7 @@ @Override protected ClientSessionFactoryInternal createSessionFactory() { - final ClientSessionFactoryInternal sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.integration.transports.netty.NettyConnectorFactory")); + final ClientSessionFactoryInternal sf = (ClientSessionFactoryInternal) HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.integration.transports.netty.NettyConnectorFactory")); sf.setReconnectAttempts(-1); sf.setConfirmationWindowSize(1024 * 1024); return sf; Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/RandomReattachTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/RandomReattachTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/RandomReattachTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -23,13 +23,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; -import org.hornetq.api.core.client.MessageHandler; +import org.hornetq.api.core.client.*; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.client.impl.ClientSessionInternal; @@ -234,7 +228,7 @@ RandomReattachTest.log.info("####" + getName() + " iteration #" + its); start(); - ClientSessionFactoryImpl sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactoryImpl sf = (ClientSessionFactoryImpl) HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); sf.setReconnectAttempts(-1); sf.setConfirmationWindowSize(1024 * 1024); Modified: trunk/tests/src/org/hornetq/tests/integration/divert/DivertTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/divert/DivertTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/divert/DivertTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -19,12 +19,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.*; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.core.config.Configuration; import org.hornetq.core.logging.Logger; @@ -76,7 +71,7 @@ messagingService.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(false, true, true); @@ -170,7 +165,7 @@ messagingService.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(false, true, true); @@ -302,7 +297,7 @@ messagingService.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(false, true, true); @@ -377,7 +372,7 @@ messagingService.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(false, true, true); @@ -494,7 +489,7 @@ messagingService.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(false, true, true); @@ -646,7 +641,7 @@ messagingService.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(false, true, true); @@ -787,7 +782,7 @@ messagingService.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(false, true, true); @@ -920,7 +915,7 @@ messagingService.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(false, true, true); @@ -1104,7 +1099,7 @@ messagingService.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(false, true, true); @@ -1266,7 +1261,7 @@ // Only the first and third should be deployed - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(false, true, true); Modified: trunk/tests/src/org/hornetq/tests/integration/divert/PersistentDivertTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/divert/PersistentDivertTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/divert/PersistentDivertTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -19,12 +19,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.*; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.core.config.Configuration; import org.hornetq.core.logging.Logger; @@ -47,7 +42,7 @@ { private static final Logger log = Logger.getLogger(DivertTest.class); - final int minLargeMessageSize = ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE * 2; + final int minLargeMessageSize = HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE * 2; public void testPersistentDivert() throws Exception { @@ -109,7 +104,7 @@ messagingService.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); sf.setBlockOnAcknowledge(true); sf.setBlockOnNonDurableSend(true); @@ -312,7 +307,7 @@ messagingService.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); sf.setBlockOnAcknowledge(true); sf.setBlockOnNonDurableSend(true); @@ -364,7 +359,7 @@ messagingService.start(); - sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); sf.setBlockOnDurableSend(true); @@ -460,7 +455,7 @@ messagingService.start(); - sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); sf.setBlockOnDurableSend(true); Modified: trunk/tests/src/org/hornetq/tests/integration/http/CoreClientOverHttpTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/http/CoreClientOverHttpTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/http/CoreClientOverHttpTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -17,12 +17,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.*; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; @@ -53,7 +48,7 @@ server.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(UnitTestCase.NETTY_CONNECTOR_FACTORY, + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(UnitTestCase.NETTY_CONNECTOR_FACTORY, params)); ClientSession session = sf.createSession(false, true, true); @@ -109,7 +104,7 @@ server.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(UnitTestCase.NETTY_CONNECTOR_FACTORY, + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(UnitTestCase.NETTY_CONNECTOR_FACTORY, params)); sf.setConnectionTTL(500); Modified: trunk/tests/src/org/hornetq/tests/integration/jms/FloodServerTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/FloodServerTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/jms/FloodServerTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -25,9 +25,9 @@ import javax.jms.Session; import org.hornetq.api.Pair; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.HornetQClient; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.jms.HornetQTopic; +import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; @@ -135,26 +135,26 @@ connectorConfigs, null, 1000, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL, + HornetQClient.DEFAULT_CONNECTION_TTL, callTimeout, - ClientSessionFactoryImpl.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT, - ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE, + HornetQClient.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, + HornetQClient.DEFAULT_CONSUMER_WINDOW_SIZE, + HornetQClient.DEFAULT_CONSUMER_MAX_RATE, + HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_MAX_RATE, false, false, false, - ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP, + HornetQClient.DEFAULT_AUTO_GROUP, false, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_USE_GLOBAL_POOLS, - ClientSessionFactoryImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_USE_GLOBAL_POOLS, + HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_THREAD_POOL_MAX_SIZE, retryInterval, retryIntervalMultiplier, 1000, @@ -230,7 +230,7 @@ session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); - producer = session.createProducer(new HornetQTopic("my-topic")); + producer = session.createProducer(HornetQJMSClient.createHornetQTopic("my-topic")); producer.setDeliveryMode(DeliveryMode.NON_PERSISTENT); @@ -285,7 +285,7 @@ session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); - consumer = session.createConsumer(new HornetQTopic("my-topic")); + consumer = session.createConsumer(HornetQJMSClient.createHornetQTopic("my-topic")); this.numMessages = numMessages; } Modified: trunk/tests/src/org/hornetq/tests/integration/jms/HornetQConnectionFactoryTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/HornetQConnectionFactoryTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/jms/HornetQConnectionFactoryTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -25,9 +25,10 @@ import org.hornetq.api.Pair; import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.HornetQClient; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.jms.HornetQConnectionFactory; +import org.hornetq.jms.HornetQConnectionFactory; +import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; @@ -64,37 +65,37 @@ public void testDefaultConstructor() throws Exception { - HornetQConnectionFactory cf = new HornetQConnectionFactory(); + HornetQConnectionFactory cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(); assertFactoryParams(cf, null, null, 0, - ClientSessionFactoryImpl.DEFAULT_DISCOVERY_REFRESH_TIMEOUT, + HornetQClient.DEFAULT_DISCOVERY_REFRESH_TIMEOUT, null, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL, - ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP, - ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_USE_GLOBAL_POOLS, - ClientSessionFactoryImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL, - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER, - ClientSessionFactoryImpl.DEFAULT_RECONNECT_ATTEMPTS, - ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CONNECTION_TTL, + HornetQClient.DEFAULT_CALL_TIMEOUT, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, + HornetQClient.DEFAULT_CONSUMER_WINDOW_SIZE, + HornetQClient.DEFAULT_CONSUMER_MAX_RATE, + HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_MAX_RATE, + HornetQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE, + HornetQClient.DEFAULT_BLOCK_ON_DURABLE_SEND, + HornetQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, + HornetQClient.DEFAULT_AUTO_GROUP, + HornetQClient.DEFAULT_PRE_ACKNOWLEDGE, + HornetQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT, + HornetQClient.DEFAULT_USE_GLOBAL_POOLS, + HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_RETRY_INTERVAL, + HornetQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER, + HornetQClient.DEFAULT_RECONNECT_ATTEMPTS, + HornetQClient.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); Connection conn = null; try @@ -122,7 +123,7 @@ public void testDefaultConstructorAndSetConnectorPairs() throws Exception { - HornetQConnectionFactory cf = new HornetQConnectionFactory(); + HornetQConnectionFactory cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(); final List<Pair<TransportConfiguration, TransportConfiguration>> staticConnectors = new ArrayList<Pair<TransportConfiguration, TransportConfiguration>>(); Pair<TransportConfiguration, TransportConfiguration> pair0 = new Pair<TransportConfiguration, TransportConfiguration>(liveTC, backupTC); @@ -133,32 +134,32 @@ staticConnectors, null, 0, - ClientSessionFactoryImpl.DEFAULT_DISCOVERY_REFRESH_TIMEOUT, + HornetQClient.DEFAULT_DISCOVERY_REFRESH_TIMEOUT, null, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL, - ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP, - ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_USE_GLOBAL_POOLS, - ClientSessionFactoryImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL, - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER, - ClientSessionFactoryImpl.DEFAULT_RECONNECT_ATTEMPTS, - ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CONNECTION_TTL, + HornetQClient.DEFAULT_CALL_TIMEOUT, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, + HornetQClient.DEFAULT_CONSUMER_WINDOW_SIZE, + HornetQClient.DEFAULT_CONSUMER_MAX_RATE, + HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_MAX_RATE, + HornetQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE, + HornetQClient.DEFAULT_BLOCK_ON_DURABLE_SEND, + HornetQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, + HornetQClient.DEFAULT_AUTO_GROUP, + HornetQClient.DEFAULT_PRE_ACKNOWLEDGE, + HornetQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT, + HornetQClient.DEFAULT_USE_GLOBAL_POOLS, + HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_RETRY_INTERVAL, + HornetQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER, + HornetQClient.DEFAULT_RECONNECT_ATTEMPTS, + HornetQClient.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); Connection conn = cf.createConnection(); @@ -171,37 +172,37 @@ public void testDiscoveryConstructor() throws Exception { - HornetQConnectionFactory cf = new HornetQConnectionFactory(groupAddress, groupPort); + HornetQConnectionFactory cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(groupAddress, groupPort); assertFactoryParams(cf, null, groupAddress, groupPort, - ClientSessionFactoryImpl.DEFAULT_DISCOVERY_REFRESH_TIMEOUT, + HornetQClient.DEFAULT_DISCOVERY_REFRESH_TIMEOUT, null, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL, - ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP, - ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_USE_GLOBAL_POOLS, - ClientSessionFactoryImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL, - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER, - ClientSessionFactoryImpl.DEFAULT_RECONNECT_ATTEMPTS, - ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CONNECTION_TTL, + HornetQClient.DEFAULT_CALL_TIMEOUT, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, + HornetQClient.DEFAULT_CONSUMER_WINDOW_SIZE, + HornetQClient.DEFAULT_CONSUMER_MAX_RATE, + HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_MAX_RATE, + HornetQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE, + HornetQClient.DEFAULT_BLOCK_ON_DURABLE_SEND, + HornetQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, + HornetQClient.DEFAULT_AUTO_GROUP, + HornetQClient.DEFAULT_PRE_ACKNOWLEDGE, + HornetQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT, + HornetQClient.DEFAULT_USE_GLOBAL_POOLS, + HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_RETRY_INTERVAL, + HornetQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER, + HornetQClient.DEFAULT_RECONNECT_ATTEMPTS, + HornetQClient.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); Connection conn = cf.createConnection(); Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); @@ -218,37 +219,37 @@ backupTC); staticConnectors.add(pair0); - HornetQConnectionFactory cf = new HornetQConnectionFactory(staticConnectors); + HornetQConnectionFactory cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(staticConnectors); assertFactoryParams(cf, staticConnectors, null, 0, - ClientSessionFactoryImpl.DEFAULT_DISCOVERY_REFRESH_TIMEOUT, + HornetQClient.DEFAULT_DISCOVERY_REFRESH_TIMEOUT, null, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL, - ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP, - ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_USE_GLOBAL_POOLS, - ClientSessionFactoryImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL, - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER, - ClientSessionFactoryImpl.DEFAULT_RECONNECT_ATTEMPTS, - ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CONNECTION_TTL, + HornetQClient.DEFAULT_CALL_TIMEOUT, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, + HornetQClient.DEFAULT_CONSUMER_WINDOW_SIZE, + HornetQClient.DEFAULT_CONSUMER_MAX_RATE, + HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_MAX_RATE, + HornetQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE, + HornetQClient.DEFAULT_BLOCK_ON_DURABLE_SEND, + HornetQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, + HornetQClient.DEFAULT_AUTO_GROUP, + HornetQClient.DEFAULT_PRE_ACKNOWLEDGE, + HornetQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT, + HornetQClient.DEFAULT_USE_GLOBAL_POOLS, + HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_RETRY_INTERVAL, + HornetQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER, + HornetQClient.DEFAULT_RECONNECT_ATTEMPTS, + HornetQClient.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); Connection conn = cf.createConnection(); Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); @@ -266,37 +267,37 @@ backupTC); staticConnectors.add(pair0); - HornetQConnectionFactory cf = new HornetQConnectionFactory(liveTC, backupTC); + HornetQConnectionFactory cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(liveTC, backupTC); assertFactoryParams(cf, staticConnectors, null, 0, - ClientSessionFactoryImpl.DEFAULT_DISCOVERY_REFRESH_TIMEOUT, + HornetQClient.DEFAULT_DISCOVERY_REFRESH_TIMEOUT, null, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL, - ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP, - ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_USE_GLOBAL_POOLS, - ClientSessionFactoryImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL, - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER, - ClientSessionFactoryImpl.DEFAULT_RECONNECT_ATTEMPTS, - ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CONNECTION_TTL, + HornetQClient.DEFAULT_CALL_TIMEOUT, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, + HornetQClient.DEFAULT_CONSUMER_WINDOW_SIZE, + HornetQClient.DEFAULT_CONSUMER_MAX_RATE, + HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_MAX_RATE, + HornetQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE, + HornetQClient.DEFAULT_BLOCK_ON_DURABLE_SEND, + HornetQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, + HornetQClient.DEFAULT_AUTO_GROUP, + HornetQClient.DEFAULT_PRE_ACKNOWLEDGE, + HornetQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT, + HornetQClient.DEFAULT_USE_GLOBAL_POOLS, + HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_RETRY_INTERVAL, + HornetQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER, + HornetQClient.DEFAULT_RECONNECT_ATTEMPTS, + HornetQClient.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); Connection conn = cf.createConnection(); Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); @@ -314,37 +315,37 @@ null); staticConnectors.add(pair0); - HornetQConnectionFactory cf = new HornetQConnectionFactory(liveTC); + HornetQConnectionFactory cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(liveTC); assertFactoryParams(cf, staticConnectors, null, 0, - ClientSessionFactoryImpl.DEFAULT_DISCOVERY_REFRESH_TIMEOUT, + HornetQClient.DEFAULT_DISCOVERY_REFRESH_TIMEOUT, null, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL, - ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP, - ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_USE_GLOBAL_POOLS, - ClientSessionFactoryImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL, - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER, - ClientSessionFactoryImpl.DEFAULT_RECONNECT_ATTEMPTS, - ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CONNECTION_TTL, + HornetQClient.DEFAULT_CALL_TIMEOUT, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, + HornetQClient.DEFAULT_CONSUMER_WINDOW_SIZE, + HornetQClient.DEFAULT_CONSUMER_MAX_RATE, + HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_MAX_RATE, + HornetQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE, + HornetQClient.DEFAULT_BLOCK_ON_DURABLE_SEND, + HornetQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, + HornetQClient.DEFAULT_AUTO_GROUP, + HornetQClient.DEFAULT_PRE_ACKNOWLEDGE, + HornetQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT, + HornetQClient.DEFAULT_USE_GLOBAL_POOLS, + HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_RETRY_INTERVAL, + HornetQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER, + HornetQClient.DEFAULT_RECONNECT_ATTEMPTS, + HornetQClient.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); Connection conn = cf.createConnection(); Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); @@ -356,13 +357,13 @@ public void testGettersAndSetters() { - ClientSessionFactory csf = new ClientSessionFactoryImpl(); + ClientSessionFactory csf = HornetQClient.createClientSessionFactory(); List<Pair<TransportConfiguration, TransportConfiguration>> staticConnectors = new ArrayList<Pair<TransportConfiguration, TransportConfiguration>>(); Pair<TransportConfiguration, TransportConfiguration> pair0 = new Pair<TransportConfiguration, TransportConfiguration>(liveTC, backupTC); staticConnectors.add(pair0); - HornetQConnectionFactory cf = new HornetQConnectionFactory(csf); + HornetQConnectionFactory cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(csf); String discoveryAddress = RandomUtil.randomString(); int discoveryPort = RandomUtil.randomPositiveInt(); Modified: trunk/tests/src/org/hornetq/tests/integration/jms/bridge/BridgeTestBase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/bridge/BridgeTestBase.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/jms/bridge/BridgeTestBase.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -36,7 +36,8 @@ import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.management.ResourceNames; -import org.hornetq.api.jms.HornetQConnectionFactory; +import org.hornetq.jms.HornetQConnectionFactory; +import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.api.jms.management.JMSQueueControl; import org.hornetq.api.jms.management.TopicControl; import org.hornetq.core.config.Configuration; @@ -202,7 +203,7 @@ { public ConnectionFactory createConnectionFactory() throws Exception { - HornetQConnectionFactory cf = new HornetQConnectionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); + HornetQConnectionFactory cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); // Note! We disable automatic reconnection on the session factory. The bridge needs to do the reconnection cf.setReconnectAttempts(0); @@ -222,7 +223,7 @@ public ConnectionFactory createConnectionFactory() throws Exception { - HornetQConnectionFactory cf = new HornetQConnectionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName(), + HornetQConnectionFactory cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName(), params1)); // Note! We disable automatic reconnection on the session factory. The bridge needs to do the reconnection Modified: trunk/tests/src/org/hornetq/tests/integration/jms/client/PreACKJMSTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/client/PreACKJMSTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/jms/client/PreACKJMSTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -25,7 +25,7 @@ import junit.framework.Assert; import org.hornetq.api.Pair; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.HornetQClient; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.tests.util.JMSTestBase; @@ -201,30 +201,30 @@ jmsServer.createConnectionFactory("ManualReconnectionToSingleServerTest", connectorConfigs, null, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CONNECTION_TTL, callTimeout, - ClientSessionFactoryImpl.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT, - ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP, + HornetQClient.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, + HornetQClient.DEFAULT_CONSUMER_WINDOW_SIZE, + HornetQClient.DEFAULT_CONSUMER_MAX_RATE, + HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_MAX_RATE, + HornetQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE, + HornetQClient.DEFAULT_BLOCK_ON_DURABLE_SEND, + HornetQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, + HornetQClient.DEFAULT_AUTO_GROUP, true, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_USE_GLOBAL_POOLS, - ClientSessionFactoryImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_USE_GLOBAL_POOLS, + HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_THREAD_POOL_MAX_SIZE, retryInterval, retryIntervalMultiplier, - ClientSessionFactoryImpl.DEFAULT_MAX_RETRY_INTERVAL, + HornetQClient.DEFAULT_MAX_RETRY_INTERVAL, reconnectAttempts, failoverOnServerShutdown, null, Modified: trunk/tests/src/org/hornetq/tests/integration/jms/client/ReSendLargeMessageTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/client/ReSendLargeMessageTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/jms/client/ReSendLargeMessageTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -31,7 +31,7 @@ import junit.framework.Assert; import org.hornetq.api.Pair; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.HornetQClient; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.jms.HornetQMessageConstants; import org.hornetq.tests.util.JMSTestBase; @@ -73,7 +73,7 @@ { BytesMessage bm = sess.createBytesMessage(); bm.setObjectProperty(HornetQMessageConstants.JMS_HORNETQ_INPUT_STREAM, - UnitTestCase.createFakeLargeStream(2 * ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE)); + UnitTestCase.createFakeLargeStream(2 * HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE)); msgs.add(bm); MapMessage mm = sess.createMapMessage(); @@ -247,30 +247,30 @@ jmsServer.createConnectionFactory("ManualReconnectionToSingleServerTest", connectorConfigs, null, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CONNECTION_TTL, callTimeout, true, - ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP, - ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_USE_GLOBAL_POOLS, - ClientSessionFactoryImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, + HornetQClient.DEFAULT_CONSUMER_WINDOW_SIZE, + HornetQClient.DEFAULT_CONSUMER_MAX_RATE, + HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_MAX_RATE, + HornetQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE, + HornetQClient.DEFAULT_BLOCK_ON_DURABLE_SEND, + HornetQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, + HornetQClient.DEFAULT_AUTO_GROUP, + HornetQClient.DEFAULT_PRE_ACKNOWLEDGE, + HornetQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_USE_GLOBAL_POOLS, + HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_THREAD_POOL_MAX_SIZE, retryInterval, retryIntervalMultiplier, - ClientSessionFactoryImpl.DEFAULT_MAX_RETRY_INTERVAL, + HornetQClient.DEFAULT_MAX_RETRY_INTERVAL, reconnectAttempts, failoverOnServerShutdown, null, Modified: trunk/tests/src/org/hornetq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -27,7 +27,7 @@ import junit.framework.Assert; import org.hornetq.api.Pair; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.HornetQClient; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.client.impl.ClientSessionInternal; @@ -71,30 +71,30 @@ jmsServer.createConnectionFactory("cffoo", connectorConfigs, null, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL, - ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT, - ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP, - ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_USE_GLOBAL_POOLS, - ClientSessionFactoryImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL, - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER, - ClientSessionFactoryImpl.DEFAULT_MAX_RETRY_INTERVAL, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CONNECTION_TTL, + HornetQClient.DEFAULT_CALL_TIMEOUT, + HornetQClient.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, + HornetQClient.DEFAULT_CONSUMER_WINDOW_SIZE, + HornetQClient.DEFAULT_CONSUMER_MAX_RATE, + HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_MAX_RATE, + HornetQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE, + HornetQClient.DEFAULT_BLOCK_ON_DURABLE_SEND, + HornetQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, + HornetQClient.DEFAULT_AUTO_GROUP, + HornetQClient.DEFAULT_PRE_ACKNOWLEDGE, + HornetQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_USE_GLOBAL_POOLS, + HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_RETRY_INTERVAL, + HornetQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER, + HornetQClient.DEFAULT_MAX_RETRY_INTERVAL, 0, false, null, Modified: trunk/tests/src/org/hornetq/tests/integration/jms/client/TextMessageTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/client/TextMessageTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/jms/client/TextMessageTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -25,7 +25,7 @@ import junit.framework.Assert; import org.hornetq.api.Pair; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.HornetQClient; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.tests.util.JMSTestBase; import org.hornetq.tests.util.RandomUtil; @@ -230,30 +230,30 @@ jmsServer.createConnectionFactory("ManualReconnectionToSingleServerTest", connectorConfigs, null, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CONNECTION_TTL, callTimeout, - ClientSessionFactoryImpl.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT, - ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP, - ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_USE_GLOBAL_POOLS, - ClientSessionFactoryImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, + HornetQClient.DEFAULT_CONSUMER_WINDOW_SIZE, + HornetQClient.DEFAULT_CONSUMER_MAX_RATE, + HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_MAX_RATE, + HornetQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE, + HornetQClient.DEFAULT_BLOCK_ON_DURABLE_SEND, + HornetQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, + HornetQClient.DEFAULT_AUTO_GROUP, + HornetQClient.DEFAULT_PRE_ACKNOWLEDGE, + HornetQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_USE_GLOBAL_POOLS, + HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_THREAD_POOL_MAX_SIZE, retryInterval, retryIntervalMultiplier, - ClientSessionFactoryImpl.DEFAULT_MAX_RETRY_INTERVAL, + HornetQClient.DEFAULT_MAX_RETRY_INTERVAL, reconnectAttempts, failoverOnServerShutdown, null, Modified: trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSFailoverTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSFailoverTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSFailoverTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -33,8 +33,9 @@ import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.jms.HornetQConnectionFactory; -import org.hornetq.api.jms.HornetQQueue; +import org.hornetq.jms.HornetQConnectionFactory; +import org.hornetq.api.jms.HornetQJMSClient; +import org.hornetq.jms.HornetQQueue; import org.hornetq.core.client.impl.ClientSessionInternal; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; @@ -83,7 +84,7 @@ public void testAutomaticFailover() throws Exception { - HornetQConnectionFactory jbcf = new HornetQConnectionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory"), + HornetQConnectionFactory jbcf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory"), new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory", backupParams)); @@ -169,12 +170,12 @@ public void testManualFailover() throws Exception { - HornetQConnectionFactory jbcfLive = new HornetQConnectionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + HornetQConnectionFactory jbcfLive = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); jbcfLive.setBlockOnNonDurableSend(true); jbcfLive.setBlockOnDurableSend(true); - HornetQConnectionFactory jbcfBackup = new HornetQConnectionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory", + HornetQConnectionFactory jbcfBackup = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory", backupParams)); jbcfBackup.setBlockOnNonDurableSend(true); jbcfBackup.setBlockOnDurableSend(true); Modified: trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSReconnectTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSReconnectTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSReconnectTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -32,9 +32,10 @@ import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.jms.HornetQConnectionFactory; -import org.hornetq.api.jms.HornetQQueue; -import org.hornetq.api.jms.HornetQTopic; +import org.hornetq.jms.HornetQConnectionFactory; +import org.hornetq.api.jms.HornetQJMSClient; +import org.hornetq.jms.HornetQQueue; +import org.hornetq.jms.HornetQTopic; import org.hornetq.core.client.impl.ClientSessionInternal; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; @@ -85,7 +86,7 @@ private void testReconnectOrReattachSameNode(boolean reattach) throws Exception { - HornetQConnectionFactory jbcf = new HornetQConnectionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + HornetQConnectionFactory jbcf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); jbcf.setBlockOnDurableSend(true); jbcf.setBlockOnNonDurableSend(true); @@ -189,7 +190,7 @@ //Test that non durable JMS sub gets recreated in auto reconnect private void testReconnectSameNodeServerRestartedWithNonDurableSubOrTempQueue(final boolean durableSub) throws Exception { - HornetQConnectionFactory jbcf = new HornetQConnectionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + HornetQConnectionFactory jbcf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); jbcf.setReconnectAttempts(-1); @@ -209,7 +210,7 @@ { coreSession.createQueue(HornetQTopic.JMS_TOPIC_ADDRESS_PREFIX + "mytopic", "blahblah", null, false); - dest = new HornetQTopic("mytopic"); + dest = HornetQJMSClient.createHornetQTopic("mytopic"); } else { @@ -266,7 +267,7 @@ //If the server is shutdown after a non durable sub is created, then close on the connection should proceed normally public void testNoReconnectCloseAfterFailToReconnectWithTopicConsumer() throws Exception { - HornetQConnectionFactory jbcf = new HornetQConnectionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + HornetQConnectionFactory jbcf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); jbcf.setReconnectAttempts(0); @@ -278,7 +279,7 @@ coreSession.createQueue(HornetQTopic.JMS_TOPIC_ADDRESS_PREFIX + "mytopic", "blahblah", null, false); - Topic topic = new HornetQTopic("mytopic"); + Topic topic = HornetQJMSClient.createHornetQTopic("mytopic"); //Create a non durable subscriber MessageConsumer consumer = sess.createConsumer(topic); @@ -297,7 +298,7 @@ //If server is shutdown, and then connection is closed, after a temp queue has been created, the close should complete normally public void testNoReconnectCloseAfterFailToReconnectWithTempQueue() throws Exception { - HornetQConnectionFactory jbcf = new HornetQConnectionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + HornetQConnectionFactory jbcf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); jbcf.setReconnectAttempts(0); Modified: trunk/tests/src/org/hornetq/tests/integration/jms/connection/CloseConnectionOnGCTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/connection/CloseConnectionOnGCTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/jms/connection/CloseConnectionOnGCTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -23,7 +23,8 @@ import junit.framework.Assert; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.jms.HornetQConnectionFactory; +import org.hornetq.jms.HornetQConnectionFactory; +import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.CloseListener; import org.hornetq.core.remoting.RemotingConnection; @@ -49,7 +50,7 @@ { super.setUp(); - cf = new HornetQConnectionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); cf.setBlockOnDurableSend(true); cf.setPreAcknowledge(true); } Modified: trunk/tests/src/org/hornetq/tests/integration/jms/connection/CloseDestroyedConnectionTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/connection/CloseDestroyedConnectionTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/jms/connection/CloseDestroyedConnectionTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -23,8 +23,8 @@ import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.jms.HornetQConnectionFactory; -import org.hornetq.api.jms.HornetQQueue; +import org.hornetq.jms.HornetQConnectionFactory; +import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.core.client.impl.ClientSessionInternal; import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.RemotingConnection; @@ -50,7 +50,7 @@ { super.setUp(); - cf = new HornetQConnectionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); cf.setBlockOnDurableSend(true); cf.setPreAcknowledge(true); } @@ -84,7 +84,7 @@ String queueName = "myqueue"; - Queue queue = new HornetQQueue(queueName); + Queue queue = HornetQJMSClient.createHornetQQueue(queueName); super.createQueue(queueName); Modified: trunk/tests/src/org/hornetq/tests/integration/jms/connection/ExceptionListenerTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/connection/ExceptionListenerTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/jms/connection/ExceptionListenerTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -24,7 +24,8 @@ import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.jms.HornetQConnectionFactory; +import org.hornetq.jms.HornetQConnectionFactory; +import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.core.client.impl.ClientSessionInternal; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; @@ -69,7 +70,7 @@ jmsServer.setContext(new NullInitialContext()); jmsServer.start(); jmsServer.createQueue(ExceptionListenerTest.Q_NAME, ExceptionListenerTest.Q_NAME, null, true); - cf = new HornetQConnectionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); cf.setBlockOnDurableSend(true); cf.setPreAcknowledge(true); } Modified: trunk/tests/src/org/hornetq/tests/integration/jms/consumer/ConsumerTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/consumer/ConsumerTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/jms/consumer/ConsumerTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -25,8 +25,9 @@ import org.hornetq.api.SimpleString; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.jms.HornetQConnectionFactory; -import org.hornetq.api.jms.HornetQQueue; +import org.hornetq.jms.HornetQConnectionFactory; +import org.hornetq.api.jms.HornetQJMSClient; +import org.hornetq.jms.HornetQQueue; import org.hornetq.core.logging.Logger; import org.hornetq.core.server.Queue; import org.hornetq.jms.client.HornetQSession; @@ -49,7 +50,7 @@ super.setUp(); jmsServer.createQueue(ConsumerTest.Q_NAME, ConsumerTest.Q_NAME, null, true); - cf = new HornetQConnectionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + cf = HornetQJMSClient.createConnectionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); } @Override @@ -64,7 +65,7 @@ { Connection conn = cf.createConnection(); Session session = conn.createSession(false, HornetQSession.PRE_ACKNOWLEDGE); - jBossQueue = new HornetQQueue(ConsumerTest.Q_NAME); + jBossQueue = (HornetQQueue) HornetQJMSClient.createHornetQQueue(ConsumerTest.Q_NAME); MessageProducer producer = session.createProducer(jBossQueue); MessageConsumer consumer = session.createConsumer(jBossQueue); int noOfMessages = 100; @@ -92,7 +93,7 @@ Connection conn = cf.createConnection(); Session session = conn.createSession(false, Session.CLIENT_ACKNOWLEDGE); - jBossQueue = new HornetQQueue(ConsumerTest.Q_NAME); + jBossQueue = (HornetQQueue) HornetQJMSClient.createHornetQQueue(ConsumerTest.Q_NAME); MessageProducer producer = session.createProducer(jBossQueue); MessageConsumer consumer = session.createConsumer(jBossQueue); int noOfMessages = 100; @@ -121,7 +122,7 @@ Connection conn = cf.createConnection(); Session session = conn.createSession(false, HornetQSession.PRE_ACKNOWLEDGE); - jBossQueue = new HornetQQueue(ConsumerTest.Q_NAME); + jBossQueue = (HornetQQueue) HornetQJMSClient.createHornetQQueue(ConsumerTest.Q_NAME); MessageProducer producer = session.createProducer(jBossQueue); MessageConsumer consumer = session.createConsumer(jBossQueue); int noOfMessages = 1000; @@ -151,7 +152,7 @@ ((HornetQConnectionFactory)cf).setPreAcknowledge(true); Connection conn = cf.createConnection(); Session session = conn.createSession(false, Session.CLIENT_ACKNOWLEDGE); - jBossQueue = new HornetQQueue(ConsumerTest.Q_NAME); + jBossQueue = (HornetQQueue) HornetQJMSClient.createHornetQQueue(ConsumerTest.Q_NAME); MessageProducer producer = session.createProducer(jBossQueue); MessageConsumer consumer = session.createConsumer(jBossQueue); int noOfMessages = 1000; @@ -179,7 +180,7 @@ { Connection conn = cf.createConnection(); Session session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); - jBossQueue = new HornetQQueue(ConsumerTest.Q_NAME); + jBossQueue = (HornetQQueue) HornetQJMSClient.createHornetQQueue(ConsumerTest.Q_NAME); MessageConsumer consumer = session.createConsumer(jBossQueue); consumer.setMessageListener(new MessageListener() { @@ -198,7 +199,7 @@ { Connection conn = cf.createConnection(); Session session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); - jBossQueue = new HornetQQueue(ConsumerTest.Q_NAME); + jBossQueue = (HornetQQueue) HornetQJMSClient.createHornetQQueue(ConsumerTest.Q_NAME); MessageConsumer consumer = session.createConsumer(jBossQueue); consumer.setMessageListener(new MessageListener() { Modified: trunk/tests/src/org/hornetq/tests/integration/jms/divert/DivertAndACKClientTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/divert/DivertAndACKClientTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/jms/divert/DivertAndACKClientTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -25,9 +25,9 @@ import junit.framework.Assert; import org.hornetq.api.Pair; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.HornetQClient; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.jms.HornetQQueue; +import org.hornetq.jms.HornetQQueue; import org.hornetq.core.config.Configuration; import org.hornetq.core.server.cluster.DivertConfiguration; import org.hornetq.tests.util.JMSTestBase; @@ -147,30 +147,30 @@ jmsServer.createConnectionFactory("ManualReconnectionToSingleServerTest", connectorConfigs, null, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CONNECTION_TTL, callTimeout, - ClientSessionFactoryImpl.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT, - ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE, + HornetQClient.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, + HornetQClient.DEFAULT_CONSUMER_WINDOW_SIZE, + HornetQClient.DEFAULT_CONSUMER_MAX_RATE, + HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_MAX_RATE, true, // this test needs to block on ACK - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP, - ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_USE_GLOBAL_POOLS, - ClientSessionFactoryImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_BLOCK_ON_DURABLE_SEND, + HornetQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, + HornetQClient.DEFAULT_AUTO_GROUP, + HornetQClient.DEFAULT_PRE_ACKNOWLEDGE, + HornetQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_USE_GLOBAL_POOLS, + HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_THREAD_POOL_MAX_SIZE, retryInterval, retryIntervalMultiplier, - ClientSessionFactoryImpl.DEFAULT_MAX_RETRY_INTERVAL, + HornetQClient.DEFAULT_MAX_RETRY_INTERVAL, reconnectAttempts, failoverOnServerShutdown, null, Modified: trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerDeployerTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerDeployerTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerDeployerTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -22,7 +22,7 @@ import junit.framework.Assert; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.jms.HornetQConnectionFactory; +import org.hornetq.jms.HornetQConnectionFactory; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.deployers.DeploymentManager; Modified: trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerStartStopTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerStartStopTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerStartStopTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -23,7 +23,8 @@ import junit.framework.Assert; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.jms.HornetQConnectionFactory; +import org.hornetq.jms.HornetQConnectionFactory; +import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.core.config.impl.FileConfiguration; import org.hornetq.core.logging.Logger; import org.hornetq.core.server.HornetQServer; @@ -69,7 +70,7 @@ start(); - HornetQConnectionFactory jbcf = new HornetQConnectionFactory(new TransportConfiguration(NettyConnectorFactory.class.getCanonicalName())); + HornetQConnectionFactory jbcf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(new TransportConfiguration(NettyConnectorFactory.class.getCanonicalName())); jbcf.setBlockOnDurableSend(true); jbcf.setBlockOnNonDurableSend(true); @@ -96,7 +97,7 @@ start(); - HornetQConnectionFactory jbcf = new HornetQConnectionFactory(new TransportConfiguration(NettyConnectorFactory.class.getCanonicalName())); + HornetQConnectionFactory jbcf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(new TransportConfiguration(NettyConnectorFactory.class.getCanonicalName())); jbcf.setBlockOnDurableSend(true); jbcf.setBlockOnNonDurableSend(true); Modified: trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSQueueControlTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSQueueControlTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSQueueControlTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -29,8 +29,9 @@ import org.hornetq.api.SimpleString; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.jms.HornetQConnectionFactory; -import org.hornetq.api.jms.HornetQQueue; +import org.hornetq.jms.HornetQConnectionFactory; +import org.hornetq.api.jms.HornetQJMSClient; +import org.hornetq.jms.HornetQQueue; import org.hornetq.api.jms.management.JMSQueueControl; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; @@ -415,7 +416,7 @@ { JMSQueueControl queueControl = createManagementControl(); String expiryQueueName = RandomUtil.randomString(); - HornetQQueue expiryQueue = new HornetQQueue(expiryQueueName); + HornetQQueue expiryQueue = (HornetQQueue) HornetQJMSClient.createHornetQQueue(expiryQueueName); serverManager.createQueue(expiryQueueName, expiryQueueName, null, true); queueControl.setExpiryAddress(expiryQueue.getAddress()); @@ -544,7 +545,7 @@ { String deadLetterQueue = RandomUtil.randomString(); serverManager.createQueue(deadLetterQueue, deadLetterQueue, null, true); - HornetQQueue dlq = new HornetQQueue(deadLetterQueue); + HornetQQueue dlq = (HornetQQueue) HornetQJMSClient.createHornetQQueue(deadLetterQueue); Connection conn = createConnection(); Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); @@ -605,7 +606,7 @@ String deadLetterQueue = RandomUtil.randomString(); serverManager.createQueue(deadLetterQueue, deadLetterQueue, null, true); - HornetQQueue dlq = new HornetQQueue(deadLetterQueue); + HornetQQueue dlq = (HornetQQueue) HornetQJMSClient.createHornetQQueue(deadLetterQueue); Connection conn = createConnection(); Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); @@ -647,7 +648,7 @@ String otherQueueName = RandomUtil.randomString(); serverManager.createQueue(otherQueueName, otherQueueName, null, true); - HornetQQueue otherQueue = new HornetQQueue(otherQueueName); + HornetQQueue otherQueue = (HornetQQueue) HornetQJMSClient.createHornetQQueue(otherQueueName); // send on queue JMSUtil.sendMessages(queue, 2); @@ -694,7 +695,7 @@ String otherQueueName = RandomUtil.randomString(); serverManager.createQueue(otherQueueName, otherQueueName, null, true); - HornetQQueue otherQueue = new HornetQQueue(otherQueueName); + HornetQQueue otherQueue = (HornetQQueue) HornetQJMSClient.createHornetQQueue(otherQueueName); Connection connection = JMSUtil.createConnection(InVMConnectorFactory.class.getName()); Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); @@ -729,7 +730,7 @@ String otherQueueName = RandomUtil.randomString(); serverManager.createQueue(otherQueueName, otherQueueName, null, true); - HornetQQueue otherQueue = new HornetQQueue(otherQueueName); + HornetQQueue otherQueue = (HornetQQueue) HornetQJMSClient.createHornetQQueue(otherQueueName); String[] messageIDs = JMSUtil.sendMessages(queue, 1); @@ -833,7 +834,7 @@ String queueName = RandomUtil.randomString(); serverManager.createQueue(queueName, queueName, null, true); - queue = new HornetQQueue(queueName); + queue = (HornetQQueue) HornetQJMSClient.createHornetQQueue(queueName); } @Override @@ -865,7 +866,7 @@ private Connection createConnection() throws JMSException { - HornetQConnectionFactory cf = new HornetQConnectionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); + HornetQConnectionFactory cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); cf.setBlockOnDurableSend(true); Modified: trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -21,8 +21,9 @@ import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.management.ResourceNames; -import org.hornetq.api.jms.HornetQConnectionFactory; -import org.hornetq.api.jms.HornetQQueue; +import org.hornetq.jms.HornetQConnectionFactory; +import org.hornetq.api.jms.HornetQJMSClient; +import org.hornetq.jms.HornetQQueue; import org.hornetq.api.jms.management.JMSQueueControl; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; @@ -56,7 +57,7 @@ { super.setUp(); - HornetQConnectionFactory cf = new HornetQConnectionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); + HornetQConnectionFactory cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); connection = cf.createQueueConnection(); session = connection.createQueueSession(false, Session.AUTO_ACKNOWLEDGE); connection.start(); @@ -77,7 +78,7 @@ @Override protected JMSQueueControl createManagementControl() throws Exception { - HornetQQueue managementQueue = new HornetQQueue(ConfigurationImpl.DEFAULT_MANAGEMENT_ADDRESS.toString(), + HornetQQueue managementQueue = (HornetQQueue) HornetQJMSClient.createHornetQQueue(ConfigurationImpl.DEFAULT_MANAGEMENT_ADDRESS.toString(), ConfigurationImpl.DEFAULT_MANAGEMENT_ADDRESS.toString()); final JMSMessagingProxy proxy = new JMSMessagingProxy(session, managementQueue, Modified: trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -22,7 +22,7 @@ import junit.framework.Assert; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.HornetQClient; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.management.ObjectNameBuilder; import org.hornetq.api.jms.management.JMSServerControl; @@ -452,32 +452,32 @@ new Object[] { tcBackup.getFactoryClassName() }, new Object[] { tcBackup.getParams() }, clientID, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL, - ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT, - ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP, - ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_USE_GLOBAL_POOLS, - ClientSessionFactoryImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL, - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER, - ClientSessionFactoryImpl.DEFAULT_MAX_RETRY_INTERVAL, - ClientSessionFactoryImpl.DEFAULT_RECONNECT_ATTEMPTS, - ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CONNECTION_TTL, + HornetQClient.DEFAULT_CALL_TIMEOUT, + HornetQClient.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, + HornetQClient.DEFAULT_CONSUMER_WINDOW_SIZE, + HornetQClient.DEFAULT_CONSUMER_MAX_RATE, + HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_MAX_RATE, + HornetQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE, + HornetQClient.DEFAULT_BLOCK_ON_DURABLE_SEND, + HornetQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, + HornetQClient.DEFAULT_AUTO_GROUP, + HornetQClient.DEFAULT_PRE_ACKNOWLEDGE, + HornetQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_USE_GLOBAL_POOLS, + HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_RETRY_INTERVAL, + HornetQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER, + HornetQClient.DEFAULT_MAX_RETRY_INTERVAL, + HornetQClient.DEFAULT_RECONNECT_ATTEMPTS, + HornetQClient.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN, null, bindings); } @@ -501,32 +501,32 @@ InVMConnectorFactory.class.getName(), TransportConstants.SERVER_ID_PROP_NAME + "=1", clientID, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL, - ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT, - ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP, - ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_USE_GLOBAL_POOLS, - ClientSessionFactoryImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL, - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER, - ClientSessionFactoryImpl.DEFAULT_MAX_RETRY_INTERVAL, - ClientSessionFactoryImpl.DEFAULT_RECONNECT_ATTEMPTS, - ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CONNECTION_TTL, + HornetQClient.DEFAULT_CALL_TIMEOUT, + HornetQClient.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, + HornetQClient.DEFAULT_CONSUMER_WINDOW_SIZE, + HornetQClient.DEFAULT_CONSUMER_MAX_RATE, + HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_MAX_RATE, + HornetQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE, + HornetQClient.DEFAULT_BLOCK_ON_DURABLE_SEND, + HornetQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, + HornetQClient.DEFAULT_AUTO_GROUP, + HornetQClient.DEFAULT_PRE_ACKNOWLEDGE, + HornetQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_USE_GLOBAL_POOLS, + HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_RETRY_INTERVAL, + HornetQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER, + HornetQClient.DEFAULT_MAX_RETRY_INTERVAL, + HornetQClient.DEFAULT_RECONNECT_ATTEMPTS, + HornetQClient.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN, null, jndiBindings); } Modified: trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -21,8 +21,9 @@ import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.management.ResourceNames; -import org.hornetq.api.jms.HornetQConnectionFactory; -import org.hornetq.api.jms.HornetQQueue; +import org.hornetq.jms.HornetQConnectionFactory; +import org.hornetq.api.jms.HornetQJMSClient; +import org.hornetq.jms.HornetQQueue; import org.hornetq.api.jms.management.JMSServerControl; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; @@ -64,7 +65,7 @@ { super.setUp(); - HornetQConnectionFactory cf = new HornetQConnectionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); + HornetQConnectionFactory cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); connection = cf.createQueueConnection(); session = connection.createQueueSession(false, Session.AUTO_ACKNOWLEDGE); connection.start(); @@ -85,7 +86,7 @@ @Override protected JMSServerControl createManagementControl() throws Exception { - HornetQQueue managementQueue = new HornetQQueue(ConfigurationImpl.DEFAULT_MANAGEMENT_ADDRESS.toString(), + HornetQQueue managementQueue = (HornetQQueue) HornetQJMSClient.createHornetQQueue(ConfigurationImpl.DEFAULT_MANAGEMENT_ADDRESS.toString(), ConfigurationImpl.DEFAULT_MANAGEMENT_ADDRESS.toString()); final JMSMessagingProxy proxy = new JMSMessagingProxy(session, managementQueue, ResourceNames.JMS_SERVER); Modified: trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSUtil.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSUtil.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSUtil.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -27,7 +27,8 @@ import junit.framework.Assert; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.jms.HornetQConnectionFactory; +import org.hornetq.jms.HornetQConnectionFactory; +import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.tests.util.RandomUtil; @@ -51,7 +52,7 @@ public static Connection createConnection(final String connectorFactory) throws JMSException { - HornetQConnectionFactory cf = new HornetQConnectionFactory(new TransportConfiguration(connectorFactory)); + HornetQConnectionFactory cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(new TransportConfiguration(connectorFactory)); cf.setBlockOnNonDurableSend(true); cf.setBlockOnDurableSend(true); @@ -64,7 +65,7 @@ final long connectionTTL, final long clientFailureCheckPeriod) throws JMSException { - HornetQConnectionFactory cf = new HornetQConnectionFactory(new TransportConfiguration(connectorFactory)); + HornetQConnectionFactory cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(new TransportConfiguration(connectorFactory)); cf.setBlockOnNonDurableSend(true); cf.setBlockOnDurableSend(true); @@ -102,7 +103,7 @@ public static String[] sendMessages(final Destination destination, final int messagesToSend) throws Exception { - HornetQConnectionFactory cf = new HornetQConnectionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); + HornetQConnectionFactory cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); return JMSUtil.sendMessages(cf, destination, messagesToSend); } Modified: trunk/tests/src/org/hornetq/tests/integration/jms/server/management/TopicControlTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/server/management/TopicControlTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/TopicControlTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -22,7 +22,8 @@ import junit.framework.Assert; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.jms.HornetQTopic; +import org.hornetq.api.jms.HornetQJMSClient; +import org.hornetq.jms.HornetQTopic; import org.hornetq.api.jms.management.SubscriptionInfo; import org.hornetq.api.jms.management.TopicControl; import org.hornetq.core.config.Configuration; @@ -427,7 +428,7 @@ String topicName = RandomUtil.randomString(); serverManager.createTopic(topicName, topicName); - topic = new HornetQTopic(topicName); + topic = (HornetQTopic) HornetQJMSClient.createHornetQTopic(topicName); } @Override Modified: trunk/tests/src/org/hornetq/tests/integration/jms/server/management/TopicControlUsingJMSTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/server/management/TopicControlUsingJMSTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/TopicControlUsingJMSTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -23,9 +23,10 @@ import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.management.ResourceNames; -import org.hornetq.api.jms.HornetQConnectionFactory; -import org.hornetq.api.jms.HornetQQueue; -import org.hornetq.api.jms.HornetQTopic; +import org.hornetq.jms.HornetQConnectionFactory; +import org.hornetq.api.jms.HornetQJMSClient; +import org.hornetq.jms.HornetQQueue; +import org.hornetq.jms.HornetQTopic; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; @@ -351,14 +352,14 @@ String topicName = RandomUtil.randomString(); serverManager.createTopic(topicName, topicName); - topic = new HornetQTopic(topicName); + topic = (HornetQTopic) HornetQJMSClient.createHornetQTopic(topicName); - HornetQConnectionFactory cf = new HornetQConnectionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); + HornetQConnectionFactory cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); connection = cf.createQueueConnection(); session = connection.createQueueSession(false, Session.AUTO_ACKNOWLEDGE); connection.start(); - HornetQQueue managementQueue = new HornetQQueue(ConfigurationImpl.DEFAULT_MANAGEMENT_ADDRESS.toString(), + HornetQQueue managementQueue = (HornetQQueue) HornetQJMSClient.createHornetQQueue(ConfigurationImpl.DEFAULT_MANAGEMENT_ADDRESS.toString(), ConfigurationImpl.DEFAULT_MANAGEMENT_ADDRESS.toString()); proxy = new JMSMessagingProxy(session, managementQueue, ResourceNames.JMS_TOPIC + topic.getTopicName()); } Modified: trunk/tests/src/org/hornetq/tests/integration/largemessage/ServerLargeMessageTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/largemessage/ServerLargeMessageTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/largemessage/ServerLargeMessageTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -15,12 +15,7 @@ import junit.framework.Assert; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.*; import org.hornetq.core.persistence.impl.journal.JournalStorageManager; import org.hornetq.core.persistence.impl.journal.LargeServerMessageImpl; import org.hornetq.core.server.HornetQServer; @@ -64,7 +59,7 @@ fileMessage.setMessageID(1005); - for (int i = 0; i < 2 * ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE; i++) + for (int i = 0; i < 2 * HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE; i++) { fileMessage.addBytes(new byte[] { UnitTestCase.getSamplebyte(i) }); } @@ -89,9 +84,9 @@ Assert.assertNotNull(msg); - Assert.assertEquals(msg.getBodySize(), 2 * ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE); + Assert.assertEquals(msg.getBodySize(), 2 * HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE); - for (int i = 0; i < 2 * ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE; i++) + for (int i = 0; i < 2 * HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE; i++) { Assert.assertEquals(UnitTestCase.getSamplebyte(i), msg.getBodyBuffer().readByte()); } Modified: trunk/tests/src/org/hornetq/tests/integration/management/AcceptorControlTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/AcceptorControlTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/management/AcceptorControlTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -21,6 +21,7 @@ import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.HornetQClient; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.management.AcceptorControl; import org.hornetq.api.core.management.NotificationType; @@ -97,7 +98,7 @@ // started by the server Assert.assertTrue(acceptorControl.isStarted()); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); ClientSession session = sf.createSession(false, true, true); Assert.assertNotNull(session); session.close(); Modified: trunk/tests/src/org/hornetq/tests/integration/management/AcceptorControlUsingCoreTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/AcceptorControlUsingCoreTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/management/AcceptorControlUsingCoreTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -18,6 +18,7 @@ import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.HornetQClient; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.management.AcceptorControl; import org.hornetq.api.core.management.ResourceNames; @@ -48,7 +49,7 @@ @Override protected AcceptorControl createManagementControl(final String name) throws Exception { - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); session = sf.createSession(false, true, true); session.start(); Modified: trunk/tests/src/org/hornetq/tests/integration/management/AddressControlTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/AddressControlTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/management/AddressControlTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -19,11 +19,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.*; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.management.AddressControl; import org.hornetq.api.core.management.RoleInfo; @@ -348,7 +344,7 @@ server.getAddressSettingsRepository().addMatch(address.toString(), addressSettings); server.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); session = sf.createSession(false, true, false); session.start(); session.createQueue(address, address, true); @@ -404,7 +400,7 @@ server.getAddressSettingsRepository().addMatch(address.toString(), addressSettings); server.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); session = sf.createSession(false, true, false); session.createQueue(address, address, true); Assert.assertEquals(1024, addressControl.getNumberOfBytesPerPage()); @@ -426,7 +422,7 @@ server = HornetQServers.newHornetQServer(conf, mbeanServer, false); server.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); sf.setBlockOnNonDurableSend(true); sf.setBlockOnNonDurableSend(true); session = sf.createSession(false, true, false); Modified: trunk/tests/src/org/hornetq/tests/integration/management/AddressControlUsingCoreTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/AddressControlUsingCoreTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/management/AddressControlUsingCoreTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -22,6 +22,7 @@ import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.HornetQClient; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.management.AddressControl; import org.hornetq.api.core.management.ResourceNames; @@ -314,7 +315,7 @@ server = HornetQServers.newHornetQServer(conf, mbeanServer, false); server.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); sf.setBlockOnNonDurableSend(true); sf.setBlockOnNonDurableSend(true); session = sf.createSession(false, true, false); Modified: trunk/tests/src/org/hornetq/tests/integration/management/BridgeControlTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/BridgeControlTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/management/BridgeControlTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -23,7 +23,7 @@ import org.hornetq.api.Pair; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.HornetQClient; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.management.BridgeControl; import org.hornetq.api.core.management.NotificationType; @@ -171,7 +171,7 @@ RandomUtil.randomBoolean(), RandomUtil.randomBoolean(), RandomUtil.randomPositiveInt(), - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, connectorPair); Configuration conf_1 = new ConfigurationImpl(); Modified: trunk/tests/src/org/hornetq/tests/integration/management/BridgeControlUsingCoreTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/BridgeControlUsingCoreTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/management/BridgeControlUsingCoreTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -23,7 +23,7 @@ import org.hornetq.api.Pair; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.HornetQClient; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.management.ObjectNameBuilder; import org.hornetq.api.core.management.ResourceNames; @@ -149,7 +149,7 @@ RandomUtil.randomBoolean(), RandomUtil.randomBoolean(), RandomUtil.randomPositiveInt(), - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, connectorPair); Configuration conf_1 = new ConfigurationImpl(); @@ -174,7 +174,7 @@ server_0 = HornetQServers.newHornetQServer(conf_0, mbeanServer, false); server_0.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); session = sf.createSession(false, true, true); session.start(); } Modified: trunk/tests/src/org/hornetq/tests/integration/management/BroadcastGroupControlUsingCoreTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/BroadcastGroupControlUsingCoreTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/management/BroadcastGroupControlUsingCoreTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -16,6 +16,7 @@ import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.HornetQClient; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.management.BroadcastGroupControl; import org.hornetq.api.core.management.ResourceNames; @@ -46,7 +47,7 @@ @Override protected BroadcastGroupControl createManagementControl(final String name) throws Exception { - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); session = sf.createSession(false, true, true); session.start(); Modified: trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControl2Test.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControl2Test.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControl2Test.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -24,7 +24,7 @@ import junit.framework.Assert; import org.hornetq.api.Pair; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.HornetQClient; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.management.ClusterConnectionControl; import org.hornetq.core.config.Configuration; @@ -150,7 +150,7 @@ DiscoveryGroupConfiguration discoveryGroupConfig = new DiscoveryGroupConfiguration(discoveryName, groupAddress, groupPort, - ClientSessionFactoryImpl.DEFAULT_DISCOVERY_REFRESH_TIMEOUT); + HornetQClient.DEFAULT_DISCOVERY_REFRESH_TIMEOUT); Configuration conf_1 = new ConfigurationImpl(); conf_1.setSecurityEnabled(false); Modified: trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControlUsingCoreTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControlUsingCoreTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControlUsingCoreTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -18,6 +18,7 @@ import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.HornetQClient; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.management.ClusterConnectionControl; import org.hornetq.api.core.management.ResourceNames; @@ -48,7 +49,7 @@ @Override protected ClusterConnectionControl createManagementControl(final String name) throws Exception { - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); session = sf.createSession(false, true, true); session.start(); Modified: trunk/tests/src/org/hornetq/tests/integration/management/DiscoveryGroupControlUsingCoreTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/DiscoveryGroupControlUsingCoreTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/management/DiscoveryGroupControlUsingCoreTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -16,6 +16,7 @@ import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.HornetQClient; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.management.DiscoveryGroupControl; import org.hornetq.api.core.management.ResourceNames; @@ -46,7 +47,7 @@ @Override protected DiscoveryGroupControl createManagementControl(final String name) throws Exception { - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); session = sf.createSession(false, true, true); session.start(); Modified: trunk/tests/src/org/hornetq/tests/integration/management/DivertControlUsingCoreTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/DivertControlUsingCoreTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/management/DivertControlUsingCoreTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -16,6 +16,7 @@ import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.HornetQClient; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.management.DivertControl; import org.hornetq.api.core.management.ResourceNames; @@ -46,7 +47,7 @@ @Override protected DivertControl createManagementControl(final String name) throws Exception { - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); session = sf.createSession(false, true, true); session.start(); Modified: trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlUsingCoreTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlUsingCoreTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlUsingCoreTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -16,6 +16,7 @@ import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.HornetQClient; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.management.HornetQServerControl; import org.hornetq.api.core.management.ResourceNames; @@ -59,7 +60,7 @@ { super.setUp(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); session = sf.createSession(false, true, true); session.start(); Modified: trunk/tests/src/org/hornetq/tests/integration/management/NotificationTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/NotificationTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/management/NotificationTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -20,11 +20,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.*; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; import org.hornetq.api.core.management.ManagementHelper; @@ -219,7 +215,7 @@ service = HornetQServers.newHornetQServer(conf, false); service.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); session = sf.createSession(false, true, true); session.start(); Modified: trunk/tests/src/org/hornetq/tests/integration/management/QueueControlTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/QueueControlTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/management/QueueControlTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -18,12 +18,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.*; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.management.DayCounterInfo; import org.hornetq.api.core.management.HornetQServerControl; @@ -1285,7 +1280,7 @@ server = HornetQServers.newHornetQServer(conf, mbeanServer, false); server.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); sf.setBlockOnNonDurableSend(true); sf.setBlockOnNonDurableSend(true); session = sf.createSession(false, true, false); Modified: trunk/tests/src/org/hornetq/tests/integration/management/QueueControlUsingCoreTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/QueueControlUsingCoreTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/management/QueueControlUsingCoreTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -19,6 +19,7 @@ import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.HornetQClient; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.management.QueueControl; import org.hornetq.api.core.management.ResourceNames; @@ -269,7 +270,7 @@ { super.setUp(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); session = sf.createSession(false, true, true); session.start(); } Modified: trunk/tests/src/org/hornetq/tests/integration/management/SecurityManagementTestBase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/SecurityManagementTestBase.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/management/SecurityManagementTestBase.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -15,11 +15,7 @@ import junit.framework.Assert; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientRequestor; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.*; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.management.ManagementHelper; import org.hornetq.api.core.management.ResourceNames; @@ -75,7 +71,7 @@ protected void doSendManagementMessage(final String user, final String password, final boolean expectSuccess) throws Exception { - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); try { ClientSession session = null; Modified: trunk/tests/src/org/hornetq/tests/integration/management/SecurityNotificationTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/SecurityNotificationTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/management/SecurityNotificationTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -22,11 +22,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.*; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; import org.hornetq.api.core.management.ManagementHelper; @@ -75,7 +71,7 @@ SecurityNotificationTest.flush(notifConsumer); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); try { @@ -107,7 +103,7 @@ SecurityNotificationTest.flush(notifConsumer); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); ClientSession guestSession = sf.createSession("guest", "guest", false, true, true, false, 1); try @@ -163,7 +159,7 @@ securityManager.addRole("admin", "notif"); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); adminSession = sf.createSession("admin", "admin", false, true, true, false, 1); adminSession.start(); Modified: trunk/tests/src/org/hornetq/tests/integration/remoting/NetworkAddressTestBase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/remoting/NetworkAddressTestBase.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/remoting/NetworkAddressTestBase.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -29,6 +29,7 @@ import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.HornetQClient; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.core.config.Configuration; import org.hornetq.core.server.HornetQServer; @@ -202,7 +203,7 @@ try { - ClientSessionFactory sf = new ClientSessionFactoryImpl(connectorConfig); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(connectorConfig); if (mustConnect) { Modified: trunk/tests/src/org/hornetq/tests/integration/remoting/PingTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/remoting/PingTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/remoting/PingTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -19,10 +19,7 @@ import junit.framework.Assert; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; -import org.hornetq.api.core.client.SessionFailureListener; +import org.hornetq.api.core.client.*; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; import org.hornetq.api.core.interceptor.Interceptor; @@ -106,7 +103,7 @@ { TransportConfiguration transportConfig = new TransportConfiguration("org.hornetq.integration.transports.netty.NettyConnectorFactory"); - ClientSessionFactory csf = new ClientSessionFactoryImpl(transportConfig); + ClientSessionFactory csf = HornetQClient.createClientSessionFactory(transportConfig); csf.setClientFailureCheckPeriod(PingTest.CLIENT_FAILURE_CHECK_PERIOD); csf.setConnectionTTL(PingTest.CLIENT_FAILURE_CHECK_PERIOD * 2); @@ -165,7 +162,7 @@ { TransportConfiguration transportConfig = new TransportConfiguration("org.hornetq.integration.transports.netty.NettyConnectorFactory"); - ClientSessionFactory csf = new ClientSessionFactoryImpl(transportConfig); + ClientSessionFactory csf = HornetQClient.createClientSessionFactory(transportConfig); csf.setClientFailureCheckPeriod(-1); csf.setConnectionTTL(-1); @@ -197,7 +194,7 @@ serverConn.addFailureListener(serverListener); - Thread.sleep(ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD); + Thread.sleep(HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD); Assert.assertNull(clientListener.getException()); @@ -221,7 +218,7 @@ { TransportConfiguration transportConfig = new TransportConfiguration("org.hornetq.integration.transports.netty.NettyConnectorFactory"); - ClientSessionFactoryImpl csf = new ClientSessionFactoryImpl(transportConfig); + ClientSessionFactoryImpl csf = (ClientSessionFactoryImpl) HornetQClient.createClientSessionFactory(transportConfig); csf.setClientFailureCheckPeriod(PingTest.CLIENT_FAILURE_CHECK_PERIOD); csf.setConnectionTTL(PingTest.CLIENT_FAILURE_CHECK_PERIOD * 2); @@ -314,7 +311,7 @@ TransportConfiguration transportConfig = new TransportConfiguration("org.hornetq.integration.transports.netty.NettyConnectorFactory"); - ClientSessionFactory csf = new ClientSessionFactoryImpl(transportConfig); + ClientSessionFactory csf = HornetQClient.createClientSessionFactory(transportConfig); csf.setClientFailureCheckPeriod(PingTest.CLIENT_FAILURE_CHECK_PERIOD); csf.setConnectionTTL(PingTest.CLIENT_FAILURE_CHECK_PERIOD * 2); Modified: trunk/tests/src/org/hornetq/tests/integration/remoting/SynchronousCloseTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/remoting/SynchronousCloseTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/remoting/SynchronousCloseTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -18,6 +18,7 @@ import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.HornetQClient; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.core.config.Configuration; import org.hornetq.core.logging.Logger; @@ -86,11 +87,11 @@ ClientSessionFactory sf; if (isNetty()) { - sf = new ClientSessionFactoryImpl(new TransportConfiguration(NettyConnectorFactory.class.getName())); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(NettyConnectorFactory.class.getName())); } else { - sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); } return sf; Modified: trunk/tests/src/org/hornetq/tests/integration/replication/ReplicationOrderTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/replication/ReplicationOrderTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/replication/ReplicationOrderTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -18,12 +18,7 @@ import junit.framework.Assert; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.*; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; @@ -68,7 +63,7 @@ String address = RandomUtil.randomString(); String queue = RandomUtil.randomString(); - ClientSessionFactory csf = new ClientSessionFactoryImpl(getConnectorTransportConfiguration(true)); + ClientSessionFactory csf = HornetQClient.createClientSessionFactory(getConnectorTransportConfiguration(true)); csf.setBlockOnNonDurableSend(false); csf.setBlockOnDurableSend(false); ClientSession session = null; @@ -107,7 +102,7 @@ } session.close(); - csf = new ClientSessionFactoryImpl(getConnectorTransportConfiguration(true)); + csf = HornetQClient.createClientSessionFactory(getConnectorTransportConfiguration(true)); session = csf.createSession(true, true); session.start(); ClientConsumer consumer = session.createConsumer(queue); Modified: trunk/tests/src/org/hornetq/tests/integration/replication/ReplicationTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/replication/ReplicationTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/replication/ReplicationTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -32,7 +32,7 @@ import org.hornetq.api.core.buffers.HornetQBuffer; import org.hornetq.api.core.buffers.HornetQBuffers; import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.HornetQClient; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; import org.hornetq.api.core.interceptor.Interceptor; @@ -720,9 +720,9 @@ connectorConfig, null, false, - ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL, + HornetQClient.DEFAULT_CALL_TIMEOUT, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CONNECTION_TTL, 0, 1.0d, 0, Modified: trunk/tests/src/org/hornetq/tests/integration/security/SimpleClient.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/security/SimpleClient.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/security/SimpleClient.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -13,12 +13,7 @@ package org.hornetq.tests.integration.security; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.*; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.core.logging.Logger; import org.hornetq.jms.client.HornetQTextMessage; @@ -52,7 +47,7 @@ String queueName = RandomUtil.randomString(); String messageText = RandomUtil.randomString(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(connectorFactoryClassName)); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(connectorFactoryClassName)); ClientSession session = sf.createSession(false, true, true); session.createQueue(queueName, queueName, null, false); Modified: trunk/tests/src/org/hornetq/tests/integration/server/ExpiryRunnerTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/server/ExpiryRunnerTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/server/ExpiryRunnerTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -23,12 +23,7 @@ import junit.textui.TestRunner; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.*; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.config.impl.ConfigurationImpl; @@ -260,7 +255,7 @@ // start the server server.start(); // then we create a client as normal - ClientSessionFactory sessionFactory = new ClientSessionFactoryImpl(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY)); + ClientSessionFactory sessionFactory = HornetQClient.createClientSessionFactory(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY)); sessionFactory.setBlockOnAcknowledge(true); clientSession = sessionFactory.createSession(false, true, true); clientSession.createQueue(qName, qName, null, false); Modified: trunk/tests/src/org/hornetq/tests/integration/server/LVQRecoveryTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/server/LVQRecoveryTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/server/LVQRecoveryTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -18,12 +18,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.*; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; import org.hornetq.api.core.message.Message; @@ -218,7 +213,7 @@ qs.setLastValueQueue(true); server.getAddressSettingsRepository().addMatch(address.toString(), qs); // then we create a client as normal - ClientSessionFactory sessionFactory = new ClientSessionFactoryImpl(new TransportConfiguration(ServiceTestBase.INVM_CONNECTOR_FACTORY)); + ClientSessionFactory sessionFactory = HornetQClient.createClientSessionFactory(new TransportConfiguration(ServiceTestBase.INVM_CONNECTOR_FACTORY)); sessionFactory.setBlockOnAcknowledge(true); sessionFactory.setAckBatchSize(0); clientSession = sessionFactory.createSession(false, true, true); @@ -239,7 +234,7 @@ qs.setLastValueQueue(true); server.getAddressSettingsRepository().addMatch(address.toString(), qs); // then we create a client as normal - ClientSessionFactory sessionFactory = new ClientSessionFactoryImpl(new TransportConfiguration(ServiceTestBase.INVM_CONNECTOR_FACTORY)); + ClientSessionFactory sessionFactory = HornetQClient.createClientSessionFactory(new TransportConfiguration(ServiceTestBase.INVM_CONNECTOR_FACTORY)); sessionFactory.setBlockOnAcknowledge(true); sessionFactory.setAckBatchSize(0); clientSession = sessionFactory.createSession(false, true, true); Modified: trunk/tests/src/org/hornetq/tests/integration/server/LVQTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/server/LVQTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/server/LVQTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -15,12 +15,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.*; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; import org.hornetq.api.core.message.Message; @@ -585,7 +580,7 @@ qs.setLastValueQueue(true); server.getAddressSettingsRepository().addMatch(address.toString(), qs); // then we create a client as normal - ClientSessionFactory sessionFactory = new ClientSessionFactoryImpl(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY)); + ClientSessionFactory sessionFactory = HornetQClient.createClientSessionFactory(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY)); sessionFactory.setBlockOnAcknowledge(true); sessionFactory.setAckBatchSize(0); clientSession = sessionFactory.createSession(false, true, true); Modified: trunk/tests/src/org/hornetq/tests/integration/server/PredefinedQueueTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/server/PredefinedQueueTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/server/PredefinedQueueTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -19,12 +19,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.*; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.config.Configuration; @@ -79,7 +74,7 @@ server.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(false, true, true); @@ -153,7 +148,7 @@ Assert.assertEquals(2, bindings.getBindings().size()); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(false, true, true); @@ -217,7 +212,7 @@ server.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(false, true, true); @@ -249,7 +244,7 @@ server.start(); - sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); session = sf.createSession(false, true, true); @@ -330,7 +325,7 @@ server.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(false, true, true); @@ -361,7 +356,7 @@ server.start(); - sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); session = sf.createSession(false, true, true); @@ -415,7 +410,7 @@ server.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(false, true, true); Modified: trunk/tests/src/org/hornetq/tests/integration/ssl/CoreClientOverSSLTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/ssl/CoreClientOverSSLTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/ssl/CoreClientOverSSLTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -19,12 +19,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.*; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; import org.hornetq.api.core.message.Message; @@ -75,7 +70,7 @@ tc.getParams().put(TransportConstants.KEYSTORE_PATH_PROP_NAME, TransportConstants.DEFAULT_KEYSTORE_PATH); tc.getParams().put(TransportConstants.KEYSTORE_PASSWORD_PROP_NAME, TransportConstants.DEFAULT_KEYSTORE_PASSWORD); - ClientSessionFactory sf = new ClientSessionFactoryImpl(tc); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(tc); ClientSession session = sf.createSession(false, true, true); session.createQueue(CoreClientOverSSLTest.QUEUE, CoreClientOverSSLTest.QUEUE, false); ClientProducer producer = session.createProducer(CoreClientOverSSLTest.QUEUE); @@ -98,7 +93,7 @@ tc.getParams().put(TransportConstants.KEYSTORE_PATH_PROP_NAME, TransportConstants.DEFAULT_KEYSTORE_PATH); tc.getParams().put(TransportConstants.KEYSTORE_PASSWORD_PROP_NAME, "invalid password"); - ClientSessionFactory sf = new ClientSessionFactoryImpl(tc); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(tc); try { sf.createSession(false, true, true); @@ -116,7 +111,7 @@ TransportConfiguration tc = new TransportConfiguration(NettyConnectorFactory.class.getName()); tc.getParams().put(TransportConstants.SSL_ENABLED_PROP_NAME, false); - ClientSessionFactory sf = new ClientSessionFactoryImpl(tc); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(tc); sf.setCallTimeout(2000); try { Modified: trunk/tests/src/org/hornetq/tests/integration/xa/XaTimeoutTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/xa/XaTimeoutTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/xa/XaTimeoutTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -26,12 +26,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientProducer; -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.*; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.config.impl.ConfigurationImpl; @@ -82,7 +77,7 @@ // start the server messagingService.start(); // then we create a client as normal - sessionFactory = new ClientSessionFactoryImpl(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY)); + sessionFactory = HornetQClient.createClientSessionFactory(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY)); clientSession = sessionFactory.createSession(true, false, false); clientSession.createQueue(atestq, atestq, null, true); clientProducer = clientSession.createProducer(atestq); Modified: trunk/tests/src/org/hornetq/tests/opt/SendTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/opt/SendTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/opt/SendTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -29,8 +29,8 @@ import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.jms.HornetQConnectionFactory; -import org.hornetq.api.jms.HornetQQueue; +import org.hornetq.jms.HornetQConnectionFactory; +import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; @@ -144,7 +144,7 @@ // TransportConfiguration tc = new TransportConfiguration(InVMConnectorFactory.class.getCanonicalName(), params); - HornetQConnectionFactory cf = new HornetQConnectionFactory(tc); + HornetQConnectionFactory cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(tc); cf.setProducerWindowSize(1024 * 1024); @@ -156,7 +156,7 @@ coreSession.createQueue("jms.queue.test_queue", "jms.queue.test_queue"); - Queue queue = new HornetQQueue("test_queue"); + Queue queue = HornetQJMSClient.createHornetQQueue("test_queue"); MessageProducer prod = sess.createProducer(queue); @@ -242,7 +242,7 @@ // TransportConfiguration tc = new TransportConfiguration(InVMConnectorFactory.class.getCanonicalName(), params); - HornetQConnectionFactory cf = new HornetQConnectionFactory(tc); + HornetQConnectionFactory cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(tc); cf.setProducerWindowSize(1024 * 1024); @@ -254,7 +254,7 @@ coreSession.createQueue("jms.queue.test_queue", "jms.queue.test_queue"); - Queue queue = new HornetQQueue("test_queue"); + Queue queue = HornetQJMSClient.createHornetQQueue("test_queue"); MessageConsumer cons = sess.createConsumer(queue); @@ -363,7 +363,7 @@ // TransportConfiguration tc = new TransportConfiguration(InVMConnectorFactory.class.getCanonicalName(), params); - HornetQConnectionFactory cf = new HornetQConnectionFactory(tc); + HornetQConnectionFactory cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(tc); cf.setProducerWindowSize(1024 * 1024); @@ -375,7 +375,7 @@ coreSession.createQueue("jms.queue.test_queue", "jms.queue.test_queue"); - Queue queue = new HornetQQueue("test_queue"); + Queue queue = HornetQJMSClient.createHornetQQueue("test_queue"); MessageProducer prod = sess.createProducer(queue); @@ -463,7 +463,7 @@ // TransportConfiguration tc = new TransportConfiguration(InVMConnectorFactory.class.getCanonicalName(), params); - HornetQConnectionFactory cf = new HornetQConnectionFactory(tc); + HornetQConnectionFactory cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(tc); Connection conn = cf.createConnection(); @@ -473,7 +473,7 @@ coreSession.createQueue("jms.queue.test_queue", "jms.queue.test_queue"); - Queue queue = new HornetQQueue("test_queue"); + Queue queue = HornetQJMSClient.createHornetQQueue("test_queue"); MessageConsumer cons = sess.createConsumer(queue); Modified: trunk/tests/src/org/hornetq/tests/stress/remote/PingStressTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/stress/remote/PingStressTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/stress/remote/PingStressTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -18,6 +18,7 @@ import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.HornetQClient; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; import org.hornetq.api.core.interceptor.Interceptor; @@ -120,7 +121,7 @@ server.getRemotingService().addInterceptor(noPongInterceptor); - final ClientSessionFactory csf1 = new ClientSessionFactoryImpl(transportConfig); + final ClientSessionFactory csf1 = HornetQClient.createClientSessionFactory(transportConfig); csf1.setClientFailureCheckPeriod(PingStressTest.PING_INTERVAL); csf1.setConnectionTTL((long)(PingStressTest.PING_INTERVAL * 1.5)); @@ -150,7 +151,7 @@ try { - final ClientSessionFactory csf2 = new ClientSessionFactoryImpl(transportConfig); + final ClientSessionFactory csf2 = HornetQClient.createClientSessionFactory(transportConfig); csf2.setClientFailureCheckPeriod(PingStressTest.PING_INTERVAL); csf2.setConnectionTTL((long)(PingStressTest.PING_INTERVAL * 1.5)); Modified: trunk/tests/src/org/hornetq/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -41,8 +41,8 @@ import junit.framework.Assert; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.jms.HornetQConnectionFactory; -import org.hornetq.api.jms.HornetQQueue; +import org.hornetq.jms.HornetQConnectionFactory; +import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; @@ -157,7 +157,7 @@ private static ConnectionFactory createConnectionFactory() { - HornetQConnectionFactory cf = new HornetQConnectionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); + HornetQConnectionFactory cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); // Note! We disable automatic reconnection on the session factory. The bridge needs to do the reconnection cf.setReconnectAttempts(0); cf.setBlockOnNonDurableSend(true); @@ -182,8 +182,8 @@ ConnectionFactoryFactory sourceCFF = JMSBridgeImplTest.newConnectionFactoryFactory(failingSourceCF); ConnectionFactoryFactory targetCFF = JMSBridgeImplTest.newConnectionFactoryFactory(JMSBridgeImplTest.createConnectionFactory()); - DestinationFactory sourceDF = JMSBridgeImplTest.newDestinationFactory(new HornetQQueue(JMSBridgeImplTest.SOURCE)); - DestinationFactory targetDF = JMSBridgeImplTest.newDestinationFactory(new HornetQQueue(JMSBridgeImplTest.TARGET)); + DestinationFactory sourceDF = JMSBridgeImplTest.newDestinationFactory(HornetQJMSClient.createHornetQQueue(JMSBridgeImplTest.SOURCE)); + DestinationFactory targetDF = JMSBridgeImplTest.newDestinationFactory(HornetQJMSClient.createHornetQQueue(JMSBridgeImplTest.TARGET)); TransactionManager tm = JMSBridgeImplTest.newTransactionManager(); JMSBridgeImpl bridge = new JMSBridgeImpl(); @@ -237,8 +237,8 @@ ConnectionFactoryFactory sourceCFF = JMSBridgeImplTest.newConnectionFactoryFactory(failingSourceCF); ConnectionFactoryFactory targetCFF = JMSBridgeImplTest.newConnectionFactoryFactory(JMSBridgeImplTest.createConnectionFactory()); - DestinationFactory sourceDF = JMSBridgeImplTest.newDestinationFactory(new HornetQQueue(JMSBridgeImplTest.SOURCE)); - DestinationFactory targetDF = JMSBridgeImplTest.newDestinationFactory(new HornetQQueue(JMSBridgeImplTest.TARGET)); + DestinationFactory sourceDF = JMSBridgeImplTest.newDestinationFactory(HornetQJMSClient.createHornetQQueue(JMSBridgeImplTest.SOURCE)); + DestinationFactory targetDF = JMSBridgeImplTest.newDestinationFactory(HornetQJMSClient.createHornetQQueue(JMSBridgeImplTest.TARGET)); TransactionManager tm = JMSBridgeImplTest.newTransactionManager(); JMSBridgeImpl bridge = new JMSBridgeImpl(); @@ -277,8 +277,8 @@ ConnectionFactoryFactory sourceCFF = JMSBridgeImplTest.newConnectionFactoryFactory(JMSBridgeImplTest.createConnectionFactory()); ConnectionFactoryFactory targetCFF = JMSBridgeImplTest.newConnectionFactoryFactory(JMSBridgeImplTest.createConnectionFactory()); - DestinationFactory sourceDF = JMSBridgeImplTest.newDestinationFactory(new HornetQQueue(JMSBridgeImplTest.SOURCE)); - DestinationFactory targetDF = JMSBridgeImplTest.newDestinationFactory(new HornetQQueue(JMSBridgeImplTest.TARGET)); + DestinationFactory sourceDF = JMSBridgeImplTest.newDestinationFactory(HornetQJMSClient.createHornetQQueue(JMSBridgeImplTest.SOURCE)); + DestinationFactory targetDF = JMSBridgeImplTest.newDestinationFactory(HornetQJMSClient.createHornetQQueue(JMSBridgeImplTest.TARGET)); TransactionManager tm = JMSBridgeImplTest.newTransactionManager(); JMSBridgeImpl bridge = new JMSBridgeImpl(); @@ -337,8 +337,8 @@ ConnectionFactoryFactory sourceCFF = JMSBridgeImplTest.newConnectionFactoryFactory(JMSBridgeImplTest.createConnectionFactory()); ConnectionFactoryFactory targetCFF = JMSBridgeImplTest.newConnectionFactoryFactory(JMSBridgeImplTest.createConnectionFactory()); - DestinationFactory sourceDF = JMSBridgeImplTest.newDestinationFactory(new HornetQQueue(JMSBridgeImplTest.SOURCE)); - DestinationFactory targetDF = JMSBridgeImplTest.newDestinationFactory(new HornetQQueue(JMSBridgeImplTest.TARGET)); + DestinationFactory sourceDF = JMSBridgeImplTest.newDestinationFactory(HornetQJMSClient.createHornetQQueue(JMSBridgeImplTest.SOURCE)); + DestinationFactory targetDF = JMSBridgeImplTest.newDestinationFactory(HornetQJMSClient.createHornetQQueue(JMSBridgeImplTest.TARGET)); TransactionManager tm = JMSBridgeImplTest.newTransactionManager(); JMSBridgeImpl bridge = new JMSBridgeImpl(); @@ -426,8 +426,8 @@ ConnectionFactoryFactory sourceCFF = JMSBridgeImplTest.newConnectionFactoryFactory(failingSourceCF); ConnectionFactoryFactory targetCFF = JMSBridgeImplTest.newConnectionFactoryFactory(JMSBridgeImplTest.createConnectionFactory()); - DestinationFactory sourceDF = JMSBridgeImplTest.newDestinationFactory(new HornetQQueue(JMSBridgeImplTest.SOURCE)); - DestinationFactory targetDF = JMSBridgeImplTest.newDestinationFactory(new HornetQQueue(JMSBridgeImplTest.TARGET)); + DestinationFactory sourceDF = JMSBridgeImplTest.newDestinationFactory(HornetQJMSClient.createHornetQQueue(JMSBridgeImplTest.SOURCE)); + DestinationFactory targetDF = JMSBridgeImplTest.newDestinationFactory(HornetQJMSClient.createHornetQQueue(JMSBridgeImplTest.TARGET)); TransactionManager tm = JMSBridgeImplTest.newTransactionManager(); JMSBridgeImpl bridge = new JMSBridgeImpl(); @@ -486,8 +486,8 @@ ConnectionFactoryFactory sourceCFF = JMSBridgeImplTest.newConnectionFactoryFactory(failingSourceCF); ConnectionFactoryFactory targetCFF = JMSBridgeImplTest.newConnectionFactoryFactory(JMSBridgeImplTest.createConnectionFactory()); - DestinationFactory sourceDF = JMSBridgeImplTest.newDestinationFactory(new HornetQQueue(JMSBridgeImplTest.SOURCE)); - DestinationFactory targetDF = JMSBridgeImplTest.newDestinationFactory(new HornetQQueue(JMSBridgeImplTest.TARGET)); + DestinationFactory sourceDF = JMSBridgeImplTest.newDestinationFactory(HornetQJMSClient.createHornetQQueue(JMSBridgeImplTest.SOURCE)); + DestinationFactory targetDF = JMSBridgeImplTest.newDestinationFactory(HornetQJMSClient.createHornetQQueue(JMSBridgeImplTest.TARGET)); TransactionManager tm = JMSBridgeImplTest.newTransactionManager(); JMSBridgeImpl bridge = new JMSBridgeImpl(); Modified: trunk/tests/src/org/hornetq/tests/unit/jms/HornetQDestinationTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/jms/HornetQDestinationTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/unit/jms/HornetQDestinationTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -20,11 +20,10 @@ import junit.framework.Assert; -import org.hornetq.api.jms.HornetQDestination; -import org.hornetq.api.jms.HornetQQueue; -import org.hornetq.api.jms.HornetQTemporaryQueue; -import org.hornetq.api.jms.HornetQTemporaryTopic; -import org.hornetq.api.jms.HornetQTopic; +import org.hornetq.jms.HornetQDestination; +import org.hornetq.jms.HornetQQueue; +import org.hornetq.jms.*; +import org.hornetq.jms.HornetQTopic; import org.hornetq.tests.util.RandomUtil; import org.hornetq.tests.util.UnitTestCase; @@ -50,9 +49,9 @@ { String destinationName = RandomUtil.randomString(); String address = HornetQQueue.JMS_QUEUE_ADDRESS_PREFIX + destinationName; - HornetQDestination destination = HornetQDestination.fromAddress(address); - HornetQDestination sameDestination = HornetQDestination.fromAddress(address); - HornetQDestination differentDestination = HornetQDestination.fromAddress(address + RandomUtil.randomString()); + HornetQDestination destination = (HornetQDestination) HornetQDestination.fromAddress(address); + HornetQDestination sameDestination = (HornetQDestination) HornetQDestination.fromAddress(address); + HornetQDestination differentDestination = (HornetQDestination) HornetQDestination.fromAddress(address + RandomUtil.randomString()); Assert.assertFalse(destination.equals(null)); Assert.assertTrue(destination.equals(destination)); @@ -64,7 +63,7 @@ { String destinationName = RandomUtil.randomString(); String address = HornetQQueue.JMS_QUEUE_ADDRESS_PREFIX + destinationName; - HornetQDestination destination = HornetQDestination.fromAddress(address); + HornetQDestination destination = (HornetQDestination) HornetQDestination.fromAddress(address); Assert.assertTrue(destination instanceof Queue); Assert.assertEquals(destinationName, ((Queue)destination).getQueueName()); } @@ -73,7 +72,7 @@ { String destinationName = RandomUtil.randomString(); String address = HornetQTopic.JMS_TOPIC_ADDRESS_PREFIX + destinationName; - HornetQDestination destination = HornetQDestination.fromAddress(address); + HornetQDestination destination = (HornetQDestination) HornetQDestination.fromAddress(address); Assert.assertTrue(destination instanceof Topic); Assert.assertEquals(destinationName, ((Topic)destination).getTopicName()); } @@ -82,7 +81,7 @@ { String destinationName = RandomUtil.randomString(); String address = HornetQTemporaryQueue.JMS_TEMP_QUEUE_ADDRESS_PREFIX + destinationName; - HornetQDestination destination = HornetQDestination.fromAddress(address); + HornetQDestination destination = (HornetQDestination) HornetQDestination.fromAddress(address); Assert.assertTrue(destination instanceof TemporaryQueue); Assert.assertEquals(destinationName, ((TemporaryQueue)destination).getQueueName()); } @@ -91,7 +90,7 @@ { String destinationName = RandomUtil.randomString(); String address = HornetQTemporaryTopic.JMS_TEMP_TOPIC_ADDRESS_PREFIX + destinationName; - HornetQDestination destination = HornetQDestination.fromAddress(address); + HornetQDestination destination = (HornetQDestination) HornetQDestination.fromAddress(address); Assert.assertTrue(destination instanceof TemporaryTopic); Assert.assertEquals(destinationName, ((TemporaryTopic)destination).getTopicName()); } Modified: trunk/tests/src/org/hornetq/tests/unit/jms/HornetQQueueTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/jms/HornetQQueueTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/unit/jms/HornetQQueueTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -15,7 +15,8 @@ import junit.framework.Assert; -import org.hornetq.api.jms.HornetQQueue; +import org.hornetq.api.jms.HornetQJMSClient; +import org.hornetq.jms.HornetQQueue; import org.hornetq.tests.util.RandomUtil; import org.hornetq.tests.util.UnitTestCase; @@ -39,14 +40,14 @@ public void testIsTemporary() throws Exception { - HornetQQueue queue = new HornetQQueue(RandomUtil.randomString()); + HornetQQueue queue = (HornetQQueue) HornetQJMSClient.createHornetQQueue(RandomUtil.randomString()); Assert.assertFalse(queue.isTemporary()); } public void testGetQueueName() throws Exception { String queueName = RandomUtil.randomString(); - HornetQQueue queue = new HornetQQueue(queueName); + HornetQQueue queue = (HornetQQueue) HornetQJMSClient.createHornetQQueue(queueName); Assert.assertEquals(queueName, queue.getQueueName()); } Modified: trunk/tests/src/org/hornetq/tests/unit/jms/HornetQTopicTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/jms/HornetQTopicTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/unit/jms/HornetQTopicTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -16,7 +16,8 @@ import junit.framework.Assert; import org.hornetq.api.Pair; -import org.hornetq.api.jms.HornetQTopic; +import org.hornetq.api.jms.HornetQJMSClient; +import org.hornetq.jms.HornetQTopic; import org.hornetq.tests.util.RandomUtil; import org.hornetq.tests.util.UnitTestCase; @@ -40,14 +41,14 @@ public void testIsTemporary() throws Exception { - HornetQTopic topic = new HornetQTopic(RandomUtil.randomString()); + HornetQTopic topic = (HornetQTopic) HornetQJMSClient.createHornetQTopic(RandomUtil.randomString()); Assert.assertFalse(topic.isTemporary()); } public void testGetTopicName() throws Exception { String topicName = RandomUtil.randomString(); - HornetQTopic queue = new HornetQTopic(topicName); + HornetQTopic queue = (HornetQTopic) HornetQJMSClient.createHornetQTopic(topicName); Assert.assertEquals(topicName, queue.getTopicName()); } Modified: trunk/tests/src/org/hornetq/tests/unit/jms/referenceable/DestinationObjectFactoryTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/jms/referenceable/DestinationObjectFactoryTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/unit/jms/referenceable/DestinationObjectFactoryTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -17,8 +17,9 @@ import junit.framework.Assert; -import org.hornetq.api.jms.HornetQDestination; -import org.hornetq.api.jms.HornetQQueue; +import org.hornetq.jms.HornetQDestination; +import org.hornetq.api.jms.HornetQJMSClient; +import org.hornetq.jms.HornetQQueue; import org.hornetq.jms.referenceable.DestinationObjectFactory; import org.hornetq.tests.util.RandomUtil; import org.hornetq.tests.util.UnitTestCase; @@ -43,7 +44,7 @@ public void testReference() throws Exception { - HornetQDestination queue = new HornetQQueue(RandomUtil.randomString()); + HornetQDestination queue = (HornetQQueue) HornetQJMSClient.createHornetQQueue(RandomUtil.randomString()); Reference reference = queue.getReference(); DestinationObjectFactory factory = new DestinationObjectFactory(); Modified: trunk/tests/src/org/hornetq/tests/unit/ra/ResourceAdapterTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/ra/ResourceAdapterTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/unit/ra/ResourceAdapterTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -33,9 +33,10 @@ import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; -import org.hornetq.api.jms.HornetQConnectionFactory; -import org.hornetq.api.jms.HornetQQueue; +import org.hornetq.api.core.client.HornetQClient; +import org.hornetq.jms.HornetQConnectionFactory; +import org.hornetq.api.jms.HornetQJMSClient; +import org.hornetq.jms.HornetQQueue; import org.hornetq.core.remoting.impl.invm.InVMConnector; import org.hornetq.core.server.HornetQServer; import org.hornetq.integration.transports.netty.NettyConnector; @@ -71,44 +72,44 @@ HornetQResourceAdapter ra = new HornetQResourceAdapter(); ra.setConnectorClassName(InVMConnector.class.getName()); HornetQConnectionFactory factory = ra.getDefaultHornetQConnectionFactory(); - Assert.assertEquals(factory.getCallTimeout(), ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT); + Assert.assertEquals(factory.getCallTimeout(), HornetQClient.DEFAULT_CALL_TIMEOUT); Assert.assertEquals(factory.getClientFailureCheckPeriod(), - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD); + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD); Assert.assertEquals(factory.getClientID(), null); Assert.assertEquals(factory.getConnectionLoadBalancingPolicyClassName(), - ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME); - Assert.assertEquals(factory.getConnectionTTL(), ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL); - Assert.assertEquals(factory.getConsumerMaxRate(), ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE); - Assert.assertEquals(factory.getConsumerWindowSize(), ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE); + HornetQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME); + Assert.assertEquals(factory.getConnectionTTL(), HornetQClient.DEFAULT_CONNECTION_TTL); + Assert.assertEquals(factory.getConsumerMaxRate(), HornetQClient.DEFAULT_CONSUMER_MAX_RATE); + Assert.assertEquals(factory.getConsumerWindowSize(), HornetQClient.DEFAULT_CONSUMER_WINDOW_SIZE); Assert.assertEquals(factory.getDiscoveryAddress(), null); Assert.assertEquals(factory.getDiscoveryInitialWaitTimeout(), - ClientSessionFactoryImpl.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT); + HornetQClient.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT); Assert.assertEquals(factory.getDiscoveryPort(), 0); Assert.assertEquals(factory.getDiscoveryRefreshTimeout(), - ClientSessionFactoryImpl.DEFAULT_DISCOVERY_REFRESH_TIMEOUT); - Assert.assertEquals(factory.getDupsOKBatchSize(), ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE); - Assert.assertEquals(factory.getMinLargeMessageSize(), ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE); - Assert.assertEquals(factory.getProducerMaxRate(), ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE); + HornetQClient.DEFAULT_DISCOVERY_REFRESH_TIMEOUT); + Assert.assertEquals(factory.getDupsOKBatchSize(), HornetQClient.DEFAULT_ACK_BATCH_SIZE); + Assert.assertEquals(factory.getMinLargeMessageSize(), HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE); + Assert.assertEquals(factory.getProducerMaxRate(), HornetQClient.DEFAULT_PRODUCER_MAX_RATE); Assert.assertEquals(factory.getConfirmationWindowSize(), - ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE); + HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE); // by default, reconnect attempts is set to -1 Assert.assertEquals(-1, factory.getReconnectAttempts()); - Assert.assertEquals(factory.getRetryInterval(), ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL); + Assert.assertEquals(factory.getRetryInterval(), HornetQClient.DEFAULT_RETRY_INTERVAL); Assert.assertEquals(factory.getRetryIntervalMultiplier(), - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER); + HornetQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER); Assert.assertEquals(factory.getScheduledThreadPoolMaxSize(), - ClientSessionFactoryImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE); - Assert.assertEquals(factory.getThreadPoolMaxSize(), ClientSessionFactoryImpl.DEFAULT_THREAD_POOL_MAX_SIZE); - Assert.assertEquals(factory.getTransactionBatchSize(), ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE); - Assert.assertEquals(factory.isAutoGroup(), ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP); - Assert.assertEquals(factory.isBlockOnAcknowledge(), ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE); + HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE); + Assert.assertEquals(factory.getThreadPoolMaxSize(), HornetQClient.DEFAULT_THREAD_POOL_MAX_SIZE); + Assert.assertEquals(factory.getTransactionBatchSize(), HornetQClient.DEFAULT_ACK_BATCH_SIZE); + Assert.assertEquals(factory.isAutoGroup(), HornetQClient.DEFAULT_AUTO_GROUP); + Assert.assertEquals(factory.isBlockOnAcknowledge(), HornetQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE); Assert.assertEquals(factory.isBlockOnNonDurableSend(), - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND); - Assert.assertEquals(factory.isBlockOnDurableSend(), ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND); + HornetQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND); + Assert.assertEquals(factory.isBlockOnDurableSend(), HornetQClient.DEFAULT_BLOCK_ON_DURABLE_SEND); Assert.assertEquals(factory.isFailoverOnServerShutdown(), - ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); - Assert.assertEquals(factory.isPreAcknowledge(), ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE); - Assert.assertEquals(factory.isUseGlobalPools(), ClientSessionFactoryImpl.DEFAULT_USE_GLOBAL_POOLS); + HornetQClient.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); + Assert.assertEquals(factory.isPreAcknowledge(), HornetQClient.DEFAULT_PRE_ACKNOWLEDGE); + Assert.assertEquals(factory.isUseGlobalPools(), HornetQClient.DEFAULT_USE_GLOBAL_POOLS); } public void test2DefaultConnectionFactorySame() throws Exception @@ -125,54 +126,54 @@ HornetQResourceAdapter ra = new HornetQResourceAdapter(); ra.setConnectorClassName(InVMConnector.class.getName()); HornetQConnectionFactory factory = ra.createHornetQConnectionFactory(new ConnectionFactoryProperties()); - Assert.assertEquals(factory.getCallTimeout(), ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT); + Assert.assertEquals(factory.getCallTimeout(), HornetQClient.DEFAULT_CALL_TIMEOUT); Assert.assertEquals(factory.getClientFailureCheckPeriod(), - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD); + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD); Assert.assertEquals(factory.getClientID(), null); Assert.assertEquals(factory.getConnectionLoadBalancingPolicyClassName(), - ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME); - Assert.assertEquals(factory.getConnectionTTL(), ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL); - Assert.assertEquals(factory.getConsumerMaxRate(), ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE); - Assert.assertEquals(factory.getConsumerWindowSize(), ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE); + HornetQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME); + Assert.assertEquals(factory.getConnectionTTL(), HornetQClient.DEFAULT_CONNECTION_TTL); + Assert.assertEquals(factory.getConsumerMaxRate(), HornetQClient.DEFAULT_CONSUMER_MAX_RATE); + Assert.assertEquals(factory.getConsumerWindowSize(), HornetQClient.DEFAULT_CONSUMER_WINDOW_SIZE); Assert.assertEquals(factory.getDiscoveryAddress(), null); Assert.assertEquals(factory.getDiscoveryInitialWaitTimeout(), - ClientSessionFactoryImpl.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT); + HornetQClient.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT); Assert.assertEquals(factory.getDiscoveryPort(), 0); Assert.assertEquals(factory.getDiscoveryRefreshTimeout(), - ClientSessionFactoryImpl.DEFAULT_DISCOVERY_REFRESH_TIMEOUT); - Assert.assertEquals(factory.getDupsOKBatchSize(), ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE); - Assert.assertEquals(factory.getMinLargeMessageSize(), ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE); - Assert.assertEquals(factory.getProducerMaxRate(), ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE); + HornetQClient.DEFAULT_DISCOVERY_REFRESH_TIMEOUT); + Assert.assertEquals(factory.getDupsOKBatchSize(), HornetQClient.DEFAULT_ACK_BATCH_SIZE); + Assert.assertEquals(factory.getMinLargeMessageSize(), HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE); + Assert.assertEquals(factory.getProducerMaxRate(), HornetQClient.DEFAULT_PRODUCER_MAX_RATE); Assert.assertEquals(factory.getConfirmationWindowSize(), - ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE); + HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE); // by default, reconnect attempts is set to -1 Assert.assertEquals(-1, factory.getReconnectAttempts()); - Assert.assertEquals(factory.getRetryInterval(), ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL); + Assert.assertEquals(factory.getRetryInterval(), HornetQClient.DEFAULT_RETRY_INTERVAL); Assert.assertEquals(factory.getRetryIntervalMultiplier(), - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER); + HornetQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER); Assert.assertEquals(factory.getScheduledThreadPoolMaxSize(), - ClientSessionFactoryImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE); - Assert.assertEquals(factory.getThreadPoolMaxSize(), ClientSessionFactoryImpl.DEFAULT_THREAD_POOL_MAX_SIZE); - Assert.assertEquals(factory.getTransactionBatchSize(), ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE); - Assert.assertEquals(factory.isAutoGroup(), ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP); - Assert.assertEquals(factory.isBlockOnAcknowledge(), ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE); + HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE); + Assert.assertEquals(factory.getThreadPoolMaxSize(), HornetQClient.DEFAULT_THREAD_POOL_MAX_SIZE); + Assert.assertEquals(factory.getTransactionBatchSize(), HornetQClient.DEFAULT_ACK_BATCH_SIZE); + Assert.assertEquals(factory.isAutoGroup(), HornetQClient.DEFAULT_AUTO_GROUP); + Assert.assertEquals(factory.isBlockOnAcknowledge(), HornetQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE); Assert.assertEquals(factory.isBlockOnNonDurableSend(), - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND); - Assert.assertEquals(factory.isBlockOnDurableSend(), ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND); + HornetQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND); + Assert.assertEquals(factory.isBlockOnDurableSend(), HornetQClient.DEFAULT_BLOCK_ON_DURABLE_SEND); Assert.assertEquals(factory.isFailoverOnServerShutdown(), - ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); - Assert.assertEquals(factory.isPreAcknowledge(), ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE); - Assert.assertEquals(factory.isUseGlobalPools(), ClientSessionFactoryImpl.DEFAULT_USE_GLOBAL_POOLS); + HornetQClient.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); + Assert.assertEquals(factory.isPreAcknowledge(), HornetQClient.DEFAULT_PRE_ACKNOWLEDGE); + Assert.assertEquals(factory.isUseGlobalPools(), HornetQClient.DEFAULT_USE_GLOBAL_POOLS); } public void testDefaultConnectionFactoryOverrides() throws Exception { HornetQResourceAdapter ra = new HornetQResourceAdapter(); ra.setConnectorClassName(InVMConnector.class.getName()); - ra.setAutoGroup(!ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP); - ra.setBlockOnAcknowledge(!ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE); - ra.setBlockOnNonDurableSend(!ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND); - ra.setBlockOnDurableSend(!ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND); + ra.setAutoGroup(!HornetQClient.DEFAULT_AUTO_GROUP); + ra.setBlockOnAcknowledge(!HornetQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE); + ra.setBlockOnNonDurableSend(!HornetQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND); + ra.setBlockOnDurableSend(!HornetQClient.DEFAULT_BLOCK_ON_DURABLE_SEND); ra.setCallTimeout(1l); ra.setClientFailureCheckPeriod(2l); ra.setClientID("myid"); @@ -183,9 +184,9 @@ ra.setDiscoveryInitialWaitTimeout(6l); ra.setDiscoveryRefreshTimeout(7l); ra.setDupsOKBatchSize(8); - ra.setFailoverOnServerShutdown(!ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); + ra.setFailoverOnServerShutdown(!HornetQClient.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); ra.setMinLargeMessageSize(10); - ra.setPreAcknowledge(!ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE); + ra.setPreAcknowledge(!HornetQClient.DEFAULT_PRE_ACKNOWLEDGE); ra.setProducerMaxRate(11); ra.setConfirmationWindowSize(12); ra.setReconnectAttempts(13); @@ -194,7 +195,7 @@ ra.setScheduledThreadPoolMaxSize(16); ra.setThreadPoolMaxSize(17); ra.setTransactionBatchSize(18); - ra.setUseGlobalPools(!ClientSessionFactoryImpl.DEFAULT_USE_GLOBAL_POOLS); + ra.setUseGlobalPools(!HornetQClient.DEFAULT_USE_GLOBAL_POOLS); HornetQConnectionFactory factory = ra.getDefaultHornetQConnectionFactory(); Assert.assertEquals(factory.getCallTimeout(), 1); Assert.assertEquals(factory.getClientFailureCheckPeriod(), 2); @@ -217,15 +218,15 @@ Assert.assertEquals(factory.getScheduledThreadPoolMaxSize(), 16); Assert.assertEquals(factory.getThreadPoolMaxSize(), 17); Assert.assertEquals(factory.getTransactionBatchSize(), 18); - Assert.assertEquals(factory.isAutoGroup(), !ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP); - Assert.assertEquals(factory.isBlockOnAcknowledge(), !ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE); + Assert.assertEquals(factory.isAutoGroup(), !HornetQClient.DEFAULT_AUTO_GROUP); + Assert.assertEquals(factory.isBlockOnAcknowledge(), !HornetQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE); Assert.assertEquals(factory.isBlockOnNonDurableSend(), - !ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND); - Assert.assertEquals(factory.isBlockOnDurableSend(), !ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND); + !HornetQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND); + Assert.assertEquals(factory.isBlockOnDurableSend(), !HornetQClient.DEFAULT_BLOCK_ON_DURABLE_SEND); Assert.assertEquals(factory.isFailoverOnServerShutdown(), - !ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); - Assert.assertEquals(factory.isPreAcknowledge(), !ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE); - Assert.assertEquals(factory.isUseGlobalPools(), !ClientSessionFactoryImpl.DEFAULT_USE_GLOBAL_POOLS); + !HornetQClient.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); + Assert.assertEquals(factory.isPreAcknowledge(), !HornetQClient.DEFAULT_PRE_ACKNOWLEDGE); + Assert.assertEquals(factory.isUseGlobalPools(), !HornetQClient.DEFAULT_USE_GLOBAL_POOLS); } public void testCreateConnectionFactoryOverrides() throws Exception @@ -233,10 +234,10 @@ HornetQResourceAdapter ra = new HornetQResourceAdapter(); ra.setConnectorClassName(InVMConnector.class.getName()); ConnectionFactoryProperties connectionFactoryProperties = new ConnectionFactoryProperties(); - connectionFactoryProperties.setAutoGroup(!ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP); - connectionFactoryProperties.setBlockOnAcknowledge(!ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE); - connectionFactoryProperties.setBlockOnNonDurableSend(!ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND); - connectionFactoryProperties.setBlockOnDurableSend(!ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND); + connectionFactoryProperties.setAutoGroup(!HornetQClient.DEFAULT_AUTO_GROUP); + connectionFactoryProperties.setBlockOnAcknowledge(!HornetQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE); + connectionFactoryProperties.setBlockOnNonDurableSend(!HornetQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND); + connectionFactoryProperties.setBlockOnDurableSend(!HornetQClient.DEFAULT_BLOCK_ON_DURABLE_SEND); connectionFactoryProperties.setCallTimeout(1l); connectionFactoryProperties.setClientFailureCheckPeriod(2l); connectionFactoryProperties.setClientID("myid"); @@ -247,9 +248,9 @@ connectionFactoryProperties.setDiscoveryInitialWaitTimeout(6l); connectionFactoryProperties.setDiscoveryRefreshTimeout(7l); connectionFactoryProperties.setDupsOKBatchSize(8); - connectionFactoryProperties.setFailoverOnServerShutdown(!ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); + connectionFactoryProperties.setFailoverOnServerShutdown(!HornetQClient.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); connectionFactoryProperties.setMinLargeMessageSize(10); - connectionFactoryProperties.setPreAcknowledge(!ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE); + connectionFactoryProperties.setPreAcknowledge(!HornetQClient.DEFAULT_PRE_ACKNOWLEDGE); connectionFactoryProperties.setProducerMaxRate(11); connectionFactoryProperties.setConfirmationWindowSize(12); connectionFactoryProperties.setReconnectAttempts(13); @@ -258,7 +259,7 @@ connectionFactoryProperties.setScheduledThreadPoolMaxSize(16); connectionFactoryProperties.setThreadPoolMaxSize(17); connectionFactoryProperties.setTransactionBatchSize(18); - connectionFactoryProperties.setUseGlobalPools(!ClientSessionFactoryImpl.DEFAULT_USE_GLOBAL_POOLS); + connectionFactoryProperties.setUseGlobalPools(!HornetQClient.DEFAULT_USE_GLOBAL_POOLS); HornetQConnectionFactory factory = ra.createHornetQConnectionFactory(connectionFactoryProperties); Assert.assertEquals(factory.getCallTimeout(), 1); Assert.assertEquals(factory.getClientFailureCheckPeriod(), 2); @@ -281,15 +282,15 @@ Assert.assertEquals(factory.getScheduledThreadPoolMaxSize(), 16); Assert.assertEquals(factory.getThreadPoolMaxSize(), 17); Assert.assertEquals(factory.getTransactionBatchSize(), 18); - Assert.assertEquals(factory.isAutoGroup(), !ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP); - Assert.assertEquals(factory.isBlockOnAcknowledge(), !ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE); + Assert.assertEquals(factory.isAutoGroup(), !HornetQClient.DEFAULT_AUTO_GROUP); + Assert.assertEquals(factory.isBlockOnAcknowledge(), !HornetQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE); Assert.assertEquals(factory.isBlockOnNonDurableSend(), - !ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND); - Assert.assertEquals(factory.isBlockOnDurableSend(), !ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND); + !HornetQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND); + Assert.assertEquals(factory.isBlockOnDurableSend(), !HornetQClient.DEFAULT_BLOCK_ON_DURABLE_SEND); Assert.assertEquals(factory.isFailoverOnServerShutdown(), - !ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); - Assert.assertEquals(factory.isPreAcknowledge(), !ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE); - Assert.assertEquals(factory.isUseGlobalPools(), !ClientSessionFactoryImpl.DEFAULT_USE_GLOBAL_POOLS); + !HornetQClient.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); + Assert.assertEquals(factory.isPreAcknowledge(), !HornetQClient.DEFAULT_PRE_ACKNOWLEDGE); + Assert.assertEquals(factory.isUseGlobalPools(), !HornetQClient.DEFAULT_USE_GLOBAL_POOLS); } public void testCreateConnectionFactoryOverrideConnector() throws Exception @@ -386,7 +387,7 @@ ClientSessionFactory factory = createInVMFactory(); ClientSession session = factory.createSession(false, false, false); - HornetQQueue queue = new HornetQQueue("test"); + HornetQQueue queue = (HornetQQueue) HornetQJMSClient.createHornetQQueue("test"); session.createQueue(queue.getSimpleAddress(), queue.getSimpleAddress(), true); session.close(); Modified: trunk/tests/src/org/hornetq/tests/util/JMSTestBase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/util/JMSTestBase.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/util/JMSTestBase.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -21,7 +21,7 @@ import javax.naming.NamingException; import org.hornetq.api.Pair; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.HornetQClient; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.core.config.Configuration; import org.hornetq.core.server.HornetQServer; @@ -180,30 +180,30 @@ jmsServer.createConnectionFactory("ManualReconnectionToSingleServerTest", connectorConfigs, null, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CONNECTION_TTL, callTimeout, - ClientSessionFactoryImpl.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT, - ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP, - ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_USE_GLOBAL_POOLS, - ClientSessionFactoryImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, + HornetQClient.DEFAULT_CONSUMER_WINDOW_SIZE, + HornetQClient.DEFAULT_CONSUMER_MAX_RATE, + HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_MAX_RATE, + HornetQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE, + HornetQClient.DEFAULT_BLOCK_ON_DURABLE_SEND, + HornetQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, + HornetQClient.DEFAULT_AUTO_GROUP, + HornetQClient.DEFAULT_PRE_ACKNOWLEDGE, + HornetQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_USE_GLOBAL_POOLS, + HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_THREAD_POOL_MAX_SIZE, retryInterval, retryIntervalMultiplier, - ClientSessionFactoryImpl.DEFAULT_MAX_RETRY_INTERVAL, + HornetQClient.DEFAULT_MAX_RETRY_INTERVAL, reconnectAttempts, failoverOnServerShutdown, null, Modified: trunk/tests/src/org/hornetq/tests/util/ServiceTestBase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/util/ServiceTestBase.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/util/ServiceTestBase.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -25,6 +25,7 @@ import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.HornetQClient; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; @@ -347,7 +348,7 @@ protected ClientSessionFactoryImpl createFactory(final String connectorClass) { - return new ClientSessionFactoryImpl(new TransportConfiguration(connectorClass), null); + return (ClientSessionFactoryImpl) HornetQClient.createClientSessionFactory(new TransportConfiguration(connectorClass), null); }