JBoss hornetq SVN: r8704 - in trunk: tests/src/org/hornetq/tests/integration/client and 1 other directory.
by do-not-reply＠jboss.org
Author: jmesnil
Date: 2009-12-22 09:56:14 -0500 (Tue, 22 Dec 2009)
New Revision: 8704
Modified:
trunk/src/main/org/hornetq/core/server/impl/HornetQPacketHandler.java
trunk/tests/src/org/hornetq/tests/integration/client/IncompatibleVersionTest.java
Log:
HORNETQ-252: Connections not closed if client/server version mismatch
* on the server, do not destroy the connection immediately (or there is a chance the network
socket will be closed before the exception packet is received by the client) and
let it be destroyed later (when its TTL expires)
* rewrite IncompatibleVersionTest
Modified: trunk/src/main/org/hornetq/core/server/impl/HornetQPacketHandler.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/impl/HornetQPacketHandler.java 2009-12-22 11:14:43 UTC (rev 8703)
+++ trunk/src/main/org/hornetq/core/server/impl/HornetQPacketHandler.java 2009-12-22 14:56:14 UTC (rev 8704)
@@ -153,7 +153,6 @@
if (incompatibleVersion)
{
channel1.sendAndFlush(response);
- connection.destroy();
}
else
{
Modified: trunk/tests/src/org/hornetq/tests/integration/client/IncompatibleVersionTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/IncompatibleVersionTest.java 2009-12-22 11:14:43 UTC (rev 8703)
+++ trunk/tests/src/org/hornetq/tests/integration/client/IncompatibleVersionTest.java 2009-12-22 14:56:14 UTC (rev 8704)
@@ -30,6 +30,7 @@
import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory;
import org.hornetq.core.remoting.impl.wireformat.CreateSessionMessage;
import org.hornetq.core.remoting.impl.wireformat.CreateSessionResponseMessage;
+import org.hornetq.core.remoting.server.impl.RemotingServiceImpl;
import org.hornetq.core.server.HornetQServer;
import org.hornetq.tests.util.ServiceTestBase;
import org.hornetq.utils.VersionLoader;
@@ -37,7 +38,7 @@
/**
* A IncompatibleVersionTest
*
- * @author jmesnil
+ * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a>
*
*
*/
@@ -62,6 +63,7 @@
protected void setUp() throws Exception
{
server = createServer(false, false);
+ server.getConfiguration().setConnectionTTLOverride(500);
server.start();
TransportConfiguration config = new TransportConfiguration(InVMConnectorFactory.class.getName());
@@ -74,7 +76,7 @@
ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN,
ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT,
ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD,
- ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL,
+ 500,
ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL,
ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER,
ClientSessionFactoryImpl.DEFAULT_MAX_RETRY_INTERVAL,
@@ -88,6 +90,8 @@
@Override
protected void tearDown() throws Exception
{
+ connection.destroy();
+
server.stop();
}
@@ -141,6 +145,14 @@
{
assertEquals(HornetQException.INCOMPATIBLE_CLIENT_SERVER_VERSIONS, e.getCode());
}
+ long start = System.currentTimeMillis();
+ while (System.currentTimeMillis() < start + 3 * RemotingServiceImpl.CONNECTION_TTL_CHECK_INTERVAL)
+ {
+ if (server.getConnectionCount() == 0)
+ {
+ break;
+ }
+ }
// no connection on the server
assertEquals(0, server.getConnectionCount());
}
14 years, 3 months
- 1
- 0
JBoss hornetq SVN: r8703 - trunk/src/main/org/hornetq/core/server/impl.
by do-not-reply＠jboss.org
Author: jmesnil
Date: 2009-12-22 06:14:43 -0500 (Tue, 22 Dec 2009)
New Revision: 8703
Modified:
trunk/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java
Log:
HORNETQ-256: ensure all operations are completed before closing the session
Modified: trunk/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java 2009-12-21 13:57:05 UTC (rev 8702)
+++ trunk/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java 2009-12-22 11:14:43 UTC (rev 8703)
@@ -1321,30 +1321,17 @@
public void handleClose(final Packet packet)
{
- Packet response = null;
-
- try
+ storageManager.afterCompleteOperations(new IOAsyncTask()
{
- close();
-
- response = new NullResponseMessage();
- }
- catch (Exception e)
- {
- ServerSessionImpl.log.error("Failed to close", e);
-
- if (e instanceof HornetQException)
+ public void onError(int errorCode, String errorMessage)
{
- response = new HornetQExceptionMessage((HornetQException)e);
}
- else
+
+ public void done()
{
- response = new HornetQExceptionMessage(new HornetQException(HornetQException.INTERNAL_ERROR));
+ doClose(packet);
}
- }
-
- sendResponse(packet, response, true, true);
-
+ });
}
public void handleCloseConsumer(final SessionConsumerCloseMessage packet)
@@ -1777,6 +1764,33 @@
}
}
+ private void doClose(final Packet packet)
+ {
+ Packet response = null;
+
+ try
+ {
+ close();
+
+ response = new NullResponseMessage();
+ }
+ catch (Exception e)
+ {
+ ServerSessionImpl.log.error("Failed to close", e);
+
+ if (e instanceof HornetQException)
+ {
+ response = new HornetQExceptionMessage((HornetQException)e);
+ }
+ else
+ {
+ response = new HornetQExceptionMessage(new HornetQException(HornetQException.INTERNAL_ERROR));
+ }
+ }
+
+ sendResponse(packet, response, true, true);
+ }
+
private void setStarted(final boolean s)
{
Set<ServerConsumer> consumersClone = new HashSet<ServerConsumer>(consumers.values());
14 years, 3 months
- 1
- 0
JBoss hornetq SVN: r8702 - trunk/tests/src/org/hornetq/tests/integration/client.
by do-not-reply＠jboss.org
Author: jmesnil
Date: 2009-12-21 08:57:05 -0500 (Mon, 21 Dec 2009)
New Revision: 8702
Removed:
trunk/tests/src/org/hornetq/tests/integration/client/AddressOOME.java
Log:
removed class
Deleted: trunk/tests/src/org/hornetq/tests/integration/client/AddressOOME.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/AddressOOME.java 2009-12-21 13:46:07 UTC (rev 8701)
+++ trunk/tests/src/org/hornetq/tests/integration/client/AddressOOME.java 2009-12-21 13:57:05 UTC (rev 8702)
@@ -1,124 +0,0 @@
-package org.hornetq.tests.integration.client;
-
-import javax.jms.Destination;
-import javax.jms.JMSException;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageListener;
-import javax.jms.MessageProducer;
-import javax.jms.ObjectMessage;
-import javax.jms.Queue;
-import javax.jms.Session;
-import javax.jms.TemporaryQueue;
-import javax.jms.TextMessage;
-
-import org.hornetq.core.config.TransportConfiguration;
-import org.hornetq.core.config.impl.ConfigurationImpl;
-import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory;
-import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory;
-import org.hornetq.core.server.HornetQ;
-import org.hornetq.core.server.HornetQServer;
-import org.hornetq.jms.client.HornetQConnection;
-import org.hornetq.jms.client.HornetQConnectionFactory;
-import org.hornetq.jms.client.HornetQMessage;
-import org.hornetq.jms.client.HornetQSession;
-import org.hornetq.jms.server.JMSServerManager;
-import org.hornetq.jms.server.impl.JMSServerManagerImpl;
-
-public class AddressOOME implements MessageListener
-{
-
- public static HornetQSession coreSession;
-
- public static void main(String[] args) throws Exception
- {
-
- final String queueName = "request-reply-queue";
-
- ConfigurationImpl conf = new ConfigurationImpl();
-
- final TransportConfiguration serverConfiguration = new TransportConfiguration(InVMAcceptorFactory.class.getName());
- final TransportConfiguration clientConfiguration = new TransportConfiguration(InVMConnectorFactory.class.getName());
- conf.getAcceptorConfigurations().add(serverConfiguration);
- conf.setSecurityEnabled(false);
-
- HornetQServer server = HornetQ.newHornetQServer(conf, false);
- JMSServerManager serverManager = new JMSServerManagerImpl(server);
- serverManager.setContext(null);
- serverManager.start();
- serverManager.createQueue(queueName, null, null, false);
-
- MessageProducer controlProducer = init(queueName, clientConfiguration, new AddressOOME());
-
- try
- {
- int count = 0;
- while (true)
- {
- HornetQMessage message = (HornetQMessage)coreSession.createTextMessage("myMessageWithNumber[" + (count++) +
- "]");
- TemporaryQueue replyQueue = coreSession.createTemporaryQueue();
- message.setJMSReplyTo(replyQueue);
- controlProducer.send(message);
- MessageConsumer temporaryConsumer = coreSession.createConsumer(replyQueue);
- TextMessage returnMessage = (TextMessage)temporaryConsumer.receive(3000);
- if (returnMessage != null)
- {
- System.out.println("received answer: [" + returnMessage.getText() + "]");
- }
- else
- {
- System.out.println("timeout on receiveing answer");
- }
- temporaryConsumer.close();
- replyQueue.delete();
- }
- }
- catch (JMSException e)
- {
- // TODO Auto-generated catch block
- e.printStackTrace();
- return;
- }
-
- }
-
- private static MessageProducer init(final String queueName,
- final TransportConfiguration transportConfiguration,
- MessageListener listener) throws JMSException
- {
-
- MessageProducer controlProducer;
- HornetQConnectionFactory cf = new HornetQConnectionFactory(transportConfiguration);
-
- HornetQConnection connection = (HornetQConnection)cf.createQueueConnection();
- connection.start();
- coreSession = (HornetQSession)connection.createQueueSession(false, Session.AUTO_ACKNOWLEDGE);
- Queue queue = coreSession.createQueue(queueName);
- controlProducer = coreSession.createProducer(queue);
- coreSession.start();
- MessageConsumer consumer = coreSession.createConsumer(queue);
- consumer.setMessageListener(listener);
-
- return controlProducer;
- }
-
- public void onMessage(Message msg)
- {
- TextMessage message = (TextMessage)msg;
- try
- {
- String textMessage = (String)message.getText();
- Destination replyDestination = msg.getJMSReplyTo();
- MessageProducer replyProducer = coreSession.createProducer(replyDestination);
- HornetQMessage replyMessage = (HornetQMessage)coreSession.createTextMessage(textMessage + "_ANSWERED");
- replyProducer.send(replyMessage);
- replyProducer.close();
- }
- catch (Exception e)
- {
- e.printStackTrace();
- }
- }
-
-}
\ No newline at end of file
14 years, 4 months
- 1
- 0
JBoss hornetq SVN: r8701 - in trunk: src/main/org/hornetq/core/paging/impl and 5 other directories.
by do-not-reply＠jboss.org
Author: jmesnil
Date: 2009-12-21 08:46:07 -0500 (Mon, 21 Dec 2009)
New Revision: 8701
Added:
trunk/tests/src/org/hornetq/tests/integration/client/AddressOOME.java
Modified:
trunk/src/main/org/hornetq/core/paging/PagingManager.java
trunk/src/main/org/hornetq/core/paging/impl/PagingManagerImpl.java
trunk/src/main/org/hornetq/core/postoffice/impl/PostOfficeImpl.java
trunk/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java
trunk/tests/src/org/hornetq/tests/integration/client/TemporaryQueueTest.java
trunk/tests/src/org/hornetq/tests/unit/core/paging/impl/PagingStoreImplTest.java
trunk/tests/src/org/hornetq/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java
Log:
HORNETQ-255: memory leaks when creating/deleting queue
* when the last binding to a queue is removed, remove the pagingStore corresponding
to the address and removed the consumer credit holder from the server session
* used a Map for the temporary queues' failureRunners and removes the runner when the queue
is deleted by the user (from ServerSessionImpl.handleDeleteQueue)
Modified: trunk/src/main/org/hornetq/core/paging/PagingManager.java
===================================================================
--- trunk/src/main/org/hornetq/core/paging/PagingManager.java 2009-12-21 13:41:03 UTC (rev 8700)
+++ trunk/src/main/org/hornetq/core/paging/PagingManager.java 2009-12-21 13:46:07 UTC (rev 8701)
@@ -82,4 +82,6 @@
void reloadStores() throws Exception;
SimpleString[] getStoreNames();
+
+ void deletePageStore(SimpleString storeName) throws Exception;
}
Modified: trunk/src/main/org/hornetq/core/paging/impl/PagingManagerImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/paging/impl/PagingManagerImpl.java 2009-12-21 13:41:03 UTC (rev 8700)
+++ trunk/src/main/org/hornetq/core/paging/impl/PagingManagerImpl.java 2009-12-21 13:46:07 UTC (rev 8701)
@@ -113,6 +113,15 @@
return store;
}
+
+ public void deletePageStore(final SimpleString storeName) throws Exception
+ {
+ PagingStore store = stores.remove(storeName);
+ if (store != null)
+ {
+ store.stop();
+ }
+ }
/** stores is a ConcurrentHashMap, so we don't need to synchronize this method */
public PagingStore getPageStore(final SimpleString storeName) throws Exception
Modified: trunk/src/main/org/hornetq/core/postoffice/impl/PostOfficeImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/postoffice/impl/PostOfficeImpl.java 2009-12-21 13:41:03 UTC (rev 8700)
+++ trunk/src/main/org/hornetq/core/postoffice/impl/PostOfficeImpl.java 2009-12-21 13:46:07 UTC (rev 8701)
@@ -481,23 +481,20 @@
throw new HornetQException(HornetQException.QUEUE_DOES_NOT_EXIST);
}
+ if (addressManager.getBindingsForRoutingAddress(binding.getAddress()) == null)
+ {
+ pagingManager.deletePageStore(binding.getAddress());
+
+ managementService.unregisterAddress(binding.getAddress());
+ }
+
if (binding.getType() == BindingType.LOCAL_QUEUE)
{
managementService.unregisterQueue(uniqueName, binding.getAddress());
-
- if (addressManager.getBindingsForRoutingAddress(binding.getAddress()) == null)
- {
- managementService.unregisterAddress(binding.getAddress());
- }
}
else if (binding.getType() == BindingType.DIVERT)
{
managementService.unregisterDivert(uniqueName);
-
- if (addressManager.getBindingsForRoutingAddress(binding.getAddress()) == null)
- {
- managementService.unregisterAddress(binding.getAddress());
- }
}
TypedProperties props = new TypedProperties();
Modified: trunk/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java 2009-12-21 13:41:03 UTC (rev 8700)
+++ trunk/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java 2009-12-21 13:46:07 UTC (rev 8701)
@@ -155,7 +155,7 @@
private volatile boolean started = false;
- private final List<Runnable> failureRunners = new ArrayList<Runnable>();
+ private final Map<SimpleString, Runnable> failureRunners = new HashMap<SimpleString, Runnable>();
private final String name;
@@ -471,7 +471,7 @@
// session is closed.
// It is up to the user to delete the queue when finished with it
- failureRunners.add(new Runnable()
+ failureRunners.put(name, new Runnable()
{
public void run()
{
@@ -480,6 +480,11 @@
if (postOffice.getBinding(name) != null)
{
postOffice.removeBinding(name);
+
+ if (postOffice.getBindingsForAddress(name).getBindings().size() == 0)
+ {
+ creditManagerHolders.remove(name);
+ }
}
}
catch (Exception e)
@@ -532,6 +537,13 @@
server.destroyQueue(name, this);
+ failureRunners.remove(name);
+
+ if (postOffice.getBindingsForAddress(name).getBindings().size() == 0)
+ {
+ creditManagerHolders.remove(name);
+ }
+
response = new NullResponseMessage();
}
catch (Exception e)
@@ -1618,7 +1630,7 @@
{
ServerSessionImpl.log.warn("Client connection failed, clearing up resources for session " + name);
- for (Runnable runner : failureRunners)
+ for (Runnable runner : failureRunners.values())
{
try
{
@@ -1644,7 +1656,7 @@
{
try
{
- for (Runnable runner : failureRunners)
+ for (Runnable runner : failureRunners.values())
{
try
{
Added: trunk/tests/src/org/hornetq/tests/integration/client/AddressOOME.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/AddressOOME.java (rev 0)
+++ trunk/tests/src/org/hornetq/tests/integration/client/AddressOOME.java 2009-12-21 13:46:07 UTC (rev 8701)
@@ -0,0 +1,124 @@
+package org.hornetq.tests.integration.client;
+
+import javax.jms.Destination;
+import javax.jms.JMSException;
+import javax.jms.Message;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageListener;
+import javax.jms.MessageProducer;
+import javax.jms.ObjectMessage;
+import javax.jms.Queue;
+import javax.jms.Session;
+import javax.jms.TemporaryQueue;
+import javax.jms.TextMessage;
+
+import org.hornetq.core.config.TransportConfiguration;
+import org.hornetq.core.config.impl.ConfigurationImpl;
+import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory;
+import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory;
+import org.hornetq.core.server.HornetQ;
+import org.hornetq.core.server.HornetQServer;
+import org.hornetq.jms.client.HornetQConnection;
+import org.hornetq.jms.client.HornetQConnectionFactory;
+import org.hornetq.jms.client.HornetQMessage;
+import org.hornetq.jms.client.HornetQSession;
+import org.hornetq.jms.server.JMSServerManager;
+import org.hornetq.jms.server.impl.JMSServerManagerImpl;
+
+public class AddressOOME implements MessageListener
+{
+
+ public static HornetQSession coreSession;
+
+ public static void main(String[] args) throws Exception
+ {
+
+ final String queueName = "request-reply-queue";
+
+ ConfigurationImpl conf = new ConfigurationImpl();
+
+ final TransportConfiguration serverConfiguration = new TransportConfiguration(InVMAcceptorFactory.class.getName());
+ final TransportConfiguration clientConfiguration = new TransportConfiguration(InVMConnectorFactory.class.getName());
+ conf.getAcceptorConfigurations().add(serverConfiguration);
+ conf.setSecurityEnabled(false);
+
+ HornetQServer server = HornetQ.newHornetQServer(conf, false);
+ JMSServerManager serverManager = new JMSServerManagerImpl(server);
+ serverManager.setContext(null);
+ serverManager.start();
+ serverManager.createQueue(queueName, null, null, false);
+
+ MessageProducer controlProducer = init(queueName, clientConfiguration, new AddressOOME());
+
+ try
+ {
+ int count = 0;
+ while (true)
+ {
+ HornetQMessage message = (HornetQMessage)coreSession.createTextMessage("myMessageWithNumber[" + (count++) +
+ "]");
+ TemporaryQueue replyQueue = coreSession.createTemporaryQueue();
+ message.setJMSReplyTo(replyQueue);
+ controlProducer.send(message);
+ MessageConsumer temporaryConsumer = coreSession.createConsumer(replyQueue);
+ TextMessage returnMessage = (TextMessage)temporaryConsumer.receive(3000);
+ if (returnMessage != null)
+ {
+ System.out.println("received answer: [" + returnMessage.getText() + "]");
+ }
+ else
+ {
+ System.out.println("timeout on receiveing answer");
+ }
+ temporaryConsumer.close();
+ replyQueue.delete();
+ }
+ }
+ catch (JMSException e)
+ {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ return;
+ }
+
+ }
+
+ private static MessageProducer init(final String queueName,
+ final TransportConfiguration transportConfiguration,
+ MessageListener listener) throws JMSException
+ {
+
+ MessageProducer controlProducer;
+ HornetQConnectionFactory cf = new HornetQConnectionFactory(transportConfiguration);
+
+ HornetQConnection connection = (HornetQConnection)cf.createQueueConnection();
+ connection.start();
+ coreSession = (HornetQSession)connection.createQueueSession(false, Session.AUTO_ACKNOWLEDGE);
+ Queue queue = coreSession.createQueue(queueName);
+ controlProducer = coreSession.createProducer(queue);
+ coreSession.start();
+ MessageConsumer consumer = coreSession.createConsumer(queue);
+ consumer.setMessageListener(listener);
+
+ return controlProducer;
+ }
+
+ public void onMessage(Message msg)
+ {
+ TextMessage message = (TextMessage)msg;
+ try
+ {
+ String textMessage = (String)message.getText();
+ Destination replyDestination = msg.getJMSReplyTo();
+ MessageProducer replyProducer = coreSession.createProducer(replyDestination);
+ HornetQMessage replyMessage = (HornetQMessage)coreSession.createTextMessage(textMessage + "_ANSWERED");
+ replyProducer.send(replyMessage);
+ replyProducer.close();
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ }
+ }
+
+}
\ No newline at end of file
Modified: trunk/tests/src/org/hornetq/tests/integration/client/TemporaryQueueTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/TemporaryQueueTest.java 2009-12-21 13:41:03 UTC (rev 8700)
+++ trunk/tests/src/org/hornetq/tests/integration/client/TemporaryQueueTest.java 2009-12-21 13:46:07 UTC (rev 8701)
@@ -13,6 +13,7 @@
package org.hornetq.tests.integration.client;
+import java.util.Arrays;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
@@ -93,7 +94,37 @@
session.close();
}
+
+ public void testPaginStoreIsRemovedWhenQueueIsDeleted() throws Exception
+ {
+ SimpleString queue = RandomUtil.randomSimpleString();
+ SimpleString address = RandomUtil.randomSimpleString();
+ session.createTemporaryQueue(address, queue);
+
+ ClientProducer producer = session.createProducer(address);
+ ClientMessage msg = session.createMessage(false);
+
+ producer.send(msg);
+
+ session.start();
+ ClientConsumer consumer = session.createConsumer(queue);
+ ClientMessage message = consumer.receive(500);
+ Assert.assertNotNull(message);
+ message.acknowledge();
+
+ SimpleString[] storeNames = server.getPostOffice().getPagingManager().getStoreNames();
+ assertTrue(Arrays.asList(storeNames).contains(address));
+
+ consumer.close();
+ session.deleteQueue(queue);
+
+ storeNames = server.getPostOffice().getPagingManager().getStoreNames();
+ assertFalse(Arrays.asList(storeNames).contains(address));
+
+ session.close();
+ }
+
public void testConsumeFromTemporaryQueueCreatedByOtherSession() throws Exception
{
SimpleString queue = RandomUtil.randomSimpleString();
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 2009-12-21 13:41:03 UTC (rev 8700)
+++ trunk/tests/src/org/hornetq/tests/unit/core/paging/impl/PagingStoreImplTest.java 2009-12-21 13:46:07 UTC (rev 8701)
@@ -811,6 +811,10 @@
{
return null;
}
+
+ public void deletePageStore(SimpleString storeName) throws Exception
+ {
+ }
public PageTransactionInfo getTransaction(final long transactionID)
{
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 2009-12-21 13:41:03 UTC (rev 8700)
+++ trunk/tests/src/org/hornetq/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java 2009-12-21 13:46:07 UTC (rev 8701)
@@ -236,6 +236,10 @@
return null;
}
+ public void deletePageStore(SimpleString storeName) throws Exception
+ {
+ }
+
public PageTransactionInfo getTransaction(final long transactionID)
{
return null;
14 years, 4 months
- 1
- 0
JBoss hornetq SVN: r8700 - trunk.
by do-not-reply＠jboss.org
Author: jmesnil
Date: 2009-12-21 08:41:03 -0500 (Mon, 21 Dec 2009)
New Revision: 8700
Modified:
trunk/pom.xml
Log:
updated POM's version to 2.0.0.CR2
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2009-12-19 16:10:07 UTC (rev 8699)
+++ trunk/pom.xml 2009-12-21 13:41:03 UTC (rev 8700)
@@ -19,7 +19,7 @@
<groupId>org.hornetq</groupId>
<artifactId>messaging</artifactId>
<packaging>pom</packaging>
- <version>2.0.0.BETA3-SNAPSHOT</version>
+ <version>2.0.0.CR2</version>
<name>HornetQ</name>
<url>http://hornetq.org</url>
14 years, 4 months
- 1
- 0
JBoss hornetq SVN: r8699 - trunk/docs/quickstart-guide/en.
by do-not-reply＠jboss.org
Author: timfox
Date: 2009-12-19 11:10:07 -0500 (Sat, 19 Dec 2009)
New Revision: 8699
Modified:
trunk/docs/quickstart-guide/en/installation.xml
Log:
fixed typo and some tweaks to quickstart
Modified: trunk/docs/quickstart-guide/en/installation.xml
===================================================================
--- trunk/docs/quickstart-guide/en/installation.xml 2009-12-18 11:54:49 UTC (rev 8698)
+++ trunk/docs/quickstart-guide/en/installation.xml 2009-12-19 16:10:07 UTC (rev 8699)
@@ -22,25 +22,23 @@
<section id="installation.prerequisites">
<title>Prerequisites</title>
<note>
- <para>HornetQ only runs on Java 5 or later. We highly recommend to use Java 6.</para>
+ <para>HornetQ only runs on Java 5 or later. We highly recommend you use Java 6.</para>
</note>
- <para>By default, HornetQ server is run with 1GiB of memory. If your computer has less memory,
+ <para>By default, HornetQ server runs with 1GiB of memory. If your computer has less memory,
or you want to run it with more available RAM, modify the value in <literal
>bin/run.sh</literal> accordingly.</para>
<para>For persistence, HornetQ uses its own fast journal, which you can configure to use
libaio (which is the default when running on Linux) or Java NIO. In order to use the libaio
module on Linux, it's required to install libaio.</para>
<para>If you're not running on Linux then you don't need to worry about this.</para>
- <para>You can install libaio using the following steps:</para>
+ <para>You can install libaio using the following steps as the root user:</para>
<para>Using yum, (e.g. on Fedora or Red Hat Enterprise Linux):</para>
- <programlisting>sudo yum install libaio</programlisting>
+ <programlisting>yum install libaio</programlisting>
<para>Using aptitude, (e.g. on Ubuntu or Debian system):</para>
- <programlisting>sudo apt-get install libaio</programlisting>
- <para><ulink url="http://ant.apache.org/">Apache Ant</ulink> is required to create the
- profiles for JBoss AS 5 and run the examples.</para>
+ <programlisting>apt-get install libaio</programlisting>
</section>
<section id="installation.standalone">
- <title>Standalone HornetQ Server</title>
+ <title>Stand-alone HornetQ Server</title>
<para>After downloading the distribution, unzip it into your chosen directory. At this point
it should be possible to <link linkend="running.standalone">run straight out of the
box</link>, the following describes the directory structure: </para>
@@ -91,10 +89,10 @@
</itemizedlist>
</section>
<section id="installation.jboss.as5">
- <title>HornetQ In JBoss AS 5</title>
- <para>HornetQ can be deployed in <ulink url="http://www.jboss.org/jbossas/">JBoss AS
- 5</ulink>. It is not shipped by default with the application server and you need to create
- new AS 5 profiles to run AS 5 with HornetQ.</para>
+ <title>HornetQ In JBoss Application Server 5.x</title>
+ <para>HornetQ can also be deployed in <ulink url="http://www.jboss.org/jbossas/">JBoss AS
+ 5</ulink>. It is not shipped by default with the application server and you need to
+ create new AS 5 profiles to run AS 5 with HornetQ.</para>
<para>To create AS 5 profiles:</para>
<orderedlist>
<listitem>
@@ -126,7 +124,7 @@
<programlisting>$JBOSS_HOME/bin/run.sh -c default-with-hornetq</programlisting>
</section>
<section id="installation.jboss.as4">
- <title>HornetQ In JBoss AS 4</title>
+ <title>HornetQ In JBoss Application Server 4.x</title>
<note>
<para>HornetQ can be deployed on AS 4 but isn't recommended</para>
</note>
14 years, 4 months
- 1
- 0
JBoss hornetq SVN: r8698 - in trunk/examples/jms/request-reply: src/org/hornetq/jms/example and 1 other directory.
by do-not-reply＠jboss.org
Author: timfox
Date: 2009-12-18 06:54:49 -0500 (Fri, 18 Dec 2009)
New Revision: 8698
Modified:
trunk/examples/jms/request-reply/readme.html
trunk/examples/jms/request-reply/src/org/hornetq/jms/example/RequestReplyExample.java
Log:
tweak to request reply example docs
Modified: trunk/examples/jms/request-reply/readme.html
===================================================================
--- trunk/examples/jms/request-reply/readme.html 2009-12-16 15:31:57 UTC (rev 8697)
+++ trunk/examples/jms/request-reply/readme.html 2009-12-18 11:54:49 UTC (rev 8698)
@@ -9,6 +9,8 @@
<h1>JMS Request-Reply Example</h1>
<br>
<p>This example shows you how to handle a request message and receive a reply. To get a reply message, the requesting client creates a temporary queue. Then it sends out the request message with JMSReplyTo set to the temporary queue. The request message is handled by a SimpleRequestServer, who is listening to the request queue for incoming requests. If a request message has arrived, it extracts the reply queue from the request message by JMSReplyTo header, and sends back a reply message. To let the client know to which request message a reply message is related, the server also set the JMSCorrelationID with the request message's JMSMessageID header to the reply message.</p>
+<p>Of course, in a real world example you would re-use the session, producer, consumer and temporary queue and not create a new one for each message!
+Or better still use the correlation id, and just store the requests in a map, then you don't need a temporary queue at all
<p>Request/Reply style messaging is supported through standard JMS message headers JMSReplyTo and JMSCorrelationID. This is often used in request-reply style communications between applications.
Whenever a client sends a message that expects a response, it can use this mechanism to implement. please consult the JMS 1.1 specification for full details.</p>
Modified: trunk/examples/jms/request-reply/src/org/hornetq/jms/example/RequestReplyExample.java
===================================================================
--- trunk/examples/jms/request-reply/src/org/hornetq/jms/example/RequestReplyExample.java 2009-12-16 15:31:57 UTC (rev 8697)
+++ trunk/examples/jms/request-reply/src/org/hornetq/jms/example/RequestReplyExample.java 2009-12-18 11:54:49 UTC (rev 8698)
@@ -34,6 +34,11 @@
/**
* A simple JMS example that shows how to use Request/Replay style messaging.
*
+ * Of course, in a real world example you would re-use the session, producer, consumer and temporary queue
+ * and not create a new one for each message!
+ *
+ * Or better still use the correlation id, and just store the requests in a map, then you don't need a temporary queue at all
+ *
* @author <a href="hgao(a)redhat.com">Howard Gao</a>
*/
public class RequestReplyExample extends HornetQExample
14 years, 4 months
- 1
- 0
JBoss hornetq SVN: r8697 - in trunk: examples/jms/bridge/src/org/hornetq/jms/example and 102 other directories.
by do-not-reply＠jboss.org
Author: jmesnil
Date: 2009-12-16 10:31:57 -0500 (Wed, 16 Dec 2009)
New Revision: 8697
Added:
trunk/src/main/org/hornetq/Pair.java
trunk/src/main/org/hornetq/SimpleString.java
trunk/src/main/org/hornetq/SimpleStringReader.java
trunk/src/main/org/hornetq/package-info.java
Removed:
trunk/src/main/org/hornetq/utils/Pair.java
trunk/src/main/org/hornetq/utils/SimpleString.java
trunk/src/main/org/hornetq/utils/SimpleStringReader.java
Modified:
trunk/build-hornetq.xml
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/core/buffers/HornetQBuffer.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/ClientProducer.java
trunk/src/main/org/hornetq/core/client/ClientRequestor.java
trunk/src/main/org/hornetq/core/client/ClientSession.java
trunk/src/main/org/hornetq/core/client/ClientSessionFactory.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/ClientSessionFactoryImpl.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/client/management/impl/ManagementHelper.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/cluster/BridgeConfiguration.java
trunk/src/main/org/hornetq/core/config/cluster/BroadcastGroupConfiguration.java
trunk/src/main/org/hornetq/core/config/cluster/ClusterConnectionConfiguration.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/ObjectNameBuilder.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/Message.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/BroadcastGroup.java
trunk/src/main/org/hornetq/core/server/cluster/ClusterConnection.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/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/HornetQConnectionFactory.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:
HORNETQ-185 + HORNETQ-186: API review + javadoc
* moved SimpleString & Pair classes to org.hornetq
* removed org.hornet.utils from javadoc in hornetq-build.xml
Modified: trunk/build-hornetq.xml
===================================================================
--- trunk/build-hornetq.xml 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/build-hornetq.xml 2009-12-16 15:31:57 UTC (rev 8697)
@@ -405,6 +405,7 @@
<pathelement path="${build.src.dir}"/>
<pathelement path="${src.main.dir}"/>
</src>
+ <include name="**/hornetq/*.java"/>
<include name="**/hornetq/core/**/*.java"/>
<include name="**/hornetq/utils/**/*.java"/>
<classpath refid="core.compilation.classpath"/>
@@ -734,6 +735,7 @@
<jar jarfile="${build.jars.dir}/${core.client.jar.name}">
<fileset dir="${build.core.classes.dir}">
<include name="hornetq-version.properties"/>
+ <include name="org/hornetq/*.class"/>
<include name="org/hornetq/core/client/**/*.class"/>
<include name="org/hornetq/core/filter/**/*.class"/>
<include name="org/hornetq/core/buffers/**/*.class"/>
@@ -1009,6 +1011,7 @@
windowtitle="HornetQ ${module.version}">
<packageset dir="${src.main.dir}" defaultexcludes="false">
+ <include name="org/hornetq"/>
<include name="org/hornetq/core/buffers"/>
<include name="org/hornetq/core/config"/>
<include name="org/hornetq/core/client"/>
@@ -1020,15 +1023,13 @@
<include name="org/hornetq/jms"/>
<include name="org/hornetq/jms/client"/>
<include name="org/hornetq/jms/management"/>
- <include name="org/hornetq/utils"/>
</packageset>
<classpath refid="javadoc.classpath"/>
<doctitle><![CDATA[<h2>HornetQ ${module.version}</h2>]]></doctitle>
<bottom><![CDATA[<i>Copyright © 2009 Red Hat Inc. All Rights Reserved.</i>]]></bottom>
- <group title="HornetQ Core API" packages="org.hornetq.core.buffers, org.hornetq.core.client, org.hornetq.core.config, org.hornetq.core.exception, org.hornetq.core.message, org.hornetq.utils"/>
+ <group title="HornetQ Core API" packages="org.hornetq, org.hornetq.core.buffers, org.hornetq.core.client, org.hornetq.core.config, org.hornetq.core.exception, org.hornetq.core.message, org.hornetq.utils"/>
<group title="HornetQ Management API" packages="org.hornetq.core.management"/>
- <group title="HornetQ Remoting API" packages="org.hornetq.core.remoting"/>
- <group title="HornetQ Remoting SPI" packages="org.hornetq.core.remoting.spi"/>
+ <group title="HornetQ Remoting API & SPI " packages="org.hornetq.core.remoting, org.hornetq.core.remoting.spi"/>
<group title="JMS Facade" packages="org.hornetq.jms, org.hornetq.jms.client"/>
<group title="JMS Management API" packages="org.hornetq.jms.management"/>
<link href="http://java.sun.com/j2se/1.5.0/docs/api"/>
Modified: trunk/examples/jms/bridge/src/org/hornetq/jms/example/HatColourChangeTransformer.java
===================================================================
--- trunk/examples/jms/bridge/src/org/hornetq/jms/example/HatColourChangeTransformer.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/examples/jms/bridge/src/org/hornetq/jms/example/HatColourChangeTransformer.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -13,9 +13,9 @@
package org.hornetq.jms.example;
+import org.hornetq.SimpleString;
import org.hornetq.core.server.ServerMessage;
import org.hornetq.core.server.cluster.Transformer;
-import org.hornetq.utils.SimpleString;
/**
* A HatColourChangeTransformer
Modified: trunk/examples/jms/divert/src/org/hornetq/jms/example/AddForwardingTimeTransformer.java
===================================================================
--- trunk/examples/jms/divert/src/org/hornetq/jms/example/AddForwardingTimeTransformer.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/examples/jms/divert/src/org/hornetq/jms/example/AddForwardingTimeTransformer.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -13,9 +13,9 @@
package org.hornetq.jms.example;
+import org.hornetq.SimpleString;
import org.hornetq.core.server.ServerMessage;
import org.hornetq.core.server.cluster.Transformer;
-import org.hornetq.utils.SimpleString;
/**
* A AddForwardingTimeTransformer
Modified: trunk/examples/jms/interceptor/src/org/hornetq/jms/example/SimpleInterceptor.java
===================================================================
--- trunk/examples/jms/interceptor/src/org/hornetq/jms/example/SimpleInterceptor.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/examples/jms/interceptor/src/org/hornetq/jms/example/SimpleInterceptor.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -13,13 +13,13 @@
package org.hornetq.jms.example;
+import org.hornetq.SimpleString;
import org.hornetq.core.exception.HornetQException;
import org.hornetq.core.message.Message;
import org.hornetq.core.remoting.Interceptor;
import org.hornetq.core.remoting.Packet;
import org.hornetq.core.remoting.RemotingConnection;
import org.hornetq.core.remoting.impl.wireformat.SessionSendMessage;
-import org.hornetq.utils.SimpleString;
/**
* A simple Interceptor implementation
Copied: trunk/src/main/org/hornetq/Pair.java (from rev 8663, trunk/src/main/org/hornetq/utils/Pair.java)
===================================================================
--- trunk/src/main/org/hornetq/Pair.java (rev 0)
+++ trunk/src/main/org/hornetq/Pair.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -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;
+
+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/SimpleString.java (from rev 8667, trunk/src/main/org/hornetq/utils/SimpleString.java)
===================================================================
--- trunk/src/main/org/hornetq/SimpleString.java (rev 0)
+++ trunk/src/main/org/hornetq/SimpleString.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -0,0 +1,426 @@
+/*
+ * 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.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>
+ *
+ */
+
+ // TODO - implement an intern() method like in java.lang.String, since many Strings e.g. addresses, queue names, remote node ids are duplicated heavily
+ //in bindings taking up more memory than they should
+ //Intern can be called when receiving a sent message at the server (destination)
+ //Also when receiving bindings remotely via bridge, the address, queue name and node id can be interned
+ //
+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
Copied: trunk/src/main/org/hornetq/SimpleStringReader.java (from rev 8663, trunk/src/main/org/hornetq/utils/SimpleStringReader.java)
===================================================================
--- trunk/src/main/org/hornetq/SimpleStringReader.java (rev 0)
+++ trunk/src/main/org/hornetq/SimpleStringReader.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -0,0 +1,91 @@
+/*
+ * 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;
+
+
+/**
+ * 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/buffers/HornetQBuffer.java
===================================================================
--- trunk/src/main/org/hornetq/core/buffers/HornetQBuffer.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/buffers/HornetQBuffer.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -15,7 +15,7 @@
import java.nio.ByteBuffer;
-import org.hornetq.utils.SimpleString;
+import org.hornetq.SimpleString;
import org.jboss.netty.buffer.ChannelBuffer;
/**
Modified: trunk/src/main/org/hornetq/core/buffers/impl/ChannelBufferWrapper.java
===================================================================
--- trunk/src/main/org/hornetq/core/buffers/impl/ChannelBufferWrapper.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/buffers/impl/ChannelBufferWrapper.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -15,10 +15,10 @@
import java.nio.ByteBuffer;
+import org.hornetq.SimpleString;
import org.hornetq.core.buffers.HornetQBuffer;
import org.hornetq.core.logging.Logger;
import org.hornetq.utils.DataConstants;
-import org.hornetq.utils.SimpleString;
import org.hornetq.utils.UTF8Util;
import org.jboss.netty.buffer.ChannelBuffer;
Modified: trunk/src/main/org/hornetq/core/buffers/impl/ResetLimitWrappedHornetQBuffer.java
===================================================================
--- trunk/src/main/org/hornetq/core/buffers/impl/ResetLimitWrappedHornetQBuffer.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/buffers/impl/ResetLimitWrappedHornetQBuffer.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -15,10 +15,10 @@
import java.nio.ByteBuffer;
+import org.hornetq.SimpleString;
import org.hornetq.core.buffers.HornetQBuffer;
import org.hornetq.core.logging.Logger;
import org.hornetq.core.message.impl.MessageInternal;
-import org.hornetq.utils.SimpleString;
/**
* A ResetLimitWrappedHornetQBuffer
Modified: trunk/src/main/org/hornetq/core/client/ClientProducer.java
===================================================================
--- trunk/src/main/org/hornetq/core/client/ClientProducer.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/client/ClientProducer.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -13,9 +13,9 @@
package org.hornetq.core.client;
+import org.hornetq.SimpleString;
import org.hornetq.core.exception.HornetQException;
import org.hornetq.core.message.Message;
-import org.hornetq.utils.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/core/client/ClientRequestor.java
===================================================================
--- trunk/src/main/org/hornetq/core/client/ClientRequestor.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/client/ClientRequestor.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -14,8 +14,8 @@
import java.util.UUID;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.impl.ClientMessageImpl;
-import org.hornetq.utils.SimpleString;
/**
* The ClientRequestor class helps making requests.
Modified: trunk/src/main/org/hornetq/core/client/ClientSession.java
===================================================================
--- trunk/src/main/org/hornetq/core/client/ClientSession.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/client/ClientSession.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -17,8 +17,8 @@
import javax.transaction.xa.XAResource;
+import org.hornetq.SimpleString;
import org.hornetq.core.exception.HornetQException;
-import org.hornetq.utils.SimpleString;
/**
* A ClientSession is a single-thread object required for producing and consuming messages.
Modified: trunk/src/main/org/hornetq/core/client/ClientSessionFactory.java
===================================================================
--- trunk/src/main/org/hornetq/core/client/ClientSessionFactory.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/client/ClientSessionFactory.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -15,10 +15,10 @@
import java.util.List;
+import org.hornetq.Pair;
import org.hornetq.core.config.TransportConfiguration;
import org.hornetq.core.exception.HornetQException;
import org.hornetq.core.remoting.Interceptor;
-import org.hornetq.utils.Pair;
/**
* A ClientSessionFactory is the entry point to create and configure HornetQ resources to produce and consume messages.
@@ -141,8 +141,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.utils.Pair#b}) can be <code>null</code> if there is no
- * backup for the corresponding live configuration (returned by {@link org.hornetq.utils.Pair#a})
+ * The backup configuration (returned by {@link org.hornetq.Pair#b}) can be <code>null</code> if there is no
+ * backup for the corresponding live configuration (returned by {@link org.hornetq.Pair#a})
*
* @return a list of pair of TransportConfiguration corresponding to the live - backup nodes
*/
Modified: trunk/src/main/org/hornetq/core/client/impl/ClientConsumerImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/client/impl/ClientConsumerImpl.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/client/impl/ClientConsumerImpl.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -17,6 +17,7 @@
import java.util.concurrent.Executor;
import java.util.concurrent.atomic.AtomicLong;
+import org.hornetq.SimpleString;
import org.hornetq.core.buffers.HornetQBuffers;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.MessageHandler;
@@ -31,7 +32,6 @@
import org.hornetq.core.remoting.impl.wireformat.SessionReceiveContinuationMessage;
import org.hornetq.core.remoting.impl.wireformat.SessionReceiveLargeMessage;
import org.hornetq.utils.Future;
-import org.hornetq.utils.SimpleString;
import org.hornetq.utils.TokenBucketLimiter;
/**
Modified: trunk/src/main/org/hornetq/core/client/impl/ClientConsumerInternal.java
===================================================================
--- trunk/src/main/org/hornetq/core/client/impl/ClientConsumerInternal.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/client/impl/ClientConsumerInternal.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -13,13 +13,13 @@
package org.hornetq.core.client.impl;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.exception.HornetQException;
import org.hornetq.core.remoting.impl.wireformat.SessionQueueQueryResponseMessage;
import org.hornetq.core.remoting.impl.wireformat.SessionReceiveContinuationMessage;
import org.hornetq.core.remoting.impl.wireformat.SessionReceiveLargeMessage;
-import org.hornetq.utils.SimpleString;
/**
*
Modified: trunk/src/main/org/hornetq/core/client/impl/ClientMessageImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/client/impl/ClientMessageImpl.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/client/impl/ClientMessageImpl.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -18,13 +18,13 @@
import java.io.OutputStream;
import java.nio.ByteBuffer;
+import org.hornetq.SimpleString;
import org.hornetq.core.buffers.HornetQBuffer;
import org.hornetq.core.buffers.HornetQBuffers;
import org.hornetq.core.exception.HornetQException;
import org.hornetq.core.logging.Logger;
import org.hornetq.core.message.BodyEncoder;
import org.hornetq.core.message.impl.MessageImpl;
-import org.hornetq.utils.SimpleString;
/**
*
Modified: trunk/src/main/org/hornetq/core/client/impl/ClientProducerCreditManager.java
===================================================================
--- trunk/src/main/org/hornetq/core/client/impl/ClientProducerCreditManager.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/client/impl/ClientProducerCreditManager.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -13,7 +13,7 @@
package org.hornetq.core.client.impl;
-import org.hornetq.utils.SimpleString;
+import org.hornetq.SimpleString;
/**
* A ClientProducerCreditManager
Modified: trunk/src/main/org/hornetq/core/client/impl/ClientProducerCreditManagerImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/client/impl/ClientProducerCreditManagerImpl.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/client/impl/ClientProducerCreditManagerImpl.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -16,7 +16,7 @@
import java.util.HashMap;
import java.util.Map;
-import org.hornetq.utils.SimpleString;
+import org.hornetq.SimpleString;
/**
* A ProducerCreditManager
Modified: trunk/src/main/org/hornetq/core/client/impl/ClientProducerCreditsImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/client/impl/ClientProducerCreditsImpl.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/client/impl/ClientProducerCreditsImpl.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -15,8 +15,8 @@
import java.util.concurrent.Semaphore;
+import org.hornetq.SimpleString;
import org.hornetq.core.logging.Logger;
-import org.hornetq.utils.SimpleString;
/**
* A ProducerCredits
Modified: trunk/src/main/org/hornetq/core/client/impl/ClientProducerImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/client/impl/ClientProducerImpl.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/client/impl/ClientProducerImpl.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -16,6 +16,7 @@
import java.io.IOException;
import java.io.InputStream;
+import org.hornetq.SimpleString;
import org.hornetq.core.buffers.HornetQBuffer;
import org.hornetq.core.buffers.HornetQBuffers;
import org.hornetq.core.exception.HornetQException;
@@ -28,7 +29,6 @@
import org.hornetq.core.remoting.impl.wireformat.SessionSendContinuationMessage;
import org.hornetq.core.remoting.impl.wireformat.SessionSendLargeMessage;
import org.hornetq.core.remoting.impl.wireformat.SessionSendMessage;
-import org.hornetq.utils.SimpleString;
import org.hornetq.utils.TokenBucketLimiter;
import org.hornetq.utils.UUIDGenerator;
Modified: trunk/src/main/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -28,6 +28,7 @@
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.TimeUnit;
+import org.hornetq.Pair;
import org.hornetq.core.client.ClientSession;
import org.hornetq.core.client.ClientSessionFactory;
import org.hornetq.core.client.ConnectionLoadBalancingPolicy;
@@ -40,7 +41,6 @@
import org.hornetq.core.logging.Logger;
import org.hornetq.core.remoting.Interceptor;
import org.hornetq.utils.HornetQThreadFactory;
-import org.hornetq.utils.Pair;
import org.hornetq.utils.UUIDGenerator;
/**
Modified: trunk/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -24,6 +24,7 @@
import javax.transaction.xa.XAResource;
import javax.transaction.xa.Xid;
+import org.hornetq.SimpleString;
import org.hornetq.core.buffers.HornetQBuffer;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
@@ -76,7 +77,6 @@
import org.hornetq.utils.ConcurrentHashSet;
import org.hornetq.utils.IDGenerator;
import org.hornetq.utils.SimpleIDGenerator;
-import org.hornetq.utils.SimpleString;
import org.hornetq.utils.TokenBucketLimiterImpl;
/*
Modified: trunk/src/main/org/hornetq/core/client/impl/ClientSessionInternal.java
===================================================================
--- trunk/src/main/org/hornetq/core/client/impl/ClientSessionInternal.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/client/impl/ClientSessionInternal.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -13,13 +13,13 @@
package org.hornetq.core.client.impl;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientSession;
import org.hornetq.core.exception.HornetQException;
import org.hornetq.core.remoting.RemotingConnection;
import org.hornetq.core.remoting.impl.wireformat.SessionReceiveContinuationMessage;
import org.hornetq.core.remoting.impl.wireformat.SessionReceiveLargeMessage;
import org.hornetq.core.remoting.impl.wireformat.SessionReceiveMessage;
-import org.hornetq.utils.SimpleString;
/**
* A ClientSessionInternal
Modified: trunk/src/main/org/hornetq/core/client/impl/DelegatingSession.java
===================================================================
--- trunk/src/main/org/hornetq/core/client/impl/DelegatingSession.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/client/impl/DelegatingSession.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -19,6 +19,7 @@
import javax.transaction.xa.XAResource;
import javax.transaction.xa.Xid;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -31,7 +32,6 @@
import org.hornetq.core.remoting.impl.wireformat.SessionReceiveLargeMessage;
import org.hornetq.core.remoting.impl.wireformat.SessionReceiveMessage;
import org.hornetq.utils.ConcurrentHashSet;
-import org.hornetq.utils.SimpleString;
/**
* A DelegatingSession
Modified: trunk/src/main/org/hornetq/core/client/impl/LargeMessageBufferImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/client/impl/LargeMessageBufferImpl.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/client/impl/LargeMessageBufferImpl.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -26,12 +26,12 @@
import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.TimeUnit;
+import org.hornetq.SimpleString;
import org.hornetq.core.buffers.HornetQBuffer;
import org.hornetq.core.exception.HornetQException;
import org.hornetq.core.logging.Logger;
import org.hornetq.core.remoting.impl.wireformat.SessionReceiveContinuationMessage;
import org.hornetq.utils.DataConstants;
-import org.hornetq.utils.SimpleString;
import org.hornetq.utils.UTF8Util;
import org.jboss.netty.buffer.ChannelBuffer;
Modified: trunk/src/main/org/hornetq/core/client/management/impl/ManagementHelper.java
===================================================================
--- trunk/src/main/org/hornetq/core/client/management/impl/ManagementHelper.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/client/management/impl/ManagementHelper.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -18,9 +18,9 @@
import java.util.Iterator;
import java.util.Map;
+import org.hornetq.SimpleString;
import org.hornetq.core.logging.Logger;
import org.hornetq.core.message.Message;
-import org.hornetq.utils.SimpleString;
import org.hornetq.utils.json.JSONArray;
import org.hornetq.utils.json.JSONObject;
Modified: trunk/src/main/org/hornetq/core/cluster/DiscoveryEntry.java
===================================================================
--- trunk/src/main/org/hornetq/core/cluster/DiscoveryEntry.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/cluster/DiscoveryEntry.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -13,8 +13,8 @@
package org.hornetq.core.cluster;
+import org.hornetq.Pair;
import org.hornetq.core.config.TransportConfiguration;
-import org.hornetq.utils.Pair;
/**
* A DiscoveryEntry
Modified: trunk/src/main/org/hornetq/core/cluster/impl/DiscoveryGroupImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/cluster/impl/DiscoveryGroupImpl.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/cluster/impl/DiscoveryGroupImpl.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -23,6 +23,8 @@
import java.util.List;
import java.util.Map;
+import org.hornetq.Pair;
+import org.hornetq.SimpleString;
import org.hornetq.core.buffers.HornetQBuffer;
import org.hornetq.core.buffers.HornetQBuffers;
import org.hornetq.core.cluster.DiscoveryEntry;
@@ -33,8 +35,6 @@
import org.hornetq.core.management.NotificationType;
import org.hornetq.core.server.management.Notification;
import org.hornetq.core.server.management.NotificationService;
-import org.hornetq.utils.Pair;
-import org.hornetq.utils.SimpleString;
import org.hornetq.utils.TypedProperties;
/**
Modified: trunk/src/main/org/hornetq/core/config/Configuration.java
===================================================================
--- trunk/src/main/org/hornetq/core/config/Configuration.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/config/Configuration.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -18,6 +18,7 @@
import java.util.Map;
import java.util.Set;
+import org.hornetq.SimpleString;
import org.hornetq.core.config.cluster.BridgeConfiguration;
import org.hornetq.core.config.cluster.BroadcastGroupConfiguration;
import org.hornetq.core.config.cluster.ClusterConnectionConfiguration;
@@ -26,7 +27,6 @@
import org.hornetq.core.config.cluster.QueueConfiguration;
import org.hornetq.core.server.JournalType;
import org.hornetq.core.server.group.impl.GroupingHandlerConfiguration;
-import org.hornetq.utils.SimpleString;
/**
*
Modified: trunk/src/main/org/hornetq/core/config/cluster/BridgeConfiguration.java
===================================================================
--- trunk/src/main/org/hornetq/core/config/cluster/BridgeConfiguration.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/config/cluster/BridgeConfiguration.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -15,7 +15,7 @@
import java.io.Serializable;
-import org.hornetq.utils.Pair;
+import org.hornetq.Pair;
/**
* A BridgeConfiguration
Modified: trunk/src/main/org/hornetq/core/config/cluster/BroadcastGroupConfiguration.java
===================================================================
--- trunk/src/main/org/hornetq/core/config/cluster/BroadcastGroupConfiguration.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/config/cluster/BroadcastGroupConfiguration.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -16,8 +16,8 @@
import java.io.Serializable;
import java.util.List;
+import org.hornetq.Pair;
import org.hornetq.core.logging.Logger;
-import org.hornetq.utils.Pair;
/**
* A BroadcastGroupConfiguration
Modified: trunk/src/main/org/hornetq/core/config/cluster/ClusterConnectionConfiguration.java
===================================================================
--- trunk/src/main/org/hornetq/core/config/cluster/ClusterConnectionConfiguration.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/config/cluster/ClusterConnectionConfiguration.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -16,7 +16,7 @@
import java.io.Serializable;
import java.util.List;
-import org.hornetq.utils.Pair;
+import org.hornetq.Pair;
/**
* A ClusterConnectionConfiguration
Modified: trunk/src/main/org/hornetq/core/config/impl/ConfigurationImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/config/impl/ConfigurationImpl.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/config/impl/ConfigurationImpl.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -21,6 +21,7 @@
import java.util.Map;
import java.util.Set;
+import org.hornetq.SimpleString;
import org.hornetq.core.config.Configuration;
import org.hornetq.core.config.TransportConfiguration;
import org.hornetq.core.config.cluster.BridgeConfiguration;
@@ -32,7 +33,6 @@
import org.hornetq.core.logging.impl.JULLogDelegateFactory;
import org.hornetq.core.server.JournalType;
import org.hornetq.core.server.group.impl.GroupingHandlerConfiguration;
-import org.hornetq.utils.SimpleString;
/**
* @author <a href="mailto:ataylor@redhat.com>Andy Taylor</a>
Modified: trunk/src/main/org/hornetq/core/config/impl/FileConfiguration.java
===================================================================
--- trunk/src/main/org/hornetq/core/config/impl/FileConfiguration.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/config/impl/FileConfiguration.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -21,6 +21,8 @@
import java.util.List;
import java.util.Map;
+import org.hornetq.Pair;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.impl.ClientSessionFactoryImpl;
import org.hornetq.core.config.TransportConfiguration;
import org.hornetq.core.config.cluster.BridgeConfiguration;
@@ -31,8 +33,6 @@
import org.hornetq.core.logging.Logger;
import org.hornetq.core.server.JournalType;
import org.hornetq.core.server.group.impl.GroupingHandlerConfiguration;
-import org.hornetq.utils.Pair;
-import org.hornetq.utils.SimpleString;
import org.hornetq.utils.XMLConfigurationUtil;
import org.hornetq.utils.XMLUtil;
import org.w3c.dom.Element;
Modified: trunk/src/main/org/hornetq/core/deployers/impl/AddressSettingsDeployer.java
===================================================================
--- trunk/src/main/org/hornetq/core/deployers/impl/AddressSettingsDeployer.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/deployers/impl/AddressSettingsDeployer.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -13,13 +13,13 @@
package org.hornetq.core.deployers.impl;
+import org.hornetq.SimpleString;
import org.hornetq.core.config.impl.Validators;
import org.hornetq.core.deployers.DeploymentManager;
import org.hornetq.core.logging.Logger;
import org.hornetq.core.settings.HierarchicalRepository;
import org.hornetq.core.settings.impl.AddressFullMessagePolicy;
import org.hornetq.core.settings.impl.AddressSettings;
-import org.hornetq.utils.SimpleString;
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
Modified: trunk/src/main/org/hornetq/core/deployers/impl/FileDeploymentManager.java
===================================================================
--- trunk/src/main/org/hornetq/core/deployers/impl/FileDeploymentManager.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/deployers/impl/FileDeploymentManager.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -27,10 +27,10 @@
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
+import org.hornetq.Pair;
import org.hornetq.core.deployers.Deployer;
import org.hornetq.core.deployers.DeploymentManager;
import org.hornetq.core.logging.Logger;
-import org.hornetq.utils.Pair;
/**
* @author <a href="ataylor(a)redhat.com">Andy Taylor</a>
Modified: trunk/src/main/org/hornetq/core/filter/Filter.java
===================================================================
--- trunk/src/main/org/hornetq/core/filter/Filter.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/filter/Filter.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -13,8 +13,8 @@
package org.hornetq.core.filter;
+import org.hornetq.SimpleString;
import org.hornetq.core.server.ServerMessage;
-import org.hornetq.utils.SimpleString;
/**
*
Modified: trunk/src/main/org/hornetq/core/filter/impl/FilterImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/filter/impl/FilterImpl.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/filter/impl/FilterImpl.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -16,11 +16,11 @@
import java.util.HashMap;
import java.util.Map;
+import org.hornetq.SimpleString;
import org.hornetq.core.exception.HornetQException;
import org.hornetq.core.filter.Filter;
import org.hornetq.core.logging.Logger;
import org.hornetq.core.server.ServerMessage;
-import org.hornetq.utils.SimpleString;
/**
* This class implements a HornetQ filter
Modified: trunk/src/main/org/hornetq/core/filter/impl/FilterParser.jj
===================================================================
--- trunk/src/main/org/hornetq/core/filter/impl/FilterParser.jj 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/filter/impl/FilterParser.jj 2009-12-16 15:31:57 UTC (rev 8697)
@@ -39,8 +39,8 @@
import java.util.Map;
import java.util.Set;
-import org.hornetq.utils.SimpleString;
-import org.hornetq.utils.SimpleStringReader;
+import org.hornetq.SimpleString;
+import org.hornetq.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 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/filter/impl/Identifier.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -22,7 +22,7 @@
package org.hornetq.core.filter.impl;
-import org.hornetq.utils.SimpleString;
+import org.hornetq.SimpleString;
/**
*
Modified: trunk/src/main/org/hornetq/core/filter/impl/Operator.java
===================================================================
--- trunk/src/main/org/hornetq/core/filter/impl/Operator.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/filter/impl/Operator.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -24,8 +24,8 @@
import java.util.HashSet;
+import org.hornetq.SimpleString;
import org.hornetq.core.logging.Logger;
-import org.hornetq.utils.SimpleString;
/**
* Implementations of the operators used in HornetQ filter expressions
Modified: trunk/src/main/org/hornetq/core/journal/impl/AbstractJournalUpdateTask.java
===================================================================
--- trunk/src/main/org/hornetq/core/journal/impl/AbstractJournalUpdateTask.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/journal/impl/AbstractJournalUpdateTask.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -18,6 +18,7 @@
import java.util.List;
import java.util.Set;
+import org.hornetq.Pair;
import org.hornetq.core.buffers.HornetQBuffer;
import org.hornetq.core.buffers.HornetQBuffers;
import org.hornetq.core.journal.SequentialFile;
@@ -27,7 +28,6 @@
import org.hornetq.core.journal.impl.dataformat.JournalInternalRecord;
import org.hornetq.core.logging.Logger;
import org.hornetq.utils.ConcurrentHashSet;
-import org.hornetq.utils.Pair;
/**
*
Modified: trunk/src/main/org/hornetq/core/journal/impl/JournalCompactor.java
===================================================================
--- trunk/src/main/org/hornetq/core/journal/impl/JournalCompactor.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/journal/impl/JournalCompactor.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -21,6 +21,7 @@
import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
+import org.hornetq.Pair;
import org.hornetq.core.buffers.HornetQBuffer;
import org.hornetq.core.buffers.HornetQBuffers;
import org.hornetq.core.journal.RecordInfo;
@@ -34,7 +35,6 @@
import org.hornetq.core.journal.impl.dataformat.JournalDeleteRecordTX;
import org.hornetq.core.journal.impl.dataformat.JournalInternalRecord;
import org.hornetq.core.logging.Logger;
-import org.hornetq.utils.Pair;
/**
* A JournalCompactor
Modified: trunk/src/main/org/hornetq/core/journal/impl/JournalImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/journal/impl/JournalImpl.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/journal/impl/JournalImpl.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -41,6 +41,7 @@
import java.util.concurrent.locks.ReentrantLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
+import org.hornetq.Pair;
import org.hornetq.core.buffers.HornetQBuffer;
import org.hornetq.core.buffers.HornetQBuffers;
import org.hornetq.core.journal.EncodingSupport;
@@ -64,7 +65,6 @@
import org.hornetq.core.journal.impl.dataformat.JournalRollbackRecordTX;
import org.hornetq.core.logging.Logger;
import org.hornetq.utils.DataConstants;
-import org.hornetq.utils.Pair;
import org.hornetq.utils.concurrent.LinkedBlockingDeque;
/**
Modified: trunk/src/main/org/hornetq/core/management/ObjectNameBuilder.java
===================================================================
--- trunk/src/main/org/hornetq/core/management/ObjectNameBuilder.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/management/ObjectNameBuilder.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -15,12 +15,12 @@
import javax.management.ObjectName;
+import org.hornetq.SimpleString;
import org.hornetq.core.config.impl.ConfigurationImpl;
import org.hornetq.jms.management.ConnectionFactoryControl;
import org.hornetq.jms.management.JMSQueueControl;
import org.hornetq.jms.management.JMSServerControl;
import org.hornetq.jms.management.TopicControl;
-import org.hornetq.utils.SimpleString;
/**
* Helper class to build ObjectNames for HornetQ resources.
Modified: trunk/src/main/org/hornetq/core/management/impl/AddressControlImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/management/impl/AddressControlImpl.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/management/impl/AddressControlImpl.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -18,6 +18,7 @@
import javax.management.MBeanOperationInfo;
+import org.hornetq.SimpleString;
import org.hornetq.core.logging.Logger;
import org.hornetq.core.management.AddressControl;
import org.hornetq.core.paging.PagingManager;
@@ -28,7 +29,6 @@
import org.hornetq.core.security.CheckType;
import org.hornetq.core.security.Role;
import org.hornetq.core.settings.HierarchicalRepository;
-import org.hornetq.utils.SimpleString;
import org.hornetq.utils.json.JSONArray;
import org.hornetq.utils.json.JSONObject;
Modified: trunk/src/main/org/hornetq/core/management/impl/BroadcastGroupControlImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/management/impl/BroadcastGroupControlImpl.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/management/impl/BroadcastGroupControlImpl.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -15,12 +15,12 @@
import javax.management.MBeanOperationInfo;
+import org.hornetq.Pair;
import org.hornetq.core.config.cluster.BroadcastGroupConfiguration;
import org.hornetq.core.management.AddressControl;
import org.hornetq.core.management.BroadcastGroupControl;
import org.hornetq.core.persistence.StorageManager;
import org.hornetq.core.server.cluster.BroadcastGroup;
-import org.hornetq.utils.Pair;
import org.hornetq.utils.json.JSONArray;
import org.hornetq.utils.json.JSONObject;
Modified: trunk/src/main/org/hornetq/core/management/impl/ClusterConnectionControlImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/management/impl/ClusterConnectionControlImpl.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/management/impl/ClusterConnectionControlImpl.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -18,12 +18,12 @@
import javax.management.MBeanOperationInfo;
+import org.hornetq.Pair;
import org.hornetq.core.config.cluster.ClusterConnectionConfiguration;
import org.hornetq.core.management.AddressControl;
import org.hornetq.core.management.ClusterConnectionControl;
import org.hornetq.core.persistence.StorageManager;
import org.hornetq.core.server.cluster.ClusterConnection;
-import org.hornetq.utils.Pair;
import org.hornetq.utils.json.JSONArray;
import org.hornetq.utils.json.JSONObject;
Modified: trunk/src/main/org/hornetq/core/management/impl/HornetQServerControlImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/management/impl/HornetQServerControlImpl.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/management/impl/HornetQServerControlImpl.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -33,6 +33,7 @@
import javax.management.NotificationListener;
import javax.transaction.xa.Xid;
+import org.hornetq.SimpleString;
import org.hornetq.core.config.Configuration;
import org.hornetq.core.config.TransportConfiguration;
import org.hornetq.core.exception.HornetQException;
@@ -53,7 +54,6 @@
import org.hornetq.core.transaction.ResourceManager;
import org.hornetq.core.transaction.Transaction;
import org.hornetq.core.transaction.impl.XidImpl;
-import org.hornetq.utils.SimpleString;
import org.hornetq.utils.json.JSONArray;
import org.hornetq.utils.json.JSONObject;
Modified: trunk/src/main/org/hornetq/core/management/impl/QueueControlImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/management/impl/QueueControlImpl.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/management/impl/QueueControlImpl.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -18,6 +18,7 @@
import javax.management.MBeanOperationInfo;
+import org.hornetq.SimpleString;
import org.hornetq.core.exception.HornetQException;
import org.hornetq.core.filter.Filter;
import org.hornetq.core.filter.impl.FilterImpl;
@@ -34,7 +35,6 @@
import org.hornetq.core.server.Queue;
import org.hornetq.core.settings.HierarchicalRepository;
import org.hornetq.core.settings.impl.AddressSettings;
-import org.hornetq.utils.SimpleString;
import org.hornetq.utils.json.JSONArray;
import org.hornetq.utils.json.JSONObject;
Modified: trunk/src/main/org/hornetq/core/message/Message.java
===================================================================
--- trunk/src/main/org/hornetq/core/message/Message.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/message/Message.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -16,8 +16,8 @@
import java.util.Map;
import java.util.Set;
+import org.hornetq.SimpleString;
import org.hornetq.core.buffers.HornetQBuffer;
-import org.hornetq.utils.SimpleString;
/**
* A Message is a routable instance that has a payload.
Modified: trunk/src/main/org/hornetq/core/message/impl/MessageImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/message/impl/MessageImpl.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/message/impl/MessageImpl.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -18,6 +18,7 @@
import java.util.Map;
import java.util.Set;
+import org.hornetq.SimpleString;
import org.hornetq.core.buffers.HornetQBuffer;
import org.hornetq.core.buffers.HornetQBuffers;
import org.hornetq.core.buffers.impl.ResetLimitWrappedHornetQBuffer;
@@ -28,7 +29,6 @@
import org.hornetq.core.message.PropertyConversionException;
import org.hornetq.core.remoting.impl.wireformat.PacketImpl;
import org.hornetq.utils.DataConstants;
-import org.hornetq.utils.SimpleString;
import org.hornetq.utils.TypedProperties;
/**
Modified: trunk/src/main/org/hornetq/core/paging/PagingManager.java
===================================================================
--- trunk/src/main/org/hornetq/core/paging/PagingManager.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/paging/PagingManager.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -13,10 +13,10 @@
package org.hornetq.core.paging;
+import org.hornetq.SimpleString;
import org.hornetq.core.journal.SequentialFile;
import org.hornetq.core.postoffice.PostOffice;
import org.hornetq.core.server.HornetQComponent;
-import org.hornetq.utils.SimpleString;
/**
*
Modified: trunk/src/main/org/hornetq/core/paging/PagingStore.java
===================================================================
--- trunk/src/main/org/hornetq/core/paging/PagingStore.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/paging/PagingStore.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -13,12 +13,12 @@
package org.hornetq.core.paging;
+import org.hornetq.SimpleString;
import org.hornetq.core.server.HornetQComponent;
import org.hornetq.core.server.MessageReference;
import org.hornetq.core.server.ServerMessage;
import org.hornetq.core.server.impl.ServerProducerCreditManager;
import org.hornetq.core.settings.impl.AddressFullMessagePolicy;
-import org.hornetq.utils.SimpleString;
/**
*
Modified: trunk/src/main/org/hornetq/core/paging/PagingStoreFactory.java
===================================================================
--- trunk/src/main/org/hornetq/core/paging/PagingStoreFactory.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/paging/PagingStoreFactory.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -15,12 +15,12 @@
import java.util.List;
+import org.hornetq.SimpleString;
import org.hornetq.core.journal.SequentialFileFactory;
import org.hornetq.core.persistence.StorageManager;
import org.hornetq.core.postoffice.PostOffice;
import org.hornetq.core.settings.HierarchicalRepository;
import org.hornetq.core.settings.impl.AddressSettings;
-import org.hornetq.utils.SimpleString;
/**
* The integration point between the PagingManger and the File System (aka SequentialFiles)
Modified: trunk/src/main/org/hornetq/core/paging/impl/PageImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/paging/impl/PageImpl.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/paging/impl/PageImpl.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -18,6 +18,7 @@
import java.util.List;
import java.util.concurrent.atomic.AtomicInteger;
+import org.hornetq.SimpleString;
import org.hornetq.core.buffers.HornetQBuffer;
import org.hornetq.core.buffers.HornetQBuffers;
import org.hornetq.core.journal.SequentialFile;
@@ -27,7 +28,6 @@
import org.hornetq.core.paging.PagedMessage;
import org.hornetq.core.persistence.StorageManager;
import org.hornetq.utils.DataConstants;
-import org.hornetq.utils.SimpleString;
/**
*
Modified: trunk/src/main/org/hornetq/core/paging/impl/PagingManagerImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/paging/impl/PagingManagerImpl.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/paging/impl/PagingManagerImpl.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -19,6 +19,7 @@
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.atomic.AtomicLong;
+import org.hornetq.SimpleString;
import org.hornetq.core.logging.Logger;
import org.hornetq.core.paging.PageTransactionInfo;
import org.hornetq.core.paging.PagingManager;
@@ -28,7 +29,6 @@
import org.hornetq.core.postoffice.PostOffice;
import org.hornetq.core.settings.HierarchicalRepository;
import org.hornetq.core.settings.impl.AddressSettings;
-import org.hornetq.utils.SimpleString;
/**
*
Modified: trunk/src/main/org/hornetq/core/paging/impl/PagingStoreFactoryNIO.java
===================================================================
--- trunk/src/main/org/hornetq/core/paging/impl/PagingStoreFactoryNIO.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/paging/impl/PagingStoreFactoryNIO.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -24,6 +24,7 @@
import java.util.Collections;
import java.util.List;
+import org.hornetq.SimpleString;
import org.hornetq.core.journal.SequentialFileFactory;
import org.hornetq.core.journal.impl.NIOSequentialFileFactory;
import org.hornetq.core.logging.Logger;
@@ -35,7 +36,6 @@
import org.hornetq.core.settings.HierarchicalRepository;
import org.hornetq.core.settings.impl.AddressSettings;
import org.hornetq.utils.ExecutorFactory;
-import org.hornetq.utils.SimpleString;
import org.hornetq.utils.UUIDGenerator;
/**
Modified: trunk/src/main/org/hornetq/core/paging/impl/PagingStoreImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/paging/impl/PagingStoreImpl.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/paging/impl/PagingStoreImpl.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -27,6 +27,7 @@
import java.util.concurrent.locks.ReentrantLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
+import org.hornetq.SimpleString;
import org.hornetq.core.journal.SequentialFile;
import org.hornetq.core.journal.SequentialFileFactory;
import org.hornetq.core.logging.Logger;
@@ -51,7 +52,6 @@
import org.hornetq.core.transaction.TransactionPropertyIndexes;
import org.hornetq.core.transaction.Transaction.State;
import org.hornetq.core.transaction.impl.TransactionImpl;
-import org.hornetq.utils.SimpleString;
/**
*
Modified: trunk/src/main/org/hornetq/core/persistence/GroupingInfo.java
===================================================================
--- trunk/src/main/org/hornetq/core/persistence/GroupingInfo.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/persistence/GroupingInfo.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -12,7 +12,7 @@
*/
package org.hornetq.core.persistence;
-import org.hornetq.utils.SimpleString;
+import org.hornetq.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 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/persistence/QueueBindingInfo.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -13,7 +13,7 @@
package org.hornetq.core.persistence;
-import org.hornetq.utils.SimpleString;
+import org.hornetq.SimpleString;
/**
* A QueueBindingInfo
Modified: trunk/src/main/org/hornetq/core/persistence/StorageManager.java
===================================================================
--- trunk/src/main/org/hornetq/core/persistence/StorageManager.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/persistence/StorageManager.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -19,6 +19,8 @@
import javax.transaction.xa.Xid;
+import org.hornetq.Pair;
+import org.hornetq.SimpleString;
import org.hornetq.core.journal.IOAsyncTask;
import org.hornetq.core.journal.JournalLoadInformation;
import org.hornetq.core.paging.PageTransactionInfo;
@@ -33,8 +35,6 @@
import org.hornetq.core.server.ServerMessage;
import org.hornetq.core.server.group.impl.GroupBinding;
import org.hornetq.core.transaction.ResourceManager;
-import org.hornetq.utils.Pair;
-import org.hornetq.utils.SimpleString;
import org.hornetq.utils.UUID;
/**
Modified: trunk/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java
===================================================================
--- trunk/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -24,6 +24,8 @@
import javax.transaction.xa.Xid;
+import org.hornetq.Pair;
+import org.hornetq.SimpleString;
import org.hornetq.core.buffers.HornetQBuffer;
import org.hornetq.core.buffers.HornetQBuffers;
import org.hornetq.core.config.Configuration;
@@ -71,8 +73,6 @@
import org.hornetq.core.transaction.impl.TransactionImpl;
import org.hornetq.utils.DataConstants;
import org.hornetq.utils.ExecutorFactory;
-import org.hornetq.utils.Pair;
-import org.hornetq.utils.SimpleString;
import org.hornetq.utils.UUID;
/**
Modified: trunk/src/main/org/hornetq/core/persistence/impl/nullpm/NullStorageManager.java
===================================================================
--- trunk/src/main/org/hornetq/core/persistence/impl/nullpm/NullStorageManager.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/persistence/impl/nullpm/NullStorageManager.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -20,6 +20,8 @@
import javax.transaction.xa.Xid;
+import org.hornetq.Pair;
+import org.hornetq.SimpleString;
import org.hornetq.core.buffers.HornetQBuffer;
import org.hornetq.core.buffers.HornetQBuffers;
import org.hornetq.core.journal.IOAsyncTask;
@@ -40,8 +42,6 @@
import org.hornetq.core.server.ServerMessage;
import org.hornetq.core.server.group.impl.GroupBinding;
import org.hornetq.core.transaction.ResourceManager;
-import org.hornetq.utils.Pair;
-import org.hornetq.utils.SimpleString;
import org.hornetq.utils.UUID;
/**
Modified: trunk/src/main/org/hornetq/core/postoffice/Address.java
===================================================================
--- trunk/src/main/org/hornetq/core/postoffice/Address.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/postoffice/Address.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -14,7 +14,7 @@
import java.util.List;
-import org.hornetq.utils.SimpleString;
+import org.hornetq.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 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/postoffice/AddressManager.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -14,7 +14,7 @@
import java.util.Map;
-import org.hornetq.utils.SimpleString;
+import org.hornetq.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 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/postoffice/Binding.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -13,11 +13,11 @@
package org.hornetq.core.postoffice;
+import org.hornetq.SimpleString;
import org.hornetq.core.filter.Filter;
import org.hornetq.core.server.Bindable;
import org.hornetq.core.server.RoutingContext;
import org.hornetq.core.server.ServerMessage;
-import org.hornetq.utils.SimpleString;
/**
*
Modified: trunk/src/main/org/hornetq/core/postoffice/DuplicateIDCache.java
===================================================================
--- trunk/src/main/org/hornetq/core/postoffice/DuplicateIDCache.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/postoffice/DuplicateIDCache.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -15,8 +15,8 @@
import java.util.List;
+import org.hornetq.Pair;
import org.hornetq.core.transaction.Transaction;
-import org.hornetq.utils.Pair;
/**
* A DuplicateIDCache
Modified: trunk/src/main/org/hornetq/core/postoffice/PostOffice.java
===================================================================
--- trunk/src/main/org/hornetq/core/postoffice/PostOffice.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/postoffice/PostOffice.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -13,6 +13,7 @@
package org.hornetq.core.postoffice;
+import org.hornetq.SimpleString;
import org.hornetq.core.paging.PagingManager;
import org.hornetq.core.server.HornetQComponent;
import org.hornetq.core.server.MessageReference;
@@ -20,7 +21,6 @@
import org.hornetq.core.server.RoutingContext;
import org.hornetq.core.server.ServerMessage;
import org.hornetq.core.transaction.Transaction;
-import org.hornetq.utils.SimpleString;
/**
*
Modified: trunk/src/main/org/hornetq/core/postoffice/QueueInfo.java
===================================================================
--- trunk/src/main/org/hornetq/core/postoffice/QueueInfo.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/postoffice/QueueInfo.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -16,7 +16,7 @@
import java.io.Serializable;
import java.util.List;
-import org.hornetq.utils.SimpleString;
+import org.hornetq.SimpleString;
/**
* A QueueInfo
Modified: trunk/src/main/org/hornetq/core/postoffice/impl/AddressImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/postoffice/impl/AddressImpl.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/postoffice/impl/AddressImpl.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -15,8 +15,8 @@
import java.util.ArrayList;
import java.util.List;
+import org.hornetq.SimpleString;
import org.hornetq.core.postoffice.Address;
-import org.hornetq.utils.SimpleString;
/**
* splits an address string into its hierarchical parts split by '.'
Modified: trunk/src/main/org/hornetq/core/postoffice/impl/BindingsImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/postoffice/impl/BindingsImpl.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/postoffice/impl/BindingsImpl.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -21,6 +21,7 @@
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.CopyOnWriteArrayList;
+import org.hornetq.SimpleString;
import org.hornetq.core.exception.HornetQException;
import org.hornetq.core.filter.Filter;
import org.hornetq.core.logging.Logger;
@@ -33,7 +34,6 @@
import org.hornetq.core.server.group.GroupingHandler;
import org.hornetq.core.server.group.impl.Proposal;
import org.hornetq.core.server.group.impl.Response;
-import org.hornetq.utils.SimpleString;
/**
* A BindingsImpl
Modified: trunk/src/main/org/hornetq/core/postoffice/impl/DivertBinding.java
===================================================================
--- trunk/src/main/org/hornetq/core/postoffice/impl/DivertBinding.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/postoffice/impl/DivertBinding.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -13,6 +13,7 @@
package org.hornetq.core.postoffice.impl;
+import org.hornetq.SimpleString;
import org.hornetq.core.filter.Filter;
import org.hornetq.core.postoffice.Binding;
import org.hornetq.core.postoffice.BindingType;
@@ -20,7 +21,6 @@
import org.hornetq.core.server.Divert;
import org.hornetq.core.server.RoutingContext;
import org.hornetq.core.server.ServerMessage;
-import org.hornetq.utils.SimpleString;
/**
* A LocalQueueBinding
Modified: trunk/src/main/org/hornetq/core/postoffice/impl/DuplicateIDCacheImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/postoffice/impl/DuplicateIDCacheImpl.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/postoffice/impl/DuplicateIDCacheImpl.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -19,14 +19,14 @@
import java.util.List;
import java.util.Set;
+import org.hornetq.Pair;
+import org.hornetq.SimpleString;
import org.hornetq.core.logging.Logger;
import org.hornetq.core.persistence.StorageManager;
import org.hornetq.core.postoffice.DuplicateIDCache;
import org.hornetq.core.server.Queue;
import org.hornetq.core.transaction.Transaction;
import org.hornetq.core.transaction.TransactionOperation;
-import org.hornetq.utils.Pair;
-import org.hornetq.utils.SimpleString;
/**
* A DuplicateIDCacheImpl
Modified: trunk/src/main/org/hornetq/core/postoffice/impl/LocalQueueBinding.java
===================================================================
--- trunk/src/main/org/hornetq/core/postoffice/impl/LocalQueueBinding.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/postoffice/impl/LocalQueueBinding.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -13,6 +13,7 @@
package org.hornetq.core.postoffice.impl;
+import org.hornetq.SimpleString;
import org.hornetq.core.filter.Filter;
import org.hornetq.core.logging.Logger;
import org.hornetq.core.postoffice.BindingType;
@@ -21,7 +22,6 @@
import org.hornetq.core.server.Queue;
import org.hornetq.core.server.RoutingContext;
import org.hornetq.core.server.ServerMessage;
-import org.hornetq.utils.SimpleString;
/**
* A LocalQueueBinding
Modified: trunk/src/main/org/hornetq/core/postoffice/impl/PostOfficeImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/postoffice/impl/PostOfficeImpl.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/postoffice/impl/PostOfficeImpl.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -25,6 +25,7 @@
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.management.impl.ManagementHelper;
import org.hornetq.core.exception.HornetQException;
import org.hornetq.core.filter.Filter;
@@ -64,7 +65,6 @@
import org.hornetq.core.transaction.Transaction.State;
import org.hornetq.core.transaction.impl.TransactionImpl;
import org.hornetq.utils.ExecutorFactory;
-import org.hornetq.utils.SimpleString;
import org.hornetq.utils.TypedProperties;
import org.hornetq.utils.UUIDGenerator;
Modified: trunk/src/main/org/hornetq/core/postoffice/impl/SimpleAddressManager.java
===================================================================
--- trunk/src/main/org/hornetq/core/postoffice/impl/SimpleAddressManager.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/postoffice/impl/SimpleAddressManager.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -16,13 +16,13 @@
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
+import org.hornetq.SimpleString;
import org.hornetq.core.logging.Logger;
import org.hornetq.core.postoffice.Address;
import org.hornetq.core.postoffice.AddressManager;
import org.hornetq.core.postoffice.Binding;
import org.hornetq.core.postoffice.Bindings;
import org.hornetq.core.postoffice.BindingsFactory;
-import org.hornetq.utils.SimpleString;
/**
* A simple address manager that maintains the addresses and bindings.
Modified: trunk/src/main/org/hornetq/core/postoffice/impl/WildcardAddressManager.java
===================================================================
--- trunk/src/main/org/hornetq/core/postoffice/impl/WildcardAddressManager.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/postoffice/impl/WildcardAddressManager.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -17,12 +17,12 @@
import java.util.List;
import java.util.Map;
+import org.hornetq.SimpleString;
import org.hornetq.core.logging.Logger;
import org.hornetq.core.postoffice.Address;
import org.hornetq.core.postoffice.Binding;
import org.hornetq.core.postoffice.Bindings;
import org.hornetq.core.postoffice.BindingsFactory;
-import org.hornetq.utils.SimpleString;
/**
* extends the simple manager to allow wildcard addresses to be used.
Modified: trunk/src/main/org/hornetq/core/remoting/impl/invm/InVMAcceptor.java
===================================================================
--- trunk/src/main/org/hornetq/core/remoting/impl/invm/InVMAcceptor.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/remoting/impl/invm/InVMAcceptor.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -17,6 +17,7 @@
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.Executor;
+import org.hornetq.SimpleString;
import org.hornetq.core.exception.HornetQException;
import org.hornetq.core.logging.Logger;
import org.hornetq.core.management.NotificationType;
@@ -29,7 +30,6 @@
import org.hornetq.utils.ConfigurationHelper;
import org.hornetq.utils.ExecutorFactory;
import org.hornetq.utils.OrderedExecutorFactory;
-import org.hornetq.utils.SimpleString;
import org.hornetq.utils.TypedProperties;
/**
Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/CreateQueueMessage.java
===================================================================
--- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/CreateQueueMessage.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/CreateQueueMessage.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -13,9 +13,9 @@
package org.hornetq.core.remoting.impl.wireformat;
+import org.hornetq.SimpleString;
import org.hornetq.core.buffers.HornetQBuffer;
import org.hornetq.core.logging.Logger;
-import org.hornetq.utils.SimpleString;
/**
* @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a>
Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationPageEventMessage.java
===================================================================
--- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationPageEventMessage.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationPageEventMessage.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -13,8 +13,8 @@
package org.hornetq.core.remoting.impl.wireformat;
+import org.hornetq.SimpleString;
import org.hornetq.core.buffers.HornetQBuffer;
-import org.hornetq.utils.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 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionBindingQueryMessage.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -13,8 +13,8 @@
package org.hornetq.core.remoting.impl.wireformat;
+import org.hornetq.SimpleString;
import org.hornetq.core.buffers.HornetQBuffer;
-import org.hornetq.utils.SimpleString;
/**
*
Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionBindingQueryResponseMessage.java
===================================================================
--- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionBindingQueryResponseMessage.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionBindingQueryResponseMessage.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -16,8 +16,8 @@
import java.util.ArrayList;
import java.util.List;
+import org.hornetq.SimpleString;
import org.hornetq.core.buffers.HornetQBuffer;
-import org.hornetq.utils.SimpleString;
/**
*
Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionCreateConsumerMessage.java
===================================================================
--- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionCreateConsumerMessage.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionCreateConsumerMessage.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -13,8 +13,8 @@
package org.hornetq.core.remoting.impl.wireformat;
+import org.hornetq.SimpleString;
import org.hornetq.core.buffers.HornetQBuffer;
-import org.hornetq.utils.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 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionDeleteQueueMessage.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -13,8 +13,8 @@
package org.hornetq.core.remoting.impl.wireformat;
+import org.hornetq.SimpleString;
import org.hornetq.core.buffers.HornetQBuffer;
-import org.hornetq.utils.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 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionProducerCreditsMessage.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -13,8 +13,8 @@
package org.hornetq.core.remoting.impl.wireformat;
+import org.hornetq.SimpleString;
import org.hornetq.core.buffers.HornetQBuffer;
-import org.hornetq.utils.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 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionQueueQueryMessage.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -13,8 +13,8 @@
package org.hornetq.core.remoting.impl.wireformat;
+import org.hornetq.SimpleString;
import org.hornetq.core.buffers.HornetQBuffer;
-import org.hornetq.utils.SimpleString;
/**
*
Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionQueueQueryResponseMessage.java
===================================================================
--- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionQueueQueryResponseMessage.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionQueueQueryResponseMessage.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -13,8 +13,8 @@
package org.hornetq.core.remoting.impl.wireformat;
+import org.hornetq.SimpleString;
import org.hornetq.core.buffers.HornetQBuffer;
-import org.hornetq.utils.SimpleString;
/**
*
Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionRequestProducerCreditsMessage.java
===================================================================
--- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionRequestProducerCreditsMessage.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionRequestProducerCreditsMessage.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -13,8 +13,8 @@
package org.hornetq.core.remoting.impl.wireformat;
+import org.hornetq.SimpleString;
import org.hornetq.core.buffers.HornetQBuffer;
-import org.hornetq.utils.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 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/replication/ReplicationManager.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -15,13 +15,13 @@
import java.util.Set;
+import org.hornetq.SimpleString;
import org.hornetq.core.exception.HornetQException;
import org.hornetq.core.journal.EncodingSupport;
import org.hornetq.core.journal.JournalLoadInformation;
import org.hornetq.core.paging.PagedMessage;
import org.hornetq.core.persistence.OperationContext;
import org.hornetq.core.server.HornetQComponent;
-import org.hornetq.utils.SimpleString;
/**
* @author <mailto:clebert.suconic@jboss.org">Clebert Suconic</a>
Modified: trunk/src/main/org/hornetq/core/replication/impl/ReplicationEndpointImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/replication/impl/ReplicationEndpointImpl.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/replication/impl/ReplicationEndpointImpl.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -16,6 +16,7 @@
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
+import org.hornetq.SimpleString;
import org.hornetq.core.config.Configuration;
import org.hornetq.core.exception.HornetQException;
import org.hornetq.core.journal.Journal;
@@ -49,7 +50,6 @@
import org.hornetq.core.server.HornetQServer;
import org.hornetq.core.server.LargeServerMessage;
import org.hornetq.core.server.ServerMessage;
-import org.hornetq.utils.SimpleString;
/**
*
Modified: trunk/src/main/org/hornetq/core/replication/impl/ReplicationManagerImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/replication/impl/ReplicationManagerImpl.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/replication/impl/ReplicationManagerImpl.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -18,6 +18,7 @@
import java.util.Set;
import java.util.concurrent.ConcurrentLinkedQueue;
+import org.hornetq.SimpleString;
import org.hornetq.core.buffers.HornetQBuffer;
import org.hornetq.core.client.SessionFailureListener;
import org.hornetq.core.client.impl.FailoverManager;
@@ -48,7 +49,6 @@
import org.hornetq.core.remoting.impl.wireformat.ReplicationPrepareMessage;
import org.hornetq.core.replication.ReplicationManager;
import org.hornetq.utils.ExecutorFactory;
-import org.hornetq.utils.SimpleString;
/**
* A RepplicationManagerImpl
Modified: trunk/src/main/org/hornetq/core/security/SecurityStore.java
===================================================================
--- trunk/src/main/org/hornetq/core/security/SecurityStore.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/security/SecurityStore.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -13,8 +13,8 @@
package org.hornetq.core.security;
+import org.hornetq.SimpleString;
import org.hornetq.core.server.ServerSession;
-import org.hornetq.utils.SimpleString;
/**
* @author <a href="mailto:ovidiu@feodorov.com">Ovidiu Feodorov</a>
Modified: trunk/src/main/org/hornetq/core/security/impl/SecurityStoreImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/security/impl/SecurityStoreImpl.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/security/impl/SecurityStoreImpl.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -19,6 +19,7 @@
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.management.impl.ManagementHelper;
import org.hornetq.core.exception.HornetQException;
import org.hornetq.core.logging.Logger;
@@ -33,7 +34,6 @@
import org.hornetq.core.settings.HierarchicalRepository;
import org.hornetq.core.settings.HierarchicalRepositoryChangeListener;
import org.hornetq.utils.ConcurrentHashSet;
-import org.hornetq.utils.SimpleString;
import org.hornetq.utils.TypedProperties;
/**
Modified: trunk/src/main/org/hornetq/core/server/Divert.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/Divert.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/server/Divert.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -13,8 +13,8 @@
package org.hornetq.core.server;
+import org.hornetq.SimpleString;
import org.hornetq.core.filter.Filter;
-import org.hornetq.utils.SimpleString;
/**
* A Divert
Modified: trunk/src/main/org/hornetq/core/server/HornetQServer.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/HornetQServer.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/server/HornetQServer.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -18,6 +18,7 @@
import javax.management.MBeanServer;
+import org.hornetq.SimpleString;
import org.hornetq.core.config.Configuration;
import org.hornetq.core.management.impl.HornetQServerControlImpl;
import org.hornetq.core.persistence.StorageManager;
@@ -38,7 +39,6 @@
import org.hornetq.core.transaction.ResourceManager;
import org.hornetq.core.version.Version;
import org.hornetq.utils.ExecutorFactory;
-import org.hornetq.utils.SimpleString;
/**
* This interface defines the internal interface of the HornetQ Server exposed to other components of the server. The
Modified: trunk/src/main/org/hornetq/core/server/Queue.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/Queue.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/server/Queue.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -18,9 +18,9 @@
import java.util.List;
import java.util.concurrent.Executor;
+import org.hornetq.SimpleString;
import org.hornetq.core.filter.Filter;
import org.hornetq.core.transaction.Transaction;
-import org.hornetq.utils.SimpleString;
/**
*
Modified: trunk/src/main/org/hornetq/core/server/QueueFactory.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/QueueFactory.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/server/QueueFactory.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -13,9 +13,9 @@
package org.hornetq.core.server;
+import org.hornetq.SimpleString;
import org.hornetq.core.filter.Filter;
import org.hornetq.core.postoffice.PostOffice;
-import org.hornetq.utils.SimpleString;
/**
*
Modified: trunk/src/main/org/hornetq/core/server/cluster/Bridge.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/cluster/Bridge.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/server/cluster/Bridge.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -13,12 +13,12 @@
package org.hornetq.core.server.cluster;
+import org.hornetq.SimpleString;
import org.hornetq.core.remoting.RemotingConnection;
import org.hornetq.core.server.Consumer;
import org.hornetq.core.server.HornetQComponent;
import org.hornetq.core.server.Queue;
import org.hornetq.core.server.management.NotificationService;
-import org.hornetq.utils.SimpleString;
/**
* A Core Bridge
Modified: trunk/src/main/org/hornetq/core/server/cluster/BroadcastGroup.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/cluster/BroadcastGroup.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/server/cluster/BroadcastGroup.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -13,10 +13,10 @@
package org.hornetq.core.server.cluster;
+import org.hornetq.Pair;
import org.hornetq.core.config.TransportConfiguration;
import org.hornetq.core.server.HornetQComponent;
import org.hornetq.core.server.management.NotificationService;
-import org.hornetq.utils.Pair;
/**
* A BroadcastGroup
Modified: trunk/src/main/org/hornetq/core/server/cluster/ClusterConnection.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/cluster/ClusterConnection.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/server/cluster/ClusterConnection.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -15,8 +15,8 @@
import java.util.Map;
+import org.hornetq.SimpleString;
import org.hornetq.core.server.HornetQComponent;
-import org.hornetq.utils.SimpleString;
/**
* A ClusterConnection
Modified: trunk/src/main/org/hornetq/core/server/cluster/ClusterManager.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/cluster/ClusterManager.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/server/cluster/ClusterManager.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -16,8 +16,8 @@
import java.util.Map;
import java.util.Set;
+import org.hornetq.SimpleString;
import org.hornetq.core.server.HornetQComponent;
-import org.hornetq.utils.SimpleString;
/**
* A ClusterManager
Modified: trunk/src/main/org/hornetq/core/server/cluster/RemoteQueueBinding.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/cluster/RemoteQueueBinding.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/server/cluster/RemoteQueueBinding.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -13,8 +13,8 @@
package org.hornetq.core.server.cluster;
+import org.hornetq.SimpleString;
import org.hornetq.core.postoffice.QueueBinding;
-import org.hornetq.utils.SimpleString;
/**
* A RemoteQueueBinding
Modified: trunk/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -20,6 +20,8 @@
import java.util.concurrent.Executor;
import java.util.concurrent.ScheduledExecutorService;
+import org.hornetq.Pair;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -51,8 +53,6 @@
import org.hornetq.core.server.management.Notification;
import org.hornetq.core.server.management.NotificationService;
import org.hornetq.utils.Future;
-import org.hornetq.utils.Pair;
-import org.hornetq.utils.SimpleString;
import org.hornetq.utils.TypedProperties;
import org.hornetq.utils.UUID;
import org.hornetq.utils.UUIDGenerator;
Modified: trunk/src/main/org/hornetq/core/server/cluster/impl/BroadcastGroupImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/cluster/impl/BroadcastGroupImpl.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/server/cluster/impl/BroadcastGroupImpl.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -20,6 +20,8 @@
import java.util.List;
import java.util.concurrent.ScheduledFuture;
+import org.hornetq.Pair;
+import org.hornetq.SimpleString;
import org.hornetq.core.buffers.HornetQBuffer;
import org.hornetq.core.buffers.HornetQBuffers;
import org.hornetq.core.config.TransportConfiguration;
@@ -28,8 +30,6 @@
import org.hornetq.core.server.cluster.BroadcastGroup;
import org.hornetq.core.server.management.Notification;
import org.hornetq.core.server.management.NotificationService;
-import org.hornetq.utils.Pair;
-import org.hornetq.utils.SimpleString;
import org.hornetq.utils.TypedProperties;
import org.hornetq.utils.UUIDGenerator;
Modified: trunk/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -24,6 +24,8 @@
import java.util.Map.Entry;
import java.util.concurrent.ScheduledExecutorService;
+import org.hornetq.Pair;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.management.impl.ManagementHelper;
import org.hornetq.core.cluster.DiscoveryEntry;
@@ -47,8 +49,6 @@
import org.hornetq.core.server.management.ManagementService;
import org.hornetq.core.server.management.Notification;
import org.hornetq.utils.ExecutorFactory;
-import org.hornetq.utils.Pair;
-import org.hornetq.utils.SimpleString;
import org.hornetq.utils.TypedProperties;
import org.hornetq.utils.UUID;
Modified: trunk/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -25,6 +25,8 @@
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledFuture;
+import org.hornetq.Pair;
+import org.hornetq.SimpleString;
import org.hornetq.core.cluster.DiscoveryGroup;
import org.hornetq.core.cluster.impl.DiscoveryGroupImpl;
import org.hornetq.core.config.Configuration;
@@ -44,8 +46,6 @@
import org.hornetq.core.server.cluster.ClusterManager;
import org.hornetq.core.server.cluster.Transformer;
import org.hornetq.core.server.management.ManagementService;
-import org.hornetq.utils.Pair;
-import org.hornetq.utils.SimpleString;
import org.hornetq.utils.UUID;
/**
Modified: trunk/src/main/org/hornetq/core/server/cluster/impl/RemoteQueueBindingImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/cluster/impl/RemoteQueueBindingImpl.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/server/cluster/impl/RemoteQueueBindingImpl.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -19,6 +19,7 @@
import java.util.Map;
import java.util.Set;
+import org.hornetq.SimpleString;
import org.hornetq.core.filter.Filter;
import org.hornetq.core.filter.impl.FilterImpl;
import org.hornetq.core.logging.Logger;
@@ -29,7 +30,6 @@
import org.hornetq.core.server.RoutingContext;
import org.hornetq.core.server.ServerMessage;
import org.hornetq.core.server.cluster.RemoteQueueBinding;
-import org.hornetq.utils.SimpleString;
/**
* A RemoteQueueBindingImpl
Modified: trunk/src/main/org/hornetq/core/server/group/GroupingHandler.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/group/GroupingHandler.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/server/group/GroupingHandler.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -12,11 +12,11 @@
*/
package org.hornetq.core.server.group;
+import org.hornetq.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;
import org.hornetq.core.server.management.NotificationListener;
-import org.hornetq.utils.SimpleString;
/**
* @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
Modified: trunk/src/main/org/hornetq/core/server/group/impl/GroupBinding.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/group/impl/GroupBinding.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/server/group/impl/GroupBinding.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -12,7 +12,7 @@
*/
package org.hornetq.core.server.group.impl;
-import org.hornetq.utils.SimpleString;
+import org.hornetq.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 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/server/group/impl/GroupingHandlerConfiguration.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -12,7 +12,7 @@
*/
package org.hornetq.core.server.group.impl;
-import org.hornetq.utils.SimpleString;
+import org.hornetq.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 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/server/group/impl/LocalGroupingHandler.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -16,6 +16,7 @@
import java.util.List;
import java.util.concurrent.ConcurrentHashMap;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.management.impl.ManagementHelper;
import org.hornetq.core.logging.Logger;
import org.hornetq.core.management.NotificationType;
@@ -24,7 +25,6 @@
import org.hornetq.core.server.group.GroupingHandler;
import org.hornetq.core.server.management.ManagementService;
import org.hornetq.core.server.management.Notification;
-import org.hornetq.utils.SimpleString;
import org.hornetq.utils.TypedProperties;
/**
Modified: trunk/src/main/org/hornetq/core/server/group/impl/Proposal.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/group/impl/Proposal.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/server/group/impl/Proposal.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -12,7 +12,7 @@
*/
package org.hornetq.core.server.group.impl;
-import org.hornetq.utils.SimpleString;
+import org.hornetq.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 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/server/group/impl/RemoteGroupingHandler.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -23,13 +23,13 @@
import java.util.concurrent.locks.ReentrantLock;
import java.util.logging.Logger;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.management.impl.ManagementHelper;
import org.hornetq.core.management.NotificationType;
import org.hornetq.core.postoffice.BindingType;
import org.hornetq.core.server.group.GroupingHandler;
import org.hornetq.core.server.management.ManagementService;
import org.hornetq.core.server.management.Notification;
-import org.hornetq.utils.SimpleString;
import org.hornetq.utils.TypedProperties;
/**
Modified: trunk/src/main/org/hornetq/core/server/group/impl/Response.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/group/impl/Response.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/server/group/impl/Response.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -12,7 +12,7 @@
*/
package org.hornetq.core.server.group.impl;
-import org.hornetq.utils.SimpleString;
+import org.hornetq.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 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/server/impl/DivertImpl.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -13,6 +13,7 @@
package org.hornetq.core.server.impl;
+import org.hornetq.SimpleString;
import org.hornetq.core.filter.Filter;
import org.hornetq.core.logging.Logger;
import org.hornetq.core.persistence.StorageManager;
@@ -21,7 +22,6 @@
import org.hornetq.core.server.RoutingContext;
import org.hornetq.core.server.ServerMessage;
import org.hornetq.core.server.cluster.Transformer;
-import org.hornetq.utils.SimpleString;
/**
* A DivertImpl simply diverts a message to a different forwardAddress
Modified: trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -32,6 +32,8 @@
import javax.management.MBeanServer;
+import org.hornetq.Pair;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientSessionFactory;
import org.hornetq.core.client.impl.ClientSessionFactoryImpl;
import org.hornetq.core.client.impl.FailoverManager;
@@ -111,8 +113,6 @@
import org.hornetq.utils.ExecutorFactory;
import org.hornetq.utils.HornetQThreadFactory;
import org.hornetq.utils.OrderedExecutorFactory;
-import org.hornetq.utils.Pair;
-import org.hornetq.utils.SimpleString;
import org.hornetq.utils.UUID;
import org.hornetq.utils.UUIDGenerator;
import org.hornetq.utils.VersionLoader;
Modified: trunk/src/main/org/hornetq/core/server/impl/LastValueQueue.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/impl/LastValueQueue.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/server/impl/LastValueQueue.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -16,6 +16,7 @@
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ScheduledExecutorService;
+import org.hornetq.SimpleString;
import org.hornetq.core.filter.Filter;
import org.hornetq.core.logging.Logger;
import org.hornetq.core.message.impl.MessageImpl;
@@ -26,7 +27,6 @@
import org.hornetq.core.server.ServerMessage;
import org.hornetq.core.settings.HierarchicalRepository;
import org.hornetq.core.settings.impl.AddressSettings;
-import org.hornetq.utils.SimpleString;
/**
* A queue that will discard messages if a newer message with the same MessageImpl.HDR_LAST_VALUE_NAME property value.
Modified: trunk/src/main/org/hornetq/core/server/impl/QueueFactoryImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/impl/QueueFactoryImpl.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/server/impl/QueueFactoryImpl.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -15,6 +15,7 @@
import java.util.concurrent.ScheduledExecutorService;
+import org.hornetq.SimpleString;
import org.hornetq.core.filter.Filter;
import org.hornetq.core.persistence.StorageManager;
import org.hornetq.core.postoffice.PostOffice;
@@ -23,7 +24,6 @@
import org.hornetq.core.settings.HierarchicalRepository;
import org.hornetq.core.settings.impl.AddressSettings;
import org.hornetq.utils.ExecutorFactory;
-import org.hornetq.utils.SimpleString;
/**
*
Modified: trunk/src/main/org/hornetq/core/server/impl/QueueImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/impl/QueueImpl.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/server/impl/QueueImpl.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -30,6 +30,7 @@
import java.util.concurrent.atomic.AtomicBoolean;
import java.util.concurrent.atomic.AtomicInteger;
+import org.hornetq.SimpleString;
import org.hornetq.core.filter.Filter;
import org.hornetq.core.list.PriorityLinkedList;
import org.hornetq.core.list.impl.PriorityLinkedListImpl;
@@ -54,7 +55,6 @@
import org.hornetq.core.transaction.impl.TransactionImpl;
import org.hornetq.utils.ConcurrentHashSet;
import org.hornetq.utils.ConcurrentSet;
-import org.hornetq.utils.SimpleString;
/**
* Implementation of a Queue
Modified: trunk/src/main/org/hornetq/core/server/impl/ServerInfo.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/impl/ServerInfo.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/server/impl/ServerInfo.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -17,10 +17,10 @@
import java.lang.management.ThreadMXBean;
import java.util.Date;
+import org.hornetq.SimpleString;
import org.hornetq.core.paging.PagingManager;
import org.hornetq.core.paging.PagingStore;
import org.hornetq.core.server.HornetQServer;
-import org.hornetq.utils.SimpleString;
import org.hornetq.utils.SizeFormatterUtil;
/**
Modified: trunk/src/main/org/hornetq/core/server/impl/ServerMessageImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/impl/ServerMessageImpl.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/server/impl/ServerMessageImpl.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -16,6 +16,7 @@
import java.io.InputStream;
import java.util.concurrent.atomic.AtomicInteger;
+import org.hornetq.SimpleString;
import org.hornetq.core.logging.Logger;
import org.hornetq.core.message.impl.MessageImpl;
import org.hornetq.core.paging.PagingStore;
@@ -25,7 +26,6 @@
import org.hornetq.core.server.ServerMessage;
import org.hornetq.utils.DataConstants;
import org.hornetq.utils.MemorySize;
-import org.hornetq.utils.SimpleString;
/**
*
Modified: trunk/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -28,6 +28,7 @@
import javax.transaction.xa.XAResource;
import javax.transaction.xa.Xid;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.impl.ClientMessageImpl;
import org.hornetq.core.client.management.impl.ManagementHelper;
import org.hornetq.core.exception.HornetQException;
@@ -96,7 +97,6 @@
import org.hornetq.core.transaction.ResourceManager;
import org.hornetq.core.transaction.Transaction;
import org.hornetq.core.transaction.impl.TransactionImpl;
-import org.hornetq.utils.SimpleString;
import org.hornetq.utils.TypedProperties;
/*
Modified: trunk/src/main/org/hornetq/core/server/management/ManagementService.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/management/ManagementService.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/server/management/ManagementService.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -18,6 +18,7 @@
import javax.management.ObjectName;
+import org.hornetq.SimpleString;
import org.hornetq.core.cluster.DiscoveryGroup;
import org.hornetq.core.config.Configuration;
import org.hornetq.core.config.TransportConfiguration;
@@ -47,7 +48,6 @@
import org.hornetq.core.settings.HierarchicalRepository;
import org.hornetq.core.settings.impl.AddressSettings;
import org.hornetq.core.transaction.ResourceManager;
-import org.hornetq.utils.SimpleString;
/**
* @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a>
Modified: trunk/src/main/org/hornetq/core/server/management/impl/ManagementServiceImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/management/impl/ManagementServiceImpl.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/server/management/impl/ManagementServiceImpl.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -28,6 +28,7 @@
import javax.management.ObjectName;
import javax.management.StandardMBean;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.management.impl.ManagementHelper;
import org.hornetq.core.cluster.DiscoveryGroup;
import org.hornetq.core.config.Configuration;
@@ -80,7 +81,6 @@
import org.hornetq.core.settings.HierarchicalRepository;
import org.hornetq.core.settings.impl.AddressSettings;
import org.hornetq.core.transaction.ResourceManager;
-import org.hornetq.utils.SimpleString;
import org.hornetq.utils.TypedProperties;
/*
Modified: trunk/src/main/org/hornetq/core/settings/impl/AddressSettings.java
===================================================================
--- trunk/src/main/org/hornetq/core/settings/impl/AddressSettings.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/core/settings/impl/AddressSettings.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -13,9 +13,9 @@
package org.hornetq.core.settings.impl;
+import org.hornetq.SimpleString;
import org.hornetq.core.logging.Logger;
import org.hornetq.core.settings.Mergeable;
-import org.hornetq.utils.SimpleString;
/**
* Configuration settings that are applied on the address level
Modified: trunk/src/main/org/hornetq/integration/transports/netty/NettyAcceptor.java
===================================================================
--- trunk/src/main/org/hornetq/integration/transports/netty/NettyAcceptor.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/integration/transports/netty/NettyAcceptor.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -26,6 +26,7 @@
import javax.net.ssl.SSLContext;
+import org.hornetq.SimpleString;
import org.hornetq.core.config.TransportConfiguration;
import org.hornetq.core.exception.HornetQException;
import org.hornetq.core.logging.Logger;
@@ -38,7 +39,6 @@
import org.hornetq.core.server.management.Notification;
import org.hornetq.core.server.management.NotificationService;
import org.hornetq.utils.ConfigurationHelper;
-import org.hornetq.utils.SimpleString;
import org.hornetq.utils.TypedProperties;
import org.hornetq.utils.VersionLoader;
import org.jboss.netty.bootstrap.ServerBootstrap;
Modified: trunk/src/main/org/hornetq/jms/HornetQDestination.java
===================================================================
--- trunk/src/main/org/hornetq/jms/HornetQDestination.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/jms/HornetQDestination.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -20,9 +20,9 @@
import javax.naming.Reference;
import javax.naming.Referenceable;
+import org.hornetq.SimpleString;
import org.hornetq.jms.referenceable.DestinationObjectFactory;
import org.hornetq.jms.referenceable.SerializableObjectRefAddr;
-import org.hornetq.utils.SimpleString;
/**
* HornetQ implementation of a JMS Destination.
Modified: trunk/src/main/org/hornetq/jms/HornetQQueue.java
===================================================================
--- trunk/src/main/org/hornetq/jms/HornetQQueue.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/jms/HornetQQueue.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -16,8 +16,8 @@
import javax.jms.JMSException;
import javax.jms.Queue;
+import org.hornetq.SimpleString;
import org.hornetq.core.logging.Logger;
-import org.hornetq.utils.SimpleString;
/**
* HornetQ implementation of a JMS Queue.
Modified: trunk/src/main/org/hornetq/jms/HornetQTopic.java
===================================================================
--- trunk/src/main/org/hornetq/jms/HornetQTopic.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/jms/HornetQTopic.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -16,8 +16,8 @@
import javax.jms.JMSException;
import javax.jms.Topic;
-import org.hornetq.utils.Pair;
-import org.hornetq.utils.SimpleString;
+import org.hornetq.Pair;
+import org.hornetq.SimpleString;
/**
* HornetQ implementation of a JMS Topic.
Modified: trunk/src/main/org/hornetq/jms/client/HornetQConnection.java
===================================================================
--- trunk/src/main/org/hornetq/jms/client/HornetQConnection.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/jms/client/HornetQConnection.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -39,13 +39,13 @@
import javax.jms.XATopicConnection;
import javax.jms.XATopicSession;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientSession;
import org.hornetq.core.client.ClientSessionFactory;
import org.hornetq.core.client.SessionFailureListener;
import org.hornetq.core.exception.HornetQException;
import org.hornetq.core.logging.Logger;
import org.hornetq.core.version.Version;
-import org.hornetq.utils.SimpleString;
import org.hornetq.utils.UUIDGenerator;
import org.hornetq.utils.VersionLoader;
Modified: trunk/src/main/org/hornetq/jms/client/HornetQConnectionFactory.java
===================================================================
--- trunk/src/main/org/hornetq/jms/client/HornetQConnectionFactory.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/jms/client/HornetQConnectionFactory.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -33,13 +33,13 @@
import javax.naming.Reference;
import javax.naming.Referenceable;
+import org.hornetq.Pair;
import org.hornetq.core.client.ClientSessionFactory;
import org.hornetq.core.client.impl.ClientSessionFactoryImpl;
import org.hornetq.core.config.TransportConfiguration;
import org.hornetq.core.logging.Logger;
import org.hornetq.jms.referenceable.ConnectionFactoryObjectFactory;
import org.hornetq.jms.referenceable.SerializableObjectRefAddr;
-import org.hornetq.utils.Pair;
/**
* HornetQ implementation of a JMS ConnectionFactory.
Modified: trunk/src/main/org/hornetq/jms/client/HornetQMapMessage.java
===================================================================
--- trunk/src/main/org/hornetq/jms/client/HornetQMapMessage.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/jms/client/HornetQMapMessage.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -22,10 +22,10 @@
import javax.jms.MapMessage;
import javax.jms.MessageFormatException;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientSession;
import org.hornetq.core.message.PropertyConversionException;
-import org.hornetq.utils.SimpleString;
import org.hornetq.utils.TypedProperties;
/**
Modified: trunk/src/main/org/hornetq/jms/client/HornetQMessage.java
===================================================================
--- trunk/src/main/org/hornetq/jms/client/HornetQMessage.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/jms/client/HornetQMessage.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -33,6 +33,7 @@
import javax.jms.MessageNotReadableException;
import javax.jms.MessageNotWriteableException;
+import org.hornetq.SimpleString;
import org.hornetq.core.buffers.HornetQBuffer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientSession;
@@ -42,7 +43,6 @@
import org.hornetq.core.message.PropertyConversionException;
import org.hornetq.core.message.impl.MessageImpl;
import org.hornetq.jms.HornetQDestination;
-import org.hornetq.utils.SimpleString;
/**
* HornetQ implementation of a JMS Message.
Modified: trunk/src/main/org/hornetq/jms/client/HornetQMessageConsumer.java
===================================================================
--- trunk/src/main/org/hornetq/jms/client/HornetQMessageConsumer.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/jms/client/HornetQMessageConsumer.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -24,13 +24,13 @@
import javax.jms.Topic;
import javax.jms.TopicSubscriber;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.MessageHandler;
import org.hornetq.core.exception.HornetQException;
import org.hornetq.core.logging.Logger;
import org.hornetq.jms.HornetQDestination;
-import org.hornetq.utils.SimpleString;
/**
* HornetQ implementation of a JMS MessageConsumer.
Modified: trunk/src/main/org/hornetq/jms/client/HornetQMessageProducer.java
===================================================================
--- trunk/src/main/org/hornetq/jms/client/HornetQMessageProducer.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/jms/client/HornetQMessageProducer.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -30,13 +30,13 @@
import javax.jms.Topic;
import javax.jms.TopicPublisher;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
import org.hornetq.core.client.ClientSession;
import org.hornetq.core.exception.HornetQException;
import org.hornetq.core.logging.Logger;
import org.hornetq.jms.HornetQDestination;
-import org.hornetq.utils.SimpleString;
import org.hornetq.utils.UUIDGenerator;
/**
Modified: trunk/src/main/org/hornetq/jms/client/HornetQQueueBrowser.java
===================================================================
--- trunk/src/main/org/hornetq/jms/client/HornetQQueueBrowser.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/jms/client/HornetQQueueBrowser.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -20,13 +20,13 @@
import javax.jms.Queue;
import javax.jms.QueueBrowser;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientSession;
import org.hornetq.core.exception.HornetQException;
import org.hornetq.core.logging.Logger;
import org.hornetq.jms.HornetQQueue;
-import org.hornetq.utils.SimpleString;
/**
* HornetQ implementation of a JMS QueueBrowser.
Modified: trunk/src/main/org/hornetq/jms/client/HornetQSession.java
===================================================================
--- trunk/src/main/org/hornetq/jms/client/HornetQSession.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/jms/client/HornetQSession.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -50,6 +50,7 @@
import javax.jms.XATopicSession;
import javax.transaction.xa.XAResource;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientProducer;
import org.hornetq.core.client.ClientSession;
@@ -63,7 +64,6 @@
import org.hornetq.jms.HornetQTemporaryQueue;
import org.hornetq.jms.HornetQTemporaryTopic;
import org.hornetq.jms.HornetQTopic;
-import org.hornetq.utils.SimpleString;
/**
* HornetQ implementation of a JMS Session.
Modified: trunk/src/main/org/hornetq/jms/client/HornetQTextMessage.java
===================================================================
--- trunk/src/main/org/hornetq/jms/client/HornetQTextMessage.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/jms/client/HornetQTextMessage.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -16,11 +16,11 @@
import javax.jms.JMSException;
import javax.jms.TextMessage;
+import org.hornetq.SimpleString;
import org.hornetq.core.buffers.HornetQBuffer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientSession;
import org.hornetq.core.logging.Logger;
-import org.hornetq.utils.SimpleString;
/**
* HornetQ implementation of a JMS TextMessage.
Modified: trunk/src/main/org/hornetq/jms/management/impl/JMSServerControlImpl.java
===================================================================
--- trunk/src/main/org/hornetq/jms/management/impl/JMSServerControlImpl.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/jms/management/impl/JMSServerControlImpl.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -28,6 +28,7 @@
import javax.management.NotificationListener;
import javax.management.StandardMBean;
+import org.hornetq.Pair;
import org.hornetq.core.client.management.impl.ManagementHelper;
import org.hornetq.core.config.TransportConfiguration;
import org.hornetq.core.management.impl.MBeanInfoHelper;
@@ -36,7 +37,6 @@
import org.hornetq.jms.management.JMSServerControl;
import org.hornetq.jms.management.TopicControl;
import org.hornetq.jms.server.JMSServerManager;
-import org.hornetq.utils.Pair;
/**
* @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a>
Modified: trunk/src/main/org/hornetq/jms/management/impl/JMSTopicControlImpl.java
===================================================================
--- trunk/src/main/org/hornetq/jms/management/impl/JMSTopicControlImpl.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/jms/management/impl/JMSTopicControlImpl.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -21,6 +21,7 @@
import javax.management.MBeanInfo;
import javax.management.StandardMBean;
+import org.hornetq.Pair;
import org.hornetq.core.exception.HornetQException;
import org.hornetq.core.logging.Logger;
import org.hornetq.core.management.AddressControl;
@@ -34,7 +35,6 @@
import org.hornetq.jms.client.SelectorTranslator;
import org.hornetq.jms.management.JMSQueueControl;
import org.hornetq.jms.management.TopicControl;
-import org.hornetq.utils.Pair;
import org.hornetq.utils.json.JSONArray;
import org.hornetq.utils.json.JSONObject;
Modified: trunk/src/main/org/hornetq/jms/server/JMSServerManager.java
===================================================================
--- trunk/src/main/org/hornetq/jms/server/JMSServerManager.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/jms/server/JMSServerManager.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -17,10 +17,10 @@
import javax.naming.Context;
+import org.hornetq.Pair;
import org.hornetq.core.config.TransportConfiguration;
import org.hornetq.core.server.HornetQComponent;
import org.hornetq.core.server.HornetQServer;
-import org.hornetq.utils.Pair;
/**
* The JMS Management interface.
Modified: trunk/src/main/org/hornetq/jms/server/config/ConnectionFactoryConfiguration.java
===================================================================
--- trunk/src/main/org/hornetq/jms/server/config/ConnectionFactoryConfiguration.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/jms/server/config/ConnectionFactoryConfiguration.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -15,8 +15,8 @@
import java.util.List;
+import org.hornetq.Pair;
import org.hornetq.core.config.TransportConfiguration;
-import org.hornetq.utils.Pair;
/**
* A ConnectionFactoryConfiguration
Modified: trunk/src/main/org/hornetq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java
===================================================================
--- trunk/src/main/org/hornetq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -16,10 +16,10 @@
import java.util.ArrayList;
import java.util.List;
+import org.hornetq.Pair;
import org.hornetq.core.client.impl.ClientSessionFactoryImpl;
import org.hornetq.core.config.TransportConfiguration;
import org.hornetq.jms.server.config.ConnectionFactoryConfiguration;
-import org.hornetq.utils.Pair;
/**
* A ConnectionFactoryConfigurationImpl
Modified: trunk/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java
===================================================================
--- trunk/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -16,6 +16,7 @@
import java.util.ArrayList;
import java.util.List;
+import org.hornetq.Pair;
import org.hornetq.core.client.impl.ClientSessionFactoryImpl;
import org.hornetq.core.config.Configuration;
import org.hornetq.core.config.TransportConfiguration;
@@ -25,7 +26,6 @@
import org.hornetq.core.deployers.impl.XmlDeployer;
import org.hornetq.core.logging.Logger;
import org.hornetq.jms.server.JMSServerManager;
-import org.hornetq.utils.Pair;
import org.hornetq.utils.XMLConfigurationUtil;
import org.w3c.dom.Element;
import org.w3c.dom.NamedNodeMap;
Modified: trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java
===================================================================
--- trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -26,6 +26,7 @@
import javax.naming.NameNotFoundException;
import javax.naming.NamingException;
+import org.hornetq.Pair;
import org.hornetq.core.config.TransportConfiguration;
import org.hornetq.core.deployers.DeploymentManager;
import org.hornetq.core.deployers.impl.FileDeploymentManager;
@@ -44,7 +45,6 @@
import org.hornetq.jms.server.config.TopicConfiguration;
import org.hornetq.jms.server.management.JMSManagementService;
import org.hornetq.jms.server.management.impl.JMSManagementServiceImpl;
-import org.hornetq.utils.Pair;
/**
* A Deployer used to create and add to JNDI queues, topics and connection
Added: trunk/src/main/org/hornetq/package-info.java
===================================================================
--- trunk/src/main/org/hornetq/package-info.java (rev 0)
+++ trunk/src/main/org/hornetq/package-info.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -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 base classes.
+ * <br>
+ * 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 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/ra/inflow/HornetQActivation.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -29,6 +29,7 @@
import javax.resource.spi.work.Work;
import javax.resource.spi.work.WorkManager;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientSession;
import org.hornetq.core.logging.Logger;
import org.hornetq.jms.HornetQDestination;
@@ -36,7 +37,6 @@
import org.hornetq.jms.HornetQTopic;
import org.hornetq.ra.HornetQResourceAdapter;
import org.hornetq.ra.Util;
-import org.hornetq.utils.SimpleString;
/**
* The activation.
Modified: trunk/src/main/org/hornetq/ra/inflow/HornetQMessageHandler.java
===================================================================
--- trunk/src/main/org/hornetq/ra/inflow/HornetQMessageHandler.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/ra/inflow/HornetQMessageHandler.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -20,6 +20,7 @@
import javax.resource.spi.endpoint.MessageEndpoint;
import javax.resource.spi.endpoint.MessageEndpointFactory;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientSession;
@@ -29,7 +30,6 @@
import org.hornetq.core.logging.Logger;
import org.hornetq.jms.HornetQTopic;
import org.hornetq.jms.client.HornetQMessage;
-import org.hornetq.utils.SimpleString;
/**
* The message handler
Deleted: trunk/src/main/org/hornetq/utils/Pair.java
===================================================================
--- trunk/src/main/org/hornetq/utils/Pair.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/utils/Pair.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -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.utils;
-
-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/utils/SimpleString.java
===================================================================
--- trunk/src/main/org/hornetq/utils/SimpleString.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/utils/SimpleString.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -1,425 +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.utils;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-
-import org.hornetq.core.logging.Logger;
-
-/**
- * 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>
- *
- */
-
- // TODO - implement an intern() method like in java.lang.String, since many Strings e.g. addresses, queue names, remote node ids are duplicated heavily
- //in bindings taking up more memory than they should
- //Intern can be called when receiving a sent message at the server (destination)
- //Also when receiving bindings remotely via bridge, the address, queue name and node id can be interned
- //
-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
Deleted: trunk/src/main/org/hornetq/utils/SimpleStringReader.java
===================================================================
--- trunk/src/main/org/hornetq/utils/SimpleStringReader.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/utils/SimpleStringReader.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -1,90 +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.utils;
-
-import java.io.IOException;
-import java.io.Reader;
-
-/**
- * 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/utils/TypedProperties.java
===================================================================
--- trunk/src/main/org/hornetq/utils/TypedProperties.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/utils/TypedProperties.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -31,6 +31,7 @@
import java.util.Set;
import java.util.Map.Entry;
+import org.hornetq.SimpleString;
import org.hornetq.core.buffers.HornetQBuffer;
import org.hornetq.core.logging.Logger;
import org.hornetq.core.message.PropertyConversionException;
Modified: trunk/src/main/org/hornetq/utils/UUIDGenerator.java
===================================================================
--- trunk/src/main/org/hornetq/utils/UUIDGenerator.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/src/main/org/hornetq/utils/UUIDGenerator.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -22,6 +22,7 @@
import java.util.Enumeration;
import java.util.Random;
+import org.hornetq.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 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/CTSMiscellaneousTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -21,10 +21,10 @@
import javax.jms.MessageProducer;
import javax.jms.Session;
+import org.hornetq.Pair;
import org.hornetq.core.client.impl.ClientSessionFactoryImpl;
import org.hornetq.core.config.TransportConfiguration;
import org.hornetq.jms.client.HornetQConnectionFactory;
-import org.hornetq.utils.Pair;
/**
* 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 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/JMSTestCase.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -18,10 +18,10 @@
import javax.naming.InitialContext;
+import org.hornetq.Pair;
import org.hornetq.core.client.impl.ClientSessionFactoryImpl;
import org.hornetq.core.config.TransportConfiguration;
import org.hornetq.jms.client.HornetQConnectionFactory;
-import org.hornetq.utils.Pair;
/**
* @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a>
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 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/message/MessageHeaderTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -33,6 +33,7 @@
import javax.transaction.xa.XAResource;
import javax.transaction.xa.Xid;
+import org.hornetq.SimpleString;
import org.hornetq.core.buffers.HornetQBuffer;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
@@ -51,7 +52,6 @@
import org.hornetq.jms.client.HornetQTextMessage;
import org.hornetq.jms.tests.HornetQServerTestCase;
import org.hornetq.jms.tests.util.ProxyAssertSupport;
-import org.hornetq.utils.SimpleString;
/**
*
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 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/tools/container/LocalTestServer.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -26,6 +26,7 @@
import javax.management.ObjectName;
import javax.naming.InitialContext;
+import org.hornetq.Pair;
import org.hornetq.core.client.impl.ClientSessionFactoryImpl;
import org.hornetq.core.config.TransportConfiguration;
import org.hornetq.core.logging.Logger;
@@ -37,7 +38,6 @@
import org.hornetq.jms.management.JMSQueueControl;
import org.hornetq.jms.management.TopicControl;
import org.hornetq.jms.server.JMSServerManager;
-import org.hornetq.utils.Pair;
import org.jboss.kernel.plugins.config.property.PropertyKernelConfig;
/**
Modified: trunk/tests/src/org/hornetq/tests/concurrent/server/impl/QueueTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/concurrent/server/impl/QueueTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/concurrent/server/impl/QueueTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -16,6 +16,7 @@
import java.util.ArrayList;
import java.util.List;
+import org.hornetq.SimpleString;
import org.hornetq.core.logging.Logger;
import org.hornetq.core.server.HandleStatus;
import org.hornetq.core.server.MessageReference;
@@ -25,7 +26,6 @@
import org.hornetq.tests.unit.core.server.impl.fakes.FakeConsumer;
import org.hornetq.tests.unit.core.server.impl.fakes.FakeQueueFactory;
import org.hornetq.tests.util.UnitTestCase;
-import org.hornetq.utils.SimpleString;
/**
*
Modified: trunk/tests/src/org/hornetq/tests/integration/DuplicateDetectionTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/DuplicateDetectionTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/DuplicateDetectionTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -18,6 +18,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -32,7 +33,6 @@
import org.hornetq.core.server.HornetQServer;
import org.hornetq.core.transaction.impl.XidImpl;
import org.hornetq.tests.util.ServiceTestBase;
-import org.hornetq.utils.SimpleString;
import org.hornetq.utils.UUIDGenerator;
/**
Modified: trunk/tests/src/org/hornetq/tests/integration/InterceptorTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/InterceptorTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/InterceptorTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -14,6 +14,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -31,7 +32,6 @@
import org.hornetq.core.server.HornetQServer;
import org.hornetq.core.server.ServerMessage;
import org.hornetq.tests.util.ServiceTestBase;
-import org.hornetq.utils.SimpleString;
/**
*
Modified: trunk/tests/src/org/hornetq/tests/integration/String64KLimitTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/String64KLimitTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/String64KLimitTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -15,6 +15,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -30,7 +31,6 @@
import org.hornetq.core.server.HornetQServer;
import org.hornetq.tests.util.RandomUtil;
import org.hornetq.tests.util.UnitTestCase;
-import org.hornetq.utils.SimpleString;
/**
*
Modified: trunk/tests/src/org/hornetq/tests/integration/client/AckBatchSizeTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/AckBatchSizeTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/client/AckBatchSizeTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -14,6 +14,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -23,7 +24,6 @@
import org.hornetq.core.server.HornetQServer;
import org.hornetq.core.server.Queue;
import org.hornetq.tests.util.ServiceTestBase;
-import org.hornetq.utils.SimpleString;
/**
* @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
Modified: trunk/tests/src/org/hornetq/tests/integration/client/AcknowledgeTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/AcknowledgeTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/client/AcknowledgeTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -17,6 +17,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -27,7 +28,6 @@
import org.hornetq.core.server.HornetQServer;
import org.hornetq.core.server.Queue;
import org.hornetq.tests.util.ServiceTestBase;
-import org.hornetq.utils.SimpleString;
/**
* @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
Modified: trunk/tests/src/org/hornetq/tests/integration/client/AddressSettingsTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/AddressSettingsTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/client/AddressSettingsTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -14,6 +14,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -23,7 +24,6 @@
import org.hornetq.core.settings.HierarchicalRepository;
import org.hornetq.core.settings.impl.AddressSettings;
import org.hornetq.tests.util.ServiceTestBase;
-import org.hornetq.utils.SimpleString;
/**
* @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
Modified: trunk/tests/src/org/hornetq/tests/integration/client/AutogroupIdTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/AutogroupIdTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/client/AutogroupIdTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -16,6 +16,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -25,7 +26,6 @@
import org.hornetq.core.exception.HornetQException;
import org.hornetq.core.server.HornetQServer;
import org.hornetq.tests.util.ServiceTestBase;
-import org.hornetq.utils.SimpleString;
/**
* @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
Modified: trunk/tests/src/org/hornetq/tests/integration/client/CommitRollbackTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/CommitRollbackTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/client/CommitRollbackTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -17,6 +17,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -27,7 +28,6 @@
import org.hornetq.core.server.HornetQServer;
import org.hornetq.core.server.Queue;
import org.hornetq.tests.util.ServiceTestBase;
-import org.hornetq.utils.SimpleString;
/**
* @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
Modified: trunk/tests/src/org/hornetq/tests/integration/client/ConsumerCloseTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/ConsumerCloseTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/client/ConsumerCloseTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -14,6 +14,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -33,7 +34,6 @@
import org.hornetq.tests.util.RandomUtil;
import org.hornetq.tests.util.ServiceTestBase;
import org.hornetq.tests.util.UnitTestCase;
-import org.hornetq.utils.SimpleString;
/**
*
Modified: trunk/tests/src/org/hornetq/tests/integration/client/ConsumerRoundRobinTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/ConsumerRoundRobinTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/client/ConsumerRoundRobinTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -14,6 +14,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -21,7 +22,6 @@
import org.hornetq.core.client.ClientSessionFactory;
import org.hornetq.core.server.HornetQServer;
import org.hornetq.tests.util.ServiceTestBase;
-import org.hornetq.utils.SimpleString;
/**
* @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
Modified: trunk/tests/src/org/hornetq/tests/integration/client/ConsumerTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/ConsumerTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/client/ConsumerTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -17,6 +17,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -32,7 +33,6 @@
import org.hornetq.core.server.HornetQServer;
import org.hornetq.core.server.Queue;
import org.hornetq.tests.util.ServiceTestBase;
-import org.hornetq.utils.SimpleString;
/**
* @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
Modified: trunk/tests/src/org/hornetq/tests/integration/client/ConsumerWindowSizeTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/ConsumerWindowSizeTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/client/ConsumerWindowSizeTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -18,6 +18,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -33,7 +34,6 @@
import org.hornetq.core.server.HornetQServer;
import org.hornetq.core.server.impl.ServerConsumerImpl;
import org.hornetq.tests.util.ServiceTestBase;
-import org.hornetq.utils.SimpleString;
/**
* @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
Modified: trunk/tests/src/org/hornetq/tests/integration/client/CoreClientTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/CoreClientTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/client/CoreClientTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -15,6 +15,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.buffers.HornetQBuffer;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
@@ -30,7 +31,6 @@
import org.hornetq.core.server.HornetQServer;
import org.hornetq.jms.client.HornetQTextMessage;
import org.hornetq.tests.util.UnitTestCase;
-import org.hornetq.utils.SimpleString;
public class CoreClientTest extends UnitTestCase
{
Modified: trunk/tests/src/org/hornetq/tests/integration/client/DeadLetterAddressTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/DeadLetterAddressTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/client/DeadLetterAddressTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -17,6 +17,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -34,7 +35,6 @@
import org.hornetq.core.settings.impl.AddressSettings;
import org.hornetq.tests.util.RandomUtil;
import org.hornetq.tests.util.UnitTestCase;
-import org.hornetq.utils.SimpleString;
/**
* @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
Modified: trunk/tests/src/org/hornetq/tests/integration/client/DeliveryOrderTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/DeliveryOrderTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/client/DeliveryOrderTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -18,6 +18,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -27,7 +28,6 @@
import org.hornetq.core.exception.HornetQException;
import org.hornetq.core.server.HornetQServer;
import org.hornetq.tests.util.ServiceTestBase;
-import org.hornetq.utils.SimpleString;
/**
* @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
Modified: trunk/tests/src/org/hornetq/tests/integration/client/DurableQueueTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/DurableQueueTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/client/DurableQueueTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -15,6 +15,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -26,7 +27,6 @@
import org.hornetq.core.server.HornetQServer;
import org.hornetq.tests.util.RandomUtil;
import org.hornetq.tests.util.ServiceTestBase;
-import org.hornetq.utils.SimpleString;
/**
* A TemporaryQueueTest
Modified: trunk/tests/src/org/hornetq/tests/integration/client/ExpiryAddressTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/ExpiryAddressTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/client/ExpiryAddressTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -14,6 +14,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -30,7 +31,6 @@
import org.hornetq.core.settings.impl.AddressSettings;
import org.hornetq.tests.util.RandomUtil;
import org.hornetq.tests.util.UnitTestCase;
-import org.hornetq.utils.SimpleString;
/**
* @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
Modified: trunk/tests/src/org/hornetq/tests/integration/client/HeuristicXATest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/HeuristicXATest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/client/HeuristicXATest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -22,6 +22,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -36,7 +37,6 @@
import org.hornetq.core.transaction.impl.XidImpl;
import org.hornetq.tests.integration.management.ManagementControlHelper;
import org.hornetq.tests.util.ServiceTestBase;
-import org.hornetq.utils.SimpleString;
/**
* A HeuristicXATest
Modified: trunk/tests/src/org/hornetq/tests/integration/client/JournalCrashTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/JournalCrashTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/client/JournalCrashTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -17,6 +17,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -31,7 +32,6 @@
import org.hornetq.core.server.HornetQServer;
import org.hornetq.tests.util.ServiceTestBase;
import org.hornetq.tests.util.SpawnedVMSupport;
-import org.hornetq.utils.SimpleString;
/**
* A JournalCrashTest
Modified: trunk/tests/src/org/hornetq/tests/integration/client/LargeMessageTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/LargeMessageTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/client/LargeMessageTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -20,6 +20,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -38,7 +39,6 @@
import org.hornetq.tests.integration.largemessage.LargeMessageTestBase;
import org.hornetq.tests.util.RandomUtil;
import org.hornetq.tests.util.UnitTestCase;
-import org.hornetq.utils.SimpleString;
/**
* A LargeMessageTest
Modified: trunk/tests/src/org/hornetq/tests/integration/client/MessageConcurrencyTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/MessageConcurrencyTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/client/MessageConcurrencyTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -17,6 +17,7 @@
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -27,7 +28,6 @@
import org.hornetq.core.server.HornetQServer;
import org.hornetq.tests.util.RandomUtil;
import org.hornetq.tests.util.ServiceTestBase;
-import org.hornetq.utils.SimpleString;
/**
*
Modified: trunk/tests/src/org/hornetq/tests/integration/client/MessageCounterTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/MessageCounterTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/client/MessageCounterTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -14,6 +14,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -22,7 +23,6 @@
import org.hornetq.core.logging.Logger;
import org.hornetq.core.server.HornetQServer;
import org.hornetq.tests.util.ServiceTestBase;
-import org.hornetq.utils.SimpleString;
/**
* @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
Modified: trunk/tests/src/org/hornetq/tests/integration/client/MessageDurabilityTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/MessageDurabilityTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/client/MessageDurabilityTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -15,6 +15,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientProducer;
import org.hornetq.core.client.ClientSession;
@@ -24,7 +25,6 @@
import org.hornetq.tests.util.RandomUtil;
import org.hornetq.tests.util.ServiceTestBase;
import org.hornetq.tests.util.UnitTestCase;
-import org.hornetq.utils.SimpleString;
/**
* A MessagDurabilityTest
Modified: trunk/tests/src/org/hornetq/tests/integration/client/MessageExpirationTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/MessageExpirationTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/client/MessageExpirationTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -15,6 +15,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -26,7 +27,6 @@
import org.hornetq.core.settings.impl.AddressSettings;
import org.hornetq.tests.util.RandomUtil;
import org.hornetq.tests.util.ServiceTestBase;
-import org.hornetq.utils.SimpleString;
/**
* A MessageExpirationTest
Modified: trunk/tests/src/org/hornetq/tests/integration/client/MessageGroupingConnectionFactoryTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/MessageGroupingConnectionFactoryTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/client/MessageGroupingConnectionFactoryTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -18,6 +18,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -32,7 +33,6 @@
import org.hornetq.core.server.HornetQ;
import org.hornetq.core.server.HornetQServer;
import org.hornetq.tests.util.UnitTestCase;
-import org.hornetq.utils.SimpleString;
/**
* @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
Modified: trunk/tests/src/org/hornetq/tests/integration/client/MessageGroupingTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/MessageGroupingTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/client/MessageGroupingTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -21,6 +21,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -37,7 +38,6 @@
import org.hornetq.core.server.HornetQServer;
import org.hornetq.core.transaction.impl.XidImpl;
import org.hornetq.tests.util.UnitTestCase;
-import org.hornetq.utils.SimpleString;
/**
* @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
Modified: trunk/tests/src/org/hornetq/tests/integration/client/MessageHandlerTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/MessageHandlerTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/client/MessageHandlerTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -17,6 +17,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -26,7 +27,6 @@
import org.hornetq.core.logging.Logger;
import org.hornetq.core.server.HornetQServer;
import org.hornetq.tests.util.ServiceTestBase;
-import org.hornetq.utils.SimpleString;
/**
* @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
Modified: trunk/tests/src/org/hornetq/tests/integration/client/MessagePriorityTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/MessagePriorityTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/client/MessagePriorityTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -15,6 +15,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -30,7 +31,6 @@
import org.hornetq.core.server.HornetQServer;
import org.hornetq.tests.util.RandomUtil;
import org.hornetq.tests.util.UnitTestCase;
-import org.hornetq.utils.SimpleString;
/**
* A MessagePriorityTest
Modified: trunk/tests/src/org/hornetq/tests/integration/client/MessageRateTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/MessageRateTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/client/MessageRateTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -19,6 +19,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -27,7 +28,6 @@
import org.hornetq.core.client.MessageHandler;
import org.hornetq.core.server.HornetQServer;
import org.hornetq.tests.util.ServiceTestBase;
-import org.hornetq.utils.SimpleString;
/**
* A MessageRateTest
Modified: trunk/tests/src/org/hornetq/tests/integration/client/NewDeadLetterAddressTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/NewDeadLetterAddressTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/client/NewDeadLetterAddressTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -14,6 +14,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -27,7 +28,6 @@
import org.hornetq.core.server.HornetQServer;
import org.hornetq.core.settings.impl.AddressSettings;
import org.hornetq.tests.util.UnitTestCase;
-import org.hornetq.utils.SimpleString;
/**
*
Modified: trunk/tests/src/org/hornetq/tests/integration/client/PagingTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/PagingTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/client/PagingTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -20,6 +20,7 @@
import junit.framework.Assert;
import junit.framework.AssertionFailedError;
+import org.hornetq.SimpleString;
import org.hornetq.core.buffers.HornetQBuffer;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
@@ -37,7 +38,6 @@
import org.hornetq.tests.util.ServiceTestBase;
import org.hornetq.tests.util.UnitTestCase;
import org.hornetq.utils.DataConstants;
-import org.hornetq.utils.SimpleString;
/**
* A PagingTest
Modified: trunk/tests/src/org/hornetq/tests/integration/client/ProducerFlowControlTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/ProducerFlowControlTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/client/ProducerFlowControlTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -17,6 +17,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -33,7 +34,6 @@
import org.hornetq.tests.util.RandomUtil;
import org.hornetq.tests.util.ServiceTestBase;
import org.hornetq.tests.util.UnitTestCase;
-import org.hornetq.utils.SimpleString;
/**
*
Modified: trunk/tests/src/org/hornetq/tests/integration/client/ProducerTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/ProducerTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/client/ProducerTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -17,6 +17,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
import org.hornetq.core.client.ClientSession;
@@ -29,7 +30,6 @@
import org.hornetq.core.remoting.impl.wireformat.PacketImpl;
import org.hornetq.core.server.HornetQServer;
import org.hornetq.tests.util.ServiceTestBase;
-import org.hornetq.utils.SimpleString;
/**
* @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
Modified: trunk/tests/src/org/hornetq/tests/integration/client/QueueBrowserTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/QueueBrowserTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/client/QueueBrowserTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -14,6 +14,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -25,7 +26,6 @@
import org.hornetq.core.server.HornetQServer;
import org.hornetq.core.server.Queue;
import org.hornetq.tests.util.ServiceTestBase;
-import org.hornetq.utils.SimpleString;
/**
* @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
Modified: trunk/tests/src/org/hornetq/tests/integration/client/ReceiveImmediateTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/ReceiveImmediateTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/client/ReceiveImmediateTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -14,6 +14,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -27,7 +28,6 @@
import org.hornetq.core.server.HornetQServer;
import org.hornetq.core.server.Queue;
import org.hornetq.tests.util.ServiceTestBase;
-import org.hornetq.utils.SimpleString;
/**
* @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
Modified: trunk/tests/src/org/hornetq/tests/integration/client/ReceiveTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/ReceiveTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/client/ReceiveTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -14,6 +14,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -23,7 +24,6 @@
import org.hornetq.core.exception.HornetQException;
import org.hornetq.core.server.HornetQServer;
import org.hornetq.tests.util.ServiceTestBase;
-import org.hornetq.utils.SimpleString;
/**
* @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
Modified: trunk/tests/src/org/hornetq/tests/integration/client/RedeliveryConsumerTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/RedeliveryConsumerTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/client/RedeliveryConsumerTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -15,6 +15,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -25,7 +26,6 @@
import org.hornetq.core.logging.Logger;
import org.hornetq.core.server.HornetQServer;
import org.hornetq.tests.util.ServiceTestBase;
-import org.hornetq.utils.SimpleString;
/**
* A RedeliveryConsumerTest
Modified: trunk/tests/src/org/hornetq/tests/integration/client/RequestorTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/RequestorTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/client/RequestorTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -15,6 +15,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -34,7 +35,6 @@
import org.hornetq.core.server.HornetQServer;
import org.hornetq.tests.util.RandomUtil;
import org.hornetq.tests.util.UnitTestCase;
-import org.hornetq.utils.SimpleString;
/**
* A ClientRequestorTest
Modified: trunk/tests/src/org/hornetq/tests/integration/client/RoutingTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/RoutingTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/client/RoutingTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -14,6 +14,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -21,7 +22,6 @@
import org.hornetq.core.client.ClientSessionFactory;
import org.hornetq.core.server.HornetQServer;
import org.hornetq.tests.util.ServiceTestBase;
-import org.hornetq.utils.SimpleString;
/**
* @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
Modified: trunk/tests/src/org/hornetq/tests/integration/client/SelfExpandingBufferTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/SelfExpandingBufferTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/client/SelfExpandingBufferTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -15,6 +15,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.buffers.HornetQBuffer;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
@@ -26,7 +27,6 @@
import org.hornetq.tests.util.RandomUtil;
import org.hornetq.tests.util.ServiceTestBase;
import org.hornetq.tests.util.UnitTestCase;
-import org.hornetq.utils.SimpleString;
/**
* A SelfExpandingBufferTest
Modified: trunk/tests/src/org/hornetq/tests/integration/client/SessionCloseTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/SessionCloseTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/client/SessionCloseTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -18,6 +18,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientProducer;
import org.hornetq.core.client.ClientSession;
@@ -33,7 +34,6 @@
import org.hornetq.core.server.HornetQServer;
import org.hornetq.tests.util.RandomUtil;
import org.hornetq.tests.util.UnitTestCase;
-import org.hornetq.utils.SimpleString;
/**
* A SessionCloseTest
Modified: trunk/tests/src/org/hornetq/tests/integration/client/SessionCreateAndDeleteQueueTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/SessionCreateAndDeleteQueueTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/client/SessionCreateAndDeleteQueueTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -14,6 +14,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientSession;
import org.hornetq.core.exception.HornetQException;
import org.hornetq.core.postoffice.Binding;
@@ -22,7 +23,6 @@
import org.hornetq.core.server.impl.LastValueQueue;
import org.hornetq.core.settings.impl.AddressSettings;
import org.hornetq.tests.util.ServiceTestBase;
-import org.hornetq.utils.SimpleString;
/**
* @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
Modified: trunk/tests/src/org/hornetq/tests/integration/client/SessionFactoryTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/SessionFactoryTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/client/SessionFactoryTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -23,6 +23,7 @@
import junit.framework.Assert;
+import org.hornetq.Pair;
import org.hornetq.core.client.ClientSession;
import org.hornetq.core.client.ClientSessionFactory;
import org.hornetq.core.client.impl.ClientSessionFactoryImpl;
@@ -37,7 +38,6 @@
import org.hornetq.core.server.HornetQServer;
import org.hornetq.tests.util.RandomUtil;
import org.hornetq.tests.util.ServiceTestBase;
-import org.hornetq.utils.Pair;
/**
*
Modified: trunk/tests/src/org/hornetq/tests/integration/client/SessionSendAcknowledgementHandlerTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/SessionSendAcknowledgementHandlerTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/client/SessionSendAcknowledgementHandlerTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -18,6 +18,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
import org.hornetq.core.client.ClientSession;
@@ -27,7 +28,6 @@
import org.hornetq.core.message.Message;
import org.hornetq.core.server.HornetQServer;
import org.hornetq.tests.util.ServiceTestBase;
-import org.hornetq.utils.SimpleString;
/**
* A SendAcknowledgementsTest
Modified: trunk/tests/src/org/hornetq/tests/integration/client/SessionStopStartTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/SessionStopStartTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/client/SessionStopStartTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -17,6 +17,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -26,7 +27,6 @@
import org.hornetq.core.logging.Logger;
import org.hornetq.core.server.HornetQServer;
import org.hornetq.tests.util.ServiceTestBase;
-import org.hornetq.utils.SimpleString;
/**
* @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
Modified: trunk/tests/src/org/hornetq/tests/integration/client/SessionTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/SessionTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/client/SessionTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -18,6 +18,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -32,7 +33,6 @@
import org.hornetq.core.server.HornetQServer;
import org.hornetq.core.server.Queue;
import org.hornetq.tests.util.ServiceTestBase;
-import org.hornetq.utils.SimpleString;
/**
* This test covers the API for ClientSession altho XA tests are tested seperately.
Modified: trunk/tests/src/org/hornetq/tests/integration/client/TemporaryQueueTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/TemporaryQueueTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/client/TemporaryQueueTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -18,6 +18,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -41,7 +42,6 @@
import org.hornetq.tests.util.RandomUtil;
import org.hornetq.tests.util.ServiceTestBase;
import org.hornetq.tests.util.UnitTestCase;
-import org.hornetq.utils.SimpleString;
/**
* A TemporaryQueueTest
Modified: trunk/tests/src/org/hornetq/tests/integration/client/TransactionDurabilityTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/TransactionDurabilityTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/client/TransactionDurabilityTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -14,6 +14,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -25,7 +26,6 @@
import org.hornetq.core.logging.Logger;
import org.hornetq.core.server.HornetQServer;
import org.hornetq.tests.util.ServiceTestBase;
-import org.hornetq.utils.SimpleString;
/**
*
Modified: trunk/tests/src/org/hornetq/tests/integration/client/TransactionalSendTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/TransactionalSendTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/client/TransactionalSendTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -14,13 +14,13 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientProducer;
import org.hornetq.core.client.ClientSession;
import org.hornetq.core.client.ClientSessionFactory;
import org.hornetq.core.server.HornetQServer;
import org.hornetq.core.server.Queue;
import org.hornetq.tests.util.ServiceTestBase;
-import org.hornetq.utils.SimpleString;
/**
* @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
Modified: trunk/tests/src/org/hornetq/tests/integration/client/WildCardRoutingTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/WildCardRoutingTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/client/WildCardRoutingTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -14,6 +14,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -26,7 +27,6 @@
import org.hornetq.core.server.HornetQ;
import org.hornetq.core.server.HornetQServer;
import org.hornetq.tests.util.UnitTestCase;
-import org.hornetq.utils.SimpleString;
/**
* @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
Modified: trunk/tests/src/org/hornetq/tests/integration/clientcrash/ClientCrashTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/clientcrash/ClientCrashTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/clientcrash/ClientCrashTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -15,6 +15,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -26,7 +27,6 @@
import org.hornetq.core.message.Message;
import org.hornetq.jms.client.HornetQTextMessage;
import org.hornetq.tests.util.SpawnedVMSupport;
-import org.hornetq.utils.SimpleString;
/**
* A test that makes sure that a HornetQ server cleans up the associated
Modified: trunk/tests/src/org/hornetq/tests/integration/clientcrash/ClientExitTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/clientcrash/ClientExitTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/clientcrash/ClientExitTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -15,6 +15,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientSession;
import org.hornetq.core.client.ClientSessionFactory;
@@ -25,7 +26,6 @@
import org.hornetq.integration.transports.netty.NettyConnectorFactory;
import org.hornetq.tests.util.RandomUtil;
import org.hornetq.tests.util.SpawnedVMSupport;
-import org.hornetq.utils.SimpleString;
/**
* A test that makes sure that a HornetQ client gracefully exists after the last session is
Modified: trunk/tests/src/org/hornetq/tests/integration/clientcrash/DummyInterceptor.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/clientcrash/DummyInterceptor.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/clientcrash/DummyInterceptor.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -15,13 +15,13 @@
import java.util.concurrent.atomic.AtomicInteger;
+import org.hornetq.SimpleString;
import org.hornetq.core.exception.HornetQException;
import org.hornetq.core.logging.Logger;
import org.hornetq.core.remoting.Interceptor;
import org.hornetq.core.remoting.Packet;
import org.hornetq.core.remoting.RemotingConnection;
import org.hornetq.core.remoting.impl.wireformat.SessionReceiveMessage;
-import org.hornetq.utils.SimpleString;
/**
* @author <a href="mailto:clebert.suconic@jboss.com">Clebert Suconic</a>
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeReconnectTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeReconnectTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeReconnectTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -20,6 +20,8 @@
import junit.framework.Assert;
+import org.hornetq.Pair;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -38,8 +40,6 @@
import org.hornetq.core.server.cluster.Bridge;
import org.hornetq.core.server.cluster.impl.BridgeImpl;
import org.hornetq.integration.transports.netty.NettyConnectorFactory;
-import org.hornetq.utils.Pair;
-import org.hornetq.utils.SimpleString;
/**
* A BridgeReconnectTest
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeStartTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeStartTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeStartTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -20,6 +20,8 @@
import junit.framework.Assert;
+import org.hornetq.Pair;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -35,8 +37,6 @@
import org.hornetq.core.server.cluster.Bridge;
import org.hornetq.integration.transports.netty.NettyConnectorFactory;
import org.hornetq.tests.util.ServiceTestBase;
-import org.hornetq.utils.Pair;
-import org.hornetq.utils.SimpleString;
/**
* A BridgeStartTest
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -20,6 +20,8 @@
import junit.framework.Assert;
+import org.hornetq.Pair;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -35,8 +37,6 @@
import org.hornetq.integration.transports.netty.NettyConnectorFactory;
import org.hornetq.tests.util.ServiceTestBase;
import org.hornetq.tests.util.UnitTestCase;
-import org.hornetq.utils.Pair;
-import org.hornetq.utils.SimpleString;
/**
* A JMSBridgeTest
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -20,6 +20,8 @@
import junit.framework.Assert;
+import org.hornetq.Pair;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -37,8 +39,6 @@
import org.hornetq.integration.transports.netty.NettyConnectorFactory;
import org.hornetq.integration.transports.netty.TransportConstants;
import org.hornetq.tests.util.ServiceTestBase;
-import org.hornetq.utils.Pair;
-import org.hornetq.utils.SimpleString;
/**
* A BridgeWithDiscoveryGroupStartTest
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/SimpleTransformer.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/SimpleTransformer.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/SimpleTransformer.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -13,11 +13,11 @@
package org.hornetq.tests.integration.cluster.bridge;
+import org.hornetq.SimpleString;
import org.hornetq.core.buffers.HornetQBuffer;
import org.hornetq.core.logging.Logger;
import org.hornetq.core.server.ServerMessage;
import org.hornetq.core.server.cluster.Transformer;
-import org.hornetq.utils.SimpleString;
/**
* A SimpleTransformer
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -24,6 +24,8 @@
import junit.framework.Assert;
+import org.hornetq.Pair;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -53,8 +55,6 @@
import org.hornetq.integration.transports.netty.TransportConstants;
import org.hornetq.tests.util.ServiceTestBase;
import org.hornetq.tests.util.UnitTestCase;
-import org.hornetq.utils.Pair;
-import org.hornetq.utils.SimpleString;
/**
* A ClusterTestBase
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusteredGroupingTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusteredGroupingTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusteredGroupingTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -17,6 +17,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.management.impl.ManagementHelper;
import org.hornetq.core.management.NotificationType;
import org.hornetq.core.message.impl.MessageImpl;
@@ -27,7 +28,6 @@
import org.hornetq.core.server.group.impl.Response;
import org.hornetq.core.server.management.Notification;
import org.hornetq.core.server.management.NotificationListener;
-import org.hornetq.utils.SimpleString;
/**
* @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -26,6 +26,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -45,7 +46,6 @@
import org.hornetq.core.transaction.impl.XidImpl;
import org.hornetq.jms.client.HornetQTextMessage;
import org.hornetq.tests.util.RandomUtil;
-import org.hornetq.utils.SimpleString;
/**
*
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -18,6 +18,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.impl.ClientSessionFactoryImpl;
import org.hornetq.core.client.impl.ClientSessionFactoryInternal;
import org.hornetq.core.config.Configuration;
@@ -27,7 +28,6 @@
import org.hornetq.core.remoting.impl.invm.TransportConstants;
import org.hornetq.core.server.HornetQServer;
import org.hornetq.tests.util.ServiceTestBase;
-import org.hornetq.utils.SimpleString;
/**
* A FailoverTestBase
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/GroupingFailoverTestBase.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/GroupingFailoverTestBase.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/GroupingFailoverTestBase.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -18,6 +18,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.exception.HornetQException;
import org.hornetq.core.message.impl.MessageImpl;
import org.hornetq.core.remoting.FailureListener;
@@ -26,7 +27,6 @@
import org.hornetq.core.server.cluster.impl.ClusterConnectionImpl;
import org.hornetq.core.server.group.impl.GroupingHandlerConfiguration;
import org.hornetq.tests.integration.cluster.distribution.ClusterTestBase;
-import org.hornetq.utils.SimpleString;
/**
* @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/PagingFailoverTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/PagingFailoverTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/PagingFailoverTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -19,6 +19,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -34,7 +35,6 @@
import org.hornetq.core.server.HornetQServer;
import org.hornetq.core.server.impl.HornetQServerImpl;
import org.hornetq.core.settings.impl.AddressSettings;
-import org.hornetq.utils.SimpleString;
/**
* A PagingFailoverTest
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/ReplicatedDistributionTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/ReplicatedDistributionTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/ReplicatedDistributionTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -18,6 +18,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -28,7 +29,6 @@
import org.hornetq.core.remoting.RemotingConnection;
import org.hornetq.core.settings.impl.AddressSettings;
import org.hornetq.tests.integration.cluster.distribution.ClusterTestBase;
-import org.hornetq.utils.SimpleString;
/**
* A SymmetricFailoverTest
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/MultiThreadRandomReattachTestBase.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/MultiThreadRandomReattachTestBase.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/MultiThreadRandomReattachTestBase.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -22,6 +22,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -37,7 +38,6 @@
import org.hornetq.core.server.HornetQServer;
import org.hornetq.jms.client.HornetQBytesMessage;
import org.hornetq.jms.client.HornetQTextMessage;
-import org.hornetq.utils.SimpleString;
/**
* A MultiThreadRandomReattachTestBase
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/OrderReattachTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/OrderReattachTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/OrderReattachTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -21,6 +21,7 @@
import junit.framework.Assert;
import junit.framework.TestSuite;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -34,7 +35,6 @@
import org.hornetq.core.server.HornetQServer;
import org.hornetq.jms.client.HornetQTextMessage;
import org.hornetq.tests.util.ServiceTestBase;
-import org.hornetq.utils.SimpleString;
import org.hornetq.utils.concurrent.LinkedBlockingDeque;
/**
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/RandomReattachTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/RandomReattachTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/RandomReattachTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -22,6 +22,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -40,7 +41,6 @@
import org.hornetq.core.server.HornetQServer;
import org.hornetq.jms.client.HornetQTextMessage;
import org.hornetq.tests.util.UnitTestCase;
-import org.hornetq.utils.SimpleString;
/**
* A RandomFailoverSoakTest
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/ReattachTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/ReattachTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/ReattachTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -19,6 +19,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -34,7 +35,6 @@
import org.hornetq.core.server.HornetQServer;
import org.hornetq.jms.client.HornetQTextMessage;
import org.hornetq.tests.util.ServiceTestBase;
-import org.hornetq.utils.SimpleString;
/**
*
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/restart/ClusterRestartTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/restart/ClusterRestartTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/restart/ClusterRestartTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -14,9 +14,9 @@
import java.util.Collection;
+import org.hornetq.SimpleString;
import org.hornetq.core.postoffice.Binding;
import org.hornetq.tests.integration.cluster.distribution.ClusterTestBase;
-import org.hornetq.utils.SimpleString;
/**
* @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
Modified: trunk/tests/src/org/hornetq/tests/integration/discovery/DiscoveryTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/discovery/DiscoveryTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/discovery/DiscoveryTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -19,6 +19,8 @@
import junit.framework.Assert;
+import org.hornetq.Pair;
+import org.hornetq.SimpleString;
import org.hornetq.core.cluster.DiscoveryEntry;
import org.hornetq.core.cluster.DiscoveryGroup;
import org.hornetq.core.cluster.DiscoveryListener;
@@ -32,8 +34,6 @@
import org.hornetq.tests.integration.SimpleNotificationService;
import org.hornetq.tests.util.RandomUtil;
import org.hornetq.tests.util.UnitTestCase;
-import org.hornetq.utils.Pair;
-import org.hornetq.utils.SimpleString;
import org.hornetq.utils.UUIDGenerator;
/**
Modified: trunk/tests/src/org/hornetq/tests/integration/divert/DivertTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/divert/DivertTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/divert/DivertTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -18,6 +18,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -31,7 +32,6 @@
import org.hornetq.core.server.HornetQ;
import org.hornetq.core.server.HornetQServer;
import org.hornetq.tests.util.ServiceTestBase;
-import org.hornetq.utils.SimpleString;
/**
* A DivertTest
Modified: trunk/tests/src/org/hornetq/tests/integration/divert/PersistentDivertTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/divert/PersistentDivertTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/divert/PersistentDivertTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -18,6 +18,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -32,7 +33,6 @@
import org.hornetq.core.server.HornetQServer;
import org.hornetq.tests.util.ServiceTestBase;
import org.hornetq.tests.util.UnitTestCase;
-import org.hornetq.utils.SimpleString;
/**
* A PersistentDivertTest
Modified: trunk/tests/src/org/hornetq/tests/integration/http/CoreClientOverHttpTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/http/CoreClientOverHttpTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/http/CoreClientOverHttpTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -16,6 +16,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -30,7 +31,6 @@
import org.hornetq.integration.transports.netty.TransportConstants;
import org.hornetq.jms.client.HornetQTextMessage;
import org.hornetq.tests.util.UnitTestCase;
-import org.hornetq.utils.SimpleString;
/**
* @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
Modified: trunk/tests/src/org/hornetq/tests/integration/jms/FloodServerTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/jms/FloodServerTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/jms/FloodServerTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -24,6 +24,7 @@
import javax.jms.MessageProducer;
import javax.jms.Session;
+import org.hornetq.Pair;
import org.hornetq.core.client.impl.ClientSessionFactoryImpl;
import org.hornetq.core.config.Configuration;
import org.hornetq.core.config.TransportConfiguration;
@@ -37,7 +38,6 @@
import org.hornetq.jms.server.impl.JMSServerManagerImpl;
import org.hornetq.tests.unit.util.InVMContext;
import org.hornetq.tests.util.UnitTestCase;
-import org.hornetq.utils.Pair;
/**
*
Modified: trunk/tests/src/org/hornetq/tests/integration/jms/HornetQConnectionFactoryTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/jms/HornetQConnectionFactoryTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/jms/HornetQConnectionFactoryTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -23,6 +23,7 @@
import junit.framework.Assert;
+import org.hornetq.Pair;
import org.hornetq.core.client.ClientSessionFactory;
import org.hornetq.core.client.impl.ClientSessionFactoryImpl;
import org.hornetq.core.config.Configuration;
@@ -36,7 +37,6 @@
import org.hornetq.jms.client.HornetQConnectionFactory;
import org.hornetq.tests.util.RandomUtil;
import org.hornetq.tests.util.UnitTestCase;
-import org.hornetq.utils.Pair;
/**
*
Modified: trunk/tests/src/org/hornetq/tests/integration/jms/client/PreACKJMSTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/jms/client/PreACKJMSTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/jms/client/PreACKJMSTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -24,10 +24,10 @@
import junit.framework.Assert;
+import org.hornetq.Pair;
import org.hornetq.core.client.impl.ClientSessionFactoryImpl;
import org.hornetq.core.config.TransportConfiguration;
import org.hornetq.tests.util.JMSTestBase;
-import org.hornetq.utils.Pair;
/**
* A PreACKJMSTest
Modified: trunk/tests/src/org/hornetq/tests/integration/jms/client/ReSendLargeMessageTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/jms/client/ReSendLargeMessageTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/jms/client/ReSendLargeMessageTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -30,12 +30,12 @@
import junit.framework.Assert;
+import org.hornetq.Pair;
import org.hornetq.core.client.impl.ClientSessionFactoryImpl;
import org.hornetq.core.config.TransportConfiguration;
import org.hornetq.jms.client.HornetQMessage;
import org.hornetq.tests.util.JMSTestBase;
import org.hornetq.tests.util.UnitTestCase;
-import org.hornetq.utils.Pair;
/**
* Receive Messages and resend them, like the bridge would do
Modified: trunk/tests/src/org/hornetq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -26,6 +26,7 @@
import junit.framework.Assert;
+import org.hornetq.Pair;
import org.hornetq.core.client.impl.ClientSessionFactoryImpl;
import org.hornetq.core.client.impl.ClientSessionInternal;
import org.hornetq.core.config.TransportConfiguration;
@@ -35,7 +36,6 @@
import org.hornetq.integration.transports.netty.NettyConnectorFactory;
import org.hornetq.jms.client.HornetQSession;
import org.hornetq.tests.util.JMSTestBase;
-import org.hornetq.utils.Pair;
/**
*
Modified: trunk/tests/src/org/hornetq/tests/integration/jms/client/TextMessageTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/jms/client/TextMessageTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/jms/client/TextMessageTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -24,11 +24,11 @@
import junit.framework.Assert;
+import org.hornetq.Pair;
import org.hornetq.core.client.impl.ClientSessionFactoryImpl;
import org.hornetq.core.config.TransportConfiguration;
import org.hornetq.tests.util.JMSTestBase;
import org.hornetq.tests.util.RandomUtil;
-import org.hornetq.utils.Pair;
/**
*
Modified: trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSFailoverTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSFailoverTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSFailoverTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -29,6 +29,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientSession;
import org.hornetq.core.client.impl.ClientSessionInternal;
import org.hornetq.core.config.Configuration;
@@ -46,7 +47,6 @@
import org.hornetq.jms.client.HornetQSession;
import org.hornetq.tests.util.RandomUtil;
import org.hornetq.tests.util.UnitTestCase;
-import org.hornetq.utils.SimpleString;
/**
*
Modified: trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSReconnectTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSReconnectTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSReconnectTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -28,6 +28,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientSession;
import org.hornetq.core.client.impl.ClientSessionInternal;
import org.hornetq.core.config.Configuration;
@@ -45,7 +46,6 @@
import org.hornetq.jms.client.HornetQSession;
import org.hornetq.tests.util.RandomUtil;
import org.hornetq.tests.util.UnitTestCase;
-import org.hornetq.utils.SimpleString;
/**
*
Modified: trunk/tests/src/org/hornetq/tests/integration/jms/consumer/ConsumerTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/jms/consumer/ConsumerTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/jms/consumer/ConsumerTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -23,6 +23,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.config.TransportConfiguration;
import org.hornetq.core.logging.Logger;
import org.hornetq.core.server.Queue;
@@ -30,7 +31,6 @@
import org.hornetq.jms.client.HornetQConnectionFactory;
import org.hornetq.jms.client.HornetQSession;
import org.hornetq.tests.util.JMSTestBase;
-import org.hornetq.utils.SimpleString;
/**
* @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
Modified: trunk/tests/src/org/hornetq/tests/integration/jms/divert/DivertAndACKClientTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/jms/divert/DivertAndACKClientTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/jms/divert/DivertAndACKClientTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -24,13 +24,13 @@
import junit.framework.Assert;
+import org.hornetq.Pair;
import org.hornetq.core.client.impl.ClientSessionFactoryImpl;
import org.hornetq.core.config.Configuration;
import org.hornetq.core.config.TransportConfiguration;
import org.hornetq.core.config.cluster.DivertConfiguration;
import org.hornetq.jms.HornetQQueue;
import org.hornetq.tests.util.JMSTestBase;
-import org.hornetq.utils.Pair;
/**
* A DivertAndACKClientTest
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 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSQueueControlTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -27,6 +27,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.config.Configuration;
import org.hornetq.core.config.TransportConfiguration;
import org.hornetq.core.config.impl.ConfigurationImpl;
@@ -43,7 +44,6 @@
import org.hornetq.tests.integration.management.ManagementTestBase;
import org.hornetq.tests.unit.util.InVMContext;
import org.hornetq.tests.util.RandomUtil;
-import org.hornetq.utils.SimpleString;
import org.hornetq.utils.json.JSONArray;
/**
Modified: trunk/tests/src/org/hornetq/tests/integration/journal/NIOJournalCompactTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/journal/NIOJournalCompactTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/journal/NIOJournalCompactTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -21,6 +21,7 @@
import junit.framework.Assert;
+import org.hornetq.Pair;
import org.hornetq.core.journal.SequentialFile;
import org.hornetq.core.journal.SequentialFileFactory;
import org.hornetq.core.journal.impl.AbstractJournalUpdateTask;
@@ -33,7 +34,6 @@
import org.hornetq.tests.unit.core.journal.impl.JournalImplTestBase;
import org.hornetq.tests.unit.core.journal.impl.fakes.SimpleEncoding;
import org.hornetq.utils.IDGenerator;
-import org.hornetq.utils.Pair;
import org.hornetq.utils.TimeAndCounterIDGenerator;
/**
Modified: trunk/tests/src/org/hornetq/tests/integration/largemessage/LargeMessageTestBase.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/largemessage/LargeMessageTestBase.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/largemessage/LargeMessageTestBase.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -26,6 +26,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.buffers.HornetQBuffer;
import org.hornetq.core.buffers.HornetQBuffers;
import org.hornetq.core.client.ClientConsumer;
@@ -42,7 +43,6 @@
import org.hornetq.tests.util.ServiceTestBase;
import org.hornetq.tests.util.UnitTestCase;
import org.hornetq.utils.DataConstants;
-import org.hornetq.utils.SimpleString;
/**
* A LargeMessageTestBase
Modified: trunk/tests/src/org/hornetq/tests/integration/management/AcceptorControlTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/management/AcceptorControlTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/management/AcceptorControlTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -17,6 +17,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientSession;
import org.hornetq.core.client.ClientSessionFactory;
import org.hornetq.core.client.impl.ClientSessionFactoryImpl;
@@ -33,7 +34,6 @@
import org.hornetq.core.server.management.Notification;
import org.hornetq.tests.integration.SimpleNotificationService;
import org.hornetq.tests.util.RandomUtil;
-import org.hornetq.utils.SimpleString;
/**
* A AcceptorControlTest
Modified: trunk/tests/src/org/hornetq/tests/integration/management/AddressControlTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/management/AddressControlTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/management/AddressControlTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -18,6 +18,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
import org.hornetq.core.client.ClientSession;
@@ -36,7 +37,6 @@
import org.hornetq.core.server.HornetQServer;
import org.hornetq.core.settings.impl.AddressSettings;
import org.hornetq.tests.util.RandomUtil;
-import org.hornetq.utils.SimpleString;
/**
* A QueueControlTest
Modified: trunk/tests/src/org/hornetq/tests/integration/management/AddressControlUsingCoreTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/management/AddressControlUsingCoreTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/management/AddressControlUsingCoreTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -18,6 +18,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientSession;
import org.hornetq.core.client.ClientSessionFactory;
import org.hornetq.core.client.impl.ClientSessionFactoryImpl;
@@ -33,7 +34,6 @@
import org.hornetq.core.server.HornetQ;
import org.hornetq.core.server.HornetQServer;
import org.hornetq.tests.util.RandomUtil;
-import org.hornetq.utils.SimpleString;
/**
*
Modified: trunk/tests/src/org/hornetq/tests/integration/management/BridgeControlTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/management/BridgeControlTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/management/BridgeControlTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -21,6 +21,8 @@
import junit.framework.Assert;
+import org.hornetq.Pair;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.impl.ClientSessionFactoryImpl;
import org.hornetq.core.config.Configuration;
import org.hornetq.core.config.TransportConfiguration;
@@ -38,8 +40,6 @@
import org.hornetq.core.server.management.Notification;
import org.hornetq.tests.integration.SimpleNotificationService;
import org.hornetq.tests.util.RandomUtil;
-import org.hornetq.utils.Pair;
-import org.hornetq.utils.SimpleString;
/**
* A BridgeControlTest
Modified: trunk/tests/src/org/hornetq/tests/integration/management/BridgeControlUsingCoreTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/management/BridgeControlUsingCoreTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/management/BridgeControlUsingCoreTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -20,6 +20,7 @@
import junit.framework.Assert;
+import org.hornetq.Pair;
import org.hornetq.core.client.ClientSession;
import org.hornetq.core.client.ClientSessionFactory;
import org.hornetq.core.client.impl.ClientSessionFactoryImpl;
@@ -36,7 +37,6 @@
import org.hornetq.core.server.HornetQ;
import org.hornetq.core.server.HornetQServer;
import org.hornetq.tests.util.RandomUtil;
-import org.hornetq.utils.Pair;
/**
* A BridgeControlTest
Modified: trunk/tests/src/org/hornetq/tests/integration/management/BroadcastGroupControlTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/management/BroadcastGroupControlTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/management/BroadcastGroupControlTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -18,6 +18,7 @@
import junit.framework.Assert;
+import org.hornetq.Pair;
import org.hornetq.core.config.Configuration;
import org.hornetq.core.config.TransportConfiguration;
import org.hornetq.core.config.cluster.BroadcastGroupConfiguration;
@@ -28,7 +29,6 @@
import org.hornetq.core.server.HornetQServer;
import org.hornetq.integration.transports.netty.NettyConnectorFactory;
import org.hornetq.tests.util.RandomUtil;
-import org.hornetq.utils.Pair;
import org.hornetq.utils.json.JSONArray;
import org.hornetq.utils.json.JSONObject;
Modified: trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControl2Test.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControl2Test.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControl2Test.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -23,6 +23,7 @@
import junit.framework.Assert;
+import org.hornetq.Pair;
import org.hornetq.core.client.impl.ClientSessionFactoryImpl;
import org.hornetq.core.config.Configuration;
import org.hornetq.core.config.TransportConfiguration;
@@ -39,7 +40,6 @@
import org.hornetq.integration.transports.netty.NettyConnectorFactory;
import org.hornetq.integration.transports.netty.TransportConstants;
import org.hornetq.tests.util.RandomUtil;
-import org.hornetq.utils.Pair;
/**
* A BridgeControlTest
Modified: trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControlTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControlTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControlTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -23,6 +23,8 @@
import junit.framework.Assert;
+import org.hornetq.Pair;
+import org.hornetq.SimpleString;
import org.hornetq.core.config.Configuration;
import org.hornetq.core.config.TransportConfiguration;
import org.hornetq.core.config.cluster.ClusterConnectionConfiguration;
@@ -39,8 +41,6 @@
import org.hornetq.core.server.management.Notification;
import org.hornetq.tests.integration.SimpleNotificationService;
import org.hornetq.tests.util.RandomUtil;
-import org.hornetq.utils.Pair;
-import org.hornetq.utils.SimpleString;
import org.hornetq.utils.json.JSONArray;
import org.hornetq.utils.json.JSONObject;
Modified: trunk/tests/src/org/hornetq/tests/integration/management/DivertControlTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/management/DivertControlTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/management/DivertControlTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -15,6 +15,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.config.Configuration;
import org.hornetq.core.config.TransportConfiguration;
import org.hornetq.core.config.cluster.DivertConfiguration;
@@ -27,7 +28,6 @@
import org.hornetq.core.server.HornetQ;
import org.hornetq.core.server.HornetQServer;
import org.hornetq.tests.util.RandomUtil;
-import org.hornetq.utils.SimpleString;
/**
* A BridgeControlTest
Modified: trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -18,6 +18,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.config.Configuration;
import org.hornetq.core.config.TransportConfiguration;
import org.hornetq.core.config.impl.ConfigurationImpl;
@@ -30,7 +31,6 @@
import org.hornetq.core.server.HornetQ;
import org.hornetq.core.server.HornetQServer;
import org.hornetq.tests.util.RandomUtil;
-import org.hornetq.utils.SimpleString;
import org.hornetq.utils.json.JSONArray;
import org.hornetq.utils.json.JSONObject;
Modified: trunk/tests/src/org/hornetq/tests/integration/management/ManagementControlHelper.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/management/ManagementControlHelper.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/management/ManagementControlHelper.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -19,6 +19,7 @@
import javax.management.MBeanServerInvocationHandler;
import javax.management.ObjectName;
+import org.hornetq.SimpleString;
import org.hornetq.core.management.AcceptorControl;
import org.hornetq.core.management.AddressControl;
import org.hornetq.core.management.BridgeControl;
@@ -33,7 +34,6 @@
import org.hornetq.jms.management.JMSQueueControl;
import org.hornetq.jms.management.JMSServerControl;
import org.hornetq.jms.management.TopicControl;
-import org.hornetq.utils.SimpleString;
/**
* A ManagementControlHelper
Modified: trunk/tests/src/org/hornetq/tests/integration/management/ManagementServiceImplTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/management/ManagementServiceImplTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/management/ManagementServiceImplTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -15,6 +15,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.management.impl.ManagementHelper;
import org.hornetq.core.config.Configuration;
import org.hornetq.core.config.impl.ConfigurationImpl;
@@ -33,7 +34,6 @@
import org.hornetq.tests.unit.core.postoffice.impl.FakeQueue;
import org.hornetq.tests.util.RandomUtil;
import org.hornetq.tests.util.UnitTestCase;
-import org.hornetq.utils.SimpleString;
/*
* @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a>
Modified: trunk/tests/src/org/hornetq/tests/integration/management/ManagementTestBase.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/management/ManagementTestBase.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/management/ManagementTestBase.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -19,11 +19,11 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientSession;
import org.hornetq.tests.util.ServiceTestBase;
-import org.hornetq.utils.SimpleString;
/**
* A ManagementTestBase
Modified: trunk/tests/src/org/hornetq/tests/integration/management/NotificationTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/management/NotificationTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/management/NotificationTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -19,6 +19,7 @@
import static org.hornetq.core.management.NotificationType.CONSUMER_CREATED;
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientSession;
@@ -35,7 +36,6 @@
import org.hornetq.core.server.HornetQServer;
import org.hornetq.tests.util.RandomUtil;
import org.hornetq.tests.util.UnitTestCase;
-import org.hornetq.utils.SimpleString;
/**
* A NotificationTest
Modified: trunk/tests/src/org/hornetq/tests/integration/management/QueueControlTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/management/QueueControlTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/management/QueueControlTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -17,6 +17,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -38,7 +39,6 @@
import org.hornetq.core.server.HornetQServer;
import org.hornetq.core.settings.impl.AddressSettings;
import org.hornetq.tests.util.RandomUtil;
-import org.hornetq.utils.SimpleString;
import org.hornetq.utils.json.JSONArray;
/**
Modified: trunk/tests/src/org/hornetq/tests/integration/management/QueueControlUsingCoreTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/management/QueueControlUsingCoreTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/management/QueueControlUsingCoreTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -15,6 +15,7 @@
import java.util.Map;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientSession;
import org.hornetq.core.client.ClientSessionFactory;
import org.hornetq.core.client.impl.ClientSessionFactoryImpl;
@@ -23,7 +24,6 @@
import org.hornetq.core.management.QueueControl;
import org.hornetq.core.management.ResourceNames;
import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory;
-import org.hornetq.utils.SimpleString;
/**
* A QueueControlTest
Modified: trunk/tests/src/org/hornetq/tests/integration/management/SecurityNotificationTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/management/SecurityNotificationTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/management/SecurityNotificationTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -21,6 +21,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientSession;
@@ -40,7 +41,6 @@
import org.hornetq.core.server.HornetQServer;
import org.hornetq.tests.util.RandomUtil;
import org.hornetq.tests.util.UnitTestCase;
-import org.hornetq.utils.SimpleString;
/**
* A SecurityNotificationTest
Modified: trunk/tests/src/org/hornetq/tests/integration/paging/PageCrashTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/paging/PageCrashTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/paging/PageCrashTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -23,6 +23,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -43,7 +44,6 @@
import org.hornetq.core.settings.impl.AddressSettings;
import org.hornetq.tests.util.ServiceTestBase;
import org.hornetq.utils.OrderedExecutorFactory;
-import org.hornetq.utils.SimpleString;
/**
* This test will make sure that a failing depage won't cause duplicated messages
Modified: trunk/tests/src/org/hornetq/tests/integration/paging/PagingSendTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/paging/PagingSendTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/paging/PagingSendTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -15,6 +15,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -23,7 +24,6 @@
import org.hornetq.core.server.HornetQServer;
import org.hornetq.core.settings.impl.AddressSettings;
import org.hornetq.tests.util.ServiceTestBase;
-import org.hornetq.utils.SimpleString;
/**
* A SendTest
Modified: trunk/tests/src/org/hornetq/tests/integration/replication/ReplicationTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/replication/ReplicationTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/replication/ReplicationTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -28,6 +28,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.buffers.HornetQBuffer;
import org.hornetq.core.buffers.HornetQBuffers;
import org.hornetq.core.client.ClientSessionFactory;
@@ -73,7 +74,6 @@
import org.hornetq.utils.ExecutorFactory;
import org.hornetq.utils.HornetQThreadFactory;
import org.hornetq.utils.OrderedExecutorFactory;
-import org.hornetq.utils.SimpleString;
/**
* A ReplicationTest
Modified: trunk/tests/src/org/hornetq/tests/integration/scheduling/ScheduledMessageTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/scheduling/ScheduledMessageTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/scheduling/ScheduledMessageTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -17,6 +17,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -31,7 +32,6 @@
import org.hornetq.jms.client.HornetQTextMessage;
import org.hornetq.tests.util.ServiceTestBase;
import org.hornetq.tests.util.UnitTestCase;
-import org.hornetq.utils.SimpleString;
import org.hornetq.utils.UUIDGenerator;
/**
Modified: trunk/tests/src/org/hornetq/tests/integration/security/SecurityTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/security/SecurityTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/security/SecurityTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -31,6 +31,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -45,7 +46,6 @@
import org.hornetq.core.server.Queue;
import org.hornetq.core.settings.HierarchicalRepository;
import org.hornetq.tests.util.ServiceTestBase;
-import org.hornetq.utils.SimpleString;
import org.jboss.security.SimpleGroup;
/**
Modified: trunk/tests/src/org/hornetq/tests/integration/server/ExpiryRunnerTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/server/ExpiryRunnerTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/server/ExpiryRunnerTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -22,6 +22,7 @@
import junit.framework.TestSuite;
import junit.textui.TestRunner;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -36,7 +37,6 @@
import org.hornetq.core.server.Queue;
import org.hornetq.core.settings.impl.AddressSettings;
import org.hornetq.tests.util.UnitTestCase;
-import org.hornetq.utils.SimpleString;
/**
* @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
Modified: trunk/tests/src/org/hornetq/tests/integration/server/LVQRecoveryTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/server/LVQRecoveryTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/server/LVQRecoveryTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -17,6 +17,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -31,7 +32,6 @@
import org.hornetq.core.settings.impl.AddressSettings;
import org.hornetq.core.transaction.impl.XidImpl;
import org.hornetq.tests.util.ServiceTestBase;
-import org.hornetq.utils.SimpleString;
/**
* @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
Modified: trunk/tests/src/org/hornetq/tests/integration/server/LVQTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/server/LVQTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/server/LVQTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -14,6 +14,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -29,7 +30,6 @@
import org.hornetq.core.server.HornetQServer;
import org.hornetq.core.settings.impl.AddressSettings;
import org.hornetq.tests.util.UnitTestCase;
-import org.hornetq.utils.SimpleString;
/**
* @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
Modified: trunk/tests/src/org/hornetq/tests/integration/server/PredefinedQueueTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/server/PredefinedQueueTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/server/PredefinedQueueTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -18,6 +18,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -33,7 +34,6 @@
import org.hornetq.core.server.HornetQ;
import org.hornetq.core.server.HornetQServer;
import org.hornetq.tests.util.ServiceTestBase;
-import org.hornetq.utils.SimpleString;
/**
*
Modified: trunk/tests/src/org/hornetq/tests/integration/ssl/CoreClientOverSSLTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/ssl/CoreClientOverSSLTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/ssl/CoreClientOverSSLTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -18,6 +18,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -36,7 +37,6 @@
import org.hornetq.integration.transports.netty.TransportConstants;
import org.hornetq.tests.util.RandomUtil;
import org.hornetq.tests.util.UnitTestCase;
-import org.hornetq.utils.SimpleString;
/**
* @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a>
Modified: trunk/tests/src/org/hornetq/tests/integration/xa/BasicXaRecoveryTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/xa/BasicXaRecoveryTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/xa/BasicXaRecoveryTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -21,6 +21,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -36,7 +37,6 @@
import org.hornetq.jms.client.HornetQTextMessage;
import org.hornetq.tests.util.ServiceTestBase;
import org.hornetq.tests.util.UnitTestCase;
-import org.hornetq.utils.SimpleString;
import org.hornetq.utils.UUIDGenerator;
/**
Modified: trunk/tests/src/org/hornetq/tests/integration/xa/BasicXaTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/xa/BasicXaTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/xa/BasicXaTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -23,6 +23,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -36,7 +37,6 @@
import org.hornetq.core.settings.impl.AddressSettings;
import org.hornetq.core.transaction.impl.XidImpl;
import org.hornetq.tests.util.ServiceTestBase;
-import org.hornetq.utils.SimpleString;
import org.hornetq.utils.UUIDGenerator;
/**
Modified: trunk/tests/src/org/hornetq/tests/integration/xa/XaTimeoutTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/xa/XaTimeoutTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/integration/xa/XaTimeoutTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -25,6 +25,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -42,7 +43,6 @@
import org.hornetq.core.transaction.TransactionOperation;
import org.hornetq.core.transaction.impl.XidImpl;
import org.hornetq.tests.util.UnitTestCase;
-import org.hornetq.utils.SimpleString;
import org.hornetq.utils.UUIDGenerator;
/**
Modified: trunk/tests/src/org/hornetq/tests/performance/paging/MeasurePagingMultiThreadTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/performance/paging/MeasurePagingMultiThreadTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/performance/paging/MeasurePagingMultiThreadTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -16,6 +16,7 @@
import java.util.HashMap;
import java.util.concurrent.CountDownLatch;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
import org.hornetq.core.client.ClientSession;
@@ -25,7 +26,6 @@
import org.hornetq.core.server.HornetQServer;
import org.hornetq.core.settings.impl.AddressSettings;
import org.hornetq.tests.util.ServiceTestBase;
-import org.hornetq.utils.SimpleString;
/**
* A MeasurePagingMultiThreadTest
Modified: trunk/tests/src/org/hornetq/tests/stress/journal/MultiThreadConsumerStressTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/stress/journal/MultiThreadConsumerStressTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/stress/journal/MultiThreadConsumerStressTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -18,6 +18,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -29,7 +30,6 @@
import org.hornetq.core.server.HornetQServer;
import org.hornetq.core.server.JournalType;
import org.hornetq.tests.util.ServiceTestBase;
-import org.hornetq.utils.SimpleString;
/**
* A MultiThreadConsumerStressTest
Modified: trunk/tests/src/org/hornetq/tests/stress/journal/NIOMultiThreadCompactorStressTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/stress/journal/NIOMultiThreadCompactorStressTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/stress/journal/NIOMultiThreadCompactorStressTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -23,6 +23,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.asyncio.impl.AsynchronousFileImpl;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
@@ -39,7 +40,6 @@
import org.hornetq.core.server.HornetQServer;
import org.hornetq.core.server.JournalType;
import org.hornetq.tests.util.ServiceTestBase;
-import org.hornetq.utils.SimpleString;
/**
* A MultiThreadConsumerStressTest
Modified: trunk/tests/src/org/hornetq/tests/stress/paging/PageStressTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/stress/paging/PageStressTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/stress/paging/PageStressTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -17,6 +17,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -28,7 +29,6 @@
import org.hornetq.core.server.JournalType;
import org.hornetq.core.settings.impl.AddressSettings;
import org.hornetq.tests.util.ServiceTestBase;
-import org.hornetq.utils.SimpleString;
/**
* This is an integration-tests that will take some time to run.
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 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/timing/core/server/impl/QueueImplTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -21,6 +21,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.logging.Logger;
import org.hornetq.core.server.Consumer;
import org.hornetq.core.server.HandleStatus;
@@ -29,7 +30,6 @@
import org.hornetq.core.server.impl.QueueImpl;
import org.hornetq.tests.unit.core.server.impl.fakes.FakeConsumer;
import org.hornetq.tests.util.UnitTestCase;
-import org.hornetq.utils.SimpleString;
/**
* @author <a href="ataylor(a)redhat.com">Andy Taylor</a>
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 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/unit/core/client/impl/LargeMessageBufferTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -27,6 +27,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.buffers.HornetQBuffer;
import org.hornetq.core.buffers.HornetQBuffers;
import org.hornetq.core.client.ClientMessage;
@@ -40,7 +41,6 @@
import org.hornetq.core.remoting.impl.wireformat.SessionReceiveLargeMessage;
import org.hornetq.tests.util.RandomUtil;
import org.hornetq.tests.util.UnitTestCase;
-import org.hornetq.utils.SimpleString;
/**
* A LargeMessageBufferUnitTest
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 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/unit/core/config/impl/ConfigurationImplTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -20,12 +20,12 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.config.Configuration;
import org.hornetq.core.config.impl.ConfigurationImpl;
import org.hornetq.core.server.JournalType;
import org.hornetq.tests.util.RandomUtil;
import org.hornetq.tests.util.UnitTestCase;
-import org.hornetq.utils.SimpleString;
/**
*
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 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/unit/core/config/impl/FileConfigurationTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -15,6 +15,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.config.Configuration;
import org.hornetq.core.config.TransportConfiguration;
import org.hornetq.core.config.cluster.BridgeConfiguration;
@@ -24,7 +25,6 @@
import org.hornetq.core.config.cluster.DivertConfiguration;
import org.hornetq.core.config.impl.FileConfiguration;
import org.hornetq.core.server.JournalType;
-import org.hornetq.utils.SimpleString;
/**
* @author <a href="ataylor(a)redhat.com">Andy Taylor</a>
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 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/unit/core/deployers/impl/AddressSettingsDeployerTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -15,6 +15,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.deployers.DeploymentManager;
import org.hornetq.core.deployers.impl.AddressSettingsDeployer;
import org.hornetq.core.settings.HierarchicalRepository;
@@ -22,7 +23,6 @@
import org.hornetq.core.settings.impl.AddressSettings;
import org.hornetq.core.settings.impl.HierarchicalObjectRepository;
import org.hornetq.tests.util.UnitTestCase;
-import org.hornetq.utils.SimpleString;
import org.hornetq.utils.XMLUtil;
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
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 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/unit/core/deployers/impl/FileDeploymentManagerTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -18,11 +18,11 @@
import junit.framework.Assert;
+import org.hornetq.Pair;
import org.hornetq.core.deployers.Deployer;
import org.hornetq.core.deployers.impl.FileDeploymentManager;
import org.hornetq.core.logging.Logger;
import org.hornetq.tests.util.UnitTestCase;
-import org.hornetq.utils.Pair;
/**
*
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 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/unit/core/filter/impl/FilterParserTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -19,12 +19,12 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.filter.impl.FilterParser;
import org.hornetq.core.filter.impl.Identifier;
import org.hornetq.core.filter.impl.Operator;
import org.hornetq.core.logging.Logger;
import org.hornetq.tests.util.UnitTestCase;
-import org.hornetq.utils.SimpleString;
/**
Tests of the JavaCC LL(1) parser for the HornetQ filters
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 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/unit/core/filter/impl/FilterTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -15,6 +15,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.exception.HornetQException;
import org.hornetq.core.filter.Filter;
import org.hornetq.core.filter.impl.FilterImpl;
@@ -23,7 +24,6 @@
import org.hornetq.core.server.impl.ServerMessageImpl;
import org.hornetq.tests.util.RandomUtil;
import org.hornetq.tests.util.UnitTestCase;
-import org.hornetq.utils.SimpleString;
/**
* Tests the compliance with the HornetQ Filter syntax.
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 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/unit/core/filter/impl/OperatorTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -17,9 +17,9 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.filter.impl.Operator;
import org.hornetq.tests.util.UnitTestCase;
-import org.hornetq.utils.SimpleString;
/**
* A OperatorTest
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 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/unit/core/message/impl/MessageImplTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -17,12 +17,12 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.client.impl.ClientMessageImpl;
import org.hornetq.core.logging.Logger;
import org.hornetq.core.message.Message;
import org.hornetq.tests.util.RandomUtil;
import org.hornetq.tests.util.UnitTestCase;
-import org.hornetq.utils.SimpleString;
/**
*
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 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/unit/core/paging/impl/PageImplTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -19,6 +19,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.buffers.HornetQBuffer;
import org.hornetq.core.journal.SequentialFile;
import org.hornetq.core.journal.SequentialFileFactory;
@@ -31,7 +32,6 @@
import org.hornetq.core.server.impl.ServerMessageImpl;
import org.hornetq.tests.unit.core.journal.impl.fakes.FakeSequentialFileFactory;
import org.hornetq.tests.util.UnitTestCase;
-import org.hornetq.utils.SimpleString;
/**
*
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 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/unit/core/paging/impl/PagingManagerImplTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -20,6 +20,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.paging.Page;
import org.hornetq.core.paging.PagedMessage;
import org.hornetq.core.paging.impl.PagingManagerImpl;
@@ -35,7 +36,6 @@
import org.hornetq.tests.util.RandomUtil;
import org.hornetq.tests.util.UnitTestCase;
import org.hornetq.utils.OrderedExecutorFactory;
-import org.hornetq.utils.SimpleString;
/**
*
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 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/unit/core/paging/impl/PagingStoreImplTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -30,6 +30,8 @@
import junit.framework.Assert;
+import org.hornetq.Pair;
+import org.hornetq.SimpleString;
import org.hornetq.core.buffers.HornetQBuffer;
import org.hornetq.core.buffers.HornetQBuffers;
import org.hornetq.core.journal.IOAsyncTask;
@@ -67,8 +69,6 @@
import org.hornetq.tests.unit.core.server.impl.fakes.FakePostOffice;
import org.hornetq.tests.util.RandomUtil;
import org.hornetq.tests.util.UnitTestCase;
-import org.hornetq.utils.Pair;
-import org.hornetq.utils.SimpleString;
import org.hornetq.utils.UUID;
/**
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 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/unit/core/postoffice/impl/AddressImplTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -14,10 +14,10 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.postoffice.Address;
import org.hornetq.core.postoffice.impl.AddressImpl;
import org.hornetq.tests.util.UnitTestCase;
-import org.hornetq.utils.SimpleString;
/**
* @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a>
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 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/unit/core/postoffice/impl/BindingsImplTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -20,6 +20,7 @@
import javax.transaction.xa.Xid;
+import org.hornetq.SimpleString;
import org.hornetq.core.buffers.HornetQBuffer;
import org.hornetq.core.exception.HornetQException;
import org.hornetq.core.filter.Filter;
@@ -39,7 +40,6 @@
import org.hornetq.core.transaction.Transaction;
import org.hornetq.core.transaction.TransactionOperation;
import org.hornetq.tests.util.UnitTestCase;
-import org.hornetq.utils.SimpleString;
import org.hornetq.utils.TypedProperties;
/**
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 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -23,6 +23,8 @@
import junit.framework.Assert;
+import org.hornetq.Pair;
+import org.hornetq.SimpleString;
import org.hornetq.core.config.Configuration;
import org.hornetq.core.config.impl.ConfigurationImpl;
import org.hornetq.core.paging.PageTransactionInfo;
@@ -42,8 +44,6 @@
import org.hornetq.tests.util.ServiceTestBase;
import org.hornetq.utils.ExecutorFactory;
import org.hornetq.utils.OrderedExecutorFactory;
-import org.hornetq.utils.Pair;
-import org.hornetq.utils.SimpleString;
/**
* A DuplicateDetectionUnitTest
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 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/unit/core/postoffice/impl/FakeQueue.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -18,6 +18,7 @@
import java.util.Set;
import java.util.concurrent.Executor;
+import org.hornetq.SimpleString;
import org.hornetq.core.filter.Filter;
import org.hornetq.core.server.Consumer;
import org.hornetq.core.server.MessageReference;
@@ -25,7 +26,6 @@
import org.hornetq.core.server.RoutingContext;
import org.hornetq.core.server.ServerMessage;
import org.hornetq.core.transaction.Transaction;
-import org.hornetq.utils.SimpleString;
public class FakeQueue implements Queue
{
Modified: trunk/tests/src/org/hornetq/tests/unit/core/remoting/HornetQBufferTestBase.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/unit/core/remoting/HornetQBufferTestBase.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/unit/core/remoting/HornetQBufferTestBase.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -15,10 +15,10 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.buffers.HornetQBuffer;
import org.hornetq.tests.util.RandomUtil;
import org.hornetq.tests.util.UnitTestCase;
-import org.hornetq.utils.SimpleString;
/**
* @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a>.
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 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/unit/core/server/impl/QueueImplTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -22,6 +22,7 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.filter.Filter;
import org.hornetq.core.filter.impl.FilterImpl;
import org.hornetq.core.server.Consumer;
@@ -34,7 +35,6 @@
import org.hornetq.tests.unit.core.server.impl.fakes.FakeFilter;
import org.hornetq.tests.unit.core.server.impl.fakes.FakePostOffice;
import org.hornetq.tests.util.UnitTestCase;
-import org.hornetq.utils.SimpleString;
/**
* A QueueTest
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 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/unit/core/server/impl/fakes/FakeFilter.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -13,9 +13,9 @@
package org.hornetq.tests.unit.core.server.impl.fakes;
+import org.hornetq.SimpleString;
import org.hornetq.core.filter.Filter;
import org.hornetq.core.server.ServerMessage;
-import org.hornetq.utils.SimpleString;
/**
*
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 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/unit/core/server/impl/fakes/FakePostOffice.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -13,6 +13,7 @@
package org.hornetq.tests.unit.core.server.impl.fakes;
+import org.hornetq.SimpleString;
import org.hornetq.core.paging.PagingManager;
import org.hornetq.core.postoffice.Binding;
import org.hornetq.core.postoffice.Bindings;
@@ -23,7 +24,6 @@
import org.hornetq.core.server.RoutingContext;
import org.hornetq.core.server.ServerMessage;
import org.hornetq.core.transaction.Transaction;
-import org.hornetq.utils.SimpleString;
public class FakePostOffice implements PostOffice
{
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 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/unit/core/server/impl/fakes/FakeQueueFactory.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -16,12 +16,12 @@
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
+import org.hornetq.SimpleString;
import org.hornetq.core.filter.Filter;
import org.hornetq.core.postoffice.PostOffice;
import org.hornetq.core.server.Queue;
import org.hornetq.core.server.QueueFactory;
import org.hornetq.core.server.impl.QueueImpl;
-import org.hornetq.utils.SimpleString;
/**
*
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 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/unit/core/settings/impl/AddressSettingsTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -15,10 +15,10 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.settings.impl.AddressFullMessagePolicy;
import org.hornetq.core.settings.impl.AddressSettings;
import org.hornetq.tests.util.UnitTestCase;
-import org.hornetq.utils.SimpleString;
/**
* @author <a href="ataylor(a)redhat.com">Andy Taylor</a>
Modified: trunk/tests/src/org/hornetq/tests/unit/jms/HornetQTopicTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/unit/jms/HornetQTopicTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/unit/jms/HornetQTopicTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -15,10 +15,10 @@
import junit.framework.Assert;
+import org.hornetq.Pair;
import org.hornetq.jms.HornetQTopic;
import org.hornetq.tests.util.RandomUtil;
import org.hornetq.tests.util.UnitTestCase;
-import org.hornetq.utils.Pair;
/**
* @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a>
Modified: trunk/tests/src/org/hornetq/tests/unit/util/SimpleStringTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/unit/util/SimpleStringTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/unit/util/SimpleStringTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -17,10 +17,10 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.tests.util.RandomUtil;
import org.hornetq.tests.util.UnitTestCase;
import org.hornetq.utils.DataConstants;
-import org.hornetq.utils.SimpleString;
/**
*
Modified: trunk/tests/src/org/hornetq/tests/unit/util/TypedPropertiesConversionTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/unit/util/TypedPropertiesConversionTest.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/unit/util/TypedPropertiesConversionTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -16,10 +16,10 @@
import junit.framework.Assert;
import junit.framework.TestCase;
+import org.hornetq.SimpleString;
import org.hornetq.core.message.PropertyConversionException;
import org.hornetq.tests.util.RandomUtil;
import org.hornetq.tests.util.UnitTestCase;
-import org.hornetq.utils.SimpleString;
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 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/unit/util/TypedPropertiesTest.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -17,11 +17,11 @@
import junit.framework.Assert;
+import org.hornetq.SimpleString;
import org.hornetq.core.buffers.HornetQBuffer;
import org.hornetq.core.buffers.HornetQBuffers;
import org.hornetq.tests.util.RandomUtil;
import org.hornetq.tests.util.UnitTestCase;
-import org.hornetq.utils.SimpleString;
import org.hornetq.utils.TypedProperties;
/**
Modified: trunk/tests/src/org/hornetq/tests/util/JMSTestBase.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/util/JMSTestBase.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/util/JMSTestBase.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -20,6 +20,7 @@
import javax.jms.Queue;
import javax.naming.NamingException;
+import org.hornetq.Pair;
import org.hornetq.core.client.impl.ClientSessionFactoryImpl;
import org.hornetq.core.config.Configuration;
import org.hornetq.core.config.TransportConfiguration;
@@ -29,7 +30,6 @@
import org.hornetq.integration.transports.netty.NettyConnectorFactory;
import org.hornetq.jms.server.impl.JMSServerManagerImpl;
import org.hornetq.tests.unit.util.InVMContext;
-import org.hornetq.utils.Pair;
/**
* A JMSBaseTest
Modified: trunk/tests/src/org/hornetq/tests/util/RandomUtil.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/util/RandomUtil.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/util/RandomUtil.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -18,8 +18,8 @@
import javax.transaction.xa.Xid;
+import org.hornetq.SimpleString;
import org.hornetq.core.transaction.impl.XidImpl;
-import org.hornetq.utils.SimpleString;
/**
* @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a>
Modified: trunk/tests/src/org/hornetq/tests/util/UnitTestCase.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/util/UnitTestCase.java 2009-12-16 13:55:08 UTC (rev 8696)
+++ trunk/tests/src/org/hornetq/tests/util/UnitTestCase.java 2009-12-16 15:31:57 UTC (rev 8697)
@@ -44,6 +44,7 @@
import junit.framework.TestCase;
import junit.framework.TestSuite;
+import org.hornetq.SimpleString;
import org.hornetq.core.asyncio.impl.AsynchronousFileImpl;
import org.hornetq.core.buffers.HornetQBuffer;
import org.hornetq.core.client.ClientMessage;
@@ -65,7 +66,6 @@
import org.hornetq.core.server.impl.ServerMessageImpl;
import org.hornetq.core.transaction.impl.XidImpl;
import org.hornetq.jms.client.HornetQTextMessage;
-import org.hornetq.utils.SimpleString;
import org.hornetq.utils.UUIDGenerator;
/**
14 years, 4 months
- 1
- 0
JBoss hornetq SVN: r8696 - in trunk/src/main/org/hornetq/core: client/impl and 3 other directories.
by do-not-reply＠jboss.org
Author: jmesnil
Date: 2009-12-16 08:55:08 -0500 (Wed, 16 Dec 2009)
New Revision: 8696
Added:
trunk/src/main/org/hornetq/core/client/impl/LargeMessageBufferInternal.java
Removed:
trunk/src/main/org/hornetq/core/client/LargeMessageBuffer.java
Modified:
trunk/src/main/org/hornetq/core/client/impl/ClientMessageImpl.java
trunk/src/main/org/hornetq/core/client/impl/LargeMessageBufferImpl.java
trunk/src/main/org/hornetq/core/message/Message.java
trunk/src/main/org/hornetq/core/message/impl/MessageImpl.java
trunk/src/main/org/hornetq/core/server/management/impl/ManagementServiceImpl.java
Log:
HORNETQ-185 + HORNETQ-186: API review + javadoc
* removed LargeMessageBuffer from client API
* remove Message.getTypedProperties() method
Deleted: trunk/src/main/org/hornetq/core/client/LargeMessageBuffer.java
===================================================================
--- trunk/src/main/org/hornetq/core/client/LargeMessageBuffer.java 2009-12-16 13:53:24 UTC (rev 8695)
+++ trunk/src/main/org/hornetq/core/client/LargeMessageBuffer.java 2009-12-16 13:55:08 UTC (rev 8696)
@@ -1,66 +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.core.client;
-
-import java.io.OutputStream;
-
-import org.hornetq.core.buffers.HornetQBuffer;
-import org.hornetq.core.exception.HornetQException;
-
-/**
- * A LargeMessageBuffer represents the buffer of a large message.
- *
- * @author <a href="mailto:clebert.suconic@jboss.org">Clebert Suconic</a>
- *
- *
- */
-public interface LargeMessageBuffer extends HornetQBuffer
-{
- /**
- * Returns the size of this buffer.
-
- */
- long getSize();
-
- /**
- * Discards packets unused by this buffer.
- */
- void discardUnusedPackets();
-
- /**
- * Closes this buffer.
- */
- void close();
-
- /**
- * Cancels this buffer.
- */
- void cancel();
-
- /**
- * Sets the OutputStream of this buffer to the specified output.
- */
- void setOutputStream(final OutputStream output) throws HornetQException;
-
- /**
- * Saves this buffer to the specified output.
- */
- void saveBuffer(final OutputStream output) throws HornetQException;
-
- /**
- * Waits for the completion for the specified waiting time (in milliseconds).
- */
- boolean waitCompletion(long timeWait) throws HornetQException;
-
-}
Modified: trunk/src/main/org/hornetq/core/client/impl/ClientMessageImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/client/impl/ClientMessageImpl.java 2009-12-16 13:53:24 UTC (rev 8695)
+++ trunk/src/main/org/hornetq/core/client/impl/ClientMessageImpl.java 2009-12-16 13:55:08 UTC (rev 8696)
@@ -20,7 +20,6 @@
import org.hornetq.core.buffers.HornetQBuffer;
import org.hornetq.core.buffers.HornetQBuffers;
-import org.hornetq.core.client.LargeMessageBuffer;
import org.hornetq.core.exception.HornetQException;
import org.hornetq.core.logging.Logger;
import org.hornetq.core.message.BodyEncoder;
@@ -150,7 +149,7 @@
{
if (largeMessage)
{
- ((LargeMessageBufferImpl)getWholeBuffer()).saveBuffer(out);
+ ((LargeMessageBufferInternal)getWholeBuffer()).saveBuffer(out);
}
else
{
@@ -175,7 +174,7 @@
{
if (largeMessage)
{
- ((LargeMessageBufferImpl)getWholeBuffer()).setOutputStream(out);
+ ((LargeMessageBufferInternal)getWholeBuffer()).setOutputStream(out);
}
else
{
@@ -191,7 +190,7 @@
{
if (largeMessage)
{
- return ((LargeMessageBufferImpl)getWholeBuffer()).waitCompletion(timeMilliseconds);
+ return ((LargeMessageBufferInternal)getWholeBuffer()).waitCompletion(timeMilliseconds);
}
else
{
@@ -206,7 +205,7 @@
{
if (largeMessage)
{
- ((LargeMessageBuffer)getWholeBuffer()).discardUnusedPackets();
+ ((LargeMessageBufferInternal)getWholeBuffer()).discardUnusedPackets();
}
}
Modified: trunk/src/main/org/hornetq/core/client/impl/LargeMessageBufferImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/client/impl/LargeMessageBufferImpl.java 2009-12-16 13:53:24 UTC (rev 8695)
+++ trunk/src/main/org/hornetq/core/client/impl/LargeMessageBufferImpl.java 2009-12-16 13:55:08 UTC (rev 8696)
@@ -27,7 +27,6 @@
import java.util.concurrent.TimeUnit;
import org.hornetq.core.buffers.HornetQBuffer;
-import org.hornetq.core.client.LargeMessageBuffer;
import org.hornetq.core.exception.HornetQException;
import org.hornetq.core.logging.Logger;
import org.hornetq.core.remoting.impl.wireformat.SessionReceiveContinuationMessage;
@@ -44,7 +43,7 @@
*
*
*/
-public class LargeMessageBufferImpl implements LargeMessageBuffer
+public class LargeMessageBufferImpl implements LargeMessageBufferInternal
{
// Constants -----------------------------------------------------
Added: trunk/src/main/org/hornetq/core/client/impl/LargeMessageBufferInternal.java
===================================================================
--- trunk/src/main/org/hornetq/core/client/impl/LargeMessageBufferInternal.java (rev 0)
+++ trunk/src/main/org/hornetq/core/client/impl/LargeMessageBufferInternal.java 2009-12-16 13:55:08 UTC (rev 8696)
@@ -0,0 +1,64 @@
+/*
+ * 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.client.impl;
+
+import java.io.OutputStream;
+
+import org.hornetq.core.buffers.HornetQBuffer;
+import org.hornetq.core.exception.HornetQException;
+
+/**
+ * A LargeMessageBufferInternal
+ *
+ * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a>
+ */
+public interface LargeMessageBufferInternal extends HornetQBuffer
+{
+ /**
+ * Returns the size of this buffer.
+
+ */
+ long getSize();
+
+ /**
+ * Discards packets unused by this buffer.
+ */
+ void discardUnusedPackets();
+
+ /**
+ * Closes this buffer.
+ */
+ void close();
+
+ /**
+ * Cancels this buffer.
+ */
+ void cancel();
+
+ /**
+ * Sets the OutputStream of this buffer to the specified output.
+ */
+ void setOutputStream(final OutputStream output) throws HornetQException;
+
+ /**
+ * Saves this buffer to the specified output.
+ */
+ void saveBuffer(final OutputStream output) throws HornetQException;
+
+ /**
+ * Waits for the completion for the specified waiting time (in milliseconds).
+ */
+ boolean waitCompletion(long timeWait) throws HornetQException;
+
+}
Modified: trunk/src/main/org/hornetq/core/message/Message.java
===================================================================
--- trunk/src/main/org/hornetq/core/message/Message.java 2009-12-16 13:53:24 UTC (rev 8695)
+++ trunk/src/main/org/hornetq/core/message/Message.java 2009-12-16 13:55:08 UTC (rev 8696)
@@ -13,13 +13,11 @@
package org.hornetq.core.message;
-import java.io.InputStream;
import java.util.Map;
import java.util.Set;
import org.hornetq.core.buffers.HornetQBuffer;
import org.hornetq.utils.SimpleString;
-import org.hornetq.utils.TypedProperties;
/**
* A Message is a routable instance that has a payload.
@@ -312,8 +310,6 @@
*/
void putObjectProperty(String key, Object value) throws PropertyConversionException;
- void putTypedProperties(TypedProperties properties);
-
/**
* Removes the property corresponding to the specified key.
* @param key property name
Modified: trunk/src/main/org/hornetq/core/message/impl/MessageImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/message/impl/MessageImpl.java 2009-12-16 13:53:24 UTC (rev 8695)
+++ trunk/src/main/org/hornetq/core/message/impl/MessageImpl.java 2009-12-16 13:55:08 UTC (rev 8696)
@@ -21,7 +21,7 @@
import org.hornetq.core.buffers.HornetQBuffer;
import org.hornetq.core.buffers.HornetQBuffers;
import org.hornetq.core.buffers.impl.ResetLimitWrappedHornetQBuffer;
-import org.hornetq.core.client.LargeMessageBuffer;
+import org.hornetq.core.client.impl.LargeMessageBufferInternal;
import org.hornetq.core.exception.HornetQException;
import org.hornetq.core.logging.Logger;
import org.hornetq.core.message.BodyEncoder;
@@ -228,7 +228,7 @@
{
if (bodyBuffer == null)
{
- if (buffer instanceof LargeMessageBuffer == false)
+ if (buffer instanceof LargeMessageBufferInternal == false)
{
bodyBuffer = new ResetLimitWrappedHornetQBuffer(PacketImpl.PACKET_HEADERS_SIZE + DataConstants.SIZE_INT,
buffer,
Modified: trunk/src/main/org/hornetq/core/server/management/impl/ManagementServiceImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/management/impl/ManagementServiceImpl.java 2009-12-16 13:53:24 UTC (rev 8695)
+++ trunk/src/main/org/hornetq/core/server/management/impl/ManagementServiceImpl.java 2009-12-16 13:55:08 UTC (rev 8696)
@@ -722,34 +722,30 @@
ServerMessage notificationMessage = new ServerMessageImpl(messageID, 512);
// Notification messages are always durable so the user can choose whether to add a durable queue to
- // consume
- // them in
+ // consume them in
notificationMessage.setDurable(true);
notificationMessage.setAddress(managementNotificationAddress);
- TypedProperties notifProps;
if (notification.getProperties() != null)
{
- notifProps = new TypedProperties(notification.getProperties());
+ TypedProperties props = notification.getProperties();
+ for (SimpleString name : notification.getProperties().getPropertyNames())
+ {
+ notificationMessage.putObjectProperty(name, props.getProperty(name));
+ }
}
- else
- {
- notifProps = new TypedProperties();
- }
- notifProps.putSimpleStringProperty(ManagementHelper.HDR_NOTIFICATION_TYPE,
+ notificationMessage.putStringProperty(ManagementHelper.HDR_NOTIFICATION_TYPE,
new SimpleString(notification.getType().toString()));
- notifProps.putLongProperty(ManagementHelper.HDR_NOTIFICATION_TIMESTAMP, System.currentTimeMillis());
+ notificationMessage.putLongProperty(ManagementHelper.HDR_NOTIFICATION_TIMESTAMP, System.currentTimeMillis());
if (notification.getUID() != null)
{
- notifProps.putSimpleStringProperty(new SimpleString("foobar"),
+ notificationMessage.putStringProperty(new SimpleString("foobar"),
new SimpleString(notification.getUID()));
}
- notificationMessage.putTypedProperties(notifProps);
-
postOffice.route(notificationMessage);
}
}
14 years, 4 months
- 1
- 0
JBoss hornetq SVN: r8695 - in trunk: src/main/org/hornetq/core/server/impl and 1 other directories.
by do-not-reply＠jboss.org
Author: jmesnil
Date: 2009-12-16 08:53:24 -0500 (Wed, 16 Dec 2009)
New Revision: 8695
Added:
trunk/tests/src/org/hornetq/tests/integration/client/IncompatibleVersionTest.java
Modified:
trunk/src/main/org/hornetq/core/client/impl/FailoverManagerImpl.java
trunk/src/main/org/hornetq/core/server/impl/HornetQPacketHandler.java
Log:
HORNETQ-252: Connections not closed if client/server version mismatch
* destroy the connection on the client if the server reports an incompatible version
* send a HornetQException to the client, flush it and destroy the connection when the server
detects an incompatible version from the client
* added IncompatibleVersionTest
Modified: trunk/src/main/org/hornetq/core/client/impl/FailoverManagerImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/client/impl/FailoverManagerImpl.java 2009-12-15 15:09:02 UTC (rev 8694)
+++ trunk/src/main/org/hornetq/core/client/impl/FailoverManagerImpl.java 2009-12-16 13:53:24 UTC (rev 8695)
@@ -378,6 +378,11 @@
}
catch (HornetQException e)
{
+ if (e.getCode() == HornetQException.INCOMPATIBLE_CLIENT_SERVER_VERSIONS)
+ {
+ theConnection.destroy();
+ }
+
if (e.getCode() == HornetQException.UNBLOCKED)
{
// This means the thread was blocked on create session and failover unblocked it
Modified: trunk/src/main/org/hornetq/core/server/impl/HornetQPacketHandler.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/impl/HornetQPacketHandler.java 2009-12-15 15:09:02 UTC (rev 8694)
+++ trunk/src/main/org/hornetq/core/server/impl/HornetQPacketHandler.java 2009-12-16 13:53:24 UTC (rev 8695)
@@ -112,6 +112,7 @@
private void handleCreateSession(final CreateSessionMessage request)
{
+ boolean incompatibleVersion = false;
Packet response;
try
{
@@ -133,6 +134,11 @@
if (e instanceof HornetQException)
{
response = new HornetQExceptionMessage((HornetQException)e);
+
+ if (((HornetQException)e).getCode() == HornetQException.INCOMPATIBLE_CLIENT_SERVER_VERSIONS)
+ {
+ incompatibleVersion = true;
+ }
}
else
{
@@ -140,8 +146,19 @@
response = new HornetQExceptionMessage(new HornetQException(HornetQException.INTERNAL_ERROR));
}
}
-
- channel1.send(response);
+
+ // send the exception to the client and destroy
+ // the connection if the client and server versions
+ // are not compatible
+ if (incompatibleVersion)
+ {
+ channel1.sendAndFlush(response);
+ connection.destroy();
+ }
+ else
+ {
+ channel1.send(response);
+ }
}
private void handleReattachSession(final ReattachSessionMessage request)
Added: trunk/tests/src/org/hornetq/tests/integration/client/IncompatibleVersionTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/IncompatibleVersionTest.java (rev 0)
+++ trunk/tests/src/org/hornetq/tests/integration/client/IncompatibleVersionTest.java 2009-12-16 13:53:24 UTC (rev 8695)
@@ -0,0 +1,157 @@
+/*
+ * 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.tests.integration.client;
+
+import static org.hornetq.tests.util.RandomUtil.randomString;
+
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+
+import org.hornetq.core.client.ClientSessionFactory;
+import org.hornetq.core.client.impl.ClientSessionFactoryImpl;
+import org.hornetq.core.client.impl.FailoverManagerImpl;
+import org.hornetq.core.config.TransportConfiguration;
+import org.hornetq.core.exception.HornetQException;
+import org.hornetq.core.remoting.Channel;
+import org.hornetq.core.remoting.Packet;
+import org.hornetq.core.remoting.RemotingConnection;
+import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory;
+import org.hornetq.core.remoting.impl.wireformat.CreateSessionMessage;
+import org.hornetq.core.remoting.impl.wireformat.CreateSessionResponseMessage;
+import org.hornetq.core.server.HornetQServer;
+import org.hornetq.tests.util.ServiceTestBase;
+import org.hornetq.utils.VersionLoader;
+
+/**
+ * A IncompatibleVersionTest
+ *
+ * @author jmesnil
+ *
+ *
+ */
+public class IncompatibleVersionTest extends ServiceTestBase
+{
+
+ // Constants -----------------------------------------------------
+
+ // Attributes ----------------------------------------------------
+
+ private HornetQServer server;
+
+ private RemotingConnection connection;
+
+ // Static --------------------------------------------------------
+
+ // Constructors --------------------------------------------------
+
+ // Public --------------------------------------------------------
+
+ @Override
+ protected void setUp() throws Exception
+ {
+ server = createServer(false, false);
+ server.start();
+
+ TransportConfiguration config = new TransportConfiguration(InVMConnectorFactory.class.getName());
+ ClientSessionFactory csf = new ClientSessionFactoryImpl(config);
+ ExecutorService executorService = Executors.newFixedThreadPool(1);
+ ScheduledExecutorService scheduledexecutorService = Executors.newScheduledThreadPool(1);
+ FailoverManagerImpl failoverManager = new FailoverManagerImpl(csf,
+ config,
+ null,
+ ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN,
+ ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT,
+ ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD,
+ ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL,
+ ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL,
+ ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER,
+ ClientSessionFactoryImpl.DEFAULT_MAX_RETRY_INTERVAL,
+ ClientSessionFactoryImpl.DEFAULT_RECONNECT_ATTEMPTS,
+ executorService,
+ scheduledexecutorService,
+ null);
+ connection = failoverManager.getConnection();
+ }
+
+ @Override
+ protected void tearDown() throws Exception
+ {
+ server.stop();
+ }
+
+ public void testCompatibleClientVersion() throws Exception
+ {
+ doTestClientVersionCompatibility(true);
+ }
+
+ public void testIncompatibleClientVersion() throws Exception
+ {
+ doTestClientVersionCompatibility(false);
+ }
+
+ private void doTestClientVersionCompatibility(boolean compatible) throws Exception
+ {
+ Channel channel1 = connection.getChannel(1, -1);
+ long sessionChannelID = connection.generateChannelID();
+ int version = VersionLoader.getVersion().getIncrementingVersion();
+ if (!compatible)
+ {
+ version = -1;
+ }
+ Packet request = new CreateSessionMessage(randomString(),
+ sessionChannelID,
+ version,
+ null,
+ null,
+ ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE,
+ false,
+ true,
+ true,
+ false,
+ ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE);
+
+ if (compatible)
+ {
+ Packet packet = channel1.sendBlocking(request);
+ assertNotNull(packet);
+ assertTrue(packet instanceof CreateSessionResponseMessage);
+ // 1 connection on the server
+ assertEquals(1, server.getConnectionCount());
+ }
+ else
+ {
+ try
+ {
+ channel1.sendBlocking(request);
+ fail();
+ }
+ catch (HornetQException e)
+ {
+ assertEquals(HornetQException.INCOMPATIBLE_CLIENT_SERVER_VERSIONS, e.getCode());
+ }
+ // no connection on the server
+ assertEquals(0, server.getConnectionCount());
+ }
+ }
+
+ // Package protected ---------------------------------------------
+
+ // Protected -----------------------------------------------------
+
+ // Private -------------------------------------------------------
+
+ // Inner classes -------------------------------------------------
+
+}
14 years, 4 months
- 1
- 0