Author: timfox Date: 2010-01-06 07:15:42 -0500 (Wed, 06 Jan 2010) New Revision: 8734 Modified: 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/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/src/org/hornetq/jms/example/SymmetricClusterExample.java trunk/examples/jms/topic-hierarchies/src/org/hornetq/jms/example/TopicHierarchyExample.java trunk/src/main/org/hornetq/api/jms/HornetQJMSClient.java trunk/src/main/org/hornetq/jms/HornetQDestination.java trunk/src/main/org/hornetq/jms/HornetQQueue.java trunk/src/main/org/hornetq/jms/HornetQTopic.java trunk/src/main/org/hornetq/jms/client/HornetQSession.java trunk/src/main/org/hornetq/jms/management/impl/JMSQueueControlImpl.java trunk/src/main/org/hornetq/ra/inflow/HornetQActivation.java trunk/tests/jms-tests/src/org/hornetq/jms/tests/MessageProducerTest.java trunk/tests/jms-tests/src/org/hornetq/jms/tests/message/MessageHeaderTestBase.java trunk/tests/src/org/hornetq/tests/integration/jms/FloodServerTest.java trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSReconnectTest.java trunk/tests/src/org/hornetq/tests/integration/jms/connection/CloseDestroyedConnectionTest.java trunk/tests/src/org/hornetq/tests/integration/jms/consumer/ConsumerTest.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/JMSServerControlUsingJMSTest.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/opt/SendTest.java trunk/tests/src/org/hornetq/tests/timing/jms/bridge/impl/JMSBridgeImplTest.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 Log: some changes to HornetQJMSClient 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 11:20:38 UTC (rev 8733) +++ trunk/examples/javaee/jca-config/src/org/hornetq/javaee/example/server2/StatelessSender.java 2010-01-06 12:15:42 UTC (rev 8734) @@ -48,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) - Queue destQueueA = HornetQJMSClient.createHornetQQueue("A"); - Queue destQueueB = HornetQJMSClient.createHornetQQueue("B"); + Queue destQueueA = HornetQJMSClient.createQueue("A"); + Queue destQueueB = HornetQJMSClient.createQueue("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 11:20:38 UTC (rev 8733) +++ trunk/examples/jms/applet/src/org/hornetq/jms/example/AppletExample.java 2010-01-06 12:15:42 UTC (rev 8734) @@ -110,7 +110,7 @@ TransportConfiguration connector = new TransportConfiguration(NettyConnectorFactory.class.getName(), params); ClientSessionFactory sf = HornetQClient.createClientSessionFactory(connector); ConnectionFactory cf = HornetQJMSClient.createConnectionFactory(sf); - destination = HornetQJMSClient.createHornetQTopic("exampleTopic"); + destination = HornetQJMSClient.createTopic("exampleTopic"); try { 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 11:20:38 UTC (rev 8733) +++ trunk/examples/jms/instantiate-connection-factory/src/org/hornetq/jms/example/InstantiateConnectionFactoryExample.java 2010-01-06 12:15:42 UTC (rev 8734) @@ -53,7 +53,7 @@ try { // Step 1. Directly instantiate the JMS Queue object. - Queue queue = HornetQJMSClient.createHornetQQueue("exampleQueue"); + Queue queue = HornetQJMSClient.createQueue("exampleQueue"); // Step 2. Instantiate the TransportConfiguration object which contains the knowledge of what transport to use, // The server port etc. 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 11:20:38 UTC (rev 8733) +++ trunk/examples/jms/management/src/org/hornetq/jms/example/ManagementExample.java 2010-01-06 12:15:42 UTC (rev 8734) @@ -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 = HornetQJMSClient.createHornetQQueue("hornetq.management", "hornetq.management"); + Queue managementQueue = HornetQJMSClient.createQueue("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 11:20:38 UTC (rev 8733) +++ trunk/examples/jms/pre-acknowledge/src/org/hornetq/jms/example/PreacknowledgeExample.java 2010-01-06 12:15:42 UTC (rev 8734) @@ -128,7 +128,7 @@ { QueueSession session = ((QueueConnection)connection).createQueueSession(false, Session.AUTO_ACKNOWLEDGE); - Queue managementQueue = HornetQJMSClient.createHornetQQueue("hornetq.management", "hornetq.management"); + Queue managementQueue = HornetQJMSClient.createQueue("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 11:20:38 UTC (rev 8733) +++ trunk/examples/jms/reattach-node/src/org/hornetq/jms/example/ReattachExample.java 2010-01-06 12:15:42 UTC (rev 8734) @@ -141,7 +141,7 @@ Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); - Queue managementQueue = HornetQJMSClient.createHornetQQueue("hornetq.management", "hornetq.management"); + Queue managementQueue = HornetQJMSClient.createQueue("hornetq.management"); MessageProducer producer = session.createProducer(managementQueue); 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 11:20:38 UTC (rev 8733) +++ trunk/examples/jms/symmetric-cluster/src/org/hornetq/jms/example/SymmetricClusterExample.java 2010-01-06 12:15:42 UTC (rev 8734) @@ -85,9 +85,9 @@ Thread.sleep(2000); // Step 2. Directly instantiate JMS Queue and Topic objects - Queue queue = HornetQJMSClient.createHornetQQueue("exampleQueue"); + Queue queue = HornetQJMSClient.createQueue("exampleQueue"); - Topic topic = HornetQJMSClient.createHornetQTopic("exampleTopic"); + Topic topic = HornetQJMSClient.createTopic("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/src/org/hornetq/jms/example/TopicHierarchyExample.java =================================================================== --- trunk/examples/jms/topic-hierarchies/src/org/hornetq/jms/example/TopicHierarchyExample.java 2010-01-06 11:20:38 UTC (rev 8733) +++ trunk/examples/jms/topic-hierarchies/src/org/hornetq/jms/example/TopicHierarchyExample.java 2010-01-06 12:15:42 UTC (rev 8734) @@ -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 = HornetQJMSClient.createHornetQTopic("news.europe.#"); + Topic topicSubscribe = HornetQJMSClient.createTopic("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 = HornetQJMSClient.createHornetQTopic("news.usa.wrestling"); + Topic topicNewsUsaWrestling = HornetQJMSClient.createTopic("news.usa.wrestling"); - Topic topicNewsEuropeSport = HornetQJMSClient.createHornetQTopic("news.europe.sport"); + Topic topicNewsEuropeSport = HornetQJMSClient.createTopic("news.europe.sport"); - Topic topicNewsEuropeEntertainment = HornetQJMSClient.createHornetQTopic("news.europe.entertainment"); + Topic topicNewsEuropeEntertainment = HornetQJMSClient.createTopic("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/jms/HornetQJMSClient.java =================================================================== --- trunk/src/main/org/hornetq/api/jms/HornetQJMSClient.java 2010-01-06 11:20:38 UTC (rev 8733) +++ trunk/src/main/org/hornetq/api/jms/HornetQJMSClient.java 2010-01-06 12:15:42 UTC (rev 8734) @@ -12,18 +12,20 @@ */ package org.hornetq.api.jms; +import java.util.List; + +import javax.jms.ConnectionFactory; +import javax.jms.Queue; +import javax.jms.Topic; + import org.hornetq.api.core.Pair; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ClientSessionFactory; +import org.hornetq.core.logging.Logger; 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. * @@ -32,6 +34,8 @@ */ public class HornetQJMSClient { + private static final Logger log = Logger.getLogger(HornetQJMSClient.class); + /** * Creates a ConnectionFactory using all the defaults. * @@ -106,43 +110,21 @@ * @param name the name of the topic * @return The Topic */ - public static Topic createHornetQTopic(final String name) + public static Topic createTopic(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) + public static Queue createQueue(final String name) { + log.info("calling create queue " + name, new Exception()); 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); - } } Modified: trunk/src/main/org/hornetq/jms/HornetQDestination.java =================================================================== --- trunk/src/main/org/hornetq/jms/HornetQDestination.java 2010-01-06 11:20:38 UTC (rev 8733) +++ trunk/src/main/org/hornetq/jms/HornetQDestination.java 2010-01-06 12:15:42 UTC (rev 8734) @@ -21,11 +21,6 @@ import javax.naming.Referenceable; import org.hornetq.api.core.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; @@ -70,7 +65,7 @@ { String name = address.substring(HornetQTopic.JMS_TOPIC_ADDRESS_PREFIX.length()); - return HornetQJMSClient.createHornetQTopic(address, name); + return new HornetQTopic(address, name); } else if (address.startsWith(HornetQTemporaryQueue.JMS_TEMP_QUEUE_ADDRESS_PREFIX)) { Modified: trunk/src/main/org/hornetq/jms/HornetQQueue.java =================================================================== --- trunk/src/main/org/hornetq/jms/HornetQQueue.java 2010-01-06 11:20:38 UTC (rev 8733) +++ trunk/src/main/org/hornetq/jms/HornetQQueue.java 2010-01-06 12:15:42 UTC (rev 8734) @@ -57,7 +57,7 @@ super(HornetQQueue.JMS_QUEUE_ADDRESS_PREFIX + name, name); } - public HornetQQueue(final String address, final String name) + protected HornetQQueue(final String address, final String name) { super(address, name); } Modified: trunk/src/main/org/hornetq/jms/HornetQTopic.java =================================================================== --- trunk/src/main/org/hornetq/jms/HornetQTopic.java 2010-01-06 11:20:38 UTC (rev 8733) +++ trunk/src/main/org/hornetq/jms/HornetQTopic.java 2010-01-06 12:15:42 UTC (rev 8734) @@ -110,7 +110,7 @@ super(HornetQTopic.JMS_TOPIC_ADDRESS_PREFIX + name, name); } - public HornetQTopic(final String address, final String name) + protected HornetQTopic(final String address, final String name) { super(address, name); } Modified: trunk/src/main/org/hornetq/jms/client/HornetQSession.java =================================================================== --- trunk/src/main/org/hornetq/jms/client/HornetQSession.java 2010-01-06 11:20:38 UTC (rev 8733) +++ trunk/src/main/org/hornetq/jms/client/HornetQSession.java 2010-01-06 12:15:42 UTC (rev 8734) @@ -401,7 +401,7 @@ throw new IllegalStateException("Cannot create a queue using a TopicSession"); } - HornetQQueue queue = (HornetQQueue) HornetQJMSClient.createHornetQQueue(queueName); + HornetQQueue queue = (HornetQQueue) HornetQJMSClient.createQueue(queueName); try { @@ -430,7 +430,7 @@ throw new IllegalStateException("Cannot create a topic on a QueueSession"); } - HornetQTopic topic = (HornetQTopic) HornetQJMSClient.createHornetQTopic(topicName); + HornetQTopic topic = (HornetQTopic) HornetQJMSClient.createTopic(topicName); try { Modified: trunk/src/main/org/hornetq/jms/management/impl/JMSQueueControlImpl.java =================================================================== --- trunk/src/main/org/hornetq/jms/management/impl/JMSQueueControlImpl.java 2010-01-06 11:20:38 UTC (rev 8733) +++ trunk/src/main/org/hornetq/jms/management/impl/JMSQueueControlImpl.java 2010-01-06 12:15:42 UTC (rev 8734) @@ -275,7 +275,7 @@ public boolean moveMessage(final String messageID, final String otherQueueName) throws Exception { String filter = JMSQueueControlImpl.createFilterForJMSMessageID(messageID); - HornetQQueue otherQueue = (HornetQQueue) HornetQJMSClient.createHornetQQueue(otherQueueName); + HornetQQueue otherQueue = (HornetQQueue) HornetQJMSClient.createQueue(otherQueueName); int moved = coreQueueControl.moveMessages(filter, otherQueue.getAddress()); if (moved != 1) { @@ -288,7 +288,7 @@ public int moveMessages(final String filterStr, final String otherQueueName) throws Exception { String filter = JMSQueueControlImpl.createFilterFromJMSSelector(filterStr); - HornetQQueue otherQueue = (HornetQQueue) HornetQJMSClient.createHornetQQueue(otherQueueName); + HornetQQueue otherQueue = (HornetQQueue) HornetQJMSClient.createQueue(otherQueueName); return coreQueueControl.moveMessages(filter, otherQueue.getAddress()); } Modified: trunk/src/main/org/hornetq/ra/inflow/HornetQActivation.java =================================================================== --- trunk/src/main/org/hornetq/ra/inflow/HornetQActivation.java 2010-01-06 11:20:38 UTC (rev 8733) +++ trunk/src/main/org/hornetq/ra/inflow/HornetQActivation.java 2010-01-06 12:15:42 UTC (rev 8734) @@ -398,11 +398,11 @@ // If there is no binding on naming, we will just create a new instance if (isTopic) { - destination = (HornetQDestination) HornetQJMSClient.createHornetQTopic(destinationName.substring(destinationName.lastIndexOf('/') + 1)); + destination = (HornetQDestination) HornetQJMSClient.createTopic(destinationName.substring(destinationName.lastIndexOf('/') + 1)); } else { - destination = (HornetQDestination) HornetQJMSClient.createHornetQQueue(destinationName.substring(destinationName.lastIndexOf('/') + 1)); + destination = (HornetQDestination) HornetQJMSClient.createQueue(destinationName.substring(destinationName.lastIndexOf('/') + 1)); } } } @@ -424,11 +424,11 @@ { if (Topic.class.getName().equals(spec.getDestinationType())) { - destination = (HornetQDestination) HornetQJMSClient.createHornetQTopic(spec.getDestination()); + destination = (HornetQDestination) HornetQJMSClient.createTopic(spec.getDestination()); } else { - destination = (HornetQDestination) HornetQJMSClient.createHornetQQueue(spec.getDestination()); + destination = (HornetQDestination) HornetQJMSClient.createQueue(spec.getDestination()); } } 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 11:20:38 UTC (rev 8733) +++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/MessageProducerTest.java 2010-01-06 12:15:42 UTC (rev 8734) @@ -403,7 +403,7 @@ Session ps = pconn.createSession(false, Session.AUTO_ACKNOWLEDGE); try { - ps.createProducer(HornetQJMSClient.createHornetQTopic("NoSuchTopic")); + ps.createProducer(HornetQJMSClient.createTopic("NoSuchTopic")); ProxyAssertSupport.fail("should throw exception"); } catch (InvalidDestinationException e) 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 11:20:38 UTC (rev 8733) +++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/message/MessageHeaderTestBase.java 2010-01-06 12:15:42 UTC (rev 8734) @@ -62,8 +62,8 @@ m.setJMSMessageID("ID:messageID777"); m.setJMSTimestamp(123456789l); m.setJMSCorrelationID("correlationID777"); - m.setJMSReplyTo(HornetQJMSClient.createHornetQQueue("ReplyToQueue")); - m.setJMSDestination(HornetQJMSClient.createHornetQQueue("DestinationQueue")); + m.setJMSReplyTo(HornetQJMSClient.createQueue("ReplyToQueue")); + m.setJMSDestination(HornetQJMSClient.createQueue("DestinationQueue")); m.setJMSDeliveryMode(DeliveryMode.PERSISTENT); m.setJMSExpiration(987654321l); m.setJMSPriority(9); Modified: trunk/tests/src/org/hornetq/tests/integration/jms/FloodServerTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/FloodServerTest.java 2010-01-06 11:20:38 UTC (rev 8733) +++ trunk/tests/src/org/hornetq/tests/integration/jms/FloodServerTest.java 2010-01-06 12:15:42 UTC (rev 8734) @@ -230,7 +230,7 @@ session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); - producer = session.createProducer(HornetQJMSClient.createHornetQTopic("my-topic")); + producer = session.createProducer(HornetQJMSClient.createTopic("my-topic")); producer.setDeliveryMode(DeliveryMode.NON_PERSISTENT); @@ -285,7 +285,7 @@ session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); - consumer = session.createConsumer(HornetQJMSClient.createHornetQTopic("my-topic")); + consumer = session.createConsumer(HornetQJMSClient.createTopic("my-topic")); this.numMessages = numMessages; } 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 11:20:38 UTC (rev 8733) +++ trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSReconnectTest.java 2010-01-06 12:15:42 UTC (rev 8734) @@ -210,7 +210,7 @@ { coreSession.createQueue(HornetQTopic.JMS_TOPIC_ADDRESS_PREFIX + "mytopic", "blahblah", null, false); - dest = HornetQJMSClient.createHornetQTopic("mytopic"); + dest = HornetQJMSClient.createTopic("mytopic"); } else { @@ -279,7 +279,7 @@ coreSession.createQueue(HornetQTopic.JMS_TOPIC_ADDRESS_PREFIX + "mytopic", "blahblah", null, false); - Topic topic = HornetQJMSClient.createHornetQTopic("mytopic"); + Topic topic = HornetQJMSClient.createTopic("mytopic"); //Create a non durable subscriber MessageConsumer consumer = sess.createConsumer(topic); 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 11:20:38 UTC (rev 8733) +++ trunk/tests/src/org/hornetq/tests/integration/jms/connection/CloseDestroyedConnectionTest.java 2010-01-06 12:15:42 UTC (rev 8734) @@ -84,7 +84,7 @@ String queueName = "myqueue"; - Queue queue = HornetQJMSClient.createHornetQQueue(queueName); + Queue queue = HornetQJMSClient.createQueue(queueName); super.createQueue(queueName); 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 11:20:38 UTC (rev 8733) +++ trunk/tests/src/org/hornetq/tests/integration/jms/consumer/ConsumerTest.java 2010-01-06 12:15:42 UTC (rev 8734) @@ -65,7 +65,7 @@ { Connection conn = cf.createConnection(); Session session = conn.createSession(false, HornetQSession.PRE_ACKNOWLEDGE); - jBossQueue = (HornetQQueue) HornetQJMSClient.createHornetQQueue(ConsumerTest.Q_NAME); + jBossQueue = (HornetQQueue) HornetQJMSClient.createQueue(ConsumerTest.Q_NAME); MessageProducer producer = session.createProducer(jBossQueue); MessageConsumer consumer = session.createConsumer(jBossQueue); int noOfMessages = 100; @@ -93,7 +93,7 @@ Connection conn = cf.createConnection(); Session session = conn.createSession(false, Session.CLIENT_ACKNOWLEDGE); - jBossQueue = (HornetQQueue) HornetQJMSClient.createHornetQQueue(ConsumerTest.Q_NAME); + jBossQueue = (HornetQQueue) HornetQJMSClient.createQueue(ConsumerTest.Q_NAME); MessageProducer producer = session.createProducer(jBossQueue); MessageConsumer consumer = session.createConsumer(jBossQueue); int noOfMessages = 100; @@ -122,7 +122,7 @@ Connection conn = cf.createConnection(); Session session = conn.createSession(false, HornetQSession.PRE_ACKNOWLEDGE); - jBossQueue = (HornetQQueue) HornetQJMSClient.createHornetQQueue(ConsumerTest.Q_NAME); + jBossQueue = (HornetQQueue) HornetQJMSClient.createQueue(ConsumerTest.Q_NAME); MessageProducer producer = session.createProducer(jBossQueue); MessageConsumer consumer = session.createConsumer(jBossQueue); int noOfMessages = 1000; @@ -152,7 +152,7 @@ ((HornetQConnectionFactory)cf).setPreAcknowledge(true); Connection conn = cf.createConnection(); Session session = conn.createSession(false, Session.CLIENT_ACKNOWLEDGE); - jBossQueue = (HornetQQueue) HornetQJMSClient.createHornetQQueue(ConsumerTest.Q_NAME); + jBossQueue = (HornetQQueue) HornetQJMSClient.createQueue(ConsumerTest.Q_NAME); MessageProducer producer = session.createProducer(jBossQueue); MessageConsumer consumer = session.createConsumer(jBossQueue); int noOfMessages = 1000; @@ -180,7 +180,7 @@ { Connection conn = cf.createConnection(); Session session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); - jBossQueue = (HornetQQueue) HornetQJMSClient.createHornetQQueue(ConsumerTest.Q_NAME); + jBossQueue = (HornetQQueue) HornetQJMSClient.createQueue(ConsumerTest.Q_NAME); MessageConsumer consumer = session.createConsumer(jBossQueue); consumer.setMessageListener(new MessageListener() { @@ -199,7 +199,7 @@ { Connection conn = cf.createConnection(); Session session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); - jBossQueue = (HornetQQueue) HornetQJMSClient.createHornetQQueue(ConsumerTest.Q_NAME); + jBossQueue = (HornetQQueue) HornetQJMSClient.createQueue(ConsumerTest.Q_NAME); MessageConsumer consumer = session.createConsumer(jBossQueue); consumer.setMessageListener(new MessageListener() { 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 11:20:38 UTC (rev 8733) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSQueueControlTest.java 2010-01-06 12:15:42 UTC (rev 8734) @@ -416,7 +416,7 @@ { JMSQueueControl queueControl = createManagementControl(); String expiryQueueName = RandomUtil.randomString(); - HornetQQueue expiryQueue = (HornetQQueue) HornetQJMSClient.createHornetQQueue(expiryQueueName); + HornetQQueue expiryQueue = (HornetQQueue) HornetQJMSClient.createQueue(expiryQueueName); serverManager.createQueue(expiryQueueName, expiryQueueName, null, true); queueControl.setExpiryAddress(expiryQueue.getAddress()); @@ -545,7 +545,7 @@ { String deadLetterQueue = RandomUtil.randomString(); serverManager.createQueue(deadLetterQueue, deadLetterQueue, null, true); - HornetQQueue dlq = (HornetQQueue) HornetQJMSClient.createHornetQQueue(deadLetterQueue); + HornetQQueue dlq = (HornetQQueue) HornetQJMSClient.createQueue(deadLetterQueue); Connection conn = createConnection(); Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); @@ -606,7 +606,7 @@ String deadLetterQueue = RandomUtil.randomString(); serverManager.createQueue(deadLetterQueue, deadLetterQueue, null, true); - HornetQQueue dlq = (HornetQQueue) HornetQJMSClient.createHornetQQueue(deadLetterQueue); + HornetQQueue dlq = (HornetQQueue) HornetQJMSClient.createQueue(deadLetterQueue); Connection conn = createConnection(); Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); @@ -648,7 +648,7 @@ String otherQueueName = RandomUtil.randomString(); serverManager.createQueue(otherQueueName, otherQueueName, null, true); - HornetQQueue otherQueue = (HornetQQueue) HornetQJMSClient.createHornetQQueue(otherQueueName); + HornetQQueue otherQueue = (HornetQQueue) HornetQJMSClient.createQueue(otherQueueName); // send on queue JMSUtil.sendMessages(queue, 2); @@ -695,7 +695,7 @@ String otherQueueName = RandomUtil.randomString(); serverManager.createQueue(otherQueueName, otherQueueName, null, true); - HornetQQueue otherQueue = (HornetQQueue) HornetQJMSClient.createHornetQQueue(otherQueueName); + HornetQQueue otherQueue = (HornetQQueue) HornetQJMSClient.createQueue(otherQueueName); Connection connection = JMSUtil.createConnection(InVMConnectorFactory.class.getName()); Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); @@ -730,7 +730,7 @@ String otherQueueName = RandomUtil.randomString(); serverManager.createQueue(otherQueueName, otherQueueName, null, true); - HornetQQueue otherQueue = (HornetQQueue) HornetQJMSClient.createHornetQQueue(otherQueueName); + HornetQQueue otherQueue = (HornetQQueue) HornetQJMSClient.createQueue(otherQueueName); String[] messageIDs = JMSUtil.sendMessages(queue, 1); @@ -834,7 +834,7 @@ String queueName = RandomUtil.randomString(); serverManager.createQueue(queueName, queueName, null, true); - queue = (HornetQQueue) HornetQJMSClient.createHornetQQueue(queueName); + queue = (HornetQQueue) HornetQJMSClient.createQueue(queueName); } @Override 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 11:20:38 UTC (rev 8733) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java 2010-01-06 12:15:42 UTC (rev 8734) @@ -57,7 +57,7 @@ { super.setUp(); - HornetQConnectionFactory cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(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(); @@ -78,8 +78,8 @@ @Override protected JMSQueueControl createManagementControl() throws Exception { - HornetQQueue managementQueue = (HornetQQueue) HornetQJMSClient.createHornetQQueue(ConfigurationImpl.DEFAULT_MANAGEMENT_ADDRESS.toString(), - ConfigurationImpl.DEFAULT_MANAGEMENT_ADDRESS.toString()); + HornetQQueue managementQueue = (HornetQQueue)HornetQJMSClient.createQueue(ConfigurationImpl.DEFAULT_MANAGEMENT_ADDRESS.toString()); + final JMSMessagingProxy proxy = new JMSMessagingProxy(session, managementQueue, ResourceNames.JMS_QUEUE + queue.getQueueName()); 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 11:20:38 UTC (rev 8733) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java 2010-01-06 12:15:42 UTC (rev 8734) @@ -86,8 +86,7 @@ @Override protected JMSServerControl createManagementControl() throws Exception { - HornetQQueue managementQueue = (HornetQQueue) HornetQJMSClient.createHornetQQueue(ConfigurationImpl.DEFAULT_MANAGEMENT_ADDRESS.toString(), - ConfigurationImpl.DEFAULT_MANAGEMENT_ADDRESS.toString()); + HornetQQueue managementQueue = (HornetQQueue) HornetQJMSClient.createQueue(ConfigurationImpl.DEFAULT_MANAGEMENT_ADDRESS.toString()); final JMSMessagingProxy proxy = new JMSMessagingProxy(session, managementQueue, ResourceNames.JMS_SERVER); return new JMSServerControl() 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 11:20:38 UTC (rev 8733) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/TopicControlTest.java 2010-01-06 12:15:42 UTC (rev 8734) @@ -428,7 +428,7 @@ String topicName = RandomUtil.randomString(); serverManager.createTopic(topicName, topicName); - topic = (HornetQTopic) HornetQJMSClient.createHornetQTopic(topicName); + topic = (HornetQTopic) HornetQJMSClient.createTopic(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 11:20:38 UTC (rev 8733) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/TopicControlUsingJMSTest.java 2010-01-06 12:15:42 UTC (rev 8734) @@ -352,15 +352,14 @@ String topicName = RandomUtil.randomString(); serverManager.createTopic(topicName, topicName); - topic = (HornetQTopic) HornetQJMSClient.createHornetQTopic(topicName); + topic = (HornetQTopic)HornetQJMSClient.createTopic(topicName); - HornetQConnectionFactory cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(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 = (HornetQQueue) HornetQJMSClient.createHornetQQueue(ConfigurationImpl.DEFAULT_MANAGEMENT_ADDRESS.toString(), - ConfigurationImpl.DEFAULT_MANAGEMENT_ADDRESS.toString()); + HornetQQueue managementQueue = (HornetQQueue)HornetQJMSClient.createQueue(ConfigurationImpl.DEFAULT_MANAGEMENT_ADDRESS.toString()); proxy = new JMSMessagingProxy(session, managementQueue, ResourceNames.JMS_TOPIC + topic.getTopicName()); } Modified: trunk/tests/src/org/hornetq/tests/opt/SendTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/opt/SendTest.java 2010-01-06 11:20:38 UTC (rev 8733) +++ trunk/tests/src/org/hornetq/tests/opt/SendTest.java 2010-01-06 12:15:42 UTC (rev 8734) @@ -156,7 +156,7 @@ coreSession.createQueue("jms.queue.test_queue", "jms.queue.test_queue"); - Queue queue = HornetQJMSClient.createHornetQQueue("test_queue"); + Queue queue = HornetQJMSClient.createQueue("test_queue"); MessageProducer prod = sess.createProducer(queue); @@ -254,7 +254,7 @@ coreSession.createQueue("jms.queue.test_queue", "jms.queue.test_queue"); - Queue queue = HornetQJMSClient.createHornetQQueue("test_queue"); + Queue queue = HornetQJMSClient.createQueue("test_queue"); MessageConsumer cons = sess.createConsumer(queue); @@ -375,7 +375,7 @@ coreSession.createQueue("jms.queue.test_queue", "jms.queue.test_queue"); - Queue queue = HornetQJMSClient.createHornetQQueue("test_queue"); + Queue queue = HornetQJMSClient.createQueue("test_queue"); MessageProducer prod = sess.createProducer(queue); @@ -473,7 +473,7 @@ coreSession.createQueue("jms.queue.test_queue", "jms.queue.test_queue"); - Queue queue = HornetQJMSClient.createHornetQQueue("test_queue"); + Queue queue = HornetQJMSClient.createQueue("test_queue"); MessageConsumer cons = sess.createConsumer(queue); 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 11:20:38 UTC (rev 8733) +++ trunk/tests/src/org/hornetq/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java 2010-01-06 12:15:42 UTC (rev 8734) @@ -182,8 +182,8 @@ ConnectionFactoryFactory sourceCFF = JMSBridgeImplTest.newConnectionFactoryFactory(failingSourceCF); ConnectionFactoryFactory targetCFF = JMSBridgeImplTest.newConnectionFactoryFactory(JMSBridgeImplTest.createConnectionFactory()); - DestinationFactory sourceDF = JMSBridgeImplTest.newDestinationFactory(HornetQJMSClient.createHornetQQueue(JMSBridgeImplTest.SOURCE)); - DestinationFactory targetDF = JMSBridgeImplTest.newDestinationFactory(HornetQJMSClient.createHornetQQueue(JMSBridgeImplTest.TARGET)); + DestinationFactory sourceDF = JMSBridgeImplTest.newDestinationFactory(HornetQJMSClient.createQueue(JMSBridgeImplTest.SOURCE)); + DestinationFactory targetDF = JMSBridgeImplTest.newDestinationFactory(HornetQJMSClient.createQueue(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(HornetQJMSClient.createHornetQQueue(JMSBridgeImplTest.SOURCE)); - DestinationFactory targetDF = JMSBridgeImplTest.newDestinationFactory(HornetQJMSClient.createHornetQQueue(JMSBridgeImplTest.TARGET)); + DestinationFactory sourceDF = JMSBridgeImplTest.newDestinationFactory(HornetQJMSClient.createQueue(JMSBridgeImplTest.SOURCE)); + DestinationFactory targetDF = JMSBridgeImplTest.newDestinationFactory(HornetQJMSClient.createQueue(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(HornetQJMSClient.createHornetQQueue(JMSBridgeImplTest.SOURCE)); - DestinationFactory targetDF = JMSBridgeImplTest.newDestinationFactory(HornetQJMSClient.createHornetQQueue(JMSBridgeImplTest.TARGET)); + DestinationFactory sourceDF = JMSBridgeImplTest.newDestinationFactory(HornetQJMSClient.createQueue(JMSBridgeImplTest.SOURCE)); + DestinationFactory targetDF = JMSBridgeImplTest.newDestinationFactory(HornetQJMSClient.createQueue(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(HornetQJMSClient.createHornetQQueue(JMSBridgeImplTest.SOURCE)); - DestinationFactory targetDF = JMSBridgeImplTest.newDestinationFactory(HornetQJMSClient.createHornetQQueue(JMSBridgeImplTest.TARGET)); + DestinationFactory sourceDF = JMSBridgeImplTest.newDestinationFactory(HornetQJMSClient.createQueue(JMSBridgeImplTest.SOURCE)); + DestinationFactory targetDF = JMSBridgeImplTest.newDestinationFactory(HornetQJMSClient.createQueue(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(HornetQJMSClient.createHornetQQueue(JMSBridgeImplTest.SOURCE)); - DestinationFactory targetDF = JMSBridgeImplTest.newDestinationFactory(HornetQJMSClient.createHornetQQueue(JMSBridgeImplTest.TARGET)); + DestinationFactory sourceDF = JMSBridgeImplTest.newDestinationFactory(HornetQJMSClient.createQueue(JMSBridgeImplTest.SOURCE)); + DestinationFactory targetDF = JMSBridgeImplTest.newDestinationFactory(HornetQJMSClient.createQueue(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(HornetQJMSClient.createHornetQQueue(JMSBridgeImplTest.SOURCE)); - DestinationFactory targetDF = JMSBridgeImplTest.newDestinationFactory(HornetQJMSClient.createHornetQQueue(JMSBridgeImplTest.TARGET)); + DestinationFactory sourceDF = JMSBridgeImplTest.newDestinationFactory(HornetQJMSClient.createQueue(JMSBridgeImplTest.SOURCE)); + DestinationFactory targetDF = JMSBridgeImplTest.newDestinationFactory(HornetQJMSClient.createQueue(JMSBridgeImplTest.TARGET)); TransactionManager tm = JMSBridgeImplTest.newTransactionManager(); JMSBridgeImpl bridge = new JMSBridgeImpl(); Modified: trunk/tests/src/org/hornetq/tests/unit/jms/HornetQQueueTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/jms/HornetQQueueTest.java 2010-01-06 11:20:38 UTC (rev 8733) +++ trunk/tests/src/org/hornetq/tests/unit/jms/HornetQQueueTest.java 2010-01-06 12:15:42 UTC (rev 8734) @@ -40,14 +40,14 @@ public void testIsTemporary() throws Exception { - HornetQQueue queue = (HornetQQueue) HornetQJMSClient.createHornetQQueue(RandomUtil.randomString()); + HornetQQueue queue = (HornetQQueue) HornetQJMSClient.createQueue(RandomUtil.randomString()); Assert.assertFalse(queue.isTemporary()); } public void testGetQueueName() throws Exception { String queueName = RandomUtil.randomString(); - HornetQQueue queue = (HornetQQueue) HornetQJMSClient.createHornetQQueue(queueName); + HornetQQueue queue = (HornetQQueue) HornetQJMSClient.createQueue(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 11:20:38 UTC (rev 8733) +++ trunk/tests/src/org/hornetq/tests/unit/jms/HornetQTopicTest.java 2010-01-06 12:15:42 UTC (rev 8734) @@ -41,14 +41,14 @@ public void testIsTemporary() throws Exception { - HornetQTopic topic = (HornetQTopic) HornetQJMSClient.createHornetQTopic(RandomUtil.randomString()); + HornetQTopic topic = (HornetQTopic) HornetQJMSClient.createTopic(RandomUtil.randomString()); Assert.assertFalse(topic.isTemporary()); } public void testGetTopicName() throws Exception { String topicName = RandomUtil.randomString(); - HornetQTopic queue = (HornetQTopic) HornetQJMSClient.createHornetQTopic(topicName); + HornetQTopic queue = (HornetQTopic) HornetQJMSClient.createTopic(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 11:20:38 UTC (rev 8733) +++ trunk/tests/src/org/hornetq/tests/unit/jms/referenceable/DestinationObjectFactoryTest.java 2010-01-06 12:15:42 UTC (rev 8734) @@ -44,7 +44,7 @@ public void testReference() throws Exception { - HornetQDestination queue = (HornetQQueue) HornetQJMSClient.createHornetQQueue(RandomUtil.randomString()); + HornetQDestination queue = (HornetQQueue) HornetQJMSClient.createQueue(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 11:20:38 UTC (rev 8733) +++ trunk/tests/src/org/hornetq/tests/unit/ra/ResourceAdapterTest.java 2010-01-06 12:15:42 UTC (rev 8734) @@ -387,7 +387,7 @@ ClientSessionFactory factory = createInVMFactory(); ClientSession session = factory.createSession(false, false, false); - HornetQQueue queue = (HornetQQueue) HornetQJMSClient.createHornetQQueue("test"); + HornetQQueue queue = (HornetQQueue) HornetQJMSClient.createQueue("test"); session.createQueue(queue.getSimpleAddress(), queue.getSimpleAddress(), true); session.close();