hornetq-commits January 2010

hornetq-commits@lists.jboss.org

1 participants
155 discussions

JBoss hornetq SVN: r8740 - in trunk/src/main/org/hornetq/api/core: management and 1 other directory.

by do-not-reply＠jboss.org

Author: jmesnil Date: 2010-01-06 07:53:08 -0500 (Wed, 06 Jan 2010) New Revision: 8740 Modified: trunk/src/main/org/hornetq/api/core/client/ClientSession.java trunk/src/main/org/hornetq/api/core/management/HornetQServerControl.java Log: updated javadoc Modified: trunk/src/main/org/hornetq/api/core/client/ClientSession.java =================================================================== --- trunk/src/main/org/hornetq/api/core/client/ClientSession.java 2010-01-06 12:44:47 UTC (rev 8739) +++ trunk/src/main/org/hornetq/api/core/client/ClientSession.java 2010-01-06 12:53:08 UTC (rev 8740) @@ -417,7 +417,7 @@ * * @return a ClientProducer * - * @see ClientProducer#send(SimpleString, org.hornetq.api.core.message.Message) + * @see ClientProducer#send(SimpleString, org.hornetq.api.core.Message) */ ClientProducer createProducer() throws HornetQException; Modified: trunk/src/main/org/hornetq/api/core/management/HornetQServerControl.java =================================================================== --- trunk/src/main/org/hornetq/api/core/management/HornetQServerControl.java 2010-01-06 12:44:47 UTC (rev 8739) +++ trunk/src/main/org/hornetq/api/core/management/HornetQServerControl.java 2010-01-06 12:53:08 UTC (rev 8740) @@ -16,7 +16,7 @@ import javax.management.MBeanOperationInfo; import org.hornetq.api.core.HornetQException; -import org.hornetq.core.config.Configuration; +import org.hornetq.api.core.Interceptor; /** * A HornetQServerControl is used to manage HornetQ servers. @@ -26,7 +26,9 @@ // Attributes ---------------------------------------------------- /** - * @see Configuration#getBackupConnectorName() + * Returns the name of the connector used to connect to the backup. + * + * If this server has no backup or is itself a backup, the value is {@code null}. */ String getBackupConnectorName(); @@ -46,233 +48,239 @@ boolean isStarted(); /** - * @see Configuration#getInterceptorClassNames() + * Returns the list of interceptors used by this server. + * + * @see Interceptor */ String[] getInterceptorClassNames(); /** - * @see Configuration#isClustered() + * Returns whether this server is clustered. */ boolean isClustered(); /** - * @see Configuration#getScheduledThreadPoolMaxSize() + * Returns the maximum number of threads in the scheduled thread pool. */ int getScheduledThreadPoolMaxSize(); /** - * @see Configuration#getThreadPoolMaxSize() + * Returns the maximum number of threads in the thread pool. */ int getThreadPoolMaxSize(); /** - * @see Configuration#getSecurityInvalidationInterval() + * Returns the interval time (in milliseconds) to invalidate security credentials. */ long getSecurityInvalidationInterval(); /** - * @see Configuration#isSecurityEnabled() + * Returns whether security is enabled for this server. */ boolean isSecurityEnabled(); /** - * @see Configuration#getBindingsDirectory() + * Returns the file system directory used to store bindings. */ String getBindingsDirectory(); /** - * @see Configuration#getJournalDirectory() + * Returns the file system directory used to store journal log. */ String getJournalDirectory(); /** - * @see Configuration#getJournalType() + * Returns the type of journal used by this server (either {@code NIO} or {@code ASYNCIO}). */ String getJournalType(); /** - * @see Configuration#isJournalSyncTransactional() + * Returns whether the journal is synchronized when receiving transactional data. */ boolean isJournalSyncTransactional(); /** - * @see Configuration#isJournalSyncNonTransactional()() + * Returns whether the journal is synchronized when receiving non-transactional data. */ boolean isJournalSyncNonTransactional(); /** - * @see Configuration#getJournalFileSize() + * Returns the size (in bytes) of each journal files. */ int getJournalFileSize(); /** - * @see Configuration#getJournalMinFiles() + * Returns the number of journal files to pre-create. */ int getJournalMinFiles(); /** - * Returns the maximum number of write requests that can be in the journal at any given time. - * - * @see Configuration#getJournalMaxIO_AIO() - * @see Configuration#getJournalMaxIO_NIO() + * Returns the maximum number of write requests that can be in the AIO queue at any given time. */ int getJournalMaxIO(); /** * Returns the size of the internal buffer on the journal. - * - * @see Configuration#getJournalBufferSize_AIO() - * @see Configuration#getJournalBufferSize_NIO() */ int getJournalBufferSize(); /** * Returns the timeout (in nanoseconds) used to flush internal buffers on the journal. - * - * @see Configuration#getJournalBufferTimeout_AIO() - * @see Configuration#getJournalBufferTimeout_NIO() */ int getJournalBufferTimeout(); /** - * @see Configuration#getJournalCompactMinFiles() + * Returns the minimal number of journal files before compacting. */ int getJournalCompactMinFiles(); /** - * @see Configuration#getJournalCompactPercentage() + * Return the percentage of live data before compacting the journal. */ int getJournalCompactPercentage(); /** - * @see Configuration#isPersistenceEnabled() + * Returns whether this server is using persistence and store data. */ boolean isPersistenceEnabled(); /** - * @see Configuration#isCreateBindingsDir() + * Returns whether the bindings directory is created on this server startup. */ boolean isCreateBindingsDir(); /** - * @see Configuration#isCreateJournalDir() + * Returns whether the journal directory is created on this server startup. */ boolean isCreateJournalDir(); /** - * @see Configuration#isMessageCounterEnabled() + * Returns whether message counter is enabled for this server. */ boolean isMessageCounterEnabled(); /** - * @see Configuration#getMessageCounterMaxDayHistory() + * Returns the maximum number of days kept in memory for message counter. */ int getMessageCounterMaxDayCount(); /** - * @see Configuration#setMessageCounterMaxDayHistory(int) + * Sets the maximum number of days kept in memory for message counter. + * + * @param count value must be greater than 0 */ void setMessageCounterMaxDayCount(int count) throws Exception; /** - * @see Configuration#getMessageCounterSamplePeriod() + * Returns the sample period (in milliseconds) to take message counter snapshot. */ long getMessageCounterSamplePeriod(); /** - * @see Configuration#setMessageCounterSamplePeriod(long) + * Sets the sample period to take message counter snapshot. + * + * @param newPeriod value must be greater than 1000ms */ void setMessageCounterSamplePeriod(long newPeriod) throws Exception; /** - * @see Configuration#isBackup() + * Returns {@code true} if this server is a backup, {@code false} if it is a live server. + * + * If a backup server has been activated, returns {@code false}. */ boolean isBackup(); /** - * @see Configuration#isSharedStore() + * Returns whether this server shares its data store with a corresponding live or backup server. */ boolean isSharedStore(); /** - * @see Configuration#getPagingDirectory() + * Returns the file system directory used to store paging files. */ String getPagingDirectory(); /** - * @see Configuration#isPersistDeliveryCountBeforeDelivery() + * Returns whether delivery count is persisted before messages are delivered to the consumers. */ boolean isPersistDeliveryCountBeforeDelivery(); /** - * @see Configuration#getConnectionTTLOverride() + * Returns the connection time to live. + * + * This value overrides the connection time to live sent by the client. */ long getConnectionTTLOverride(); /** - * @see Configuration#getManagementAddress() + * Returns the management address of this server. + * + * Clients can send management messages to this address to manage this server. */ String getManagementAddress(); /** - * @see Configuration#getManagementNotificationAddress() + * Returns the management notification address of this server. + * + * Clients can bind queues to this address to receive management notifications emitted by this server. */ String getManagementNotificationAddress(); /** - * @see Configuration#getIDCacheSize() + * Returns the size of the cache for pre-creating message IDs. */ int getIDCacheSize(); /** - * @see Configuration#isPersistIDCache() + * Returns whether message ID cache is persisted. */ boolean isPersistIDCache(); /** - * @see Configuration#getLargeMessagesDirectory() + * Returns the file system directory used to store large messages. */ String getLargeMessagesDirectory(); /** - * @see Configuration#isWildcardRoutingEnabled() + * Returns whether wildcard routing is supported by this server. */ boolean isWildcardRoutingEnabled(); /** - * @see Configuration#getTransactionTimeout() + * Returns the timeout (in milliseconds) after which transactions is removed + * from the resource manager after it was created. */ long getTransactionTimeout(); /** - * @see Configuration#getTransactionTimeoutScanPeriod() + * Returns the frequency (in milliseconds) to scan transactions to detect which transactions + * have timed out. */ long getTransactionTimeoutScanPeriod(); /** - * @see Configuration#getMessageExpiryScanPeriod() + * Returns the frequency (in milliseconds) to scan messages to detect which messages + * have expired. */ long getMessageExpiryScanPeriod(); /** - * @see Configuration#getMessageExpiryThreadPriority() + * Returns the priority of the thread used to scan message expiration. */ long getMessageExpiryThreadPriority(); /** - * @see Configuration#isAsyncConnectionExecutionEnabled() + * Returns whether code coming from connection is executed asynchronously or not. */ boolean isAsyncConnectionExecutionEnabled(); /** - * @see Configuration#getConnectorConfigurations() + * Returns the connectors configured for this server. */ Object[] getConnectors() throws Exception; /** * Returns the connectors configured for this server using JSON serialization. - * - * @see Configuration#getConnectorConfigurations() */ String getConnectorsAsJSON() throws Exception;

15 years, 11 months

1
0
0 / 0

JBoss hornetq SVN: r8739 - trunk/native/src.

by do-not-reply＠jboss.org

Author: jmesnil Date: 2010-01-06 07:44:47 -0500 (Wed, 06 Jan 2010) New Revision: 8739 Modified: trunk/native/src/JavaUtilities.cpp Log: updated package location of HornetQException Modified: trunk/native/src/JavaUtilities.cpp =================================================================== --- trunk/native/src/JavaUtilities.cpp 2010-01-06 12:43:13 UTC (rev 8738) +++ trunk/native/src/JavaUtilities.cpp 2010-01-06 12:44:47 UTC (rev 8739) @@ -26,7 +26,7 @@ void throwException(JNIEnv * env, const int code, const char * message) { - jclass exceptionClass = env->FindClass("org/hornetq/api/core/exception/HornetQException"); + jclass exceptionClass = env->FindClass("org/hornetq/api/core/HornetQException"); if (exceptionClass==NULL) { std::cerr << "Couldn't throw exception message:= " << message << "\n";

15 years, 11 months

1
0
0 / 0

JBoss hornetq SVN: r8738 - trunk/docs/user-manual/en.

by do-not-reply＠jboss.org

Author: jmesnil Date: 2010-01-06 07:43:13 -0500 (Wed, 06 Jan 2010) New Revision: 8738 Modified: trunk/docs/user-manual/en/using-jms.xml Log: fixed program listing Modified: trunk/docs/user-manual/en/using-jms.xml =================================================================== --- trunk/docs/user-manual/en/using-jms.xml 2010-01-06 12:41:30 UTC (rev 8737) +++ trunk/docs/user-manual/en/using-jms.xml 2010-01-06 12:43:13 UTC (rev 8738) @@ -182,7 +182,7 @@ ConnectionFactory cf = HornetQJMSClient.createConnectionFactory(transportConfiguration); </programlisting> <para>We create the JMS Queue Object via the HornetQJMSClient Utility class:</para> - <programlisting>Queue orderQueue = HornetQJMSClient.createHornetQQueue("OrderQueue");</programlisting> + <programlisting>Queue orderQueue = HornetQJMSClient.createQueue("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

15 years, 11 months

1
0
0 / 0

JBoss hornetq SVN: r8737 - in trunk: examples/common and 27 other directories.

by do-not-reply＠jboss.org

Author: jmesnil Date: 2010-01-06 07:41:30 -0500 (Wed, 06 Jan 2010) New Revision: 8737 Added: trunk/src/main/org/hornetq/jms/client/HornetQConnectionFactory.java trunk/src/main/org/hornetq/jms/client/HornetQDestination.java trunk/src/main/org/hornetq/jms/client/HornetQQueue.java trunk/src/main/org/hornetq/jms/client/HornetQTemporaryQueue.java trunk/src/main/org/hornetq/jms/client/HornetQTemporaryTopic.java trunk/src/main/org/hornetq/jms/client/HornetQTopic.java Removed: 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 Modified: trunk/docs/user-manual/en/configuration-index.xml trunk/docs/user-manual/en/management.xml trunk/examples/common/build.xml trunk/examples/jms/applet/build.xml trunk/examples/jms/management/server0/hornetq-configuration.xml trunk/src/main/org/hornetq/api/jms/HornetQJMSClient.java trunk/src/main/org/hornetq/core/config/impl/ConfigurationImpl.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/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/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/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/ReferenceableTest.java trunk/tests/src/org/hornetq/tests/integration/client/FailureDeadlockTest.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/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/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/opt/SendTest.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 Log: HORNETQ-258: Public vs. Private API * moved o.h.jms.HornetQ* classes with other JMS implementations o.h.jms.client * renamed default management address so that JMS client can create a JMS queue bound to it to send management messages * fixed applet example Modified: trunk/docs/user-manual/en/configuration-index.xml =================================================================== --- trunk/docs/user-manual/en/configuration-index.xml 2010-01-06 12:38:23 UTC (rev 8736) +++ trunk/docs/user-manual/en/configuration-index.xml 2010-01-06 12:41:30 UTC (rev 8737) @@ -223,7 +223,7 @@ <entry>String</entry> <entry>the name of the management address to send management messages to</entry> - <entry>hornetq.management</entry> + <entry>jms.queue.hornetq.management</entry> </row> <row> <entry><link linkend="management.replication" Modified: trunk/docs/user-manual/en/management.xml =================================================================== --- trunk/docs/user-manual/en/management.xml 2010-01-06 12:38:23 UTC (rev 8736) +++ trunk/docs/user-manual/en/management.xml 2010-01-06 12:41:30 UTC (rev 8737) @@ -618,7 +618,7 @@ >exampleQueue</literal>:</para> <programlisting> ClientSession session = ... - ClientRequestor requestor = new ClientRequestor(session, "hornetq.management"); + ClientRequestor requestor = new ClientRequestor(session, "jms.queue.hornetq.management"); ClientMessage message = session.createMessage(false); ManagementHelper.putAttribute(message, "core.queue.exampleQueue", "messageCount"); ClientMessage reply = requestor.request(m); @@ -637,16 +637,17 @@ <para>The management address to send management messages is configured in <literal >hornetq-configuration.xml</literal>:</para> <programlisting> - <management-address>hornetq.management</management-address> + <management-address>jms.queue.hornetq.management</management-address> </programlisting> - <para>By default, the address is <literal>hornetq.management</literal>.</para> + <para>By default, the address is <literal>jms.queue.hornetq.management</literal> + (it is prepended by "jms.queue" so that JMS clients can also send management messages).</para> <para>The management address requires a <emphasis>special</emphasis> user permission <literal>manage</literal> to be able to receive and handle management messages. This is also configured in hornetq-configuration.xml:</para> <programlisting>   - <security-setting match="hornetq.management"> + <security-setting match="jms.queue.hornetq.management"> <permission type="manage" roles="admin" /> </security-setting> </programlisting> @@ -660,7 +661,7 @@ <para>The <emphasis>management queue</emphasis> is a special queue and needs to be instantiated directly by the client:</para> <programlisting> - Queue managementQueue = HornetQJMSClient.createHornetQQueue("hornetq.management", "hornetq.management"); + Queue managementQueue = HornetQJMSClient.createQueue("hornetq.management"); </programlisting> <para>All the other steps are the same than for the Core API but they use JMS API instead:</para> @@ -689,13 +690,13 @@ <para>For example, to know the number of messages in the JMS queue <literal >exampleQueue</literal>:</para> <programlisting> - Queue managementQueue = HornetQJMSClient.createHornetQQueue("hornetq.management", "hornetq.management"); + Queue managementQueue = HornetQJMSClient.createQueue("hornetq.management"); QueueSession session = ... QueueRequestor requestor = new QueueRequestor(session, managementQueue); connection.start(); Message message = session.createMessage(); - JMSManagementHelper.putAttribute(message, "jms.queue.exampleQueue", "managementQueueessageCount"); + JMSManagementHelper.putAttribute(message, "jms.queue.exampleQueue", "messageCount"); Message reply = requestor.request(message); int count = (Integer)JMSManagementHelper.getResult(reply); System.out.println("There are " + count + " messages in exampleQueue"); Modified: trunk/examples/common/build.xml =================================================================== --- trunk/examples/common/build.xml 2010-01-06 12:38:23 UTC (rev 8736) +++ trunk/examples/common/build.xml 2010-01-06 12:41:30 UTC (rev 8737) @@ -72,10 +72,10 @@ <fileset dir="${hornetq.jars.dir}"> <include name="**/*client*.jar"/> <include name="**/jboss-jms-api.jar"/> - <include name="**/netty.jar"/> </fileset> <fileset dir="${jars.dir}"> - <include name="**/jboss-jms-api.jar"/> + <include name="**/jboss-jms-api.jar"/> + <include name="**/netty.jar"/> </fileset> <path refid="extra.classpath"/> </path> Modified: trunk/examples/jms/applet/build.xml =================================================================== --- trunk/examples/jms/applet/build.xml 2010-01-06 12:38:23 UTC (rev 8736) +++ trunk/examples/jms/applet/build.xml 2010-01-06 12:41:30 UTC (rev 8737) @@ -19,6 +19,12 @@ <import file="../../common/build.xml"/> + <path id="extra.classpath"> + <fileset dir="${jars.dir}"> + <include name="**/netty.jar" /> + </fileset> + </path> + <path id="applet.classpath"> <fileset dir="build/classes" /> <fileset dir="build/classes"> @@ -28,10 +34,12 @@ <target name="init"> <mkdir dir="build/classes" /> - <copy todir="build/classes"> - <fileset dir="${hornetq.jars.dir}"> - <include name="hornetq-core-client.jar"/> - <include name="hornetq-jms-client.jar"/> + <copy todir="build/classes" flatten="true"> + <fileset dir="${client.jars.dir}"> + <include name="hornetq-core-client.jar"/> + <include name="hornetq-jms-client.jar"/> + </fileset> + <fileset dir="${hornetq.jars.dir}"> <include name="hornetq-transports.jar"/> </fileset> <fileset dir="${jars.dir}"> Modified: trunk/examples/jms/management/server0/hornetq-configuration.xml =================================================================== --- trunk/examples/jms/management/server0/hornetq-configuration.xml 2010-01-06 12:38:23 UTC (rev 8736) +++ trunk/examples/jms/management/server0/hornetq-configuration.xml 2010-01-06 12:41:30 UTC (rev 8737) @@ -2,7 +2,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:hornetq /schema/hornetq-configuration.xsd"> - <management-address>hornetq.management</management-address> + <management-address>jms.queue.hornetq.management</management-address> <connectors> <connector name="netty"> @@ -30,7 +30,7 @@ </security-setting>  - <security-setting match="hornetq.management"> + <security-setting match="jms.queue.hornetq.management"> <permission type="manage" roles="guest" /> </security-setting> Modified: trunk/src/main/org/hornetq/api/jms/HornetQJMSClient.java =================================================================== --- trunk/src/main/org/hornetq/api/jms/HornetQJMSClient.java 2010-01-06 12:38:23 UTC (rev 8736) +++ trunk/src/main/org/hornetq/api/jms/HornetQJMSClient.java 2010-01-06 12:41:30 UTC (rev 8737) @@ -22,9 +22,9 @@ 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 org.hornetq.jms.client.HornetQConnectionFactory; +import org.hornetq.jms.client.HornetQQueue; +import org.hornetq.jms.client.HornetQTopic; /** * A utility class for creating HornetQ Client Side JMS Objects. Modified: trunk/src/main/org/hornetq/core/config/impl/ConfigurationImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/config/impl/ConfigurationImpl.java 2010-01-06 12:38:23 UTC (rev 8736) +++ trunk/src/main/org/hornetq/core/config/impl/ConfigurationImpl.java 2010-01-06 12:41:30 UTC (rev 8737) @@ -132,7 +132,8 @@ public static final long DEFAULT_TRANSACTION_TIMEOUT_SCAN_PERIOD = 1000; - public static final SimpleString DEFAULT_MANAGEMENT_ADDRESS = new SimpleString("hornetq.management"); + // the management address is prefix with jms.queue so that JMS clients can send messages to it too. + public static final SimpleString DEFAULT_MANAGEMENT_ADDRESS = new SimpleString("jms.queue.hornetq.management"); public static final SimpleString DEFAULT_MANAGEMENT_NOTIFICATION_ADDRESS = new SimpleString("hornetq.notifications"); Deleted: trunk/src/main/org/hornetq/jms/HornetQConnectionFactory.java =================================================================== --- trunk/src/main/org/hornetq/jms/HornetQConnectionFactory.java 2010-01-06 12:38:23 UTC (rev 8736) +++ trunk/src/main/org/hornetq/jms/HornetQConnectionFactory.java 2010-01-06 12:41:30 UTC (rev 8737) @@ -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.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.core.Pair; -import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.HornetQClient; -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 -------------------------------------------------------------------------------- - -} Deleted: trunk/src/main/org/hornetq/jms/HornetQDestination.java =================================================================== --- trunk/src/main/org/hornetq/jms/HornetQDestination.java 2010-01-06 12:38:23 UTC (rev 8736) +++ trunk/src/main/org/hornetq/jms/HornetQDestination.java 2010-01-06 12:41:30 UTC (rev 8737) @@ -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.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.core.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 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 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 ------------------------------------------------- -} Deleted: trunk/src/main/org/hornetq/jms/HornetQQueue.java =================================================================== --- trunk/src/main/org/hornetq/jms/HornetQQueue.java 2010-01-06 12:38:23 UTC (rev 8736) +++ trunk/src/main/org/hornetq/jms/HornetQQueue.java 2010-01-06 12:41:30 UTC (rev 8737) @@ -1,93 +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.jms; - -import javax.jms.JMSException; -import javax.jms.Queue; - -import org.hornetq.api.core.SimpleString; -import org.hornetq.jms.HornetQDestination; -import org.hornetq.core.logging.Logger; - -/** - * HornetQ implementation of a JMS Queue. - * - * 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); - } - - protected 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/jms/HornetQTemporaryQueue.java =================================================================== --- trunk/src/main/org/hornetq/jms/HornetQTemporaryQueue.java 2010-01-06 12:38:23 UTC (rev 8736) +++ trunk/src/main/org/hornetq/jms/HornetQTemporaryQueue.java 2010-01-06 12:41:30 UTC (rev 8737) @@ -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.jms; - -import javax.jms.JMSException; -import javax.jms.TemporaryQueue; - -import org.hornetq.jms.client.HornetQSession; - -/** - * HornetQ implementation of a JMS TemporaryQueue. - * - * 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/jms/HornetQTemporaryTopic.java =================================================================== --- trunk/src/main/org/hornetq/jms/HornetQTemporaryTopic.java 2010-01-06 12:38:23 UTC (rev 8736) +++ trunk/src/main/org/hornetq/jms/HornetQTemporaryTopic.java 2010-01-06 12:41:30 UTC (rev 8737) @@ -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.jms; - -import javax.jms.JMSException; -import javax.jms.TemporaryTopic; - -import org.hornetq.jms.client.HornetQSession; - -/** - * HornetQ implementation of a JMS TemporaryTopic. - * - * 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/jms/HornetQTopic.java =================================================================== --- trunk/src/main/org/hornetq/jms/HornetQTopic.java 2010-01-06 12:38:23 UTC (rev 8736) +++ trunk/src/main/org/hornetq/jms/HornetQTopic.java 2010-01-06 12:41:30 UTC (rev 8737) @@ -1,146 +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.jms; - -import javax.jms.JMSException; -import javax.jms.Topic; - -import org.hornetq.api.core.Pair; -import org.hornetq.api.core.SimpleString; -import org.hornetq.jms.HornetQDestination; - -/** - * HornetQ implementation of a JMS Topic. - * - * 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); - } - - protected 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 ------------------------------------------------- -} Copied: trunk/src/main/org/hornetq/jms/client/HornetQConnectionFactory.java (from rev 8735, trunk/src/main/org/hornetq/jms/HornetQConnectionFactory.java) =================================================================== --- trunk/src/main/org/hornetq/jms/client/HornetQConnectionFactory.java (rev 0) +++ trunk/src/main/org/hornetq/jms/client/HornetQConnectionFactory.java 2010-01-06 12:41:30 UTC (rev 8737) @@ -0,0 +1,631 @@ +/* + * 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.client; + +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.core.Pair; +import org.hornetq.api.core.TransportConfiguration; +import org.hornetq.api.core.client.ClientSessionFactory; +import org.hornetq.api.core.client.HornetQClient; +import org.hornetq.core.logging.Logger; +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 -------------------------------------------------------------------------------- + +} Copied: trunk/src/main/org/hornetq/jms/client/HornetQDestination.java (from rev 8735, trunk/src/main/org/hornetq/jms/HornetQDestination.java) =================================================================== --- trunk/src/main/org/hornetq/jms/client/HornetQDestination.java (rev 0) +++ trunk/src/main/org/hornetq/jms/client/HornetQDestination.java 2010-01-06 12:41:30 UTC (rev 8737) @@ -0,0 +1,167 @@ +/* + * 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.client; + +import java.io.Serializable; + +import javax.jms.Destination; +import javax.naming.NamingException; +import javax.naming.Reference; +import javax.naming.Referenceable; + +import org.hornetq.api.core.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 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 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 ------------------------------------------------- +} Modified: trunk/src/main/org/hornetq/jms/client/HornetQMessage.java =================================================================== --- trunk/src/main/org/hornetq/jms/client/HornetQMessage.java 2010-01-06 12:38:23 UTC (rev 8736) +++ trunk/src/main/org/hornetq/jms/client/HornetQMessage.java 2010-01-06 12:41:30 UTC (rev 8737) @@ -39,7 +39,6 @@ import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientSession; -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 12:38:23 UTC (rev 8736) +++ trunk/src/main/org/hornetq/jms/client/HornetQMessageConsumer.java 2010-01-06 12:41:30 UTC (rev 8737) @@ -29,7 +29,6 @@ import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.MessageHandler; -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 12:38:23 UTC (rev 8736) +++ trunk/src/main/org/hornetq/jms/client/HornetQMessageProducer.java 2010-01-06 12:41:30 UTC (rev 8737) @@ -35,7 +35,6 @@ import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; import org.hornetq.api.core.client.ClientSession; -import org.hornetq.jms.HornetQDestination; import org.hornetq.core.logging.Logger; import org.hornetq.utils.UUIDGenerator; Copied: trunk/src/main/org/hornetq/jms/client/HornetQQueue.java (from rev 8735, trunk/src/main/org/hornetq/jms/HornetQQueue.java) =================================================================== --- trunk/src/main/org/hornetq/jms/client/HornetQQueue.java (rev 0) +++ trunk/src/main/org/hornetq/jms/client/HornetQQueue.java 2010-01-06 12:41:30 UTC (rev 8737) @@ -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.client; + +import javax.jms.JMSException; +import javax.jms.Queue; + +import org.hornetq.api.core.SimpleString; +import org.hornetq.jms.client.HornetQDestination; +import org.hornetq.core.logging.Logger; + +/** + * HornetQ implementation of a JMS Queue. + * + * 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); + } + + protected 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 ------------------------------------------------- +} Modified: trunk/src/main/org/hornetq/jms/client/HornetQQueueBrowser.java =================================================================== --- trunk/src/main/org/hornetq/jms/client/HornetQQueueBrowser.java 2010-01-06 12:38:23 UTC (rev 8736) +++ trunk/src/main/org/hornetq/jms/client/HornetQQueueBrowser.java 2010-01-06 12:41:30 UTC (rev 8737) @@ -25,7 +25,6 @@ import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientSession; -import org.hornetq.jms.HornetQQueue; import org.hornetq.core.logging.Logger; /** Copied: trunk/src/main/org/hornetq/jms/client/HornetQTemporaryQueue.java (from rev 8735, trunk/src/main/org/hornetq/jms/HornetQTemporaryQueue.java) =================================================================== --- trunk/src/main/org/hornetq/jms/client/HornetQTemporaryQueue.java (rev 0) +++ trunk/src/main/org/hornetq/jms/client/HornetQTemporaryQueue.java 2010-01-06 12:41:30 UTC (rev 8737) @@ -0,0 +1,81 @@ +/* + * 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.client; + +import javax.jms.JMSException; +import javax.jms.TemporaryQueue; + + +/** + * HornetQ implementation of a JMS TemporaryQueue. + * + * 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/client/HornetQTemporaryTopic.java (from rev 8735, trunk/src/main/org/hornetq/jms/HornetQTemporaryTopic.java) =================================================================== --- trunk/src/main/org/hornetq/jms/client/HornetQTemporaryTopic.java (rev 0) +++ trunk/src/main/org/hornetq/jms/client/HornetQTemporaryTopic.java 2010-01-06 12:41:30 UTC (rev 8737) @@ -0,0 +1,81 @@ +/* + * 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.client; + +import javax.jms.JMSException; +import javax.jms.TemporaryTopic; + + +/** + * HornetQ implementation of a JMS TemporaryTopic. + * + * 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/client/HornetQTopic.java (from rev 8735, trunk/src/main/org/hornetq/jms/HornetQTopic.java) =================================================================== --- trunk/src/main/org/hornetq/jms/client/HornetQTopic.java (rev 0) +++ trunk/src/main/org/hornetq/jms/client/HornetQTopic.java 2010-01-06 12:41:30 UTC (rev 8737) @@ -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.client; + +import javax.jms.JMSException; +import javax.jms.Topic; + +import org.hornetq.api.core.Pair; +import org.hornetq.api.core.SimpleString; +import org.hornetq.jms.client.HornetQDestination; + +/** + * HornetQ implementation of a JMS Topic. + * + * 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); + } + + protected 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/jms/client/package-info.java =================================================================== --- trunk/src/main/org/hornetq/jms/client/package-info.java 2010-01-06 12:38:23 UTC (rev 8736) +++ trunk/src/main/org/hornetq/jms/client/package-info.java 2010-01-06 12:41:30 UTC (rev 8737) @@ -15,7 +15,7 @@ * Implementation of the JMS API. * * Classes in this package are not meant to be used directly - * except {@link org.hornetq.jms.HornetQConnectionFactory} which can be instantiated directly + * except {@link org.hornetq.jms.client.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 12:38:23 UTC (rev 8736) +++ trunk/src/main/org/hornetq/jms/management/impl/JMSConnectionFactoryControlImpl.java 2010-01-06 12:41:30 UTC (rev 8737) @@ -19,7 +19,7 @@ import javax.management.NotCompliantMBeanException; import javax.management.StandardMBean; -import org.hornetq.jms.HornetQConnectionFactory; +import org.hornetq.jms.client.HornetQConnectionFactory; import org.hornetq.api.jms.management.ConnectionFactoryControl; 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 12:38:23 UTC (rev 8736) +++ trunk/src/main/org/hornetq/jms/management/impl/JMSQueueControlImpl.java 2010-01-06 12:41:30 UTC (rev 8737) @@ -22,13 +22,13 @@ import org.hornetq.api.core.management.MessageCounterInfo; import org.hornetq.api.core.management.QueueControl; 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; import org.hornetq.core.messagecounter.MessageCounter; import org.hornetq.core.messagecounter.impl.MessageCounterHelper; import org.hornetq.jms.client.HornetQMessage; +import org.hornetq.jms.client.HornetQQueue; import org.hornetq.jms.client.SelectorTranslator; import org.hornetq.utils.json.JSONArray; import org.hornetq.utils.json.JSONObject; Modified: trunk/src/main/org/hornetq/jms/management/impl/JMSTopicControlImpl.java =================================================================== --- trunk/src/main/org/hornetq/jms/management/impl/JMSTopicControlImpl.java 2010-01-06 12:38:23 UTC (rev 8736) +++ trunk/src/main/org/hornetq/jms/management/impl/JMSTopicControlImpl.java 2010-01-06 12:41:30 UTC (rev 8737) @@ -27,12 +27,12 @@ import org.hornetq.api.core.management.HornetQServerControl; import org.hornetq.api.core.management.QueueControl; import org.hornetq.api.core.management.ResourceNames; -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; import org.hornetq.core.server.management.ManagementService; import org.hornetq.jms.client.HornetQMessage; +import org.hornetq.jms.client.HornetQTopic; import org.hornetq.jms.client.SelectorTranslator; import org.hornetq.utils.json.JSONArray; import org.hornetq.utils.json.JSONObject; Modified: trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java 2010-01-06 12:38:23 UTC (rev 8736) +++ trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java 2010-01-06 12:41:30 UTC (rev 8737) @@ -28,16 +28,16 @@ import org.hornetq.api.core.Pair; import org.hornetq.api.core.TransportConfiguration; -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; import org.hornetq.core.logging.Logger; import org.hornetq.core.server.ActivateCallback; import org.hornetq.core.server.HornetQServer; +import org.hornetq.jms.client.HornetQConnectionFactory; +import org.hornetq.jms.client.HornetQQueue; +import org.hornetq.jms.client.HornetQTopic; import org.hornetq.jms.client.SelectorTranslator; import org.hornetq.jms.server.JMSServerManager; import org.hornetq.jms.server.config.ConnectionFactoryConfiguration; Modified: trunk/src/main/org/hornetq/jms/server/management/JMSManagementService.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/management/JMSManagementService.java 2010-01-06 12:38:23 UTC (rev 8736) +++ trunk/src/main/org/hornetq/jms/server/management/JMSManagementService.java 2010-01-06 12:41:30 UTC (rev 8737) @@ -15,10 +15,10 @@ import java.util.List; -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.client.HornetQConnectionFactory; +import org.hornetq.jms.client.HornetQQueue; +import org.hornetq.jms.client.HornetQTopic; 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 12:38:23 UTC (rev 8736) +++ trunk/src/main/org/hornetq/jms/server/management/impl/JMSManagementServiceImpl.java 2010-01-06 12:41:30 UTC (rev 8737) @@ -20,9 +20,6 @@ import org.hornetq.api.core.management.AddressControl; import org.hornetq.api.core.management.QueueControl; import org.hornetq.api.core.management.ResourceNames; -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; @@ -30,6 +27,9 @@ import org.hornetq.core.messagecounter.MessageCounter; import org.hornetq.core.messagecounter.MessageCounterManager; import org.hornetq.core.server.management.ManagementService; +import org.hornetq.jms.client.HornetQConnectionFactory; +import org.hornetq.jms.client.HornetQQueue; +import org.hornetq.jms.client.HornetQTopic; import org.hornetq.jms.management.impl.JMSConnectionFactoryControlImpl; import org.hornetq.jms.management.impl.JMSQueueControlImpl; import org.hornetq.jms.management.impl.JMSServerControlImpl; Modified: trunk/src/main/org/hornetq/ra/HornetQRAManagedConnectionFactory.java =================================================================== --- trunk/src/main/org/hornetq/ra/HornetQRAManagedConnectionFactory.java 2010-01-06 12:38:23 UTC (rev 8736) +++ trunk/src/main/org/hornetq/ra/HornetQRAManagedConnectionFactory.java 2010-01-06 12:41:30 UTC (rev 8737) @@ -28,7 +28,7 @@ import javax.security.auth.Subject; import org.hornetq.core.logging.Logger; -import org.hornetq.jms.HornetQConnectionFactory; +import org.hornetq.jms.client.HornetQConnectionFactory; /** * HornetQ ManagedConectionFactory Modified: trunk/src/main/org/hornetq/ra/HornetQResourceAdapter.java =================================================================== --- trunk/src/main/org/hornetq/ra/HornetQResourceAdapter.java 2010-01-06 12:38:23 UTC (rev 8736) +++ trunk/src/main/org/hornetq/ra/HornetQResourceAdapter.java 2010-01-06 12:41:30 UTC (rev 8737) @@ -32,7 +32,7 @@ import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.jms.HornetQConnectionFactory; +import org.hornetq.jms.client.HornetQConnectionFactory; import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.core.logging.Logger; import org.hornetq.ra.inflow.HornetQActivation; Modified: trunk/src/main/org/hornetq/ra/inflow/HornetQActivation.java =================================================================== --- trunk/src/main/org/hornetq/ra/inflow/HornetQActivation.java 2010-01-06 12:38:23 UTC (rev 8736) +++ trunk/src/main/org/hornetq/ra/inflow/HornetQActivation.java 2010-01-06 12:41:30 UTC (rev 8737) @@ -31,8 +31,8 @@ import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.ClientSession; -import org.hornetq.jms.HornetQConnectionFactory; -import org.hornetq.jms.HornetQDestination; +import org.hornetq.jms.client.HornetQConnectionFactory; +import org.hornetq.jms.client.HornetQDestination; import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.core.logging.Logger; import org.hornetq.ra.HornetQResourceAdapter; Modified: trunk/src/main/org/hornetq/ra/inflow/HornetQMessageHandler.java =================================================================== --- trunk/src/main/org/hornetq/ra/inflow/HornetQMessageHandler.java 2010-01-06 12:38:23 UTC (rev 8736) +++ trunk/src/main/org/hornetq/ra/inflow/HornetQMessageHandler.java 2010-01-06 12:41:30 UTC (rev 8737) @@ -27,9 +27,9 @@ import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.MessageHandler; import org.hornetq.api.core.client.ClientSession.QueueQuery; -import org.hornetq.jms.HornetQTopic; import org.hornetq.core.logging.Logger; import org.hornetq.jms.client.HornetQMessage; +import org.hornetq.jms.client.HornetQTopic; /** * The message handler 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 12:38:23 UTC (rev 8736) +++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/CTSMiscellaneousTest.java 2010-01-06 12:41:30 UTC (rev 8737) @@ -24,7 +24,7 @@ import org.hornetq.api.core.Pair; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.jms.HornetQConnectionFactory; +import org.hornetq.jms.client.HornetQConnectionFactory; /** * Safeguards for previously detected TCK failures. 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 12:38:23 UTC (rev 8736) +++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/JMSTestCase.java 2010-01-06 12:41:30 UTC (rev 8737) @@ -21,7 +21,7 @@ import org.hornetq.api.core.Pair; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.jms.HornetQConnectionFactory; +import org.hornetq.jms.client.HornetQConnectionFactory; /** * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> 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 12:38:23 UTC (rev 8736) +++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/ReferenceableTest.java 2010-01-06 12:41:30 UTC (rev 8737) @@ -25,9 +25,9 @@ import javax.naming.Reference; import javax.naming.Referenceable; -import org.hornetq.jms.HornetQConnectionFactory; -import org.hornetq.jms.HornetQQueue; -import org.hornetq.jms.HornetQTopic; +import org.hornetq.jms.client.HornetQConnectionFactory; +import org.hornetq.jms.client.HornetQQueue; +import org.hornetq.jms.client.HornetQTopic; import org.hornetq.jms.referenceable.ConnectionFactoryObjectFactory; import org.hornetq.jms.referenceable.DestinationObjectFactory; import org.hornetq.jms.tests.util.ProxyAssertSupport; Modified: trunk/tests/src/org/hornetq/tests/integration/client/FailureDeadlockTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/FailureDeadlockTest.java 2010-01-06 12:38:23 UTC (rev 8736) +++ trunk/tests/src/org/hornetq/tests/integration/client/FailureDeadlockTest.java 2010-01-06 12:41:30 UTC (rev 8737) @@ -19,7 +19,6 @@ import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.jms.HornetQConnectionFactory; import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.core.client.impl.ClientSessionInternal; import org.hornetq.core.config.Configuration; @@ -28,6 +27,7 @@ import org.hornetq.core.remoting.RemotingConnection; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.HornetQServers; +import org.hornetq.jms.client.HornetQConnectionFactory; import org.hornetq.jms.client.HornetQSession; import org.hornetq.jms.server.impl.JMSServerManagerImpl; import org.hornetq.tests.integration.jms.server.management.NullInitialContext; Modified: trunk/tests/src/org/hornetq/tests/integration/jms/HornetQConnectionFactoryTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/HornetQConnectionFactoryTest.java 2010-01-06 12:38:23 UTC (rev 8736) +++ trunk/tests/src/org/hornetq/tests/integration/jms/HornetQConnectionFactoryTest.java 2010-01-06 12:41:30 UTC (rev 8737) @@ -27,7 +27,7 @@ import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.jms.HornetQConnectionFactory; +import org.hornetq.jms.client.HornetQConnectionFactory; import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; 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 12:38:23 UTC (rev 8736) +++ trunk/tests/src/org/hornetq/tests/integration/jms/bridge/BridgeTestBase.java 2010-01-06 12:41:30 UTC (rev 8737) @@ -36,7 +36,6 @@ import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.management.ResourceNames; -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; @@ -51,6 +50,7 @@ import org.hornetq.jms.bridge.ConnectionFactoryFactory; import org.hornetq.jms.bridge.DestinationFactory; import org.hornetq.jms.bridge.QualityOfServiceMode; +import org.hornetq.jms.client.HornetQConnectionFactory; import org.hornetq.jms.client.HornetQMessage; import org.hornetq.jms.server.JMSServerManager; import org.hornetq.jms.server.impl.JMSServerManagerImpl; 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 12:38:23 UTC (rev 8736) +++ trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSFailoverTest.java 2010-01-06 12:41:30 UTC (rev 8737) @@ -33,9 +33,7 @@ import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ClientSession; -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; @@ -45,6 +43,8 @@ import org.hornetq.core.remoting.impl.invm.TransportConstants; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.HornetQServers; +import org.hornetq.jms.client.HornetQConnectionFactory; +import org.hornetq.jms.client.HornetQQueue; import org.hornetq.jms.client.HornetQSession; import org.hornetq.tests.util.RandomUtil; import org.hornetq.tests.util.UnitTestCase; 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 12:38:23 UTC (rev 8736) +++ trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSReconnectTest.java 2010-01-06 12:41:30 UTC (rev 8737) @@ -32,10 +32,7 @@ import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ClientSession; -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; @@ -44,7 +41,10 @@ import org.hornetq.core.remoting.impl.invm.InVMRegistry; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.HornetQServers; +import org.hornetq.jms.client.HornetQConnectionFactory; +import org.hornetq.jms.client.HornetQQueue; import org.hornetq.jms.client.HornetQSession; +import org.hornetq.jms.client.HornetQTopic; import org.hornetq.tests.util.RandomUtil; import org.hornetq.tests.util.UnitTestCase; 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 12:38:23 UTC (rev 8736) +++ trunk/tests/src/org/hornetq/tests/integration/jms/connection/CloseConnectionOnGCTest.java 2010-01-06 12:41:30 UTC (rev 8737) @@ -23,7 +23,7 @@ import junit.framework.Assert; import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.jms.HornetQConnectionFactory; +import org.hornetq.jms.client.HornetQConnectionFactory; import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.CloseListener; 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 12:38:23 UTC (rev 8736) +++ trunk/tests/src/org/hornetq/tests/integration/jms/connection/CloseDestroyedConnectionTest.java 2010-01-06 12:41:30 UTC (rev 8737) @@ -23,11 +23,11 @@ import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.TransportConfiguration; -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; +import org.hornetq.jms.client.HornetQConnectionFactory; import org.hornetq.jms.client.HornetQSession; import org.hornetq.tests.util.JMSTestBase; 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 12:38:23 UTC (rev 8736) +++ trunk/tests/src/org/hornetq/tests/integration/jms/connection/ExceptionListenerTest.java 2010-01-06 12:41:30 UTC (rev 8737) @@ -24,7 +24,6 @@ import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.jms.HornetQConnectionFactory; import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.core.client.impl.ClientSessionInternal; import org.hornetq.core.config.Configuration; @@ -32,6 +31,7 @@ import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.HornetQServers; import org.hornetq.jms.client.HornetQConnection; +import org.hornetq.jms.client.HornetQConnectionFactory; import org.hornetq.jms.client.HornetQSession; import org.hornetq.jms.server.impl.JMSServerManagerImpl; import org.hornetq.tests.integration.jms.server.management.NullInitialContext; 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 12:38:23 UTC (rev 8736) +++ trunk/tests/src/org/hornetq/tests/integration/jms/consumer/ConsumerTest.java 2010-01-06 12:41:30 UTC (rev 8737) @@ -25,11 +25,11 @@ import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; -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.HornetQConnectionFactory; +import org.hornetq.jms.client.HornetQQueue; import org.hornetq.jms.client.HornetQSession; import org.hornetq.tests.util.JMSTestBase; 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 12:38:23 UTC (rev 8736) +++ trunk/tests/src/org/hornetq/tests/integration/jms/divert/DivertAndACKClientTest.java 2010-01-06 12:41:30 UTC (rev 8737) @@ -27,7 +27,7 @@ import org.hornetq.api.core.Pair; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.jms.HornetQQueue; +import org.hornetq.jms.client.HornetQQueue; import org.hornetq.core.config.Configuration; import org.hornetq.core.server.cluster.DivertConfiguration; import org.hornetq.tests.util.JMSTestBase; 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 12:38:23 UTC (rev 8736) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerDeployerTest.java 2010-01-06 12:41:30 UTC (rev 8737) @@ -22,7 +22,6 @@ import junit.framework.Assert; import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.jms.HornetQConnectionFactory; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.deployers.DeploymentManager; @@ -30,6 +29,7 @@ import org.hornetq.core.logging.Logger; import org.hornetq.core.server.HornetQServer; import org.hornetq.integration.transports.netty.NettyConnectorFactory; +import org.hornetq.jms.client.HornetQConnectionFactory; import org.hornetq.jms.server.JMSServerManager; import org.hornetq.jms.server.impl.JMSServerDeployer; import org.hornetq.jms.server.impl.JMSServerManagerImpl; 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 12:38:23 UTC (rev 8736) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerStartStopTest.java 2010-01-06 12:41:30 UTC (rev 8737) @@ -23,13 +23,13 @@ import junit.framework.Assert; import org.hornetq.api.core.TransportConfiguration; -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; import org.hornetq.core.server.impl.HornetQServerImpl; import org.hornetq.integration.transports.netty.NettyConnectorFactory; +import org.hornetq.jms.client.HornetQConnectionFactory; import org.hornetq.jms.server.JMSServerManager; import org.hornetq.jms.server.impl.JMSServerManagerImpl; import org.hornetq.spi.core.security.HornetQSecurityManager; 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 12:38:23 UTC (rev 8736) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSQueueControlTest.java 2010-01-06 12:41:30 UTC (rev 8737) @@ -29,9 +29,7 @@ import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; -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; @@ -40,6 +38,8 @@ import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.HornetQServers; import org.hornetq.core.settings.impl.AddressSettings; +import org.hornetq.jms.client.HornetQConnectionFactory; +import org.hornetq.jms.client.HornetQQueue; import org.hornetq.jms.server.impl.JMSServerManagerImpl; import org.hornetq.tests.integration.management.ManagementControlHelper; import org.hornetq.tests.integration.management.ManagementTestBase; 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 12:38:23 UTC (rev 8736) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java 2010-01-06 12:41:30 UTC (rev 8737) @@ -21,11 +21,10 @@ import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.management.ResourceNames; -import org.hornetq.jms.HornetQConnectionFactory; import org.hornetq.api.jms.HornetQJMSClient; -import org.hornetq.jms.HornetQQueue; +import org.hornetq.jms.client.HornetQConnectionFactory; +import org.hornetq.jms.client.HornetQQueue; import org.hornetq.api.jms.management.JMSQueueControl; -import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; /** @@ -78,7 +77,7 @@ @Override protected JMSQueueControl createManagementControl() throws Exception { - HornetQQueue managementQueue = (HornetQQueue)HornetQJMSClient.createQueue(ConfigurationImpl.DEFAULT_MANAGEMENT_ADDRESS.toString()); + HornetQQueue managementQueue = (HornetQQueue) HornetQJMSClient.createQueue("hornetq.management"); final JMSMessagingProxy proxy = new JMSMessagingProxy(session, managementQueue, 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 12:38:23 UTC (rev 8736) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java 2010-01-06 12:41:30 UTC (rev 8737) @@ -21,9 +21,9 @@ import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.management.ResourceNames; -import org.hornetq.jms.HornetQConnectionFactory; import org.hornetq.api.jms.HornetQJMSClient; -import org.hornetq.jms.HornetQQueue; +import org.hornetq.jms.client.HornetQConnectionFactory; +import org.hornetq.jms.client.HornetQQueue; import org.hornetq.api.jms.management.JMSServerControl; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; 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 12:38:23 UTC (rev 8736) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSUtil.java 2010-01-06 12:41:30 UTC (rev 8737) @@ -27,7 +27,7 @@ import junit.framework.Assert; import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.jms.HornetQConnectionFactory; +import org.hornetq.jms.client.HornetQConnectionFactory; import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.tests.util.RandomUtil; 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 12:38:23 UTC (rev 8736) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/TopicControlTest.java 2010-01-06 12:41:30 UTC (rev 8737) @@ -23,7 +23,6 @@ import org.hornetq.api.core.TransportConfiguration; 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; @@ -31,6 +30,7 @@ import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.HornetQServers; +import org.hornetq.jms.client.HornetQTopic; import org.hornetq.jms.server.impl.JMSServerManagerImpl; import org.hornetq.tests.integration.management.ManagementControlHelper; import org.hornetq.tests.integration.management.ManagementTestBase; 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 12:38:23 UTC (rev 8736) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/TopicControlUsingJMSTest.java 2010-01-06 12:41:30 UTC (rev 8737) @@ -23,15 +23,15 @@ import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.management.ResourceNames; -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; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.HornetQServers; +import org.hornetq.jms.client.HornetQConnectionFactory; +import org.hornetq.jms.client.HornetQQueue; +import org.hornetq.jms.client.HornetQTopic; import org.hornetq.jms.server.impl.JMSServerManagerImpl; import org.hornetq.tests.integration.management.ManagementTestBase; import org.hornetq.tests.util.RandomUtil; Modified: trunk/tests/src/org/hornetq/tests/opt/SendTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/opt/SendTest.java 2010-01-06 12:38:23 UTC (rev 8736) +++ trunk/tests/src/org/hornetq/tests/opt/SendTest.java 2010-01-06 12:41:30 UTC (rev 8737) @@ -29,7 +29,6 @@ import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ClientSession; -import org.hornetq.jms.HornetQConnectionFactory; import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; @@ -41,6 +40,7 @@ import org.hornetq.integration.transports.netty.NettyAcceptorFactory; import org.hornetq.integration.transports.netty.NettyConnectorFactory; import org.hornetq.integration.transports.netty.TransportConstants; +import org.hornetq.jms.client.HornetQConnectionFactory; import org.hornetq.jms.client.HornetQMessage; import org.hornetq.jms.client.HornetQSession; import org.hornetq.tests.util.RandomUtil; 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 12:38:23 UTC (rev 8736) +++ trunk/tests/src/org/hornetq/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java 2010-01-06 12:41:30 UTC (rev 8737) @@ -41,7 +41,6 @@ import junit.framework.Assert; import org.hornetq.api.core.TransportConfiguration; -import org.hornetq.jms.HornetQConnectionFactory; import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; @@ -53,6 +52,7 @@ import org.hornetq.jms.bridge.DestinationFactory; import org.hornetq.jms.bridge.QualityOfServiceMode; import org.hornetq.jms.bridge.impl.JMSBridgeImpl; +import org.hornetq.jms.client.HornetQConnectionFactory; import org.hornetq.jms.server.JMSServerManager; import org.hornetq.jms.server.impl.JMSServerManagerImpl; import org.hornetq.tests.unit.util.InVMContext; Modified: trunk/tests/src/org/hornetq/tests/unit/jms/HornetQDestinationTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/jms/HornetQDestinationTest.java 2010-01-06 12:38:23 UTC (rev 8736) +++ trunk/tests/src/org/hornetq/tests/unit/jms/HornetQDestinationTest.java 2010-01-06 12:41:30 UTC (rev 8737) @@ -20,10 +20,12 @@ import junit.framework.Assert; -import org.hornetq.jms.HornetQDestination; -import org.hornetq.jms.HornetQQueue; import org.hornetq.jms.*; -import org.hornetq.jms.HornetQTopic; +import org.hornetq.jms.client.HornetQDestination; +import org.hornetq.jms.client.HornetQQueue; +import org.hornetq.jms.client.HornetQTemporaryQueue; +import org.hornetq.jms.client.HornetQTemporaryTopic; +import org.hornetq.jms.client.HornetQTopic; import org.hornetq.tests.util.RandomUtil; import org.hornetq.tests.util.UnitTestCase; Modified: trunk/tests/src/org/hornetq/tests/unit/jms/HornetQQueueTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/jms/HornetQQueueTest.java 2010-01-06 12:38:23 UTC (rev 8736) +++ trunk/tests/src/org/hornetq/tests/unit/jms/HornetQQueueTest.java 2010-01-06 12:41:30 UTC (rev 8737) @@ -16,7 +16,7 @@ import junit.framework.Assert; import org.hornetq.api.jms.HornetQJMSClient; -import org.hornetq.jms.HornetQQueue; +import org.hornetq.jms.client.HornetQQueue; import org.hornetq.tests.util.RandomUtil; import org.hornetq.tests.util.UnitTestCase; Modified: trunk/tests/src/org/hornetq/tests/unit/jms/HornetQTopicTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/jms/HornetQTopicTest.java 2010-01-06 12:38:23 UTC (rev 8736) +++ trunk/tests/src/org/hornetq/tests/unit/jms/HornetQTopicTest.java 2010-01-06 12:41:30 UTC (rev 8737) @@ -17,7 +17,7 @@ import org.hornetq.api.core.Pair; import org.hornetq.api.jms.HornetQJMSClient; -import org.hornetq.jms.HornetQTopic; +import org.hornetq.jms.client.HornetQTopic; import org.hornetq.tests.util.RandomUtil; import org.hornetq.tests.util.UnitTestCase; 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 12:38:23 UTC (rev 8736) +++ trunk/tests/src/org/hornetq/tests/unit/jms/referenceable/DestinationObjectFactoryTest.java 2010-01-06 12:41:30 UTC (rev 8737) @@ -17,9 +17,9 @@ import junit.framework.Assert; -import org.hornetq.jms.HornetQDestination; import org.hornetq.api.jms.HornetQJMSClient; -import org.hornetq.jms.HornetQQueue; +import org.hornetq.jms.client.HornetQDestination; +import org.hornetq.jms.client.HornetQQueue; import org.hornetq.jms.referenceable.DestinationObjectFactory; import org.hornetq.tests.util.RandomUtil; import org.hornetq.tests.util.UnitTestCase; Modified: trunk/tests/src/org/hornetq/tests/unit/ra/ResourceAdapterTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/ra/ResourceAdapterTest.java 2010-01-06 12:38:23 UTC (rev 8736) +++ trunk/tests/src/org/hornetq/tests/unit/ra/ResourceAdapterTest.java 2010-01-06 12:41:30 UTC (rev 8737) @@ -34,9 +34,9 @@ import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; 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.jms.client.HornetQConnectionFactory; +import org.hornetq.jms.client.HornetQQueue; import org.hornetq.core.remoting.impl.invm.InVMConnector; import org.hornetq.core.server.HornetQServer; import org.hornetq.integration.transports.netty.NettyConnector;

15 years, 11 months

1
0
0 / 0

JBoss hornetq SVN: r8736 - in trunk/src/main/org/hornetq/api: core/client and 4 other directories.

by do-not-reply＠jboss.org

Author: timfox Date: 2010-01-06 07:38:23 -0500 (Wed, 06 Jan 2010) New Revision: 8736 Added: trunk/src/main/org/hornetq/api/core/client/loadbalance/package-info.java trunk/src/main/org/hornetq/api/core/package-info.java Modified: trunk/src/main/org/hornetq/api/core/client/package-info.java trunk/src/main/org/hornetq/api/core/management/package-info.java trunk/src/main/org/hornetq/api/jms/management/package-info.java trunk/src/main/org/hornetq/api/jms/package-info.java Log: added missing package-info.java classes Added: trunk/src/main/org/hornetq/api/core/client/loadbalance/package-info.java =================================================================== --- trunk/src/main/org/hornetq/api/core/client/loadbalance/package-info.java (rev 0) +++ trunk/src/main/org/hornetq/api/core/client/loadbalance/package-info.java 2010-01-06 12:38:23 UTC (rev 8736) @@ -0,0 +1,18 @@ +/* + * 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. + */ + +/** + * HornetQ client side connection load balancing policies + */ +package org.hornetq.api.core.client.loadbalance; + Modified: trunk/src/main/org/hornetq/api/core/client/package-info.java =================================================================== --- trunk/src/main/org/hornetq/api/core/client/package-info.java 2010-01-06 12:19:47 UTC (rev 8735) +++ trunk/src/main/org/hornetq/api/core/client/package-info.java 2010-01-06 12:38:23 UTC (rev 8736) @@ -12,7 +12,7 @@ */ /** - * Core API to produce and consume messages. + * HornetQ core client messaging API to produce and consume messages. * * This package defines the API used by HornetQ clients to produce and consume messages. */ Modified: trunk/src/main/org/hornetq/api/core/management/package-info.java =================================================================== --- trunk/src/main/org/hornetq/api/core/management/package-info.java 2010-01-06 12:19:47 UTC (rev 8735) +++ trunk/src/main/org/hornetq/api/core/management/package-info.java 2010-01-06 12:38:23 UTC (rev 8736) @@ -12,7 +12,7 @@ */ /** - * management API for HornetQ servers and its Core resources. + * Management API for HornetQ servers and its Core resources. * * HornetQ can be managed either using JMX or by sending management messages to the * server's special management address. Please refer to the user manual for more information. Added: trunk/src/main/org/hornetq/api/core/package-info.java =================================================================== --- trunk/src/main/org/hornetq/api/core/package-info.java (rev 0) +++ trunk/src/main/org/hornetq/api/core/package-info.java 2010-01-06 12:38:23 UTC (rev 8736) @@ -0,0 +1,20 @@ +/* + * 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. + */ + +/** + * HornetQ core messaging API + * + * This package defines the core API + */ +package org.hornetq.api.core; + Modified: trunk/src/main/org/hornetq/api/jms/management/package-info.java =================================================================== --- trunk/src/main/org/hornetq/api/jms/management/package-info.java 2010-01-06 12:19:47 UTC (rev 8735) +++ trunk/src/main/org/hornetq/api/jms/management/package-info.java 2010-01-06 12:38:23 UTC (rev 8736) @@ -12,7 +12,7 @@ */ /** - * management API for HornetQ JMS resources. + * Management API for HornetQ JMS resources. * * HornetQ JMS resources can be managed either using JMX or by sending JMS management messages to the * server's special management address. Please refer to the user manual for more information. Modified: trunk/src/main/org/hornetq/api/jms/package-info.java =================================================================== --- trunk/src/main/org/hornetq/api/jms/package-info.java 2010-01-06 12:19:47 UTC (rev 8735) +++ trunk/src/main/org/hornetq/api/jms/package-info.java 2010-01-06 12:38:23 UTC (rev 8736) @@ -12,10 +12,7 @@ */ /** - * Implementation of the JMS Destinations. - * - * Classes in this package can be instantiated directly - * if JMS destinations are not looked up in JNDI. + * This package contains classes that relate to the HornetQ JMS implementation * */ package org.hornetq.api.jms;

15 years, 11 months

1
0
0 / 0

JBoss hornetq SVN: r8735 - trunk/src/main/org/hornetq/api/jms.

by do-not-reply＠jboss.org

Author: ataylor Date: 2010-01-06 07:19:47 -0500 (Wed, 06 Jan 2010) New Revision: 8735 Modified: trunk/src/main/org/hornetq/api/jms/HornetQJMSClient.java Log: removed spurious log message Modified: trunk/src/main/org/hornetq/api/jms/HornetQJMSClient.java =================================================================== --- trunk/src/main/org/hornetq/api/jms/HornetQJMSClient.java 2010-01-06 12:15:42 UTC (rev 8734) +++ trunk/src/main/org/hornetq/api/jms/HornetQJMSClient.java 2010-01-06 12:19:47 UTC (rev 8735) @@ -123,7 +123,6 @@ */ public static Queue createQueue(final String name) { - log.info("calling create queue " + name, new Exception()); return new HornetQQueue(name); }

15 years, 11 months

1
0
0 / 0

JBoss hornetq SVN: r8734 - in trunk: examples/jms/applet/src/org/hornetq/jms/example and 23 other directories.

by do-not-reply＠jboss.org

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();

15 years, 11 months

1
0
0 / 0

JBoss hornetq SVN: r8733 - trunk/docs/user-manual/en.

by do-not-reply＠jboss.org

Author: ataylor Date: 2010-01-06 06:20:38 -0500 (Wed, 06 Jan 2010) New Revision: 8733 Modified: trunk/docs/user-manual/en/using-jms.xml Log: doc fixes Modified: trunk/docs/user-manual/en/using-jms.xml =================================================================== --- trunk/docs/user-manual/en/using-jms.xml 2010-01-06 11:15:41 UTC (rev 8732) +++ trunk/docs/user-manual/en/using-jms.xml 2010-01-06 11:20:38 UTC (rev 8733) @@ -173,7 +173,7 @@ <para>For a full working example of direct instantiation please see the JMS examples in <xref linkend="examples"/>.</para> <para>Here's our simple example, rewritten to not use JNDI at all:</para> - <para>We create the JMS ConnectionFactory object directly, note we need to provide + <para>We create the JMS ConnectionFactory object via the HornetQJMSClient Utility class, note we need to provide connection parameters and specify which transport we are using, for more information on connectors please see <xref linkend="configuring-transports"/>.</para> <programlisting> @@ -181,7 +181,7 @@ new TransportConfiguration(NettyConnectorFactory.class.getName()); ConnectionFactory cf = HornetQJMSClient.createConnectionFactory(transportConfiguration); </programlisting> - <para>We create the JMS Queue Object directly:</para> + <para>We create the JMS Queue Object via the HornetQJMSClient Utility class:</para> <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>

15 years, 11 months

1
0
0 / 0

JBoss hornetq SVN: r8732 - trunk/src/main/org/hornetq/api/core.

by do-not-reply＠jboss.org

Author: timfox Date: 2010-01-06 06:15:41 -0500 (Wed, 06 Jan 2010) New Revision: 8732 Removed: trunk/src/main/org/hornetq/api/core/interceptor/ Log: removed empty dir

15 years, 11 months

1
0
0 / 0

JBoss hornetq SVN: r8731 - in trunk: examples/jms/divert/src/org/hornetq/jms/example and 100 other directories.

by do-not-reply＠jboss.org

Author: timfox Date: 2010-01-06 06:07:36 -0500 (Wed, 06 Jan 2010) New Revision: 8731 Added: trunk/src/main/org/hornetq/api/core/Pair.java trunk/src/main/org/hornetq/api/core/SimpleString.java trunk/src/main/org/hornetq/core/filter/impl/SimpleStringReader.java Removed: trunk/src/main/org/hornetq/SimpleStringReader.java trunk/src/main/org/hornetq/api/Pair.java trunk/src/main/org/hornetq/api/SimpleString.java trunk/src/main/org/hornetq/api/core/buffers/ trunk/src/main/org/hornetq/api/core/config/ trunk/src/main/org/hornetq/api/core/exception/ trunk/src/main/org/hornetq/api/core/message/ trunk/src/main/org/hornetq/package-info.java Modified: trunk/examples/jms/bridge/src/org/hornetq/jms/example/HatColourChangeTransformer.java trunk/examples/jms/divert/src/org/hornetq/jms/example/AddForwardingTimeTransformer.java trunk/examples/jms/interceptor/src/org/hornetq/jms/example/SimpleInterceptor.java trunk/src/main/org/hornetq/api/core/HornetQBuffer.java trunk/src/main/org/hornetq/api/core/Message.java trunk/src/main/org/hornetq/api/core/client/ClientProducer.java trunk/src/main/org/hornetq/api/core/client/ClientRequestor.java trunk/src/main/org/hornetq/api/core/client/ClientSession.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/api/core/client/HornetQClient.java trunk/src/main/org/hornetq/api/core/management/ManagementHelper.java trunk/src/main/org/hornetq/api/core/management/ObjectNameBuilder.java trunk/src/main/org/hornetq/api/jms/HornetQJMSClient.java trunk/src/main/org/hornetq/core/buffers/impl/ChannelBufferWrapper.java trunk/src/main/org/hornetq/core/buffers/impl/ResetLimitWrappedHornetQBuffer.java trunk/src/main/org/hornetq/core/client/impl/ClientConsumerImpl.java trunk/src/main/org/hornetq/core/client/impl/ClientConsumerInternal.java trunk/src/main/org/hornetq/core/client/impl/ClientMessageImpl.java trunk/src/main/org/hornetq/core/client/impl/ClientProducerCreditManager.java trunk/src/main/org/hornetq/core/client/impl/ClientProducerCreditManagerImpl.java trunk/src/main/org/hornetq/core/client/impl/ClientProducerCreditsImpl.java trunk/src/main/org/hornetq/core/client/impl/ClientProducerImpl.java trunk/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java trunk/src/main/org/hornetq/core/client/impl/ClientSessionInternal.java trunk/src/main/org/hornetq/core/client/impl/DelegatingSession.java trunk/src/main/org/hornetq/core/client/impl/LargeMessageBufferImpl.java trunk/src/main/org/hornetq/core/cluster/DiscoveryEntry.java trunk/src/main/org/hornetq/core/cluster/impl/DiscoveryGroupImpl.java trunk/src/main/org/hornetq/core/config/Configuration.java trunk/src/main/org/hornetq/core/config/impl/ConfigurationImpl.java trunk/src/main/org/hornetq/core/config/impl/FileConfiguration.java trunk/src/main/org/hornetq/core/deployers/impl/AddressSettingsDeployer.java trunk/src/main/org/hornetq/core/deployers/impl/FileDeploymentManager.java trunk/src/main/org/hornetq/core/filter/Filter.java trunk/src/main/org/hornetq/core/filter/impl/FilterImpl.java trunk/src/main/org/hornetq/core/filter/impl/FilterParser.jj trunk/src/main/org/hornetq/core/filter/impl/Identifier.java trunk/src/main/org/hornetq/core/filter/impl/Operator.java trunk/src/main/org/hornetq/core/journal/impl/AbstractJournalUpdateTask.java trunk/src/main/org/hornetq/core/journal/impl/JournalCompactor.java trunk/src/main/org/hornetq/core/journal/impl/JournalImpl.java trunk/src/main/org/hornetq/core/management/impl/AddressControlImpl.java trunk/src/main/org/hornetq/core/management/impl/BroadcastGroupControlImpl.java trunk/src/main/org/hornetq/core/management/impl/ClusterConnectionControlImpl.java trunk/src/main/org/hornetq/core/management/impl/HornetQServerControlImpl.java trunk/src/main/org/hornetq/core/management/impl/QueueControlImpl.java trunk/src/main/org/hornetq/core/message/impl/MessageImpl.java trunk/src/main/org/hornetq/core/paging/PagingManager.java trunk/src/main/org/hornetq/core/paging/PagingStore.java trunk/src/main/org/hornetq/core/paging/PagingStoreFactory.java trunk/src/main/org/hornetq/core/paging/impl/PageImpl.java trunk/src/main/org/hornetq/core/paging/impl/PagingManagerImpl.java trunk/src/main/org/hornetq/core/paging/impl/PagingStoreFactoryNIO.java trunk/src/main/org/hornetq/core/paging/impl/PagingStoreImpl.java trunk/src/main/org/hornetq/core/persistence/GroupingInfo.java trunk/src/main/org/hornetq/core/persistence/QueueBindingInfo.java trunk/src/main/org/hornetq/core/persistence/StorageManager.java trunk/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java trunk/src/main/org/hornetq/core/persistence/impl/nullpm/NullStorageManager.java trunk/src/main/org/hornetq/core/postoffice/Address.java trunk/src/main/org/hornetq/core/postoffice/AddressManager.java trunk/src/main/org/hornetq/core/postoffice/Binding.java trunk/src/main/org/hornetq/core/postoffice/DuplicateIDCache.java trunk/src/main/org/hornetq/core/postoffice/PostOffice.java trunk/src/main/org/hornetq/core/postoffice/QueueInfo.java trunk/src/main/org/hornetq/core/postoffice/impl/AddressImpl.java trunk/src/main/org/hornetq/core/postoffice/impl/BindingsImpl.java trunk/src/main/org/hornetq/core/postoffice/impl/DivertBinding.java trunk/src/main/org/hornetq/core/postoffice/impl/DuplicateIDCacheImpl.java trunk/src/main/org/hornetq/core/postoffice/impl/LocalQueueBinding.java trunk/src/main/org/hornetq/core/postoffice/impl/PostOfficeImpl.java trunk/src/main/org/hornetq/core/postoffice/impl/SimpleAddressManager.java trunk/src/main/org/hornetq/core/postoffice/impl/WildcardAddressManager.java trunk/src/main/org/hornetq/core/remoting/impl/invm/InVMAcceptor.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/CreateQueueMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationPageEventMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionBindingQueryMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionBindingQueryResponseMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionCreateConsumerMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionDeleteQueueMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionProducerCreditsMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionQueueQueryMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionQueueQueryResponseMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionRequestProducerCreditsMessage.java trunk/src/main/org/hornetq/core/replication/ReplicationManager.java trunk/src/main/org/hornetq/core/replication/impl/ReplicationEndpointImpl.java trunk/src/main/org/hornetq/core/replication/impl/ReplicationManagerImpl.java trunk/src/main/org/hornetq/core/security/SecurityStore.java trunk/src/main/org/hornetq/core/security/impl/SecurityStoreImpl.java trunk/src/main/org/hornetq/core/server/Divert.java trunk/src/main/org/hornetq/core/server/HornetQServer.java trunk/src/main/org/hornetq/core/server/Queue.java trunk/src/main/org/hornetq/core/server/QueueFactory.java trunk/src/main/org/hornetq/core/server/cluster/Bridge.java trunk/src/main/org/hornetq/core/server/cluster/BridgeConfiguration.java trunk/src/main/org/hornetq/core/server/cluster/BroadcastGroup.java trunk/src/main/org/hornetq/core/server/cluster/BroadcastGroupConfiguration.java trunk/src/main/org/hornetq/core/server/cluster/ClusterConnection.java trunk/src/main/org/hornetq/core/server/cluster/ClusterConnectionConfiguration.java trunk/src/main/org/hornetq/core/server/cluster/ClusterManager.java trunk/src/main/org/hornetq/core/server/cluster/RemoteQueueBinding.java trunk/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java trunk/src/main/org/hornetq/core/server/cluster/impl/BroadcastGroupImpl.java trunk/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java trunk/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java trunk/src/main/org/hornetq/core/server/cluster/impl/RemoteQueueBindingImpl.java trunk/src/main/org/hornetq/core/server/group/GroupingHandler.java trunk/src/main/org/hornetq/core/server/group/impl/GroupBinding.java trunk/src/main/org/hornetq/core/server/group/impl/GroupingHandlerConfiguration.java trunk/src/main/org/hornetq/core/server/group/impl/LocalGroupingHandler.java trunk/src/main/org/hornetq/core/server/group/impl/Proposal.java trunk/src/main/org/hornetq/core/server/group/impl/RemoteGroupingHandler.java trunk/src/main/org/hornetq/core/server/group/impl/Response.java trunk/src/main/org/hornetq/core/server/impl/DivertImpl.java trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java trunk/src/main/org/hornetq/core/server/impl/LastValueQueue.java trunk/src/main/org/hornetq/core/server/impl/QueueFactoryImpl.java trunk/src/main/org/hornetq/core/server/impl/QueueImpl.java trunk/src/main/org/hornetq/core/server/impl/ServerInfo.java trunk/src/main/org/hornetq/core/server/impl/ServerMessageImpl.java trunk/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java trunk/src/main/org/hornetq/core/server/management/ManagementService.java trunk/src/main/org/hornetq/core/server/management/impl/ManagementServiceImpl.java trunk/src/main/org/hornetq/core/settings/impl/AddressSettings.java trunk/src/main/org/hornetq/integration/transports/netty/NettyAcceptor.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/HornetQTopic.java trunk/src/main/org/hornetq/jms/client/HornetQConnection.java trunk/src/main/org/hornetq/jms/client/HornetQMapMessage.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/HornetQTextMessage.java trunk/src/main/org/hornetq/jms/management/impl/JMSServerControlImpl.java trunk/src/main/org/hornetq/jms/management/impl/JMSTopicControlImpl.java trunk/src/main/org/hornetq/jms/server/JMSServerManager.java trunk/src/main/org/hornetq/jms/server/config/ConnectionFactoryConfiguration.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/ra/inflow/HornetQActivation.java trunk/src/main/org/hornetq/ra/inflow/HornetQMessageHandler.java trunk/src/main/org/hornetq/utils/TypedProperties.java trunk/src/main/org/hornetq/utils/UUIDGenerator.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/message/MessageHeaderTest.java trunk/tests/jms-tests/src/org/hornetq/jms/tests/tools/container/LocalTestServer.java trunk/tests/src/org/hornetq/tests/concurrent/server/impl/QueueTest.java trunk/tests/src/org/hornetq/tests/integration/DuplicateDetectionTest.java trunk/tests/src/org/hornetq/tests/integration/InterceptorTest.java trunk/tests/src/org/hornetq/tests/integration/String64KLimitTest.java trunk/tests/src/org/hornetq/tests/integration/client/AckBatchSizeTest.java trunk/tests/src/org/hornetq/tests/integration/client/AcknowledgeTest.java trunk/tests/src/org/hornetq/tests/integration/client/AddressSettingsTest.java trunk/tests/src/org/hornetq/tests/integration/client/AutogroupIdTest.java trunk/tests/src/org/hornetq/tests/integration/client/CommitRollbackTest.java trunk/tests/src/org/hornetq/tests/integration/client/ConsumerCloseTest.java trunk/tests/src/org/hornetq/tests/integration/client/ConsumerRoundRobinTest.java trunk/tests/src/org/hornetq/tests/integration/client/ConsumerTest.java trunk/tests/src/org/hornetq/tests/integration/client/ConsumerWindowSizeTest.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/DeliveryOrderTest.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/HeuristicXATest.java trunk/tests/src/org/hornetq/tests/integration/client/JournalCrashTest.java trunk/tests/src/org/hornetq/tests/integration/client/LargeMessageTest.java trunk/tests/src/org/hornetq/tests/integration/client/MessageConcurrencyTest.java trunk/tests/src/org/hornetq/tests/integration/client/MessageCounterTest.java trunk/tests/src/org/hornetq/tests/integration/client/MessageDurabilityTest.java trunk/tests/src/org/hornetq/tests/integration/client/MessageExpirationTest.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/MessageHandlerTest.java trunk/tests/src/org/hornetq/tests/integration/client/MessagePriorityTest.java trunk/tests/src/org/hornetq/tests/integration/client/MessageRateTest.java trunk/tests/src/org/hornetq/tests/integration/client/NewDeadLetterAddressTest.java trunk/tests/src/org/hornetq/tests/integration/client/PagingTest.java trunk/tests/src/org/hornetq/tests/integration/client/ProducerFlowControlTest.java trunk/tests/src/org/hornetq/tests/integration/client/ProducerTest.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/ReceiveTest.java trunk/tests/src/org/hornetq/tests/integration/client/RedeliveryConsumerTest.java trunk/tests/src/org/hornetq/tests/integration/client/RequestorTest.java trunk/tests/src/org/hornetq/tests/integration/client/RoutingTest.java trunk/tests/src/org/hornetq/tests/integration/client/SelfExpandingBufferTest.java trunk/tests/src/org/hornetq/tests/integration/client/SessionCloseTest.java trunk/tests/src/org/hornetq/tests/integration/client/SessionCreateAndDeleteQueueTest.java trunk/tests/src/org/hornetq/tests/integration/client/SessionFactoryTest.java trunk/tests/src/org/hornetq/tests/integration/client/SessionSendAcknowledgementHandlerTest.java trunk/tests/src/org/hornetq/tests/integration/client/SessionStopStartTest.java trunk/tests/src/org/hornetq/tests/integration/client/SessionTest.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/TransactionalSendTest.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/DummyInterceptor.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/bridge/SimpleTransformer.java trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusteredGroupingTest.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/GroupingFailoverTestBase.java trunk/tests/src/org/hornetq/tests/integration/cluster/failover/PagingFailoverTest.java trunk/tests/src/org/hornetq/tests/integration/cluster/failover/ReplicatedDistributionTest.java trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/MultiThreadRandomReattachTestBase.java trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/OrderReattachTest.java trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/RandomReattachTest.java trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/ReattachTest.java trunk/tests/src/org/hornetq/tests/integration/cluster/restart/ClusterRestartTest.java trunk/tests/src/org/hornetq/tests/integration/discovery/DiscoveryTest.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/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/consumer/ConsumerTest.java trunk/tests/src/org/hornetq/tests/integration/jms/divert/DivertAndACKClientTest.java trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSQueueControlTest.java trunk/tests/src/org/hornetq/tests/integration/journal/NIOJournalCompactTest.java trunk/tests/src/org/hornetq/tests/integration/largemessage/LargeMessageTestBase.java trunk/tests/src/org/hornetq/tests/integration/management/AcceptorControlTest.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/BroadcastGroupControlTest.java trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControl2Test.java trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControlTest.java trunk/tests/src/org/hornetq/tests/integration/management/DivertControlTest.java trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlTest.java trunk/tests/src/org/hornetq/tests/integration/management/ManagementControlHelper.java trunk/tests/src/org/hornetq/tests/integration/management/ManagementServiceImplTest.java trunk/tests/src/org/hornetq/tests/integration/management/ManagementTestBase.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/SecurityNotificationTest.java trunk/tests/src/org/hornetq/tests/integration/paging/PageCrashTest.java trunk/tests/src/org/hornetq/tests/integration/paging/PagingSendTest.java trunk/tests/src/org/hornetq/tests/integration/replication/ReplicationTest.java trunk/tests/src/org/hornetq/tests/integration/scheduling/ScheduledMessageTest.java trunk/tests/src/org/hornetq/tests/integration/security/SecurityTest.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/BasicXaRecoveryTest.java trunk/tests/src/org/hornetq/tests/integration/xa/BasicXaTest.java trunk/tests/src/org/hornetq/tests/integration/xa/XaTimeoutTest.java trunk/tests/src/org/hornetq/tests/performance/paging/MeasurePagingMultiThreadTest.java trunk/tests/src/org/hornetq/tests/stress/journal/MultiThreadConsumerStressTest.java trunk/tests/src/org/hornetq/tests/stress/journal/NIOMultiThreadCompactorStressTest.java trunk/tests/src/org/hornetq/tests/stress/paging/PageStressTest.java trunk/tests/src/org/hornetq/tests/timing/core/server/impl/QueueImplTest.java trunk/tests/src/org/hornetq/tests/unit/core/client/impl/LargeMessageBufferTest.java trunk/tests/src/org/hornetq/tests/unit/core/config/impl/ConfigurationImplTest.java trunk/tests/src/org/hornetq/tests/unit/core/config/impl/FileConfigurationTest.java trunk/tests/src/org/hornetq/tests/unit/core/deployers/impl/AddressSettingsDeployerTest.java trunk/tests/src/org/hornetq/tests/unit/core/deployers/impl/FileDeploymentManagerTest.java trunk/tests/src/org/hornetq/tests/unit/core/filter/impl/FilterParserTest.java trunk/tests/src/org/hornetq/tests/unit/core/filter/impl/FilterTest.java trunk/tests/src/org/hornetq/tests/unit/core/filter/impl/OperatorTest.java trunk/tests/src/org/hornetq/tests/unit/core/message/impl/MessageImplTest.java trunk/tests/src/org/hornetq/tests/unit/core/paging/impl/PageImplTest.java trunk/tests/src/org/hornetq/tests/unit/core/paging/impl/PagingManagerImplTest.java trunk/tests/src/org/hornetq/tests/unit/core/paging/impl/PagingStoreImplTest.java trunk/tests/src/org/hornetq/tests/unit/core/postoffice/impl/AddressImplTest.java trunk/tests/src/org/hornetq/tests/unit/core/postoffice/impl/BindingsImplTest.java trunk/tests/src/org/hornetq/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java trunk/tests/src/org/hornetq/tests/unit/core/postoffice/impl/FakeQueue.java trunk/tests/src/org/hornetq/tests/unit/core/remoting/HornetQBufferTestBase.java trunk/tests/src/org/hornetq/tests/unit/core/server/impl/QueueImplTest.java trunk/tests/src/org/hornetq/tests/unit/core/server/impl/fakes/FakeFilter.java trunk/tests/src/org/hornetq/tests/unit/core/server/impl/fakes/FakePostOffice.java trunk/tests/src/org/hornetq/tests/unit/core/server/impl/fakes/FakeQueueFactory.java trunk/tests/src/org/hornetq/tests/unit/core/settings/impl/AddressSettingsTest.java trunk/tests/src/org/hornetq/tests/unit/jms/HornetQTopicTest.java trunk/tests/src/org/hornetq/tests/unit/util/SimpleStringTest.java trunk/tests/src/org/hornetq/tests/unit/util/TypedPropertiesConversionTest.java trunk/tests/src/org/hornetq/tests/unit/util/TypedPropertiesTest.java trunk/tests/src/org/hornetq/tests/util/JMSTestBase.java trunk/tests/src/org/hornetq/tests/util/RandomUtil.java trunk/tests/src/org/hornetq/tests/util/UnitTestCase.java Log: removed some empty dirs plus a little more moving around Modified: trunk/examples/jms/bridge/src/org/hornetq/jms/example/HatColourChangeTransformer.java =================================================================== --- trunk/examples/jms/bridge/src/org/hornetq/jms/example/HatColourChangeTransformer.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/examples/jms/bridge/src/org/hornetq/jms/example/HatColourChangeTransformer.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -13,7 +13,7 @@ package org.hornetq.jms.example; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.server.ServerMessage; import org.hornetq.core.server.cluster.Transformer; Modified: trunk/examples/jms/divert/src/org/hornetq/jms/example/AddForwardingTimeTransformer.java =================================================================== --- trunk/examples/jms/divert/src/org/hornetq/jms/example/AddForwardingTimeTransformer.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/examples/jms/divert/src/org/hornetq/jms/example/AddForwardingTimeTransformer.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -13,7 +13,7 @@ package org.hornetq.jms.example; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.server.ServerMessage; import org.hornetq.core.server.cluster.Transformer; Modified: trunk/examples/jms/interceptor/src/org/hornetq/jms/example/SimpleInterceptor.java =================================================================== --- trunk/examples/jms/interceptor/src/org/hornetq/jms/example/SimpleInterceptor.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/examples/jms/interceptor/src/org/hornetq/jms/example/SimpleInterceptor.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -13,10 +13,10 @@ package org.hornetq.jms.example; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.Interceptor; import org.hornetq.api.core.Message; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.remoting.Packet; import org.hornetq.core.remoting.RemotingConnection; import org.hornetq.core.remoting.impl.wireformat.SessionSendMessage; Deleted: trunk/src/main/org/hornetq/SimpleStringReader.java =================================================================== --- trunk/src/main/org/hornetq/SimpleStringReader.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/SimpleStringReader.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -1,93 +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; - -import java.io.IOException; -import java.io.Reader; - -import org.hornetq.api.SimpleString; - - -/** - * A SimpleStringReader - * - * @author <a href="jmesnil(a)redhat.com">Jeff Mesnil</a> - * - * Created 31 oct. 2008 14:41:18 - * - * - */ -public class SimpleStringReader extends Reader -{ - - // Constants ----------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private final SimpleString simpleString; - - private int next = 0; - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - public SimpleStringReader(final SimpleString simpleString) - { - this.simpleString = simpleString; - } - - // Public -------------------------------------------------------- - - // Reader overrides ---------------------------------------------- - - @Override - public int read(final char[] cbuf, final int off, final int len) throws IOException - { - synchronized (simpleString) - { - if (off < 0 || off > cbuf.length || len < 0 || off + len > cbuf.length || off + len < 0) - { - throw new IndexOutOfBoundsException(); - } - else if (len == 0) - { - return 0; - } - int length = simpleString.length(); - if (next >= length) - { - return -1; - } - int n = Math.min(length - next, len); - simpleString.getChars(next, next + n, cbuf, off); - next += n; - return n; - } - } - - @Override - public void close() throws IOException - { - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- - -} Deleted: trunk/src/main/org/hornetq/api/Pair.java =================================================================== --- trunk/src/main/org/hornetq/api/Pair.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/api/Pair.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -1,84 +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; - -import java.io.Serializable; - -/** - * - * A Pair is basically a holder for 2 objects. - * - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - */ -public class Pair<A, B> implements Serializable -{ - private static final long serialVersionUID = -2496357457812368127L; - - public Pair(final A a, final B b) - { - this.a = a; - - this.b = b; - } - - public A a; - - public B b; - - private int hash = -1; - - @Override - public int hashCode() - { - if (hash == -1) - { - if (a == null && b == null) - { - return super.hashCode(); - } - else - { - hash = (a == null ? 0 : a.hashCode()) + 37 * (b == null ? 0 : b.hashCode()); - } - } - - return hash; - } - - @Override - public boolean equals(final Object other) - { - if (other == this) - { - return true; - } - - if (other instanceof Pair == false) - { - return false; - } - - Pair<A, B> pother = (Pair<A, B>)other; - - return (pother.a == null ? a == null : pother.a.equals(a)) && (pother.b == null ? b == null : pother.b.equals(b)); - - } - - @Override - public String toString() - { - return "Pair[a=" + a + ", b=" + b + "]"; - } -} Deleted: trunk/src/main/org/hornetq/api/SimpleString.java =================================================================== --- trunk/src/main/org/hornetq/api/SimpleString.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/api/SimpleString.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -1,421 +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; - -import java.io.Serializable; -import java.util.ArrayList; -import java.util.List; - -import org.hornetq.core.logging.Logger; -import org.hornetq.utils.DataConstants; - -/** - * A simple String class that can store all characters, and stores as simple byte[], - * this minimises expensive copying between String objects. - * - * This object is used heavily throughout HornetQ for performance reasons. - * - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - */ - -public class SimpleString implements CharSequence, Serializable, Comparable<SimpleString> -{ - private static final long serialVersionUID = 4204223851422244307L; - - private static final Logger log = Logger.getLogger(SimpleString.class); - - // Attributes - // ------------------------------------------------------------------------ - private final byte[] data; - - private transient int hash; - - // Cache the string - private transient String str; - - // Static - // ---------------------------------------------------------------------- - - /** - * Returns a SimpleString constructed from the <code>string</code> parameter. - * If <code>string</code> is <code>null</code>, the return value will be <code>null</code> too. - */ - public static SimpleString toSimpleString(final String string) - { - if (string == null) - { - return null; - } - return new SimpleString(string); - } - - // Constructors - // ---------------------------------------------------------------------- - /** - * creates a SimpleString from a conventional String - * @param string the string to transform - */ - public SimpleString(final String string) - { - int len = string.length(); - - data = new byte[len << 1]; - - int j = 0; - - for (int i = 0; i < len; i++) - { - char c = string.charAt(i); - - byte low = (byte)(c & 0xFF); // low byte - - data[j++] = low; - - byte high = (byte)(c >> 8 & 0xFF); // high byte - - data[j++] = high; - } - - str = string; - } - - /** - * creates a SimpleString from a byte array - * @param data the byte array to use - */ - public SimpleString(final byte[] data) - { - this.data = data; - } - - // CharSequence implementation - // --------------------------------------------------------------------------- - - public int length() - { - return data.length >> 1; - } - - public char charAt(int pos) - { - if (pos < 0 || pos >= data.length >> 1) - { - throw new IndexOutOfBoundsException(); - } - pos <<= 1; - - return (char)(data[pos] | data[pos + 1] << 8); - } - - public CharSequence subSequence(final int start, final int end) - { - int len = data.length >> 1; - - if (end < start || start < 0 || end > len) - { - throw new IndexOutOfBoundsException(); - } - else - { - int newlen = end - start << 1; - byte[] bytes = new byte[newlen]; - - System.arraycopy(data, start << 1, bytes, 0, newlen); - - return new SimpleString(bytes); - } - } - - // Comparable implementation ------------------------------------- - - public int compareTo(final SimpleString o) - { - return toString().compareTo(o.toString()); - } - - // Public - // --------------------------------------------------------------------------- - - /** - * returns the underlying byte array of this SimpleString - * @return the byte array - */ - public byte[] getData() - { - return data; - } - - /** - * returns true if the SimpleString parameter starts with the same data as this one. false if not. - * @param other the SimpelString to look for - * @return true if this SimpleString starts with the same data - */ - public boolean startsWith(final SimpleString other) - { - byte[] otherdata = other.data; - - if (otherdata.length > data.length) - { - return false; - } - - for (int i = 0; i < otherdata.length; i++) - { - if (data[i] != otherdata[i]) - { - return false; - } - } - - return true; - } - - @Override - public String toString() - { - if (str == null) - { - int len = data.length >> 1; - - char[] chars = new char[len]; - - int j = 0; - - for (int i = 0; i < len; i++) - { - int low = data[j++] & 0xFF; - - int high = data[j++] << 8 & 0xFF00; - - chars[i] = (char)(low | high); - } - - str = new String(chars); - } - - return str; - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof SimpleString) - { - SimpleString s = (SimpleString)other; - - if (data.length != s.data.length) - { - return false; - } - - for (int i = 0; i < data.length; i++) - { - if (data[i] != s.data[i]) - { - return false; - } - } - - return true; - } - else - { - return false; - } - } - - @Override - public int hashCode() - { - if (hash == 0) - { - int tmphash = 0; - for (byte element : data) - { - tmphash = (tmphash << 5) - tmphash + element; // (hash << 5) - hash is same as hash * 31 - } - hash = tmphash; - } - - return hash; - } - - /** - * splits this SimpleString into an array of SimpleString using the char param as the delimeter. - * - * i.e. "a.b" would return "a" and "b" if . was the delimeter - * @param delim - */ - public SimpleString[] split(final char delim) - { - if (!contains(delim)) - { - return new SimpleString[] { this }; - } - else - { - List<SimpleString> all = new ArrayList<SimpleString>(); - int lasPos = 0; - for (int i = 0; i < data.length; i += 2) - { - byte low = (byte)(delim & 0xFF); // low byte - byte high = (byte)(delim >> 8 & 0xFF); // high byte - if (data[i] == low && data[i + 1] == high) - { - byte[] bytes = new byte[i - lasPos]; - System.arraycopy(data, lasPos, bytes, 0, bytes.length); - lasPos = i + 2; - all.add(new SimpleString(bytes)); - } - } - byte[] bytes = new byte[data.length - lasPos]; - System.arraycopy(data, lasPos, bytes, 0, bytes.length); - all.add(new SimpleString(bytes)); - SimpleString[] parts = new SimpleString[all.size()]; - return all.toArray(parts); - } - } - - /** - * checks to see if this SimpleString contains the char parameter passed in - * - * @param c the char to check for - * @return true if the char is found, false otherwise. - */ - public boolean contains(final char c) - { - for (int i = 0; i < data.length; i += 2) - { - byte low = (byte)(c & 0xFF); // low byte - byte high = (byte)(c >> 8 & 0xFF); // high byte - if (data[i] == low && data[i + 1] == high) - { - return true; - } - } - return false; - } - - /** - * concatanates a SimpleString and a String - * - * @param toAdd the String to concate with. - * @return the concatanated SimpleString - */ - public SimpleString concat(final String toAdd) - { - return concat(new SimpleString(toAdd)); - } - - /** - * concatanates 2 SimpleString's - * - * @param toAdd the SimpleString to concate with. - * @return the concatanated SimpleString - */ - public SimpleString concat(final SimpleString toAdd) - { - byte[] bytes = new byte[data.length + toAdd.getData().length]; - System.arraycopy(data, 0, bytes, 0, data.length); - System.arraycopy(toAdd.getData(), 0, bytes, data.length, toAdd.getData().length); - return new SimpleString(bytes); - } - - /** - * concatanates a SimpleString and a char - * - * @param c the char to concate with. - * @return the concatanated SimpleString - */ - public SimpleString concat(final char c) - { - byte[] bytes = new byte[data.length + 2]; - System.arraycopy(data, 0, bytes, 0, data.length); - bytes[data.length] = (byte)(c & 0xFF); - bytes[data.length + 1] = (byte)(c >> 8 & 0xFF); - return new SimpleString(bytes); - } - - /** - * returns the size of this SimpleString - * @return the size - */ - public int sizeof() - { - return DataConstants.SIZE_INT + data.length; - } - - /** - * returns the size of a SimpleString - * @param str the SimpleString to check - * @return the size - */ - public static int sizeofString(final SimpleString str) - { - return str.sizeof(); - } - - /** - * returns the size of a SimpleString which could be null - * @param str the SimpleString to check - * @return the size - */ - public static int sizeofNullableString(final SimpleString str) - { - if (str == null) - { - return 1; - } - else - { - return 1 + str.sizeof(); - } - } - - /** - * - * @param srcBegin - * @param srcEnd - * @param dst - * @param dstBegin - */ - public void getChars(final int srcBegin, final int srcEnd, final char dst[], final int dstBegin) - { - if (srcBegin < 0) - { - throw new StringIndexOutOfBoundsException(srcBegin); - } - if (srcEnd > length()) - { - throw new StringIndexOutOfBoundsException(srcEnd); - } - if (srcBegin > srcEnd) - { - throw new StringIndexOutOfBoundsException(srcEnd - srcBegin); - } - - int j = 0; - - for (int i = srcBegin; i < srcEnd - srcBegin; i++) - { - int low = data[j++] & 0xFF; - - int high = data[j++] << 8 & 0xFF00; - - dst[i] = (char)(low | high); - } - } - -} \ No newline at end of file Modified: trunk/src/main/org/hornetq/api/core/HornetQBuffer.java =================================================================== --- trunk/src/main/org/hornetq/api/core/HornetQBuffer.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/api/core/HornetQBuffer.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -15,7 +15,6 @@ import java.nio.ByteBuffer; -import org.hornetq.api.SimpleString; import org.jboss.netty.buffer.ChannelBuffer; /** Modified: trunk/src/main/org/hornetq/api/core/Message.java =================================================================== --- trunk/src/main/org/hornetq/api/core/Message.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/api/core/Message.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -16,7 +16,6 @@ import java.util.Map; import java.util.Set; -import org.hornetq.api.SimpleString; /** * A Message is a routable instance that has a payload. Copied: trunk/src/main/org/hornetq/api/core/Pair.java (from rev 8730, trunk/src/main/org/hornetq/api/Pair.java) =================================================================== --- trunk/src/main/org/hornetq/api/core/Pair.java (rev 0) +++ trunk/src/main/org/hornetq/api/core/Pair.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -0,0 +1,84 @@ +/* + * 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; + +import java.io.Serializable; + +/** + * + * A Pair is basically a holder for 2 objects. + * + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + */ +public class Pair<A, B> implements Serializable +{ + private static final long serialVersionUID = -2496357457812368127L; + + public Pair(final A a, final B b) + { + this.a = a; + + this.b = b; + } + + public A a; + + public B b; + + private int hash = -1; + + @Override + public int hashCode() + { + if (hash == -1) + { + if (a == null && b == null) + { + return super.hashCode(); + } + else + { + hash = (a == null ? 0 : a.hashCode()) + 37 * (b == null ? 0 : b.hashCode()); + } + } + + return hash; + } + + @Override + public boolean equals(final Object other) + { + if (other == this) + { + return true; + } + + if (other instanceof Pair == false) + { + return false; + } + + Pair<A, B> pother = (Pair<A, B>)other; + + return (pother.a == null ? a == null : pother.a.equals(a)) && (pother.b == null ? b == null : pother.b.equals(b)); + + } + + @Override + public String toString() + { + return "Pair[a=" + a + ", b=" + b + "]"; + } +} Copied: trunk/src/main/org/hornetq/api/core/SimpleString.java (from rev 8730, trunk/src/main/org/hornetq/api/SimpleString.java) =================================================================== --- trunk/src/main/org/hornetq/api/core/SimpleString.java (rev 0) +++ trunk/src/main/org/hornetq/api/core/SimpleString.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -0,0 +1,421 @@ +/* + * 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; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; + +import org.hornetq.core.logging.Logger; +import org.hornetq.utils.DataConstants; + +/** + * A simple String class that can store all characters, and stores as simple byte[], + * this minimises expensive copying between String objects. + * + * This object is used heavily throughout HornetQ for performance reasons. + * + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + */ + +public class SimpleString implements CharSequence, Serializable, Comparable<SimpleString> +{ + private static final long serialVersionUID = 4204223851422244307L; + + private static final Logger log = Logger.getLogger(SimpleString.class); + + // Attributes + // ------------------------------------------------------------------------ + private final byte[] data; + + private transient int hash; + + // Cache the string + private transient String str; + + // Static + // ---------------------------------------------------------------------- + + /** + * Returns a SimpleString constructed from the <code>string</code> parameter. + * If <code>string</code> is <code>null</code>, the return value will be <code>null</code> too. + */ + public static SimpleString toSimpleString(final String string) + { + if (string == null) + { + return null; + } + return new SimpleString(string); + } + + // Constructors + // ---------------------------------------------------------------------- + /** + * creates a SimpleString from a conventional String + * @param string the string to transform + */ + public SimpleString(final String string) + { + int len = string.length(); + + data = new byte[len << 1]; + + int j = 0; + + for (int i = 0; i < len; i++) + { + char c = string.charAt(i); + + byte low = (byte)(c & 0xFF); // low byte + + data[j++] = low; + + byte high = (byte)(c >> 8 & 0xFF); // high byte + + data[j++] = high; + } + + str = string; + } + + /** + * creates a SimpleString from a byte array + * @param data the byte array to use + */ + public SimpleString(final byte[] data) + { + this.data = data; + } + + // CharSequence implementation + // --------------------------------------------------------------------------- + + public int length() + { + return data.length >> 1; + } + + public char charAt(int pos) + { + if (pos < 0 || pos >= data.length >> 1) + { + throw new IndexOutOfBoundsException(); + } + pos <<= 1; + + return (char)(data[pos] | data[pos + 1] << 8); + } + + public CharSequence subSequence(final int start, final int end) + { + int len = data.length >> 1; + + if (end < start || start < 0 || end > len) + { + throw new IndexOutOfBoundsException(); + } + else + { + int newlen = end - start << 1; + byte[] bytes = new byte[newlen]; + + System.arraycopy(data, start << 1, bytes, 0, newlen); + + return new SimpleString(bytes); + } + } + + // Comparable implementation ------------------------------------- + + public int compareTo(final SimpleString o) + { + return toString().compareTo(o.toString()); + } + + // Public + // --------------------------------------------------------------------------- + + /** + * returns the underlying byte array of this SimpleString + * @return the byte array + */ + public byte[] getData() + { + return data; + } + + /** + * returns true if the SimpleString parameter starts with the same data as this one. false if not. + * @param other the SimpelString to look for + * @return true if this SimpleString starts with the same data + */ + public boolean startsWith(final SimpleString other) + { + byte[] otherdata = other.data; + + if (otherdata.length > data.length) + { + return false; + } + + for (int i = 0; i < otherdata.length; i++) + { + if (data[i] != otherdata[i]) + { + return false; + } + } + + return true; + } + + @Override + public String toString() + { + if (str == null) + { + int len = data.length >> 1; + + char[] chars = new char[len]; + + int j = 0; + + for (int i = 0; i < len; i++) + { + int low = data[j++] & 0xFF; + + int high = data[j++] << 8 & 0xFF00; + + chars[i] = (char)(low | high); + } + + str = new String(chars); + } + + return str; + } + + @Override + public boolean equals(final Object other) + { + if (other instanceof SimpleString) + { + SimpleString s = (SimpleString)other; + + if (data.length != s.data.length) + { + return false; + } + + for (int i = 0; i < data.length; i++) + { + if (data[i] != s.data[i]) + { + return false; + } + } + + return true; + } + else + { + return false; + } + } + + @Override + public int hashCode() + { + if (hash == 0) + { + int tmphash = 0; + for (byte element : data) + { + tmphash = (tmphash << 5) - tmphash + element; // (hash << 5) - hash is same as hash * 31 + } + hash = tmphash; + } + + return hash; + } + + /** + * splits this SimpleString into an array of SimpleString using the char param as the delimeter. + * + * i.e. "a.b" would return "a" and "b" if . was the delimeter + * @param delim + */ + public SimpleString[] split(final char delim) + { + if (!contains(delim)) + { + return new SimpleString[] { this }; + } + else + { + List<SimpleString> all = new ArrayList<SimpleString>(); + int lasPos = 0; + for (int i = 0; i < data.length; i += 2) + { + byte low = (byte)(delim & 0xFF); // low byte + byte high = (byte)(delim >> 8 & 0xFF); // high byte + if (data[i] == low && data[i + 1] == high) + { + byte[] bytes = new byte[i - lasPos]; + System.arraycopy(data, lasPos, bytes, 0, bytes.length); + lasPos = i + 2; + all.add(new SimpleString(bytes)); + } + } + byte[] bytes = new byte[data.length - lasPos]; + System.arraycopy(data, lasPos, bytes, 0, bytes.length); + all.add(new SimpleString(bytes)); + SimpleString[] parts = new SimpleString[all.size()]; + return all.toArray(parts); + } + } + + /** + * checks to see if this SimpleString contains the char parameter passed in + * + * @param c the char to check for + * @return true if the char is found, false otherwise. + */ + public boolean contains(final char c) + { + for (int i = 0; i < data.length; i += 2) + { + byte low = (byte)(c & 0xFF); // low byte + byte high = (byte)(c >> 8 & 0xFF); // high byte + if (data[i] == low && data[i + 1] == high) + { + return true; + } + } + return false; + } + + /** + * concatanates a SimpleString and a String + * + * @param toAdd the String to concate with. + * @return the concatanated SimpleString + */ + public SimpleString concat(final String toAdd) + { + return concat(new SimpleString(toAdd)); + } + + /** + * concatanates 2 SimpleString's + * + * @param toAdd the SimpleString to concate with. + * @return the concatanated SimpleString + */ + public SimpleString concat(final SimpleString toAdd) + { + byte[] bytes = new byte[data.length + toAdd.getData().length]; + System.arraycopy(data, 0, bytes, 0, data.length); + System.arraycopy(toAdd.getData(), 0, bytes, data.length, toAdd.getData().length); + return new SimpleString(bytes); + } + + /** + * concatanates a SimpleString and a char + * + * @param c the char to concate with. + * @return the concatanated SimpleString + */ + public SimpleString concat(final char c) + { + byte[] bytes = new byte[data.length + 2]; + System.arraycopy(data, 0, bytes, 0, data.length); + bytes[data.length] = (byte)(c & 0xFF); + bytes[data.length + 1] = (byte)(c >> 8 & 0xFF); + return new SimpleString(bytes); + } + + /** + * returns the size of this SimpleString + * @return the size + */ + public int sizeof() + { + return DataConstants.SIZE_INT + data.length; + } + + /** + * returns the size of a SimpleString + * @param str the SimpleString to check + * @return the size + */ + public static int sizeofString(final SimpleString str) + { + return str.sizeof(); + } + + /** + * returns the size of a SimpleString which could be null + * @param str the SimpleString to check + * @return the size + */ + public static int sizeofNullableString(final SimpleString str) + { + if (str == null) + { + return 1; + } + else + { + return 1 + str.sizeof(); + } + } + + /** + * + * @param srcBegin + * @param srcEnd + * @param dst + * @param dstBegin + */ + public void getChars(final int srcBegin, final int srcEnd, final char dst[], final int dstBegin) + { + if (srcBegin < 0) + { + throw new StringIndexOutOfBoundsException(srcBegin); + } + if (srcEnd > length()) + { + throw new StringIndexOutOfBoundsException(srcEnd); + } + if (srcBegin > srcEnd) + { + throw new StringIndexOutOfBoundsException(srcEnd - srcBegin); + } + + int j = 0; + + for (int i = srcBegin; i < srcEnd - srcBegin; i++) + { + int low = data[j++] & 0xFF; + + int high = data[j++] << 8 & 0xFF00; + + dst[i] = (char)(low | high); + } + } + +} \ No newline at end of file Modified: trunk/src/main/org/hornetq/api/core/client/ClientProducer.java =================================================================== --- trunk/src/main/org/hornetq/api/core/client/ClientProducer.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/api/core/client/ClientProducer.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -13,9 +13,9 @@ package org.hornetq.api.core.client; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.Message; +import org.hornetq.api.core.SimpleString; /** * A ClientProducer is ised to send messages to a specific address. Messages are then routed on the server to any queues Modified: trunk/src/main/org/hornetq/api/core/client/ClientRequestor.java =================================================================== --- trunk/src/main/org/hornetq/api/core/client/ClientRequestor.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/api/core/client/ClientRequestor.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -14,7 +14,7 @@ import java.util.UUID; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.client.impl.ClientMessageImpl; /** Modified: trunk/src/main/org/hornetq/api/core/client/ClientSession.java =================================================================== --- trunk/src/main/org/hornetq/api/core/client/ClientSession.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/api/core/client/ClientSession.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -17,8 +17,8 @@ import javax.transaction.xa.XAResource; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.SimpleString; /** * A ClientSession is a single-thread object required for producing and consuming messages. Modified: trunk/src/main/org/hornetq/api/core/client/ClientSessionFactory.java =================================================================== --- trunk/src/main/org/hornetq/api/core/client/ClientSessionFactory.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/api/core/client/ClientSessionFactory.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -15,9 +15,9 @@ import java.util.List; -import org.hornetq.api.Pair; import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.Interceptor; +import org.hornetq.api.core.Pair; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.loadbalance.ConnectionLoadBalancingPolicy; @@ -142,8 +142,8 @@ * that sessions created by this factory will use to connect * to HornetQ servers or <code>null</code> if the factory is using discovery group. * - * The backup configuration (returned by {@link org.hornetq.api.Pair#b}) can be <code>null</code> if there is no - * backup for the corresponding live configuration (returned by {@link org.hornetq.api.Pair#a}) + * The backup configuration (returned by {@link org.hornetq.api.core.Pair#b}) can be <code>null</code> if there is no + * backup for the corresponding live configuration (returned by {@link org.hornetq.api.core.Pair#a}) * * @return a list of pair of TransportConfiguration corresponding to the live - backup nodes */ Modified: trunk/src/main/org/hornetq/api/core/client/ClientSessionFactoryImpl.java =================================================================== --- trunk/src/main/org/hornetq/api/core/client/ClientSessionFactoryImpl.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/api/core/client/ClientSessionFactoryImpl.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -28,9 +28,9 @@ import java.util.concurrent.ThreadFactory; import java.util.concurrent.TimeUnit; -import org.hornetq.api.Pair; import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.Interceptor; +import org.hornetq.api.core.Pair; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.loadbalance.ConnectionLoadBalancingPolicy; import org.hornetq.core.client.impl.ClientSessionFactoryInternal; Modified: trunk/src/main/org/hornetq/api/core/client/HornetQClient.java =================================================================== --- trunk/src/main/org/hornetq/api/core/client/HornetQClient.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/api/core/client/HornetQClient.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -12,7 +12,7 @@ */ package org.hornetq.api.core.client; -import org.hornetq.api.Pair; +import org.hornetq.api.core.Pair; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.loadbalance.RoundRobinConnectionLoadBalancingPolicy; Modified: trunk/src/main/org/hornetq/api/core/management/ManagementHelper.java =================================================================== --- trunk/src/main/org/hornetq/api/core/management/ManagementHelper.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/api/core/management/ManagementHelper.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -18,8 +18,8 @@ import java.util.Iterator; import java.util.Map; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.Message; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.logging.Logger; import org.hornetq.utils.json.JSONArray; import org.hornetq.utils.json.JSONObject; Modified: trunk/src/main/org/hornetq/api/core/management/ObjectNameBuilder.java =================================================================== --- trunk/src/main/org/hornetq/api/core/management/ObjectNameBuilder.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/api/core/management/ObjectNameBuilder.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -15,7 +15,7 @@ import javax.management.ObjectName; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; 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/api/jms/HornetQJMSClient.java =================================================================== --- trunk/src/main/org/hornetq/api/jms/HornetQJMSClient.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/api/jms/HornetQJMSClient.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -12,7 +12,7 @@ */ package org.hornetq.api.jms; -import org.hornetq.api.Pair; +import org.hornetq.api.core.Pair; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.jms.HornetQConnectionFactory; Modified: trunk/src/main/org/hornetq/core/buffers/impl/ChannelBufferWrapper.java =================================================================== --- trunk/src/main/org/hornetq/core/buffers/impl/ChannelBufferWrapper.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/buffers/impl/ChannelBufferWrapper.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -15,8 +15,8 @@ import java.nio.ByteBuffer; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.logging.Logger; import org.hornetq.utils.DataConstants; import org.hornetq.utils.UTF8Util; Modified: trunk/src/main/org/hornetq/core/buffers/impl/ResetLimitWrappedHornetQBuffer.java =================================================================== --- trunk/src/main/org/hornetq/core/buffers/impl/ResetLimitWrappedHornetQBuffer.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/buffers/impl/ResetLimitWrappedHornetQBuffer.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -15,8 +15,8 @@ import java.nio.ByteBuffer; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.logging.Logger; import org.hornetq.core.message.impl.MessageInternal; Modified: trunk/src/main/org/hornetq/core/client/impl/ClientConsumerImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/client/impl/ClientConsumerImpl.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/client/impl/ClientConsumerImpl.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -17,9 +17,9 @@ import java.util.concurrent.Executor; import java.util.concurrent.atomic.AtomicLong; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQBuffers; import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.MessageHandler; import org.hornetq.core.list.PriorityLinkedList; Modified: trunk/src/main/org/hornetq/core/client/impl/ClientConsumerInternal.java =================================================================== --- trunk/src/main/org/hornetq/core/client/impl/ClientConsumerInternal.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/client/impl/ClientConsumerInternal.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -13,8 +13,8 @@ package org.hornetq.core.client.impl; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.core.remoting.impl.wireformat.SessionQueueQueryResponseMessage; Modified: trunk/src/main/org/hornetq/core/client/impl/ClientMessageImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/client/impl/ClientMessageImpl.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/client/impl/ClientMessageImpl.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -18,10 +18,10 @@ import java.io.OutputStream; import java.nio.ByteBuffer; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQBuffer; import org.hornetq.api.core.HornetQBuffers; import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.logging.Logger; import org.hornetq.core.message.BodyEncoder; import org.hornetq.core.message.impl.MessageImpl; Modified: trunk/src/main/org/hornetq/core/client/impl/ClientProducerCreditManager.java =================================================================== --- trunk/src/main/org/hornetq/core/client/impl/ClientProducerCreditManager.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/client/impl/ClientProducerCreditManager.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -13,7 +13,7 @@ package org.hornetq.core.client.impl; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; /** * A ClientProducerCreditManager Modified: trunk/src/main/org/hornetq/core/client/impl/ClientProducerCreditManagerImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/client/impl/ClientProducerCreditManagerImpl.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/client/impl/ClientProducerCreditManagerImpl.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -17,7 +17,7 @@ import java.util.LinkedHashMap; import java.util.Map; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.logging.Logger; /** Modified: trunk/src/main/org/hornetq/core/client/impl/ClientProducerCreditsImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/client/impl/ClientProducerCreditsImpl.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/client/impl/ClientProducerCreditsImpl.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -15,7 +15,7 @@ import java.util.concurrent.Semaphore; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.logging.Logger; /** Modified: trunk/src/main/org/hornetq/core/client/impl/ClientProducerImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/client/impl/ClientProducerImpl.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/client/impl/ClientProducerImpl.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -16,11 +16,11 @@ import java.io.IOException; import java.io.InputStream; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQBuffer; import org.hornetq.api.core.HornetQBuffers; import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.Message; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.logging.Logger; import org.hornetq.core.message.BodyEncoder; import org.hornetq.core.message.impl.MessageInternal; Modified: trunk/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -24,9 +24,9 @@ import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQBuffer; import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; Modified: trunk/src/main/org/hornetq/core/client/impl/ClientSessionInternal.java =================================================================== --- trunk/src/main/org/hornetq/core/client/impl/ClientSessionInternal.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/client/impl/ClientSessionInternal.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -13,8 +13,8 @@ package org.hornetq.core.client.impl; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.ClientSession; import org.hornetq.core.remoting.RemotingConnection; import org.hornetq.core.remoting.impl.wireformat.SessionReceiveContinuationMessage; Modified: trunk/src/main/org/hornetq/core/client/impl/DelegatingSession.java =================================================================== --- trunk/src/main/org/hornetq/core/client/impl/DelegatingSession.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/client/impl/DelegatingSession.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -19,8 +19,8 @@ import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; Modified: trunk/src/main/org/hornetq/core/client/impl/LargeMessageBufferImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/client/impl/LargeMessageBufferImpl.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/client/impl/LargeMessageBufferImpl.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -26,9 +26,9 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.TimeUnit; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQBuffer; import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.impl.wireformat.SessionReceiveContinuationMessage; import org.hornetq.utils.DataConstants; Modified: trunk/src/main/org/hornetq/core/cluster/DiscoveryEntry.java =================================================================== --- trunk/src/main/org/hornetq/core/cluster/DiscoveryEntry.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/cluster/DiscoveryEntry.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -13,7 +13,7 @@ package org.hornetq.core.cluster; -import org.hornetq.api.Pair; +import org.hornetq.api.core.Pair; import org.hornetq.api.core.TransportConfiguration; /** Modified: trunk/src/main/org/hornetq/core/cluster/impl/DiscoveryGroupImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/cluster/impl/DiscoveryGroupImpl.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/cluster/impl/DiscoveryGroupImpl.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -23,10 +23,10 @@ import java.util.List; import java.util.Map; -import org.hornetq.api.Pair; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQBuffer; import org.hornetq.api.core.HornetQBuffers; +import org.hornetq.api.core.Pair; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.management.NotificationType; import org.hornetq.core.cluster.DiscoveryEntry; Modified: trunk/src/main/org/hornetq/core/config/Configuration.java =================================================================== --- trunk/src/main/org/hornetq/core/config/Configuration.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/config/Configuration.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -18,8 +18,8 @@ import java.util.Map; import java.util.Set; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.Interceptor; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.server.JournalType; Modified: trunk/src/main/org/hornetq/core/config/impl/ConfigurationImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/config/impl/ConfigurationImpl.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/config/impl/ConfigurationImpl.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -21,7 +21,7 @@ import java.util.Map; import java.util.Set; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.core.config.Configuration; import org.hornetq.core.logging.impl.JULLogDelegateFactory; Modified: trunk/src/main/org/hornetq/core/config/impl/FileConfiguration.java =================================================================== --- trunk/src/main/org/hornetq/core/config/impl/FileConfiguration.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/config/impl/FileConfiguration.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -21,8 +21,8 @@ import java.util.List; import java.util.Map; -import org.hornetq.api.Pair; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.Pair; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ClientSessionFactoryImpl; import org.hornetq.api.core.client.HornetQClient; Modified: trunk/src/main/org/hornetq/core/deployers/impl/AddressSettingsDeployer.java =================================================================== --- trunk/src/main/org/hornetq/core/deployers/impl/AddressSettingsDeployer.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/deployers/impl/AddressSettingsDeployer.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -13,7 +13,7 @@ package org.hornetq.core.deployers.impl; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.config.impl.Validators; import org.hornetq.core.deployers.DeploymentManager; import org.hornetq.core.logging.Logger; Modified: trunk/src/main/org/hornetq/core/deployers/impl/FileDeploymentManager.java =================================================================== --- trunk/src/main/org/hornetq/core/deployers/impl/FileDeploymentManager.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/deployers/impl/FileDeploymentManager.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -27,7 +27,7 @@ import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; -import org.hornetq.api.Pair; +import org.hornetq.api.core.Pair; import org.hornetq.core.deployers.Deployer; import org.hornetq.core.deployers.DeploymentManager; import org.hornetq.core.logging.Logger; Modified: trunk/src/main/org/hornetq/core/filter/Filter.java =================================================================== --- trunk/src/main/org/hornetq/core/filter/Filter.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/filter/Filter.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -13,7 +13,7 @@ package org.hornetq.core.filter; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.server.ServerMessage; /** Modified: trunk/src/main/org/hornetq/core/filter/impl/FilterImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/filter/impl/FilterImpl.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/filter/impl/FilterImpl.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -16,8 +16,8 @@ import java.util.HashMap; import java.util.Map; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.filter.Filter; import org.hornetq.core.logging.Logger; import org.hornetq.core.server.ServerMessage; Modified: trunk/src/main/org/hornetq/core/filter/impl/FilterParser.jj =================================================================== --- trunk/src/main/org/hornetq/core/filter/impl/FilterParser.jj 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/filter/impl/FilterParser.jj 2010-01-06 11:07:36 UTC (rev 8731) @@ -39,8 +39,8 @@ import java.util.Map; import java.util.Set; -import org.hornetq.api.SimpleString; -import org.hornetq.SimpleStringReader; +import org.hornetq.api.core.SimpleString; +import org.hornetq.core.filter.impl.SimpleStringReader; /** * A JavaCC 2.0 grammar for HornetQ filters Modified: trunk/src/main/org/hornetq/core/filter/impl/Identifier.java =================================================================== --- trunk/src/main/org/hornetq/core/filter/impl/Identifier.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/filter/impl/Identifier.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -22,7 +22,7 @@ package org.hornetq.core.filter.impl; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; /** * Modified: trunk/src/main/org/hornetq/core/filter/impl/Operator.java =================================================================== --- trunk/src/main/org/hornetq/core/filter/impl/Operator.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/filter/impl/Operator.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -24,7 +24,7 @@ import java.util.HashSet; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.logging.Logger; /** Copied: trunk/src/main/org/hornetq/core/filter/impl/SimpleStringReader.java (from rev 8726, trunk/src/main/org/hornetq/SimpleStringReader.java) =================================================================== --- trunk/src/main/org/hornetq/core/filter/impl/SimpleStringReader.java (rev 0) +++ trunk/src/main/org/hornetq/core/filter/impl/SimpleStringReader.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -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.core.filter.impl; + +import java.io.IOException; +import java.io.Reader; + +import org.hornetq.api.core.SimpleString; + + +/** + * A SimpleStringReader + * + * @author <a href="jmesnil(a)redhat.com">Jeff Mesnil</a> + * + * Created 31 oct. 2008 14:41:18 + * + * + */ +public class SimpleStringReader extends Reader +{ + + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private final SimpleString simpleString; + + private int next = 0; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public SimpleStringReader(final SimpleString simpleString) + { + this.simpleString = simpleString; + } + + // Public -------------------------------------------------------- + + // Reader overrides ---------------------------------------------- + + @Override + public int read(final char[] cbuf, final int off, final int len) throws IOException + { + synchronized (simpleString) + { + if (off < 0 || off > cbuf.length || len < 0 || off + len > cbuf.length || off + len < 0) + { + throw new IndexOutOfBoundsException(); + } + else if (len == 0) + { + return 0; + } + int length = simpleString.length(); + if (next >= length) + { + return -1; + } + int n = Math.min(length - next, len); + simpleString.getChars(next, next + n, cbuf, off); + next += n; + return n; + } + } + + @Override + public void close() throws IOException + { + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- + +} Modified: trunk/src/main/org/hornetq/core/journal/impl/AbstractJournalUpdateTask.java =================================================================== --- trunk/src/main/org/hornetq/core/journal/impl/AbstractJournalUpdateTask.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/journal/impl/AbstractJournalUpdateTask.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -18,9 +18,9 @@ import java.util.List; import java.util.Set; -import org.hornetq.api.Pair; import org.hornetq.api.core.HornetQBuffer; import org.hornetq.api.core.HornetQBuffers; +import org.hornetq.api.core.Pair; import org.hornetq.core.journal.SequentialFile; import org.hornetq.core.journal.SequentialFileFactory; import org.hornetq.core.journal.impl.dataformat.ByteArrayEncoding; Modified: trunk/src/main/org/hornetq/core/journal/impl/JournalCompactor.java =================================================================== --- trunk/src/main/org/hornetq/core/journal/impl/JournalCompactor.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/journal/impl/JournalCompactor.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -21,9 +21,9 @@ import java.util.Set; import java.util.concurrent.ConcurrentHashMap; -import org.hornetq.api.Pair; import org.hornetq.api.core.HornetQBuffer; import org.hornetq.api.core.HornetQBuffers; +import org.hornetq.api.core.Pair; import org.hornetq.core.journal.RecordInfo; import org.hornetq.core.journal.SequentialFile; import org.hornetq.core.journal.SequentialFileFactory; Modified: trunk/src/main/org/hornetq/core/journal/impl/JournalImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/journal/impl/JournalImpl.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/journal/impl/JournalImpl.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -41,9 +41,9 @@ import java.util.concurrent.locks.ReentrantLock; import java.util.concurrent.locks.ReentrantReadWriteLock; -import org.hornetq.api.Pair; import org.hornetq.api.core.HornetQBuffer; import org.hornetq.api.core.HornetQBuffers; +import org.hornetq.api.core.Pair; import org.hornetq.core.journal.EncodingSupport; import org.hornetq.core.journal.IOAsyncTask; import org.hornetq.core.journal.IOCompletion; Modified: trunk/src/main/org/hornetq/core/management/impl/AddressControlImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/management/impl/AddressControlImpl.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/management/impl/AddressControlImpl.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -18,7 +18,7 @@ import javax.management.MBeanOperationInfo; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.management.AddressControl; import org.hornetq.core.logging.Logger; import org.hornetq.core.paging.PagingManager; Modified: trunk/src/main/org/hornetq/core/management/impl/BroadcastGroupControlImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/management/impl/BroadcastGroupControlImpl.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/management/impl/BroadcastGroupControlImpl.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -15,7 +15,7 @@ import javax.management.MBeanOperationInfo; -import org.hornetq.api.Pair; +import org.hornetq.api.core.Pair; import org.hornetq.api.core.management.AddressControl; import org.hornetq.api.core.management.BroadcastGroupControl; import org.hornetq.core.persistence.StorageManager; Modified: trunk/src/main/org/hornetq/core/management/impl/ClusterConnectionControlImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/management/impl/ClusterConnectionControlImpl.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/management/impl/ClusterConnectionControlImpl.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -18,7 +18,7 @@ import javax.management.MBeanOperationInfo; -import org.hornetq.api.Pair; +import org.hornetq.api.core.Pair; import org.hornetq.api.core.management.AddressControl; import org.hornetq.api.core.management.ClusterConnectionControl; import org.hornetq.core.persistence.StorageManager; Modified: trunk/src/main/org/hornetq/core/management/impl/HornetQServerControlImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/management/impl/HornetQServerControlImpl.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/management/impl/HornetQServerControlImpl.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -33,8 +33,8 @@ import javax.management.NotificationListener; import javax.transaction.xa.Xid; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.management.AddressControl; import org.hornetq.api.core.management.HornetQServerControl; Modified: trunk/src/main/org/hornetq/core/management/impl/QueueControlImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/management/impl/QueueControlImpl.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/management/impl/QueueControlImpl.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -18,9 +18,9 @@ import javax.management.MBeanOperationInfo; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.Message; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.management.MessageCounterInfo; import org.hornetq.api.core.management.QueueControl; import org.hornetq.core.filter.Filter; Modified: trunk/src/main/org/hornetq/core/message/impl/MessageImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/message/impl/MessageImpl.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/message/impl/MessageImpl.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -18,11 +18,11 @@ import java.util.Map; import java.util.Set; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQBuffer; import org.hornetq.api.core.HornetQBuffers; import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.PropertyConversionException; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.buffers.impl.ResetLimitWrappedHornetQBuffer; import org.hornetq.core.client.impl.LargeMessageBufferInternal; import org.hornetq.core.logging.Logger; Modified: trunk/src/main/org/hornetq/core/paging/PagingManager.java =================================================================== --- trunk/src/main/org/hornetq/core/paging/PagingManager.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/paging/PagingManager.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -13,7 +13,7 @@ package org.hornetq.core.paging; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.journal.SequentialFile; import org.hornetq.core.postoffice.PostOffice; import org.hornetq.core.server.HornetQComponent; Modified: trunk/src/main/org/hornetq/core/paging/PagingStore.java =================================================================== --- trunk/src/main/org/hornetq/core/paging/PagingStore.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/paging/PagingStore.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -13,7 +13,7 @@ package org.hornetq.core.paging; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.server.HornetQComponent; import org.hornetq.core.server.MessageReference; import org.hornetq.core.server.ServerMessage; Modified: trunk/src/main/org/hornetq/core/paging/PagingStoreFactory.java =================================================================== --- trunk/src/main/org/hornetq/core/paging/PagingStoreFactory.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/paging/PagingStoreFactory.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -15,7 +15,7 @@ import java.util.List; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.journal.SequentialFileFactory; import org.hornetq.core.persistence.StorageManager; import org.hornetq.core.postoffice.PostOffice; Modified: trunk/src/main/org/hornetq/core/paging/impl/PageImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/paging/impl/PageImpl.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/paging/impl/PageImpl.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -18,9 +18,9 @@ import java.util.List; import java.util.concurrent.atomic.AtomicInteger; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQBuffer; import org.hornetq.api.core.HornetQBuffers; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.journal.SequentialFile; import org.hornetq.core.journal.SequentialFileFactory; import org.hornetq.core.logging.Logger; Modified: trunk/src/main/org/hornetq/core/paging/impl/PagingManagerImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/paging/impl/PagingManagerImpl.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/paging/impl/PagingManagerImpl.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -19,7 +19,7 @@ import java.util.concurrent.ConcurrentMap; import java.util.concurrent.atomic.AtomicLong; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.logging.Logger; import org.hornetq.core.paging.PageTransactionInfo; import org.hornetq.core.paging.PagingManager; Modified: trunk/src/main/org/hornetq/core/paging/impl/PagingStoreFactoryNIO.java =================================================================== --- trunk/src/main/org/hornetq/core/paging/impl/PagingStoreFactoryNIO.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/paging/impl/PagingStoreFactoryNIO.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -24,7 +24,7 @@ import java.util.Collections; import java.util.List; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.journal.SequentialFileFactory; import org.hornetq.core.journal.impl.NIOSequentialFileFactory; import org.hornetq.core.logging.Logger; Modified: trunk/src/main/org/hornetq/core/paging/impl/PagingStoreImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/paging/impl/PagingStoreImpl.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/paging/impl/PagingStoreImpl.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -27,8 +27,8 @@ import java.util.concurrent.locks.ReentrantLock; import java.util.concurrent.locks.ReentrantReadWriteLock; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.Message; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.journal.SequentialFile; import org.hornetq.core.journal.SequentialFileFactory; import org.hornetq.core.logging.Logger; Modified: trunk/src/main/org/hornetq/core/persistence/GroupingInfo.java =================================================================== --- trunk/src/main/org/hornetq/core/persistence/GroupingInfo.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/persistence/GroupingInfo.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -12,7 +12,7 @@ */ package org.hornetq.core.persistence; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; /** * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a> Modified: trunk/src/main/org/hornetq/core/persistence/QueueBindingInfo.java =================================================================== --- trunk/src/main/org/hornetq/core/persistence/QueueBindingInfo.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/persistence/QueueBindingInfo.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -13,7 +13,7 @@ package org.hornetq.core.persistence; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; /** * A QueueBindingInfo Modified: trunk/src/main/org/hornetq/core/persistence/StorageManager.java =================================================================== --- trunk/src/main/org/hornetq/core/persistence/StorageManager.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/persistence/StorageManager.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -19,8 +19,8 @@ import javax.transaction.xa.Xid; -import org.hornetq.api.Pair; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.Pair; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.journal.IOAsyncTask; import org.hornetq.core.journal.JournalLoadInformation; import org.hornetq.core.paging.PageTransactionInfo; Modified: trunk/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java =================================================================== --- trunk/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -24,12 +24,12 @@ import javax.transaction.xa.Xid; -import org.hornetq.api.Pair; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQBuffer; import org.hornetq.api.core.HornetQBuffers; import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.Message; +import org.hornetq.api.core.Pair; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.config.Configuration; import org.hornetq.core.filter.Filter; import org.hornetq.core.journal.EncodingSupport; Modified: trunk/src/main/org/hornetq/core/persistence/impl/nullpm/NullStorageManager.java =================================================================== --- trunk/src/main/org/hornetq/core/persistence/impl/nullpm/NullStorageManager.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/persistence/impl/nullpm/NullStorageManager.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -20,10 +20,10 @@ import javax.transaction.xa.Xid; -import org.hornetq.api.Pair; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQBuffer; import org.hornetq.api.core.HornetQBuffers; +import org.hornetq.api.core.Pair; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.journal.IOAsyncTask; import org.hornetq.core.journal.JournalLoadInformation; import org.hornetq.core.paging.PageTransactionInfo; Modified: trunk/src/main/org/hornetq/core/postoffice/Address.java =================================================================== --- trunk/src/main/org/hornetq/core/postoffice/Address.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/postoffice/Address.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -14,7 +14,7 @@ import java.util.List; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; /** * USed to hold a hierarchichal style address, delimited by a '.'. Modified: trunk/src/main/org/hornetq/core/postoffice/AddressManager.java =================================================================== --- trunk/src/main/org/hornetq/core/postoffice/AddressManager.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/postoffice/AddressManager.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -14,7 +14,7 @@ import java.util.Map; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; /** * Used to maintain addresses and Bindings. Modified: trunk/src/main/org/hornetq/core/postoffice/Binding.java =================================================================== --- trunk/src/main/org/hornetq/core/postoffice/Binding.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/postoffice/Binding.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -13,7 +13,7 @@ package org.hornetq.core.postoffice; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.filter.Filter; import org.hornetq.core.server.Bindable; import org.hornetq.core.server.RoutingContext; Modified: trunk/src/main/org/hornetq/core/postoffice/DuplicateIDCache.java =================================================================== --- trunk/src/main/org/hornetq/core/postoffice/DuplicateIDCache.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/postoffice/DuplicateIDCache.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -15,7 +15,7 @@ import java.util.List; -import org.hornetq.api.Pair; +import org.hornetq.api.core.Pair; import org.hornetq.core.transaction.Transaction; /** Modified: trunk/src/main/org/hornetq/core/postoffice/PostOffice.java =================================================================== --- trunk/src/main/org/hornetq/core/postoffice/PostOffice.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/postoffice/PostOffice.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -13,7 +13,7 @@ package org.hornetq.core.postoffice; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.paging.PagingManager; import org.hornetq.core.server.HornetQComponent; import org.hornetq.core.server.MessageReference; Modified: trunk/src/main/org/hornetq/core/postoffice/QueueInfo.java =================================================================== --- trunk/src/main/org/hornetq/core/postoffice/QueueInfo.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/postoffice/QueueInfo.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -16,7 +16,7 @@ import java.io.Serializable; import java.util.List; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; /** * A QueueInfo Modified: trunk/src/main/org/hornetq/core/postoffice/impl/AddressImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/postoffice/impl/AddressImpl.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/postoffice/impl/AddressImpl.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -15,7 +15,7 @@ import java.util.ArrayList; import java.util.List; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.postoffice.Address; /** Modified: trunk/src/main/org/hornetq/core/postoffice/impl/BindingsImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/postoffice/impl/BindingsImpl.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/postoffice/impl/BindingsImpl.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -21,9 +21,9 @@ import java.util.concurrent.ConcurrentMap; import java.util.concurrent.CopyOnWriteArrayList; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.Message; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.filter.Filter; import org.hornetq.core.logging.Logger; import org.hornetq.core.message.impl.MessageImpl; Modified: trunk/src/main/org/hornetq/core/postoffice/impl/DivertBinding.java =================================================================== --- trunk/src/main/org/hornetq/core/postoffice/impl/DivertBinding.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/postoffice/impl/DivertBinding.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -13,7 +13,7 @@ package org.hornetq.core.postoffice.impl; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.filter.Filter; import org.hornetq.core.postoffice.Binding; import org.hornetq.core.postoffice.BindingType; Modified: trunk/src/main/org/hornetq/core/postoffice/impl/DuplicateIDCacheImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/postoffice/impl/DuplicateIDCacheImpl.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/postoffice/impl/DuplicateIDCacheImpl.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -19,8 +19,8 @@ import java.util.List; import java.util.Set; -import org.hornetq.api.Pair; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.Pair; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.logging.Logger; import org.hornetq.core.persistence.StorageManager; import org.hornetq.core.postoffice.DuplicateIDCache; Modified: trunk/src/main/org/hornetq/core/postoffice/impl/LocalQueueBinding.java =================================================================== --- trunk/src/main/org/hornetq/core/postoffice/impl/LocalQueueBinding.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/postoffice/impl/LocalQueueBinding.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -13,7 +13,7 @@ package org.hornetq.core.postoffice.impl; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.filter.Filter; import org.hornetq.core.logging.Logger; import org.hornetq.core.postoffice.BindingType; Modified: trunk/src/main/org/hornetq/core/postoffice/impl/PostOfficeImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/postoffice/impl/PostOfficeImpl.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/postoffice/impl/PostOfficeImpl.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -25,9 +25,9 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.Message; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.management.ManagementHelper; import org.hornetq.api.core.management.NotificationType; import org.hornetq.core.filter.Filter; Modified: trunk/src/main/org/hornetq/core/postoffice/impl/SimpleAddressManager.java =================================================================== --- trunk/src/main/org/hornetq/core/postoffice/impl/SimpleAddressManager.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/postoffice/impl/SimpleAddressManager.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -16,7 +16,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.logging.Logger; import org.hornetq.core.postoffice.Address; import org.hornetq.core.postoffice.AddressManager; Modified: trunk/src/main/org/hornetq/core/postoffice/impl/WildcardAddressManager.java =================================================================== --- trunk/src/main/org/hornetq/core/postoffice/impl/WildcardAddressManager.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/postoffice/impl/WildcardAddressManager.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -17,7 +17,7 @@ import java.util.List; import java.util.Map; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.logging.Logger; import org.hornetq.core.postoffice.Address; import org.hornetq.core.postoffice.Binding; Modified: trunk/src/main/org/hornetq/core/remoting/impl/invm/InVMAcceptor.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/invm/InVMAcceptor.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/remoting/impl/invm/InVMAcceptor.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -17,8 +17,8 @@ import java.util.concurrent.ConcurrentMap; import java.util.concurrent.Executor; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.management.NotificationType; import org.hornetq.core.logging.Logger; import org.hornetq.core.server.management.Notification; Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/CreateQueueMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/CreateQueueMessage.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/CreateQueueMessage.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -13,8 +13,8 @@ package org.hornetq.core.remoting.impl.wireformat; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.logging.Logger; /** Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationPageEventMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationPageEventMessage.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationPageEventMessage.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -13,8 +13,8 @@ package org.hornetq.core.remoting.impl.wireformat; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.SimpleString; /** * A ReplicationPageWrite Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionBindingQueryMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionBindingQueryMessage.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionBindingQueryMessage.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -13,8 +13,8 @@ package org.hornetq.core.remoting.impl.wireformat; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.SimpleString; /** * Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionBindingQueryResponseMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionBindingQueryResponseMessage.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionBindingQueryResponseMessage.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -16,8 +16,8 @@ import java.util.ArrayList; import java.util.List; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.SimpleString; /** * Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionCreateConsumerMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionCreateConsumerMessage.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionCreateConsumerMessage.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -13,8 +13,8 @@ package org.hornetq.core.remoting.impl.wireformat; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.SimpleString; /** * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionDeleteQueueMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionDeleteQueueMessage.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionDeleteQueueMessage.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -13,8 +13,8 @@ package org.hornetq.core.remoting.impl.wireformat; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.SimpleString; /** * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionProducerCreditsMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionProducerCreditsMessage.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionProducerCreditsMessage.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -13,8 +13,8 @@ package org.hornetq.core.remoting.impl.wireformat; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.SimpleString; /** * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionQueueQueryMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionQueueQueryMessage.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionQueueQueryMessage.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -13,8 +13,8 @@ package org.hornetq.core.remoting.impl.wireformat; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.SimpleString; /** * Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionQueueQueryResponseMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionQueueQueryResponseMessage.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionQueueQueryResponseMessage.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -13,8 +13,8 @@ package org.hornetq.core.remoting.impl.wireformat; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.SimpleString; /** * Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionRequestProducerCreditsMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionRequestProducerCreditsMessage.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionRequestProducerCreditsMessage.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -13,8 +13,8 @@ package org.hornetq.core.remoting.impl.wireformat; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.SimpleString; /** * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> Modified: trunk/src/main/org/hornetq/core/replication/ReplicationManager.java =================================================================== --- trunk/src/main/org/hornetq/core/replication/ReplicationManager.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/replication/ReplicationManager.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -15,8 +15,8 @@ import java.util.Set; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.journal.EncodingSupport; import org.hornetq.core.journal.JournalLoadInformation; import org.hornetq.core.paging.PagedMessage; Modified: trunk/src/main/org/hornetq/core/replication/impl/ReplicationEndpointImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/replication/impl/ReplicationEndpointImpl.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/replication/impl/ReplicationEndpointImpl.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -16,8 +16,8 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.config.Configuration; import org.hornetq.core.journal.Journal; import org.hornetq.core.journal.JournalLoadInformation; Modified: trunk/src/main/org/hornetq/core/replication/impl/ReplicationManagerImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/replication/impl/ReplicationManagerImpl.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/replication/impl/ReplicationManagerImpl.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -18,9 +18,9 @@ import java.util.Set; import java.util.concurrent.ConcurrentLinkedQueue; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQBuffer; import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.SessionFailureListener; import org.hornetq.core.client.impl.FailoverManager; import org.hornetq.core.journal.EncodingSupport; Modified: trunk/src/main/org/hornetq/core/security/SecurityStore.java =================================================================== --- trunk/src/main/org/hornetq/core/security/SecurityStore.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/security/SecurityStore.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -13,7 +13,7 @@ package org.hornetq.core.security; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.server.ServerSession; /** Modified: trunk/src/main/org/hornetq/core/security/impl/SecurityStoreImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/security/impl/SecurityStoreImpl.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/security/impl/SecurityStoreImpl.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -19,8 +19,8 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.management.ManagementHelper; import org.hornetq.api.core.management.NotificationType; import org.hornetq.core.logging.Logger; Modified: trunk/src/main/org/hornetq/core/server/Divert.java =================================================================== --- trunk/src/main/org/hornetq/core/server/Divert.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/server/Divert.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -13,7 +13,7 @@ package org.hornetq.core.server; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.filter.Filter; /** Modified: trunk/src/main/org/hornetq/core/server/HornetQServer.java =================================================================== --- trunk/src/main/org/hornetq/core/server/HornetQServer.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/server/HornetQServer.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -18,7 +18,7 @@ import javax.management.MBeanServer; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.config.Configuration; import org.hornetq.core.management.impl.HornetQServerControlImpl; import org.hornetq.core.persistence.StorageManager; Modified: trunk/src/main/org/hornetq/core/server/Queue.java =================================================================== --- trunk/src/main/org/hornetq/core/server/Queue.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/server/Queue.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -18,7 +18,7 @@ import java.util.List; import java.util.concurrent.Executor; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.filter.Filter; import org.hornetq.core.transaction.Transaction; Modified: trunk/src/main/org/hornetq/core/server/QueueFactory.java =================================================================== --- trunk/src/main/org/hornetq/core/server/QueueFactory.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/server/QueueFactory.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -13,7 +13,7 @@ package org.hornetq.core.server; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.filter.Filter; import org.hornetq.core.postoffice.PostOffice; Modified: trunk/src/main/org/hornetq/core/server/cluster/Bridge.java =================================================================== --- trunk/src/main/org/hornetq/core/server/cluster/Bridge.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/server/cluster/Bridge.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -13,7 +13,7 @@ package org.hornetq.core.server.cluster; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.remoting.RemotingConnection; import org.hornetq.core.server.Consumer; import org.hornetq.core.server.HornetQComponent; Modified: trunk/src/main/org/hornetq/core/server/cluster/BridgeConfiguration.java =================================================================== --- trunk/src/main/org/hornetq/core/server/cluster/BridgeConfiguration.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/server/cluster/BridgeConfiguration.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -15,7 +15,7 @@ import java.io.Serializable; -import org.hornetq.api.Pair; +import org.hornetq.api.core.Pair; /** * A BridgeConfiguration Modified: trunk/src/main/org/hornetq/core/server/cluster/BroadcastGroup.java =================================================================== --- trunk/src/main/org/hornetq/core/server/cluster/BroadcastGroup.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/server/cluster/BroadcastGroup.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -13,7 +13,7 @@ package org.hornetq.core.server.cluster; -import org.hornetq.api.Pair; +import org.hornetq.api.core.Pair; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.core.server.HornetQComponent; import org.hornetq.core.server.management.NotificationService; Modified: trunk/src/main/org/hornetq/core/server/cluster/BroadcastGroupConfiguration.java =================================================================== --- trunk/src/main/org/hornetq/core/server/cluster/BroadcastGroupConfiguration.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/server/cluster/BroadcastGroupConfiguration.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -16,7 +16,7 @@ import java.io.Serializable; import java.util.List; -import org.hornetq.api.Pair; +import org.hornetq.api.core.Pair; import org.hornetq.core.logging.Logger; /** Modified: trunk/src/main/org/hornetq/core/server/cluster/ClusterConnection.java =================================================================== --- trunk/src/main/org/hornetq/core/server/cluster/ClusterConnection.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/server/cluster/ClusterConnection.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -15,7 +15,7 @@ import java.util.Map; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.server.HornetQComponent; /** Modified: trunk/src/main/org/hornetq/core/server/cluster/ClusterConnectionConfiguration.java =================================================================== --- trunk/src/main/org/hornetq/core/server/cluster/ClusterConnectionConfiguration.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/server/cluster/ClusterConnectionConfiguration.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -16,7 +16,7 @@ import java.io.Serializable; import java.util.List; -import org.hornetq.api.Pair; +import org.hornetq.api.core.Pair; /** * A ClusterConnectionConfiguration Modified: trunk/src/main/org/hornetq/core/server/cluster/ClusterManager.java =================================================================== --- trunk/src/main/org/hornetq/core/server/cluster/ClusterManager.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/server/cluster/ClusterManager.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -16,7 +16,7 @@ import java.util.Map; import java.util.Set; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.server.HornetQComponent; /** Modified: trunk/src/main/org/hornetq/core/server/cluster/RemoteQueueBinding.java =================================================================== --- trunk/src/main/org/hornetq/core/server/cluster/RemoteQueueBinding.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/server/cluster/RemoteQueueBinding.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -13,7 +13,7 @@ package org.hornetq.core.server.cluster; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.postoffice.QueueBinding; /** 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 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -20,10 +20,10 @@ import java.util.concurrent.Executor; import java.util.concurrent.ScheduledExecutorService; -import org.hornetq.api.Pair; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.Message; +import org.hornetq.api.core.Pair; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; import org.hornetq.api.core.management.ManagementHelper; Modified: trunk/src/main/org/hornetq/core/server/cluster/impl/BroadcastGroupImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/server/cluster/impl/BroadcastGroupImpl.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/server/cluster/impl/BroadcastGroupImpl.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -20,10 +20,10 @@ import java.util.List; import java.util.concurrent.ScheduledFuture; -import org.hornetq.api.Pair; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQBuffer; import org.hornetq.api.core.HornetQBuffers; +import org.hornetq.api.core.Pair; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.management.NotificationType; import org.hornetq.core.logging.Logger; Modified: trunk/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -24,8 +24,8 @@ import java.util.Map.Entry; import java.util.concurrent.ScheduledExecutorService; -import org.hornetq.api.Pair; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.Pair; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.management.ManagementHelper; Modified: trunk/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -25,8 +25,8 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledFuture; -import org.hornetq.api.Pair; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.Pair; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.core.cluster.DiscoveryGroup; import org.hornetq.core.cluster.impl.DiscoveryGroupImpl; Modified: trunk/src/main/org/hornetq/core/server/cluster/impl/RemoteQueueBindingImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/server/cluster/impl/RemoteQueueBindingImpl.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/server/cluster/impl/RemoteQueueBindingImpl.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -19,7 +19,7 @@ import java.util.Map; import java.util.Set; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.filter.Filter; import org.hornetq.core.filter.impl.FilterImpl; import org.hornetq.core.logging.Logger; Modified: trunk/src/main/org/hornetq/core/server/group/GroupingHandler.java =================================================================== --- trunk/src/main/org/hornetq/core/server/group/GroupingHandler.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/server/group/GroupingHandler.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -12,7 +12,7 @@ */ package org.hornetq.core.server.group; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.server.group.impl.GroupBinding; import org.hornetq.core.server.group.impl.Proposal; import org.hornetq.core.server.group.impl.Response; Modified: trunk/src/main/org/hornetq/core/server/group/impl/GroupBinding.java =================================================================== --- trunk/src/main/org/hornetq/core/server/group/impl/GroupBinding.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/server/group/impl/GroupBinding.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -12,7 +12,7 @@ */ package org.hornetq.core.server.group.impl; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; /** * A group binding Modified: trunk/src/main/org/hornetq/core/server/group/impl/GroupingHandlerConfiguration.java =================================================================== --- trunk/src/main/org/hornetq/core/server/group/impl/GroupingHandlerConfiguration.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/server/group/impl/GroupingHandlerConfiguration.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -12,7 +12,7 @@ */ package org.hornetq.core.server.group.impl; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; /** * A remote Grouping handler configuration Modified: trunk/src/main/org/hornetq/core/server/group/impl/LocalGroupingHandler.java =================================================================== --- trunk/src/main/org/hornetq/core/server/group/impl/LocalGroupingHandler.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/server/group/impl/LocalGroupingHandler.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -16,7 +16,7 @@ import java.util.List; import java.util.concurrent.ConcurrentHashMap; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.management.ManagementHelper; import org.hornetq.api.core.management.NotificationType; import org.hornetq.core.logging.Logger; Modified: trunk/src/main/org/hornetq/core/server/group/impl/Proposal.java =================================================================== --- trunk/src/main/org/hornetq/core/server/group/impl/Proposal.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/server/group/impl/Proposal.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -12,7 +12,7 @@ */ package org.hornetq.core.server.group.impl; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; /** * A proposal to select a group id Modified: trunk/src/main/org/hornetq/core/server/group/impl/RemoteGroupingHandler.java =================================================================== --- trunk/src/main/org/hornetq/core/server/group/impl/RemoteGroupingHandler.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/server/group/impl/RemoteGroupingHandler.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -23,7 +23,7 @@ import java.util.concurrent.locks.ReentrantLock; import java.util.logging.Logger; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.management.ManagementHelper; import org.hornetq.api.core.management.NotificationType; import org.hornetq.core.postoffice.BindingType; Modified: trunk/src/main/org/hornetq/core/server/group/impl/Response.java =================================================================== --- trunk/src/main/org/hornetq/core/server/group/impl/Response.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/server/group/impl/Response.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -12,7 +12,7 @@ */ package org.hornetq.core.server.group.impl; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; /** * A response to a proposal Modified: trunk/src/main/org/hornetq/core/server/impl/DivertImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/server/impl/DivertImpl.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/server/impl/DivertImpl.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -13,7 +13,7 @@ package org.hornetq.core.server.impl; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.filter.Filter; import org.hornetq.core.logging.Logger; import org.hornetq.core.persistence.StorageManager; Modified: trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -32,9 +32,9 @@ import javax.management.MBeanServer; -import org.hornetq.api.Pair; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.Pair; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.HornetQClient; Modified: trunk/src/main/org/hornetq/core/server/impl/LastValueQueue.java =================================================================== --- trunk/src/main/org/hornetq/core/server/impl/LastValueQueue.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/server/impl/LastValueQueue.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -16,8 +16,8 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ScheduledExecutorService; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.Message; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.filter.Filter; import org.hornetq.core.logging.Logger; import org.hornetq.core.persistence.StorageManager; Modified: trunk/src/main/org/hornetq/core/server/impl/QueueFactoryImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/server/impl/QueueFactoryImpl.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/server/impl/QueueFactoryImpl.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -15,7 +15,7 @@ import java.util.concurrent.ScheduledExecutorService; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.filter.Filter; import org.hornetq.core.persistence.StorageManager; import org.hornetq.core.postoffice.PostOffice; Modified: trunk/src/main/org/hornetq/core/server/impl/QueueImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/server/impl/QueueImpl.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/server/impl/QueueImpl.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -30,8 +30,8 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.Message; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.filter.Filter; import org.hornetq.core.list.PriorityLinkedList; import org.hornetq.core.list.impl.PriorityLinkedListImpl; Modified: trunk/src/main/org/hornetq/core/server/impl/ServerInfo.java =================================================================== --- trunk/src/main/org/hornetq/core/server/impl/ServerInfo.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/server/impl/ServerInfo.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -17,7 +17,7 @@ import java.lang.management.ThreadMXBean; import java.util.Date; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.paging.PagingManager; import org.hornetq.core.paging.PagingStore; import org.hornetq.core.server.HornetQServer; Modified: trunk/src/main/org/hornetq/core/server/impl/ServerMessageImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/server/impl/ServerMessageImpl.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/server/impl/ServerMessageImpl.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -16,8 +16,8 @@ import java.io.InputStream; import java.util.concurrent.atomic.AtomicInteger; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.Message; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.logging.Logger; import org.hornetq.core.message.impl.MessageImpl; import org.hornetq.core.paging.PagingStore; Modified: trunk/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -28,8 +28,8 @@ import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.management.ManagementHelper; import org.hornetq.core.client.impl.ClientMessageImpl; import org.hornetq.core.filter.Filter; Modified: trunk/src/main/org/hornetq/core/server/management/ManagementService.java =================================================================== --- trunk/src/main/org/hornetq/core/server/management/ManagementService.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/server/management/ManagementService.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -18,7 +18,7 @@ import javax.management.ObjectName; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.management.ObjectNameBuilder; import org.hornetq.core.cluster.DiscoveryGroup; Modified: trunk/src/main/org/hornetq/core/server/management/impl/ManagementServiceImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/server/management/impl/ManagementServiceImpl.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/server/management/impl/ManagementServiceImpl.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -28,7 +28,7 @@ import javax.management.ObjectName; import javax.management.StandardMBean; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.management.AcceptorControl; import org.hornetq.api.core.management.BridgeControl; Modified: trunk/src/main/org/hornetq/core/settings/impl/AddressSettings.java =================================================================== --- trunk/src/main/org/hornetq/core/settings/impl/AddressSettings.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/core/settings/impl/AddressSettings.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -13,7 +13,7 @@ package org.hornetq.core.settings.impl; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.logging.Logger; import org.hornetq.core.settings.Mergeable; Modified: trunk/src/main/org/hornetq/integration/transports/netty/NettyAcceptor.java =================================================================== --- trunk/src/main/org/hornetq/integration/transports/netty/NettyAcceptor.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/integration/transports/netty/NettyAcceptor.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -26,8 +26,8 @@ import javax.net.ssl.SSLContext; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.management.NotificationType; import org.hornetq.core.logging.Logger; Modified: trunk/src/main/org/hornetq/jms/HornetQConnectionFactory.java =================================================================== --- trunk/src/main/org/hornetq/jms/HornetQConnectionFactory.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/jms/HornetQConnectionFactory.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -33,7 +33,7 @@ import javax.naming.Reference; import javax.naming.Referenceable; -import org.hornetq.api.Pair; +import org.hornetq.api.core.Pair; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.HornetQClient; Modified: trunk/src/main/org/hornetq/jms/HornetQDestination.java =================================================================== --- trunk/src/main/org/hornetq/jms/HornetQDestination.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/jms/HornetQDestination.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -20,7 +20,7 @@ import javax.naming.Reference; import javax.naming.Referenceable; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.jms.HornetQQueue; import org.hornetq.jms.HornetQTemporaryQueue; Modified: trunk/src/main/org/hornetq/jms/HornetQQueue.java =================================================================== --- trunk/src/main/org/hornetq/jms/HornetQQueue.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/jms/HornetQQueue.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -16,7 +16,7 @@ import javax.jms.JMSException; import javax.jms.Queue; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.jms.HornetQDestination; import org.hornetq.core.logging.Logger; Modified: trunk/src/main/org/hornetq/jms/HornetQTopic.java =================================================================== --- trunk/src/main/org/hornetq/jms/HornetQTopic.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/jms/HornetQTopic.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -16,8 +16,8 @@ import javax.jms.JMSException; import javax.jms.Topic; -import org.hornetq.api.Pair; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.Pair; +import org.hornetq.api.core.SimpleString; import org.hornetq.jms.HornetQDestination; /** Modified: trunk/src/main/org/hornetq/jms/client/HornetQConnection.java =================================================================== --- trunk/src/main/org/hornetq/jms/client/HornetQConnection.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/jms/client/HornetQConnection.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -39,8 +39,8 @@ import javax.jms.XATopicConnection; import javax.jms.XATopicSession; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.SessionFailureListener; Modified: trunk/src/main/org/hornetq/jms/client/HornetQMapMessage.java =================================================================== --- trunk/src/main/org/hornetq/jms/client/HornetQMapMessage.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/jms/client/HornetQMapMessage.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -22,8 +22,8 @@ import javax.jms.MapMessage; import javax.jms.MessageFormatException; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.PropertyConversionException; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientSession; import org.hornetq.utils.TypedProperties; Modified: trunk/src/main/org/hornetq/jms/client/HornetQMessage.java =================================================================== --- trunk/src/main/org/hornetq/jms/client/HornetQMessage.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/jms/client/HornetQMessage.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -33,10 +33,10 @@ import javax.jms.MessageNotReadableException; import javax.jms.MessageNotWriteableException; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQBuffer; import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.PropertyConversionException; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientSession; import org.hornetq.jms.HornetQDestination; Modified: trunk/src/main/org/hornetq/jms/client/HornetQMessageConsumer.java =================================================================== --- trunk/src/main/org/hornetq/jms/client/HornetQMessageConsumer.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/jms/client/HornetQMessageConsumer.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -24,8 +24,8 @@ import javax.jms.Topic; import javax.jms.TopicSubscriber; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.MessageHandler; Modified: trunk/src/main/org/hornetq/jms/client/HornetQMessageProducer.java =================================================================== --- trunk/src/main/org/hornetq/jms/client/HornetQMessageProducer.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/jms/client/HornetQMessageProducer.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -30,8 +30,8 @@ import javax.jms.Topic; import javax.jms.TopicPublisher; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; import org.hornetq.api.core.client.ClientSession; Modified: trunk/src/main/org/hornetq/jms/client/HornetQQueueBrowser.java =================================================================== --- trunk/src/main/org/hornetq/jms/client/HornetQQueueBrowser.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/jms/client/HornetQQueueBrowser.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -20,8 +20,8 @@ import javax.jms.Queue; import javax.jms.QueueBrowser; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientSession; Modified: trunk/src/main/org/hornetq/jms/client/HornetQSession.java =================================================================== --- trunk/src/main/org/hornetq/jms/client/HornetQSession.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/jms/client/HornetQSession.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -50,8 +50,8 @@ import javax.jms.XATopicSession; import javax.transaction.xa.XAResource; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientProducer; import org.hornetq.api.core.client.ClientSession; Modified: trunk/src/main/org/hornetq/jms/client/HornetQTextMessage.java =================================================================== --- trunk/src/main/org/hornetq/jms/client/HornetQTextMessage.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/jms/client/HornetQTextMessage.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -16,8 +16,8 @@ import javax.jms.JMSException; import javax.jms.TextMessage; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientSession; import org.hornetq.core.logging.Logger; Modified: trunk/src/main/org/hornetq/jms/management/impl/JMSServerControlImpl.java =================================================================== --- trunk/src/main/org/hornetq/jms/management/impl/JMSServerControlImpl.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/jms/management/impl/JMSServerControlImpl.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -28,7 +28,7 @@ import javax.management.NotificationListener; import javax.management.StandardMBean; -import org.hornetq.api.Pair; +import org.hornetq.api.core.Pair; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.management.ManagementHelper; import org.hornetq.api.jms.management.ConnectionFactoryControl; Modified: trunk/src/main/org/hornetq/jms/management/impl/JMSTopicControlImpl.java =================================================================== --- trunk/src/main/org/hornetq/jms/management/impl/JMSTopicControlImpl.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/jms/management/impl/JMSTopicControlImpl.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -21,8 +21,8 @@ import javax.management.MBeanInfo; import javax.management.StandardMBean; -import org.hornetq.api.Pair; import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.Pair; import org.hornetq.api.core.management.AddressControl; import org.hornetq.api.core.management.HornetQServerControl; import org.hornetq.api.core.management.QueueControl; Modified: trunk/src/main/org/hornetq/jms/server/JMSServerManager.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/JMSServerManager.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/jms/server/JMSServerManager.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -17,7 +17,7 @@ import javax.naming.Context; -import org.hornetq.api.Pair; +import org.hornetq.api.core.Pair; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.core.server.HornetQComponent; import org.hornetq.core.server.HornetQServer; Modified: trunk/src/main/org/hornetq/jms/server/config/ConnectionFactoryConfiguration.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/config/ConnectionFactoryConfiguration.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/jms/server/config/ConnectionFactoryConfiguration.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -15,7 +15,7 @@ import java.util.List; -import org.hornetq.api.Pair; +import org.hornetq.api.core.Pair; import org.hornetq.api.core.TransportConfiguration; /** 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 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -16,7 +16,7 @@ import java.util.ArrayList; import java.util.List; -import org.hornetq.api.Pair; +import org.hornetq.api.core.Pair; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ClientSessionFactoryImpl; import org.hornetq.api.core.client.HornetQClient; Modified: trunk/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -16,7 +16,7 @@ import java.util.ArrayList; import java.util.List; -import org.hornetq.api.Pair; +import org.hornetq.api.core.Pair; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.HornetQClient; import org.hornetq.core.config.Configuration; Modified: trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -26,7 +26,7 @@ import javax.naming.NameNotFoundException; import javax.naming.NamingException; -import org.hornetq.api.Pair; +import org.hornetq.api.core.Pair; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.jms.HornetQConnectionFactory; import org.hornetq.api.jms.HornetQJMSClient; Deleted: trunk/src/main/org/hornetq/package-info.java =================================================================== --- trunk/src/main/org/hornetq/package-info.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/package-info.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -1,20 +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. - */ - -/** - * HornetQ base classes. - * - * This package defines the base classes used by HornetQ. - */ -package org.hornetq; - Modified: trunk/src/main/org/hornetq/ra/inflow/HornetQActivation.java =================================================================== --- trunk/src/main/org/hornetq/ra/inflow/HornetQActivation.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/ra/inflow/HornetQActivation.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -29,7 +29,7 @@ import javax.resource.spi.work.Work; import javax.resource.spi.work.WorkManager; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.ClientSession; import org.hornetq.jms.HornetQConnectionFactory; import org.hornetq.jms.HornetQDestination; Modified: trunk/src/main/org/hornetq/ra/inflow/HornetQMessageHandler.java =================================================================== --- trunk/src/main/org/hornetq/ra/inflow/HornetQMessageHandler.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/ra/inflow/HornetQMessageHandler.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -20,8 +20,8 @@ import javax.resource.spi.endpoint.MessageEndpoint; import javax.resource.spi.endpoint.MessageEndpointFactory; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientSession; Modified: trunk/src/main/org/hornetq/utils/TypedProperties.java =================================================================== --- trunk/src/main/org/hornetq/utils/TypedProperties.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/utils/TypedProperties.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -31,9 +31,9 @@ import java.util.Set; import java.util.Map.Entry; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQBuffer; import org.hornetq.api.core.PropertyConversionException; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.logging.Logger; /** Modified: trunk/src/main/org/hornetq/utils/UUIDGenerator.java =================================================================== --- trunk/src/main/org/hornetq/utils/UUIDGenerator.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/src/main/org/hornetq/utils/UUIDGenerator.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -22,7 +22,7 @@ import java.util.Enumeration; import java.util.Random; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.logging.Logger; public final class UUIDGenerator 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 10:23:35 UTC (rev 8730) +++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/CTSMiscellaneousTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -21,7 +21,7 @@ import javax.jms.MessageProducer; import javax.jms.Session; -import org.hornetq.api.Pair; +import org.hornetq.api.core.Pair; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.HornetQClient; import org.hornetq.jms.HornetQConnectionFactory; 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 10:23:35 UTC (rev 8730) +++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/JMSTestCase.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -18,7 +18,7 @@ import javax.naming.InitialContext; -import org.hornetq.api.Pair; +import org.hornetq.api.core.Pair; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.HornetQClient; import org.hornetq.jms.HornetQConnectionFactory; Modified: trunk/tests/jms-tests/src/org/hornetq/jms/tests/message/MessageHeaderTest.java =================================================================== --- trunk/tests/jms-tests/src/org/hornetq/jms/tests/message/MessageHeaderTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/message/MessageHeaderTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -33,9 +33,9 @@ import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQBuffer; import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; 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 10:23:35 UTC (rev 8730) +++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/tools/container/LocalTestServer.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -26,7 +26,7 @@ import javax.management.ObjectName; import javax.naming.InitialContext; -import org.hornetq.api.Pair; +import org.hornetq.api.core.Pair; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.HornetQClient; import org.hornetq.api.core.management.ObjectNameBuilder; Modified: trunk/tests/src/org/hornetq/tests/concurrent/server/impl/QueueTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/concurrent/server/impl/QueueTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/concurrent/server/impl/QueueTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -16,7 +16,7 @@ import java.util.ArrayList; import java.util.List; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.logging.Logger; import org.hornetq.core.server.HandleStatus; import org.hornetq.core.server.MessageReference; Modified: trunk/tests/src/org/hornetq/tests/integration/DuplicateDetectionTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/DuplicateDetectionTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/DuplicateDetectionTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -18,8 +18,8 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.Message; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; import org.hornetq.core.config.Configuration; Modified: trunk/tests/src/org/hornetq/tests/integration/InterceptorTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/InterceptorTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/InterceptorTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -14,10 +14,10 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.Interceptor; import org.hornetq.api.core.Message; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; Modified: trunk/tests/src/org/hornetq/tests/integration/String64KLimitTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/String64KLimitTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/String64KLimitTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -15,7 +15,7 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; import org.hornetq.core.config.Configuration; Modified: trunk/tests/src/org/hornetq/tests/integration/client/AckBatchSizeTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/AckBatchSizeTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/client/AckBatchSizeTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -14,7 +14,7 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; Modified: trunk/tests/src/org/hornetq/tests/integration/client/AcknowledgeTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/AcknowledgeTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/client/AcknowledgeTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -17,8 +17,8 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; Modified: trunk/tests/src/org/hornetq/tests/integration/client/AddressSettingsTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/AddressSettingsTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/client/AddressSettingsTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -14,7 +14,7 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; Modified: trunk/tests/src/org/hornetq/tests/integration/client/AutogroupIdTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/AutogroupIdTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/client/AutogroupIdTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -16,8 +16,8 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; Modified: trunk/tests/src/org/hornetq/tests/integration/client/CommitRollbackTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/CommitRollbackTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/client/CommitRollbackTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -17,8 +17,8 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; Modified: trunk/tests/src/org/hornetq/tests/integration/client/ConsumerCloseTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/ConsumerCloseTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/client/ConsumerCloseTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -14,8 +14,8 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; import org.hornetq.core.config.Configuration; Modified: trunk/tests/src/org/hornetq/tests/integration/client/ConsumerRoundRobinTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/ConsumerRoundRobinTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/client/ConsumerRoundRobinTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -14,7 +14,7 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; Modified: trunk/tests/src/org/hornetq/tests/integration/client/ConsumerTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/ConsumerTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/client/ConsumerTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -17,9 +17,9 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.Interceptor; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; Modified: trunk/tests/src/org/hornetq/tests/integration/client/ConsumerWindowSizeTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/ConsumerWindowSizeTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/client/ConsumerWindowSizeTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -18,7 +18,7 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; Modified: trunk/tests/src/org/hornetq/tests/integration/client/CoreClientTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/CoreClientTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/client/CoreClientTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -15,8 +15,8 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; import org.hornetq.core.config.Configuration; Modified: trunk/tests/src/org/hornetq/tests/integration/client/DeadLetterAddressTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/DeadLetterAddressTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/client/DeadLetterAddressTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -17,9 +17,9 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.Message; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; import org.hornetq.core.config.impl.ConfigurationImpl; Modified: trunk/tests/src/org/hornetq/tests/integration/client/DeliveryOrderTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/DeliveryOrderTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/client/DeliveryOrderTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -18,8 +18,8 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; Modified: trunk/tests/src/org/hornetq/tests/integration/client/DurableQueueTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/DurableQueueTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/client/DurableQueueTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -15,7 +15,7 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; Modified: trunk/tests/src/org/hornetq/tests/integration/client/ExpiryAddressTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/ExpiryAddressTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/client/ExpiryAddressTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -14,9 +14,9 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.Message; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; import org.hornetq.core.config.impl.ConfigurationImpl; Modified: trunk/tests/src/org/hornetq/tests/integration/client/HeuristicXATest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/HeuristicXATest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/client/HeuristicXATest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -22,7 +22,7 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; Modified: trunk/tests/src/org/hornetq/tests/integration/client/JournalCrashTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/JournalCrashTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/client/JournalCrashTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -17,7 +17,7 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; Modified: trunk/tests/src/org/hornetq/tests/integration/client/LargeMessageTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/LargeMessageTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/client/LargeMessageTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -20,8 +20,8 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.Message; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.*; import org.hornetq.core.client.impl.ClientConsumerInternal; import org.hornetq.core.config.Configuration; Modified: trunk/tests/src/org/hornetq/tests/integration/client/MessageConcurrencyTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/MessageConcurrencyTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/client/MessageConcurrencyTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -17,7 +17,7 @@ import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; Modified: trunk/tests/src/org/hornetq/tests/integration/client/MessageCounterTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/MessageCounterTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/client/MessageCounterTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -14,7 +14,7 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; Modified: trunk/tests/src/org/hornetq/tests/integration/client/MessageDurabilityTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/MessageDurabilityTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/client/MessageDurabilityTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -15,8 +15,8 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientProducer; import org.hornetq.api.core.client.ClientSession; Modified: trunk/tests/src/org/hornetq/tests/integration/client/MessageExpirationTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/MessageExpirationTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/client/MessageExpirationTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -15,8 +15,8 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.Message; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; Modified: trunk/tests/src/org/hornetq/tests/integration/client/MessageGroupingConnectionFactoryTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/MessageGroupingConnectionFactoryTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/client/MessageGroupingConnectionFactoryTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -18,8 +18,8 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; import org.hornetq.core.config.impl.ConfigurationImpl; Modified: trunk/tests/src/org/hornetq/tests/integration/client/MessageGroupingTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/MessageGroupingTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/client/MessageGroupingTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -21,9 +21,9 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.Message; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; import org.hornetq.core.config.impl.ConfigurationImpl; Modified: trunk/tests/src/org/hornetq/tests/integration/client/MessageHandlerTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/MessageHandlerTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/client/MessageHandlerTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -17,7 +17,7 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; Modified: trunk/tests/src/org/hornetq/tests/integration/client/MessagePriorityTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/MessagePriorityTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/client/MessagePriorityTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -15,7 +15,7 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; import org.hornetq.core.config.Configuration; Modified: trunk/tests/src/org/hornetq/tests/integration/client/MessageRateTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/MessageRateTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/client/MessageRateTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -19,7 +19,7 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; Modified: trunk/tests/src/org/hornetq/tests/integration/client/NewDeadLetterAddressTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/NewDeadLetterAddressTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/client/NewDeadLetterAddressTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -14,8 +14,8 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; import org.hornetq.core.config.impl.ConfigurationImpl; Modified: trunk/tests/src/org/hornetq/tests/integration/client/PagingTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/PagingTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/client/PagingTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -20,9 +20,9 @@ import junit.framework.Assert; import junit.framework.AssertionFailedError; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQBuffer; import org.hornetq.api.core.Message; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; Modified: trunk/tests/src/org/hornetq/tests/integration/client/ProducerFlowControlTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/ProducerFlowControlTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/client/ProducerFlowControlTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -20,7 +20,7 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; Modified: trunk/tests/src/org/hornetq/tests/integration/client/ProducerTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/ProducerTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/client/ProducerTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -17,9 +17,9 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.Interceptor; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; import org.hornetq.api.core.client.ClientSession; Modified: trunk/tests/src/org/hornetq/tests/integration/client/QueueBrowserTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/QueueBrowserTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/client/QueueBrowserTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -14,7 +14,7 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; import org.hornetq.core.logging.Logger; Modified: trunk/tests/src/org/hornetq/tests/integration/client/ReceiveImmediateTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/ReceiveImmediateTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/client/ReceiveImmediateTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -14,7 +14,7 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; import org.hornetq.core.config.Configuration; Modified: trunk/tests/src/org/hornetq/tests/integration/client/ReceiveTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/ReceiveTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/client/ReceiveTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -14,8 +14,8 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; Modified: trunk/tests/src/org/hornetq/tests/integration/client/RedeliveryConsumerTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/RedeliveryConsumerTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/client/RedeliveryConsumerTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -15,8 +15,8 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; Modified: trunk/tests/src/org/hornetq/tests/integration/client/RequestorTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/RequestorTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/client/RequestorTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -15,8 +15,8 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; import org.hornetq.core.client.impl.ClientMessageImpl; Modified: trunk/tests/src/org/hornetq/tests/integration/client/RoutingTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/RoutingTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/client/RoutingTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -14,7 +14,7 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; Modified: trunk/tests/src/org/hornetq/tests/integration/client/SelfExpandingBufferTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/SelfExpandingBufferTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/client/SelfExpandingBufferTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -15,8 +15,8 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; Modified: trunk/tests/src/org/hornetq/tests/integration/client/SessionCloseTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/SessionCloseTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/client/SessionCloseTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -18,8 +18,8 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; import org.hornetq.core.config.Configuration; Modified: trunk/tests/src/org/hornetq/tests/integration/client/SessionCreateAndDeleteQueueTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/SessionCreateAndDeleteQueueTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/client/SessionCreateAndDeleteQueueTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -14,8 +14,8 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.ClientSession; import org.hornetq.core.postoffice.Binding; import org.hornetq.core.server.HornetQServer; Modified: trunk/tests/src/org/hornetq/tests/integration/client/SessionFactoryTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/SessionFactoryTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/client/SessionFactoryTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -23,8 +23,8 @@ import junit.framework.Assert; -import org.hornetq.api.Pair; import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.Pair; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; Modified: trunk/tests/src/org/hornetq/tests/integration/client/SessionSendAcknowledgementHandlerTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/SessionSendAcknowledgementHandlerTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/client/SessionSendAcknowledgementHandlerTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -18,8 +18,8 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.Message; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; import org.hornetq.api.core.client.ClientSession; Modified: trunk/tests/src/org/hornetq/tests/integration/client/SessionStopStartTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/SessionStopStartTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/client/SessionStopStartTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -17,7 +17,7 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; Modified: trunk/tests/src/org/hornetq/tests/integration/client/SessionTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/SessionTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/client/SessionTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -18,8 +18,8 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; Modified: trunk/tests/src/org/hornetq/tests/integration/client/TemporaryQueueTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/TemporaryQueueTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/client/TemporaryQueueTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -19,9 +19,9 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.Interceptor; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; import org.hornetq.core.client.impl.ClientSessionInternal; Modified: trunk/tests/src/org/hornetq/tests/integration/client/TransactionDurabilityTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/TransactionDurabilityTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/client/TransactionDurabilityTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -14,7 +14,7 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; import org.hornetq.core.config.Configuration; Modified: trunk/tests/src/org/hornetq/tests/integration/client/TransactionalSendTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/TransactionalSendTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/client/TransactionalSendTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -14,7 +14,7 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.ClientProducer; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; Modified: trunk/tests/src/org/hornetq/tests/integration/client/WildCardRoutingTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/WildCardRoutingTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/client/WildCardRoutingTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -14,8 +14,8 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; import org.hornetq.core.config.impl.ConfigurationImpl; Modified: trunk/tests/src/org/hornetq/tests/integration/clientcrash/ClientCrashTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/clientcrash/ClientCrashTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/clientcrash/ClientCrashTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -15,8 +15,8 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.Message; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; import org.hornetq.core.logging.Logger; Modified: trunk/tests/src/org/hornetq/tests/integration/clientcrash/ClientExitTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/clientcrash/ClientExitTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/clientcrash/ClientExitTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -15,8 +15,8 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.Message; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; import org.hornetq.core.logging.Logger; Modified: trunk/tests/src/org/hornetq/tests/integration/clientcrash/DummyInterceptor.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/clientcrash/DummyInterceptor.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/clientcrash/DummyInterceptor.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -15,9 +15,9 @@ import java.util.concurrent.atomic.AtomicInteger; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.Interceptor; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.Packet; import org.hornetq.core.remoting.RemotingConnection; 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 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeReconnectTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -20,9 +20,9 @@ import junit.framework.Assert; -import org.hornetq.api.Pair; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.Pair; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; import org.hornetq.core.logging.Logger; 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 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeStartTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -20,8 +20,8 @@ import junit.framework.Assert; -import org.hornetq.api.Pair; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.Pair; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; import org.hornetq.core.logging.Logger; 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 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -20,8 +20,8 @@ import junit.framework.Assert; -import org.hornetq.api.Pair; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.Pair; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; import org.hornetq.core.logging.Logger; 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 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -20,8 +20,8 @@ import junit.framework.Assert; -import org.hornetq.api.Pair; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.Pair; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/SimpleTransformer.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/SimpleTransformer.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/SimpleTransformer.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -13,8 +13,8 @@ package org.hornetq.tests.integration.cluster.bridge; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.logging.Logger; import org.hornetq.core.server.ServerMessage; import org.hornetq.core.server.cluster.Transformer; 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 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -24,9 +24,9 @@ import junit.framework.Assert; -import org.hornetq.api.Pair; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.Message; +import org.hornetq.api.core.Pair; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; import org.hornetq.core.config.Configuration; Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusteredGroupingTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusteredGroupingTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusteredGroupingTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -17,8 +17,8 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.Message; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.management.ManagementHelper; import org.hornetq.api.core.management.NotificationType; import org.hornetq.core.server.group.GroupingHandler; 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 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -26,10 +26,10 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.Interceptor; import org.hornetq.api.core.Message; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; import org.hornetq.core.client.impl.ClientSessionFactoryInternal; 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 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -18,7 +18,7 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ClientSessionFactoryImpl; import org.hornetq.api.core.client.HornetQClient; Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/GroupingFailoverTestBase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/GroupingFailoverTestBase.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/GroupingFailoverTestBase.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -18,9 +18,9 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.Message; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.remoting.FailureListener; import org.hornetq.core.remoting.RemotingConnection; import org.hornetq.core.server.cluster.MessageFlowRecord; Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/PagingFailoverTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/PagingFailoverTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/PagingFailoverTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -19,8 +19,8 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/ReplicatedDistributionTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/ReplicatedDistributionTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/ReplicatedDistributionTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -18,8 +18,8 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; 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 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/MultiThreadRandomReattachTestBase.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -22,8 +22,8 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; import org.hornetq.core.client.impl.ClientSessionFactoryInternal; Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/OrderReattachTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/OrderReattachTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/OrderReattachTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -21,8 +21,8 @@ import junit.framework.Assert; import junit.framework.TestSuite; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; 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 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/RandomReattachTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -22,8 +22,8 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; import org.hornetq.core.client.impl.ClientSessionInternal; Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/ReattachTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/ReattachTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/ReattachTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -19,8 +19,8 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/restart/ClusterRestartTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/restart/ClusterRestartTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/restart/ClusterRestartTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -14,7 +14,7 @@ import java.util.Collection; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.postoffice.Binding; import org.hornetq.tests.integration.cluster.distribution.ClusterTestBase; Modified: trunk/tests/src/org/hornetq/tests/integration/discovery/DiscoveryTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/discovery/DiscoveryTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/discovery/DiscoveryTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -19,8 +19,8 @@ import junit.framework.Assert; -import org.hornetq.api.Pair; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.Pair; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.management.NotificationType; import org.hornetq.core.cluster.DiscoveryEntry; Modified: trunk/tests/src/org/hornetq/tests/integration/divert/DivertTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/divert/DivertTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/divert/DivertTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -18,7 +18,7 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; import org.hornetq.core.config.Configuration; Modified: trunk/tests/src/org/hornetq/tests/integration/divert/PersistentDivertTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/divert/PersistentDivertTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/divert/PersistentDivertTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -18,7 +18,7 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; import org.hornetq.core.config.Configuration; Modified: trunk/tests/src/org/hornetq/tests/integration/http/CoreClientOverHttpTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/http/CoreClientOverHttpTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/http/CoreClientOverHttpTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -16,7 +16,7 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; import org.hornetq.core.config.Configuration; Modified: trunk/tests/src/org/hornetq/tests/integration/jms/FloodServerTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/FloodServerTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/jms/FloodServerTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -24,7 +24,7 @@ import javax.jms.MessageProducer; import javax.jms.Session; -import org.hornetq.api.Pair; +import org.hornetq.api.core.Pair; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.HornetQClient; import org.hornetq.api.jms.HornetQJMSClient; Modified: trunk/tests/src/org/hornetq/tests/integration/jms/HornetQConnectionFactoryTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/HornetQConnectionFactoryTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/jms/HornetQConnectionFactoryTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -23,7 +23,7 @@ import junit.framework.Assert; -import org.hornetq.api.Pair; +import org.hornetq.api.core.Pair; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.HornetQClient; 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 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/jms/client/PreACKJMSTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -24,7 +24,7 @@ import junit.framework.Assert; -import org.hornetq.api.Pair; +import org.hornetq.api.core.Pair; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.HornetQClient; import org.hornetq.tests.util.JMSTestBase; 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 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/jms/client/ReSendLargeMessageTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -30,7 +30,7 @@ import junit.framework.Assert; -import org.hornetq.api.Pair; +import org.hornetq.api.core.Pair; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.HornetQClient; import org.hornetq.api.jms.HornetQMessageConstants; 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 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -26,8 +26,8 @@ import junit.framework.Assert; -import org.hornetq.api.Pair; import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.Pair; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.HornetQClient; import org.hornetq.core.client.impl.ClientSessionInternal; 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 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/jms/client/TextMessageTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -24,7 +24,7 @@ import junit.framework.Assert; -import org.hornetq.api.Pair; +import org.hornetq.api.core.Pair; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.HornetQClient; import org.hornetq.tests.util.JMSTestBase; 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 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSFailoverTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -29,8 +29,8 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ClientSession; import org.hornetq.jms.HornetQConnectionFactory; 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 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSReconnectTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -28,8 +28,8 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ClientSession; import org.hornetq.jms.HornetQConnectionFactory; 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 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/jms/consumer/ConsumerTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -23,7 +23,7 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.jms.HornetQConnectionFactory; import org.hornetq.api.jms.HornetQJMSClient; 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 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/jms/divert/DivertAndACKClientTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -24,7 +24,7 @@ import junit.framework.Assert; -import org.hornetq.api.Pair; +import org.hornetq.api.core.Pair; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.HornetQClient; import org.hornetq.jms.HornetQQueue; 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 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSQueueControlTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -27,7 +27,7 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.jms.HornetQConnectionFactory; import org.hornetq.api.jms.HornetQJMSClient; Modified: trunk/tests/src/org/hornetq/tests/integration/journal/NIOJournalCompactTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/journal/NIOJournalCompactTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/journal/NIOJournalCompactTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -21,7 +21,7 @@ import junit.framework.Assert; -import org.hornetq.api.Pair; +import org.hornetq.api.core.Pair; import org.hornetq.core.journal.SequentialFile; import org.hornetq.core.journal.SequentialFileFactory; import org.hornetq.core.journal.impl.AbstractJournalUpdateTask; Modified: trunk/tests/src/org/hornetq/tests/integration/largemessage/LargeMessageTestBase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/largemessage/LargeMessageTestBase.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/largemessage/LargeMessageTestBase.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -26,11 +26,11 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQBuffer; import org.hornetq.api.core.HornetQBuffers; import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.Message; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; Modified: trunk/tests/src/org/hornetq/tests/integration/management/AcceptorControlTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/AcceptorControlTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/management/AcceptorControlTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -17,7 +17,7 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; Modified: trunk/tests/src/org/hornetq/tests/integration/management/AddressControlTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/AddressControlTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/management/AddressControlTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -18,7 +18,7 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; import org.hornetq.api.core.management.AddressControl; Modified: trunk/tests/src/org/hornetq/tests/integration/management/AddressControlUsingCoreTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/AddressControlUsingCoreTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/management/AddressControlUsingCoreTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -18,7 +18,7 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; Modified: trunk/tests/src/org/hornetq/tests/integration/management/BridgeControlTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/BridgeControlTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/management/BridgeControlTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -21,8 +21,8 @@ import junit.framework.Assert; -import org.hornetq.api.Pair; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.Pair; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.HornetQClient; import org.hornetq.api.core.management.BridgeControl; Modified: trunk/tests/src/org/hornetq/tests/integration/management/BridgeControlUsingCoreTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/BridgeControlUsingCoreTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/management/BridgeControlUsingCoreTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -20,7 +20,7 @@ import junit.framework.Assert; -import org.hornetq.api.Pair; +import org.hornetq.api.core.Pair; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; Modified: trunk/tests/src/org/hornetq/tests/integration/management/BroadcastGroupControlTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/BroadcastGroupControlTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/management/BroadcastGroupControlTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -18,7 +18,7 @@ import junit.framework.Assert; -import org.hornetq.api.Pair; +import org.hornetq.api.core.Pair; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.management.BroadcastGroupControl; import org.hornetq.core.config.Configuration; Modified: trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControl2Test.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControl2Test.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControl2Test.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -23,7 +23,7 @@ import junit.framework.Assert; -import org.hornetq.api.Pair; +import org.hornetq.api.core.Pair; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.HornetQClient; import org.hornetq.api.core.management.ClusterConnectionControl; Modified: trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControlTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControlTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControlTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -23,8 +23,8 @@ import junit.framework.Assert; -import org.hornetq.api.Pair; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.Pair; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.management.ClusterConnectionControl; import org.hornetq.api.core.management.NotificationType; Modified: trunk/tests/src/org/hornetq/tests/integration/management/DivertControlTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/DivertControlTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/management/DivertControlTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -15,7 +15,7 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.management.DivertControl; import org.hornetq.api.core.management.ObjectNameBuilder; Modified: trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -18,7 +18,7 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.management.HornetQServerControl; import org.hornetq.api.core.management.ObjectNameBuilder; Modified: trunk/tests/src/org/hornetq/tests/integration/management/ManagementControlHelper.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/ManagementControlHelper.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/management/ManagementControlHelper.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -19,7 +19,7 @@ import javax.management.MBeanServerInvocationHandler; import javax.management.ObjectName; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.management.AcceptorControl; import org.hornetq.api.core.management.AddressControl; import org.hornetq.api.core.management.BridgeControl; Modified: trunk/tests/src/org/hornetq/tests/integration/management/ManagementServiceImplTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/ManagementServiceImplTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/management/ManagementServiceImplTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -15,7 +15,7 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.management.AddressControl; import org.hornetq.api.core.management.ManagementHelper; import org.hornetq.api.core.management.QueueControl; Modified: trunk/tests/src/org/hornetq/tests/integration/management/ManagementTestBase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/ManagementTestBase.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/management/ManagementTestBase.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -19,7 +19,7 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientSession; Modified: trunk/tests/src/org/hornetq/tests/integration/management/NotificationTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/NotificationTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/management/NotificationTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -19,8 +19,8 @@ import static org.hornetq.api.core.management.NotificationType.CONSUMER_CREATED; import junit.framework.Assert; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; import org.hornetq.api.core.management.ManagementHelper; Modified: trunk/tests/src/org/hornetq/tests/integration/management/QueueControlTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/QueueControlTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/management/QueueControlTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -17,8 +17,8 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.Message; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; import org.hornetq.api.core.management.DayCounterInfo; Modified: trunk/tests/src/org/hornetq/tests/integration/management/QueueControlUsingCoreTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/QueueControlUsingCoreTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/management/QueueControlUsingCoreTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -15,7 +15,7 @@ import java.util.Map; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; Modified: trunk/tests/src/org/hornetq/tests/integration/management/SecurityNotificationTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/SecurityNotificationTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/management/SecurityNotificationTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -21,8 +21,8 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; import org.hornetq.api.core.management.ManagementHelper; Modified: trunk/tests/src/org/hornetq/tests/integration/paging/PageCrashTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/paging/PageCrashTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/paging/PageCrashTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -23,7 +23,7 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; Modified: trunk/tests/src/org/hornetq/tests/integration/paging/PagingSendTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/paging/PagingSendTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/paging/PagingSendTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -15,7 +15,7 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; Modified: trunk/tests/src/org/hornetq/tests/integration/replication/ReplicationTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/replication/ReplicationTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/replication/ReplicationTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -28,11 +28,11 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQBuffer; import org.hornetq.api.core.HornetQBuffers; import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.Interceptor; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.HornetQClient; Modified: trunk/tests/src/org/hornetq/tests/integration/scheduling/ScheduledMessageTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/scheduling/ScheduledMessageTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/scheduling/ScheduledMessageTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -17,8 +17,8 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.Message; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; Modified: trunk/tests/src/org/hornetq/tests/integration/security/SecurityTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/security/SecurityTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/security/SecurityTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -31,8 +31,8 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; Modified: trunk/tests/src/org/hornetq/tests/integration/server/ExpiryRunnerTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/server/ExpiryRunnerTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/server/ExpiryRunnerTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -22,8 +22,8 @@ import junit.framework.TestSuite; import junit.textui.TestRunner; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; import org.hornetq.core.config.impl.ConfigurationImpl; Modified: trunk/tests/src/org/hornetq/tests/integration/server/LVQRecoveryTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/server/LVQRecoveryTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/server/LVQRecoveryTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -17,9 +17,9 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.Message; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; import org.hornetq.core.config.Configuration; Modified: trunk/tests/src/org/hornetq/tests/integration/server/LVQTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/server/LVQTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/server/LVQTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -14,9 +14,9 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.Message; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; import org.hornetq.core.config.impl.ConfigurationImpl; Modified: trunk/tests/src/org/hornetq/tests/integration/server/PredefinedQueueTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/server/PredefinedQueueTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/server/PredefinedQueueTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -18,8 +18,8 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; import org.hornetq.core.config.Configuration; Modified: trunk/tests/src/org/hornetq/tests/integration/ssl/CoreClientOverSSLTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/ssl/CoreClientOverSSLTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/ssl/CoreClientOverSSLTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -18,9 +18,9 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.Message; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; import org.hornetq.core.config.impl.ConfigurationImpl; Modified: trunk/tests/src/org/hornetq/tests/integration/xa/BasicXaRecoveryTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/xa/BasicXaRecoveryTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/xa/BasicXaRecoveryTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -21,8 +21,8 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; Modified: trunk/tests/src/org/hornetq/tests/integration/xa/BasicXaTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/xa/BasicXaTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/xa/BasicXaTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -23,8 +23,8 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; Modified: trunk/tests/src/org/hornetq/tests/integration/xa/XaTimeoutTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/xa/XaTimeoutTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/integration/xa/XaTimeoutTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -25,8 +25,8 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; import org.hornetq.core.config.impl.ConfigurationImpl; Modified: trunk/tests/src/org/hornetq/tests/performance/paging/MeasurePagingMultiThreadTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/performance/paging/MeasurePagingMultiThreadTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/performance/paging/MeasurePagingMultiThreadTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -16,8 +16,8 @@ import java.util.HashMap; import java.util.concurrent.CountDownLatch; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; import org.hornetq.api.core.client.ClientSession; Modified: trunk/tests/src/org/hornetq/tests/stress/journal/MultiThreadConsumerStressTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/stress/journal/MultiThreadConsumerStressTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/stress/journal/MultiThreadConsumerStressTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -18,8 +18,8 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; Modified: trunk/tests/src/org/hornetq/tests/stress/journal/NIOMultiThreadCompactorStressTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/stress/journal/NIOMultiThreadCompactorStressTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/stress/journal/NIOMultiThreadCompactorStressTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -23,8 +23,8 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; Modified: trunk/tests/src/org/hornetq/tests/stress/paging/PageStressTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/stress/paging/PageStressTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/stress/paging/PageStressTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -17,8 +17,8 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; Modified: trunk/tests/src/org/hornetq/tests/timing/core/server/impl/QueueImplTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/timing/core/server/impl/QueueImplTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/timing/core/server/impl/QueueImplTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -21,7 +21,7 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.logging.Logger; import org.hornetq.core.server.Consumer; import org.hornetq.core.server.HandleStatus; Modified: trunk/tests/src/org/hornetq/tests/unit/core/client/impl/LargeMessageBufferTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/client/impl/LargeMessageBufferTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/unit/core/client/impl/LargeMessageBufferTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -27,10 +27,10 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQBuffer; import org.hornetq.api.core.HornetQBuffers; import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.MessageHandler; import org.hornetq.core.client.impl.ClientConsumerInternal; Modified: trunk/tests/src/org/hornetq/tests/unit/core/config/impl/ConfigurationImplTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/config/impl/ConfigurationImplTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/unit/core/config/impl/ConfigurationImplTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -20,7 +20,7 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.server.JournalType; Modified: trunk/tests/src/org/hornetq/tests/unit/core/config/impl/FileConfigurationTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/config/impl/FileConfigurationTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/unit/core/config/impl/FileConfigurationTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -15,7 +15,7 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.FileConfiguration; Modified: trunk/tests/src/org/hornetq/tests/unit/core/deployers/impl/AddressSettingsDeployerTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/deployers/impl/AddressSettingsDeployerTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/unit/core/deployers/impl/AddressSettingsDeployerTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -15,7 +15,7 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.deployers.DeploymentManager; import org.hornetq.core.deployers.impl.AddressSettingsDeployer; import org.hornetq.core.settings.HierarchicalRepository; Modified: trunk/tests/src/org/hornetq/tests/unit/core/deployers/impl/FileDeploymentManagerTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/deployers/impl/FileDeploymentManagerTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/unit/core/deployers/impl/FileDeploymentManagerTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -18,7 +18,7 @@ import junit.framework.Assert; -import org.hornetq.api.Pair; +import org.hornetq.api.core.Pair; import org.hornetq.core.deployers.Deployer; import org.hornetq.core.deployers.impl.FileDeploymentManager; import org.hornetq.core.logging.Logger; Modified: trunk/tests/src/org/hornetq/tests/unit/core/filter/impl/FilterParserTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/filter/impl/FilterParserTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/unit/core/filter/impl/FilterParserTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -19,7 +19,7 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.filter.impl.FilterParser; import org.hornetq.core.filter.impl.Identifier; import org.hornetq.core.filter.impl.Operator; Modified: trunk/tests/src/org/hornetq/tests/unit/core/filter/impl/FilterTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/filter/impl/FilterTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/unit/core/filter/impl/FilterTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -15,8 +15,8 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.filter.Filter; import org.hornetq.core.filter.impl.FilterImpl; import org.hornetq.core.logging.Logger; Modified: trunk/tests/src/org/hornetq/tests/unit/core/filter/impl/OperatorTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/filter/impl/OperatorTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/unit/core/filter/impl/OperatorTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -17,7 +17,7 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.filter.impl.Operator; import org.hornetq.tests.util.UnitTestCase; Modified: trunk/tests/src/org/hornetq/tests/unit/core/message/impl/MessageImplTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/message/impl/MessageImplTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/unit/core/message/impl/MessageImplTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -17,8 +17,8 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.Message; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.client.impl.ClientMessageImpl; import org.hornetq.core.logging.Logger; import org.hornetq.tests.util.RandomUtil; Modified: trunk/tests/src/org/hornetq/tests/unit/core/paging/impl/PageImplTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/paging/impl/PageImplTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/unit/core/paging/impl/PageImplTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -19,8 +19,8 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.journal.SequentialFile; import org.hornetq.core.journal.SequentialFileFactory; import org.hornetq.core.journal.impl.NIOSequentialFileFactory; Modified: trunk/tests/src/org/hornetq/tests/unit/core/paging/impl/PagingManagerImplTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/paging/impl/PagingManagerImplTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/unit/core/paging/impl/PagingManagerImplTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -20,7 +20,7 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.paging.Page; import org.hornetq.core.paging.PagedMessage; import org.hornetq.core.paging.impl.PagingManagerImpl; Modified: trunk/tests/src/org/hornetq/tests/unit/core/paging/impl/PagingStoreImplTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/paging/impl/PagingStoreImplTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/unit/core/paging/impl/PagingStoreImplTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -30,10 +30,10 @@ import junit.framework.Assert; -import org.hornetq.api.Pair; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQBuffer; import org.hornetq.api.core.HornetQBuffers; +import org.hornetq.api.core.Pair; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.journal.IOAsyncTask; import org.hornetq.core.journal.JournalLoadInformation; import org.hornetq.core.journal.SequentialFile; Modified: trunk/tests/src/org/hornetq/tests/unit/core/postoffice/impl/AddressImplTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/postoffice/impl/AddressImplTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/unit/core/postoffice/impl/AddressImplTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -14,7 +14,7 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.postoffice.Address; import org.hornetq.core.postoffice.impl.AddressImpl; import org.hornetq.tests.util.UnitTestCase; Modified: trunk/tests/src/org/hornetq/tests/unit/core/postoffice/impl/BindingsImplTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/postoffice/impl/BindingsImplTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/unit/core/postoffice/impl/BindingsImplTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -20,10 +20,10 @@ import javax.transaction.xa.Xid; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQBuffer; import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.PropertyConversionException; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.filter.Filter; import org.hornetq.core.message.BodyEncoder; import org.hornetq.core.paging.PagingStore; Modified: trunk/tests/src/org/hornetq/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -23,8 +23,8 @@ import junit.framework.Assert; -import org.hornetq.api.Pair; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.Pair; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.paging.PageTransactionInfo; Modified: trunk/tests/src/org/hornetq/tests/unit/core/postoffice/impl/FakeQueue.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/postoffice/impl/FakeQueue.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/unit/core/postoffice/impl/FakeQueue.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -18,7 +18,7 @@ import java.util.Set; import java.util.concurrent.Executor; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.filter.Filter; import org.hornetq.core.server.Consumer; import org.hornetq.core.server.MessageReference; Modified: trunk/tests/src/org/hornetq/tests/unit/core/remoting/HornetQBufferTestBase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/remoting/HornetQBufferTestBase.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/unit/core/remoting/HornetQBufferTestBase.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -15,8 +15,8 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.SimpleString; import org.hornetq.tests.util.RandomUtil; import org.hornetq.tests.util.UnitTestCase; Modified: trunk/tests/src/org/hornetq/tests/unit/core/server/impl/QueueImplTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/server/impl/QueueImplTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/unit/core/server/impl/QueueImplTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -22,7 +22,7 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.filter.Filter; import org.hornetq.core.filter.impl.FilterImpl; import org.hornetq.core.server.Consumer; Modified: trunk/tests/src/org/hornetq/tests/unit/core/server/impl/fakes/FakeFilter.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/server/impl/fakes/FakeFilter.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/unit/core/server/impl/fakes/FakeFilter.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -13,7 +13,7 @@ package org.hornetq.tests.unit.core.server.impl.fakes; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.filter.Filter; import org.hornetq.core.server.ServerMessage; Modified: trunk/tests/src/org/hornetq/tests/unit/core/server/impl/fakes/FakePostOffice.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/server/impl/fakes/FakePostOffice.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/unit/core/server/impl/fakes/FakePostOffice.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -13,7 +13,7 @@ package org.hornetq.tests.unit.core.server.impl.fakes; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.paging.PagingManager; import org.hornetq.core.postoffice.Binding; import org.hornetq.core.postoffice.Bindings; Modified: trunk/tests/src/org/hornetq/tests/unit/core/server/impl/fakes/FakeQueueFactory.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/server/impl/fakes/FakeQueueFactory.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/unit/core/server/impl/fakes/FakeQueueFactory.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -16,7 +16,7 @@ import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.filter.Filter; import org.hornetq.core.postoffice.PostOffice; import org.hornetq.core.server.Queue; Modified: trunk/tests/src/org/hornetq/tests/unit/core/settings/impl/AddressSettingsTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/settings/impl/AddressSettingsTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/unit/core/settings/impl/AddressSettingsTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -15,7 +15,7 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.settings.impl.AddressFullMessagePolicy; import org.hornetq.core.settings.impl.AddressSettings; import org.hornetq.tests.util.UnitTestCase; Modified: trunk/tests/src/org/hornetq/tests/unit/jms/HornetQTopicTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/jms/HornetQTopicTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/unit/jms/HornetQTopicTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -15,7 +15,7 @@ import junit.framework.Assert; -import org.hornetq.api.Pair; +import org.hornetq.api.core.Pair; import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.jms.HornetQTopic; import org.hornetq.tests.util.RandomUtil; Modified: trunk/tests/src/org/hornetq/tests/unit/util/SimpleStringTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/util/SimpleStringTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/unit/util/SimpleStringTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -17,7 +17,7 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.tests.util.RandomUtil; import org.hornetq.tests.util.UnitTestCase; import org.hornetq.utils.DataConstants; Modified: trunk/tests/src/org/hornetq/tests/unit/util/TypedPropertiesConversionTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/util/TypedPropertiesConversionTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/unit/util/TypedPropertiesConversionTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -16,8 +16,8 @@ import junit.framework.Assert; import junit.framework.TestCase; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.PropertyConversionException; +import org.hornetq.api.core.SimpleString; import org.hornetq.tests.util.RandomUtil; import org.hornetq.tests.util.UnitTestCase; import org.hornetq.utils.TypedProperties; Modified: trunk/tests/src/org/hornetq/tests/unit/util/TypedPropertiesTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/util/TypedPropertiesTest.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/unit/util/TypedPropertiesTest.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -17,9 +17,9 @@ import junit.framework.Assert; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQBuffer; import org.hornetq.api.core.HornetQBuffers; +import org.hornetq.api.core.SimpleString; import org.hornetq.tests.util.RandomUtil; import org.hornetq.tests.util.UnitTestCase; import org.hornetq.utils.TypedProperties; Modified: trunk/tests/src/org/hornetq/tests/util/JMSTestBase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/util/JMSTestBase.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/util/JMSTestBase.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -20,7 +20,7 @@ import javax.jms.Queue; import javax.naming.NamingException; -import org.hornetq.api.Pair; +import org.hornetq.api.core.Pair; import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.HornetQClient; import org.hornetq.core.config.Configuration; Modified: trunk/tests/src/org/hornetq/tests/util/RandomUtil.java =================================================================== --- trunk/tests/src/org/hornetq/tests/util/RandomUtil.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/util/RandomUtil.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -18,7 +18,7 @@ import javax.transaction.xa.Xid; -import org.hornetq.api.SimpleString; +import org.hornetq.api.core.SimpleString; import org.hornetq.core.transaction.impl.XidImpl; /** Modified: trunk/tests/src/org/hornetq/tests/util/UnitTestCase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/util/UnitTestCase.java 2010-01-06 10:23:35 UTC (rev 8730) +++ trunk/tests/src/org/hornetq/tests/util/UnitTestCase.java 2010-01-06 11:07:36 UTC (rev 8731) @@ -44,9 +44,9 @@ import junit.framework.TestCase; import junit.framework.TestSuite; -import org.hornetq.api.SimpleString; import org.hornetq.api.core.HornetQBuffer; import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.SimpleString; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientSession; import org.hornetq.core.asyncio.impl.AsynchronousFileImpl;

15 years, 11 months

1
0
0 / 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

hornetq-commits January 2010