[hornetq-commits] JBoss hornetq SVN: r7854 - in trunk: examples/javaee/ejb-jms-transaction/src/org/hornetq/javaee/example and 83 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Fri Aug 21 04:50:03 EDT 2009
Author: timfox
Date: 2009-08-21 04:50:00 -0400 (Fri, 21 Aug 2009)
New Revision: 7854
Modified:
trunk/examples/common/src/org/hornetq/common/example/DummyXid.java
trunk/examples/common/src/org/hornetq/common/example/HornetQExample.java
trunk/examples/common/src/org/hornetq/common/example/SpawnedVMSupport.java
trunk/examples/javaee/ejb-jms-transaction/src/org/hornetq/javaee/example/EJBClientExample.java
trunk/examples/javaee/ejb-jms-transaction/src/org/hornetq/javaee/example/server/SendMessageBean.java
trunk/examples/javaee/hajndi/src/org/hornetq/javaee/example/HAJNDIExample.java
trunk/examples/jms/browser/src/org/hornetq/jms/example/QueueBrowserExample.java
trunk/examples/jms/client-kickoff/src/org/hornetq/jms/example/ClientKickoffExample.java
trunk/examples/jms/jmx/src/org/hornetq/jms/example/JMXExample.java
trunk/examples/jms/large-message/src/org/hornetq/jms/example/LargeMessageExample.java
trunk/examples/jms/message-counters/src/org/hornetq/jms/example/MessageCounterExample.java
trunk/examples/jms/paging/src/org/hornetq/jms/example/PagingExample.java
trunk/examples/jms/request-reply/src/org/hornetq/jms/example/RequestReplyExample.java
trunk/examples/jms/symmetric-cluster/src/org/hornetq/jms/example/SymmetricClusterExample.java
trunk/examples/jms/xa-heuristic/src/org/hornetq/jms/example/XAHeuristicExample.java
trunk/examples/jms/xa-receive/src/org/hornetq/jms/example/XAReceiveExample.java
trunk/examples/jms/xa-send/src/org/hornetq/jms/example/XASendExample.java
trunk/src/main/org/hornetq/core/buffers/ChannelBuffer.java
trunk/src/main/org/hornetq/core/client/ClientRequestor.java
trunk/src/main/org/hornetq/core/client/impl/ClientConsumerImpl.java
trunk/src/main/org/hornetq/core/config/Configuration.java
trunk/src/main/org/hornetq/core/deployers/DeploymentManager.java
trunk/src/main/org/hornetq/core/deployers/impl/FileDeploymentManager.java
trunk/src/main/org/hornetq/core/deployers/impl/SecurityDeployer.java
trunk/src/main/org/hornetq/core/deployers/impl/XmlDeployer.java
trunk/src/main/org/hornetq/core/filter/impl/FilterImpl.java
trunk/src/main/org/hornetq/core/journal/TestableJournal.java
trunk/src/main/org/hornetq/core/journal/impl/JournalImpl.java
trunk/src/main/org/hornetq/core/journal/impl/JournalTransaction.java
trunk/src/main/org/hornetq/core/management/HornetQServerControl.java
trunk/src/main/org/hornetq/core/management/jmx/impl/ReplicationAwareHornetQServerControlWrapper.java
trunk/src/main/org/hornetq/core/paging/PagingStoreFactory.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/StorageManager.java
trunk/src/main/org/hornetq/core/persistence/impl/journal/JournalLargeServerMessage.java
trunk/src/main/org/hornetq/core/postoffice/Address.java
trunk/src/main/org/hornetq/core/postoffice/impl/AddressImpl.java
trunk/src/main/org/hornetq/core/postoffice/impl/WildcardAddressManager.java
trunk/src/main/org/hornetq/core/remoting/RemotingConnection.java
trunk/src/main/org/hornetq/core/remoting/impl/ChannelImpl.java
trunk/src/main/org/hornetq/core/remoting/impl/ssl/SSLSupport.java
trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionDeleteQueueMessage.java
trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAForgetMessage.java
trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAJoinMessage.java
trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAPrepareMessage.java
trunk/src/main/org/hornetq/core/remoting/spi/HornetQBuffer.java
trunk/src/main/org/hornetq/core/security/impl/JAASSecurityManager.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/impl/HornetQPacketHandler.java
trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java
trunk/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java
trunk/src/main/org/hornetq/core/settings/impl/HierarchicalObjectRepository.java
trunk/src/main/org/hornetq/integration/bootstrap/HornetQBootstrapServer.java
trunk/src/main/org/hornetq/integration/logging/BaseLoggerHandler.java
trunk/src/main/org/hornetq/integration/logging/HornetQLoggerPlugin.java
trunk/src/main/org/hornetq/integration/logging/Log4jLoggerHandler.java
trunk/src/main/org/hornetq/integration/security/JBossASSecurityManager.java
trunk/src/main/org/hornetq/integration/transports/netty/HornetQChannelHandler.java
trunk/src/main/org/hornetq/integration/transports/netty/HttpAcceptorHandler.java
trunk/src/main/org/hornetq/integration/transports/netty/NettyConnection.java
trunk/src/main/org/hornetq/integration/transports/netty/NettyConnector.java
trunk/src/main/org/hornetq/jms/server/JMSServerManager.java
trunk/src/main/org/hornetq/jms/server/management/impl/TopicControlImpl.java
trunk/src/main/org/hornetq/jms/server/management/jmx/impl/ReplicationAwareJMSServerControlWrapper.java
trunk/src/main/org/hornetq/ra/ConnectionFactoryProperties.java
trunk/src/main/org/hornetq/ra/HornetQRAMCFProperties.java
trunk/src/main/org/hornetq/ra/HornetQRAProperties.java
trunk/src/main/org/hornetq/ra/inflow/HornetQActivationSpec.java
trunk/src/main/org/hornetq/utils/XMLUtil.java
trunk/src/main/org/hornetq/utils/concurrent/BlockingDeque.java
trunk/src/main/org/hornetq/utils/concurrent/Deque.java
trunk/src/main/org/hornetq/utils/concurrent/LinkedBlockingDeque.java
trunk/src/main/org/hornetq/utils/json/JSONObject.java
trunk/tests/jms-tests/src/org/hornetq/jms/tests/ConnectionTest.java
trunk/tests/jms-tests/src/org/hornetq/jms/tests/HornetQServerTestCase.java
trunk/tests/jms-tests/src/org/hornetq/jms/tests/MessageProducerTest.java
trunk/tests/jms-tests/src/org/hornetq/jms/tests/SecurityTest.java
trunk/tests/joram-tests/src/org/hornetq/jms/GenericAdmin.java
trunk/tests/joram-tests/src/org/objectweb/jtests/jms/conform/connection/TopicConnectionTest.java
trunk/tests/joram-tests/src/org/objectweb/jtests/jms/framework/JMSTestCase.java
trunk/tests/src/org/hornetq/tests/integration/client/AcknowledgeTest.java
trunk/tests/src/org/hornetq/tests/integration/client/CommitRollbackTest.java
trunk/tests/src/org/hornetq/tests/integration/client/CompactingTest.java
trunk/tests/src/org/hornetq/tests/integration/client/DeliveryOrderTest.java
trunk/tests/src/org/hornetq/tests/integration/client/MessageExpirationTest.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/ProducerTest.java
trunk/tests/src/org/hornetq/tests/integration/client/RequestorTest.java
trunk/tests/src/org/hornetq/tests/integration/client/SessionSendAcknowledgementHandlerTest.java
trunk/tests/src/org/hornetq/tests/integration/client/TemporaryQueueTest.java
trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java
trunk/tests/src/org/hornetq/tests/integration/cluster/failover/ActivationTimeoutTest.java
trunk/tests/src/org/hornetq/tests/integration/cluster/failover/AutomaticFailoverWithDiscoveryTest.java
trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverExpiredMessageTest.java
trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverManagementTest.java
trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverPreAcknowledgeTest.java
trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverScheduledMessageTest.java
trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java
trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailureListenerOnFailoverTest.java
trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailureOnCreateConnectionTest.java
trunk/tests/src/org/hornetq/tests/integration/cluster/failover/LargeMessageMultiThreadFailoverTest.java
trunk/tests/src/org/hornetq/tests/integration/cluster/failover/MultiThreadFailoverSupport.java
trunk/tests/src/org/hornetq/tests/integration/cluster/failover/PagingFailoverMultiThreadTest.java
trunk/tests/src/org/hornetq/tests/integration/cluster/failover/PagingFailoverTest.java
trunk/tests/src/org/hornetq/tests/integration/cluster/failover/PreserveOrderDuringFailoverTest.java
trunk/tests/src/org/hornetq/tests/integration/cluster/failover/ReconnectTest.java
trunk/tests/src/org/hornetq/tests/integration/cluster/failover/ReconnectWithBackupTest.java
trunk/tests/src/org/hornetq/tests/integration/cluster/failover/ReplicateConnectionFailureTest.java
trunk/tests/src/org/hornetq/tests/integration/cluster/failover/SimpleAutomaticFailoverTest.java
trunk/tests/src/org/hornetq/tests/integration/cluster/failover/SimpleManualFailoverTest.java
trunk/tests/src/org/hornetq/tests/integration/cluster/failover/XALargeMessageMultiThreadFailoverTest.java
trunk/tests/src/org/hornetq/tests/integration/cluster/management/ReplicationAwareHornetQServerControlWrapperTest.java
trunk/tests/src/org/hornetq/tests/integration/jms/ManualReconnectionToSingleServerTest.java
trunk/tests/src/org/hornetq/tests/integration/jms/bridge/BridgeTestBase.java
trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSFailoverTest.java
trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerDeployerTest.java
trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlTest.java
trunk/tests/src/org/hornetq/tests/integration/largemessage/LargeMessageCleanupTest.java
trunk/tests/src/org/hornetq/tests/integration/management/ManagementHelperTest.java
trunk/tests/src/org/hornetq/tests/integration/management/QueueControlTest.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/FakeStorageManager.java
trunk/tests/src/org/hornetq/tests/integration/server/PredefinedQueueTest.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/LargeJournalStressTest.java
trunk/tests/src/org/hornetq/tests/stress/paging/PageStressTest.java
trunk/tests/src/org/hornetq/tests/timing/core/journal/impl/RealJournalImplAIOTest.java
trunk/tests/src/org/hornetq/tests/unit/core/asyncio/AIOTestBase.java
trunk/tests/src/org/hornetq/tests/unit/core/deployers/impl/BasicUserCredentialsDeployerTest.java
trunk/tests/src/org/hornetq/tests/unit/core/deployers/impl/QueueDeployerTest.java
trunk/tests/src/org/hornetq/tests/unit/core/deployers/impl/XMLDeployerTest.java
trunk/tests/src/org/hornetq/tests/unit/core/filter/impl/FilterParserTest.java
trunk/tests/src/org/hornetq/tests/unit/core/journal/impl/JournalImplTestBase.java
trunk/tests/src/org/hornetq/tests/unit/core/paging/impl/PagingStoreImplTest.java
trunk/tests/src/org/hornetq/tests/unit/core/security/impl/HornetQSecurityManagerImplTest.java
trunk/tests/src/org/hornetq/tests/unit/core/security/impl/JAASSecurityManagerTest.java
trunk/tests/src/org/hornetq/tests/unit/core/settings/impl/RepositoryTest.java
trunk/tests/src/org/hornetq/tests/unit/jms/client/HornetQMapMessageTest.java
trunk/tests/src/org/hornetq/tests/unit/jms/client/HornetQStreamMessageTest.java
trunk/tests/src/org/hornetq/tests/unit/ra/ResourceAdapterTest.java
trunk/tests/src/org/hornetq/tests/util/JournalExample.java
trunk/tests/src/org/hornetq/tests/util/ServiceTestBase.java
trunk/tests/src/org/hornetq/tests/util/UnitTestCase.java
Log:
organised imports in all java files
Modified: trunk/examples/common/src/org/hornetq/common/example/DummyXid.java
===================================================================
--- trunk/examples/common/src/org/hornetq/common/example/DummyXid.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/examples/common/src/org/hornetq/common/example/DummyXid.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -12,10 +12,10 @@
*/
package org.hornetq.common.example;
+import javax.transaction.xa.Xid;
+
import org.hornetq.utils.Base64;
-import javax.transaction.xa.Xid;
-
/**
* @author <a href="mailto:andy.taylor at jboss.org">Andy Taylor</a>
*/
Modified: trunk/examples/common/src/org/hornetq/common/example/HornetQExample.java
===================================================================
--- trunk/examples/common/src/org/hornetq/common/example/HornetQExample.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/examples/common/src/org/hornetq/common/example/HornetQExample.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -12,14 +12,15 @@
*/
package org.hornetq.common.example;
-import javax.jms.Connection;
-import javax.jms.JMSException;
-import javax.naming.InitialContext;
import java.io.File;
import java.io.FileInputStream;
import java.util.Properties;
import java.util.logging.Logger;
+import javax.jms.Connection;
+import javax.jms.JMSException;
+import javax.naming.InitialContext;
+
/**
* a baee class for examples. This takes care of starting and stopping the server as well as deploying any queue needed.
*
Modified: trunk/examples/common/src/org/hornetq/common/example/SpawnedVMSupport.java
===================================================================
--- trunk/examples/common/src/org/hornetq/common/example/SpawnedVMSupport.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/examples/common/src/org/hornetq/common/example/SpawnedVMSupport.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -13,8 +13,6 @@
package org.hornetq.common.example;
-import org.hornetq.core.logging.Logger;
-
import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
@@ -23,6 +21,8 @@
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
+import org.hornetq.core.logging.Logger;
+
/**
* @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
* @author <a href="mailto:jmesnil at redhat.com">Jeff Mesnil</a>
Modified: trunk/examples/javaee/ejb-jms-transaction/src/org/hornetq/javaee/example/EJBClientExample.java
===================================================================
--- trunk/examples/javaee/ejb-jms-transaction/src/org/hornetq/javaee/example/EJBClientExample.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/examples/javaee/ejb-jms-transaction/src/org/hornetq/javaee/example/EJBClientExample.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -12,8 +12,6 @@
*/
package org.hornetq.javaee.example;
-import org.hornetq.javaee.example.server.SendMessageService;
-
import javax.jms.Connection;
import javax.jms.ConnectionFactory;
import javax.jms.MessageConsumer;
@@ -22,6 +20,8 @@
import javax.jms.TextMessage;
import javax.naming.InitialContext;
+import org.hornetq.javaee.example.server.SendMessageService;
+
/**
* An example showing how to invoke a EJB which sends a JMS message and update a JDBC table in the same transaction.
*
Modified: trunk/examples/javaee/ejb-jms-transaction/src/org/hornetq/javaee/example/server/SendMessageBean.java
===================================================================
--- trunk/examples/javaee/ejb-jms-transaction/src/org/hornetq/javaee/example/server/SendMessageBean.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/examples/javaee/ejb-jms-transaction/src/org/hornetq/javaee/example/server/SendMessageBean.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -12,6 +12,8 @@
*/
package org.hornetq.javaee.example.server;
+import java.sql.PreparedStatement;
+
import javax.ejb.Remote;
import javax.ejb.Stateless;
import javax.jms.Connection;
@@ -22,7 +24,6 @@
import javax.jms.TextMessage;
import javax.naming.InitialContext;
import javax.sql.DataSource;
-import java.sql.PreparedStatement;
/**
* An EJB which sends a JMS message and update a JDBC table in the same transaction.
Modified: trunk/examples/javaee/hajndi/src/org/hornetq/javaee/example/HAJNDIExample.java
===================================================================
--- trunk/examples/javaee/hajndi/src/org/hornetq/javaee/example/HAJNDIExample.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/examples/javaee/hajndi/src/org/hornetq/javaee/example/HAJNDIExample.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -12,10 +12,11 @@
*/
package org.hornetq.javaee.example;
+import java.util.Hashtable;
+
import javax.jms.Connection;
import javax.jms.ConnectionFactory;
import javax.naming.InitialContext;
-import java.util.Hashtable;
/**
*
Modified: trunk/examples/jms/browser/src/org/hornetq/jms/example/QueueBrowserExample.java
===================================================================
--- trunk/examples/jms/browser/src/org/hornetq/jms/example/QueueBrowserExample.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/examples/jms/browser/src/org/hornetq/jms/example/QueueBrowserExample.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -13,6 +13,8 @@
package org.hornetq.jms.example;
+import java.util.Enumeration;
+
import javax.jms.Connection;
import javax.jms.ConnectionFactory;
import javax.jms.MessageConsumer;
@@ -25,8 +27,6 @@
import org.hornetq.common.example.HornetQExample;
-import java.util.Enumeration;
-
/**
* A simple example which shows how to use a QueueBrowser to look at messages of a queue without removing them from the queue
*
Modified: trunk/examples/jms/client-kickoff/src/org/hornetq/jms/example/ClientKickoffExample.java
===================================================================
--- trunk/examples/jms/client-kickoff/src/org/hornetq/jms/example/ClientKickoffExample.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/examples/jms/client-kickoff/src/org/hornetq/jms/example/ClientKickoffExample.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -12,9 +12,8 @@
*/
package org.hornetq.jms.example;
-import org.hornetq.common.example.HornetQExample;
-import org.hornetq.core.management.HornetQServerControl;
-import org.hornetq.core.management.ObjectNames;
+import java.util.HashMap;
+import java.util.concurrent.atomic.AtomicReference;
import javax.jms.ExceptionListener;
import javax.jms.JMSException;
@@ -27,9 +26,11 @@
import javax.management.remote.JMXConnectorFactory;
import javax.management.remote.JMXServiceURL;
import javax.naming.InitialContext;
-import java.util.HashMap;
-import java.util.concurrent.atomic.AtomicReference;
+import org.hornetq.common.example.HornetQExample;
+import org.hornetq.core.management.HornetQServerControl;
+import org.hornetq.core.management.ObjectNames;
+
/**
* An example that shows how to kick off a client connected to HornetQby using JMX.
*
Modified: trunk/examples/jms/jmx/src/org/hornetq/jms/example/JMXExample.java
===================================================================
--- trunk/examples/jms/jmx/src/org/hornetq/jms/example/JMXExample.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/examples/jms/jmx/src/org/hornetq/jms/example/JMXExample.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -12,9 +12,7 @@
*/
package org.hornetq.jms.example;
-import org.hornetq.common.example.HornetQExample;
-import org.hornetq.core.management.ObjectNames;
-import org.hornetq.jms.server.management.JMSQueueControl;
+import java.util.HashMap;
import javax.jms.MessageConsumer;
import javax.jms.MessageProducer;
@@ -31,8 +29,11 @@
import javax.management.remote.JMXConnectorFactory;
import javax.management.remote.JMXServiceURL;
import javax.naming.InitialContext;
-import java.util.HashMap;
+import org.hornetq.common.example.HornetQExample;
+import org.hornetq.core.management.ObjectNames;
+import org.hornetq.jms.server.management.JMSQueueControl;
+
/**
* An example that shows how to manage HornetQ using JMX.
*
Modified: trunk/examples/jms/large-message/src/org/hornetq/jms/example/LargeMessageExample.java
===================================================================
--- trunk/examples/jms/large-message/src/org/hornetq/jms/example/LargeMessageExample.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/examples/jms/large-message/src/org/hornetq/jms/example/LargeMessageExample.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -12,7 +12,13 @@
*/
package org.hornetq.jms.example;
-import org.hornetq.common.example.HornetQExample;
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
import javax.jms.BytesMessage;
import javax.jms.Connection;
@@ -22,14 +28,9 @@
import javax.jms.Queue;
import javax.jms.Session;
import javax.naming.InitialContext;
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
+import org.hornetq.common.example.HornetQExample;
+
/**
* This example demonstrates the ability of HornetQ to send and consume a very large message, much
* bigger than can fit in RAM.
Modified: trunk/examples/jms/message-counters/src/org/hornetq/jms/example/MessageCounterExample.java
===================================================================
--- trunk/examples/jms/message-counters/src/org/hornetq/jms/example/MessageCounterExample.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/examples/jms/message-counters/src/org/hornetq/jms/example/MessageCounterExample.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -12,10 +12,7 @@
*/
package org.hornetq.jms.example;
-import org.hornetq.common.example.HornetQExample;
-import org.hornetq.core.management.MessageCounterInfo;
-import org.hornetq.core.management.ObjectNames;
-import org.hornetq.jms.server.management.JMSQueueControl;
+import java.util.HashMap;
import javax.jms.MessageConsumer;
import javax.jms.MessageProducer;
@@ -32,8 +29,12 @@
import javax.management.remote.JMXConnectorFactory;
import javax.management.remote.JMXServiceURL;
import javax.naming.InitialContext;
-import java.util.HashMap;
+import org.hornetq.common.example.HornetQExample;
+import org.hornetq.core.management.MessageCounterInfo;
+import org.hornetq.core.management.ObjectNames;
+import org.hornetq.jms.server.management.JMSQueueControl;
+
/**
* An example showing how to use message counters to have information on a queue.
*
Modified: trunk/examples/jms/paging/src/org/hornetq/jms/example/PagingExample.java
===================================================================
--- trunk/examples/jms/paging/src/org/hornetq/jms/example/PagingExample.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/examples/jms/paging/src/org/hornetq/jms/example/PagingExample.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -12,8 +12,6 @@
*/
package org.hornetq.jms.example;
-import org.hornetq.common.example.HornetQExample;
-
import javax.jms.BytesMessage;
import javax.jms.Connection;
import javax.jms.ConnectionFactory;
@@ -24,6 +22,8 @@
import javax.jms.Session;
import javax.naming.InitialContext;
+import org.hornetq.common.example.HornetQExample;
+
/**
* A simple JMS Queue example that creates a producer and consumer on a queue and sends then receives a message.
*
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-08-21 08:38:45 UTC (rev 7853)
+++ trunk/examples/jms/request-reply/src/org/hornetq/jms/example/RequestReplyExample.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -12,6 +12,9 @@
*/
package org.hornetq.jms.example;
+import java.util.HashMap;
+import java.util.Map;
+
import javax.jms.Connection;
import javax.jms.ConnectionFactory;
import javax.jms.Destination;
@@ -28,9 +31,6 @@
import org.hornetq.common.example.HornetQExample;
-import java.util.HashMap;
-import java.util.Map;
-
/**
* A simple JMS example that shows how to use Request/Replay style messaging.
*
Modified: trunk/examples/jms/symmetric-cluster/src/org/hornetq/jms/example/SymmetricClusterExample.java
===================================================================
--- trunk/examples/jms/symmetric-cluster/src/org/hornetq/jms/example/SymmetricClusterExample.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/examples/jms/symmetric-cluster/src/org/hornetq/jms/example/SymmetricClusterExample.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -12,11 +12,6 @@
*/
package org.hornetq.jms.example;
-import org.hornetq.common.example.HornetQExample;
-import org.hornetq.jms.HornetQQueue;
-import org.hornetq.jms.HornetQTopic;
-import org.hornetq.jms.client.HornetQConnectionFactory;
-
import javax.jms.Connection;
import javax.jms.ConnectionFactory;
import javax.jms.MessageConsumer;
@@ -26,6 +21,11 @@
import javax.jms.TextMessage;
import javax.jms.Topic;
+import org.hornetq.common.example.HornetQExample;
+import org.hornetq.jms.HornetQQueue;
+import org.hornetq.jms.HornetQTopic;
+import org.hornetq.jms.client.HornetQConnectionFactory;
+
/**
* This example demonstrates a cluster of three nodes set up in a symmetric topology - i.e. each node
* is connected to every other node in the cluster. Also each node, has it's own backup node.
Modified: trunk/examples/jms/xa-heuristic/src/org/hornetq/jms/example/XAHeuristicExample.java
===================================================================
--- trunk/examples/jms/xa-heuristic/src/org/hornetq/jms/example/XAHeuristicExample.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/examples/jms/xa-heuristic/src/org/hornetq/jms/example/XAHeuristicExample.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -12,10 +12,8 @@
*/
package org.hornetq.jms.example;
-import org.hornetq.common.example.DummyXid;
-import org.hornetq.common.example.HornetQExample;
-import org.hornetq.core.management.ObjectNames;
-import org.hornetq.utils.UUIDGenerator;
+import java.util.ArrayList;
+import java.util.HashMap;
import javax.jms.JMSException;
import javax.jms.Message;
@@ -36,9 +34,12 @@
import javax.naming.InitialContext;
import javax.transaction.xa.XAResource;
import javax.transaction.xa.Xid;
-import java.util.ArrayList;
-import java.util.HashMap;
+import org.hornetq.common.example.DummyXid;
+import org.hornetq.common.example.HornetQExample;
+import org.hornetq.core.management.ObjectNames;
+import org.hornetq.utils.UUIDGenerator;
+
/**
* A simple JMS example showing how to administer un-finished transactions.
*
Modified: trunk/examples/jms/xa-receive/src/org/hornetq/jms/example/XAReceiveExample.java
===================================================================
--- trunk/examples/jms/xa-receive/src/org/hornetq/jms/example/XAReceiveExample.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/examples/jms/xa-receive/src/org/hornetq/jms/example/XAReceiveExample.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -12,10 +12,6 @@
*/
package org.hornetq.jms.example;
-import org.hornetq.common.example.DummyXid;
-import org.hornetq.common.example.HornetQExample;
-import org.hornetq.utils.UUIDGenerator;
-
import javax.jms.MessageConsumer;
import javax.jms.MessageProducer;
import javax.jms.Queue;
@@ -28,6 +24,10 @@
import javax.transaction.xa.XAResource;
import javax.transaction.xa.Xid;
+import org.hornetq.common.example.DummyXid;
+import org.hornetq.common.example.HornetQExample;
+import org.hornetq.utils.UUIDGenerator;
+
/**
* A simple JMS example showing the usage of XA support in JMS.
*
Modified: trunk/examples/jms/xa-send/src/org/hornetq/jms/example/XASendExample.java
===================================================================
--- trunk/examples/jms/xa-send/src/org/hornetq/jms/example/XASendExample.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/examples/jms/xa-send/src/org/hornetq/jms/example/XASendExample.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -12,9 +12,7 @@
*/
package org.hornetq.jms.example;
-import org.hornetq.common.example.DummyXid;
-import org.hornetq.common.example.HornetQExample;
-import org.hornetq.utils.UUIDGenerator;
+import java.util.ArrayList;
import javax.jms.JMSException;
import javax.jms.Message;
@@ -30,8 +28,11 @@
import javax.naming.InitialContext;
import javax.transaction.xa.XAResource;
import javax.transaction.xa.Xid;
-import java.util.ArrayList;
+import org.hornetq.common.example.DummyXid;
+import org.hornetq.common.example.HornetQExample;
+import org.hornetq.utils.UUIDGenerator;
+
/**
* A simple JMS example showing the usage of XA support in JMS.
*
Modified: trunk/src/main/org/hornetq/core/buffers/ChannelBuffer.java
===================================================================
--- trunk/src/main/org/hornetq/core/buffers/ChannelBuffer.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/src/main/org/hornetq/core/buffers/ChannelBuffer.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -22,6 +22,9 @@
import java.nio.charset.UnsupportedCharsetException;
import org.hornetq.core.remoting.spi.HornetQBuffer;
+import org.jboss.netty.buffer.ChannelBufferIndexFinder;
+import org.jboss.netty.buffer.ChannelBufferInputStream;
+import org.jboss.netty.buffer.ChannelBufferOutputStream;
/**
* A random and sequential accessible sequence of zero or more bytes (octets).
Modified: trunk/src/main/org/hornetq/core/client/ClientRequestor.java
===================================================================
--- trunk/src/main/org/hornetq/core/client/ClientRequestor.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/src/main/org/hornetq/core/client/ClientRequestor.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -14,12 +14,12 @@
import static org.hornetq.utils.SimpleString.toSimpleString;
+import java.util.UUID;
+
import org.hornetq.core.client.impl.ClientMessageImpl;
import org.hornetq.utils.SimpleString;
-import java.util.UUID;
-
/**
* a ClientRequestor.
*
Modified: trunk/src/main/org/hornetq/core/client/impl/ClientConsumerImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/client/impl/ClientConsumerImpl.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/src/main/org/hornetq/core/client/impl/ClientConsumerImpl.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -30,7 +30,6 @@
import org.hornetq.core.remoting.impl.wireformat.SessionReceiveMessage;
import org.hornetq.utils.Future;
import org.hornetq.utils.TokenBucketLimiter;
-import org.hornetq.utils.UUIDGenerator;
/**
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
Modified: trunk/src/main/org/hornetq/core/config/Configuration.java
===================================================================
--- trunk/src/main/org/hornetq/core/config/Configuration.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/src/main/org/hornetq/core/config/Configuration.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -24,8 +24,8 @@
import org.hornetq.core.config.cluster.DiscoveryGroupConfiguration;
import org.hornetq.core.config.cluster.DivertConfiguration;
import org.hornetq.core.config.cluster.QueueConfiguration;
+import org.hornetq.core.server.HornetQComponent;
import org.hornetq.core.server.JournalType;
-import org.hornetq.core.server.HornetQComponent;
import org.hornetq.utils.SimpleString;
/**
Modified: trunk/src/main/org/hornetq/core/deployers/DeploymentManager.java
===================================================================
--- trunk/src/main/org/hornetq/core/deployers/DeploymentManager.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/src/main/org/hornetq/core/deployers/DeploymentManager.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -13,8 +13,6 @@
package org.hornetq.core.deployers;
-import java.util.List;
-
import org.hornetq.core.server.HornetQComponent;
Modified: trunk/src/main/org/hornetq/core/deployers/impl/FileDeploymentManager.java
===================================================================
--- trunk/src/main/org/hornetq/core/deployers/impl/FileDeploymentManager.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/src/main/org/hornetq/core/deployers/impl/FileDeploymentManager.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -13,11 +13,6 @@
package org.hornetq.core.deployers.impl;
-import org.hornetq.core.deployers.Deployer;
-import org.hornetq.core.deployers.DeploymentManager;
-import org.hornetq.core.logging.Logger;
-import org.hornetq.utils.Pair;
-
import java.io.File;
import java.net.URL;
import java.util.ArrayList;
@@ -30,6 +25,11 @@
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
+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 at redhat.com">Andy Taylor</a>
* @author <a href="tim.fox at jboss.com">Tim Fox</a>
Modified: trunk/src/main/org/hornetq/core/deployers/impl/SecurityDeployer.java
===================================================================
--- trunk/src/main/org/hornetq/core/deployers/impl/SecurityDeployer.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/src/main/org/hornetq/core/deployers/impl/SecurityDeployer.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -13,6 +13,10 @@
package org.hornetq.core.deployers.impl;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Set;
+
import org.hornetq.core.deployers.DeploymentManager;
import org.hornetq.core.logging.Logger;
import org.hornetq.core.security.Role;
@@ -20,10 +24,6 @@
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.Set;
-
/**
* Deploys the security settings into a security repository and adds them to the security store.
*
Modified: trunk/src/main/org/hornetq/core/deployers/impl/XmlDeployer.java
===================================================================
--- trunk/src/main/org/hornetq/core/deployers/impl/XmlDeployer.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/src/main/org/hornetq/core/deployers/impl/XmlDeployer.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -13,14 +13,6 @@
package org.hornetq.core.deployers.impl;
-import org.hornetq.core.deployers.Deployer;
-import org.hornetq.core.deployers.DeploymentManager;
-import org.hornetq.core.logging.Logger;
-import org.hornetq.core.server.HornetQComponent;
-import org.w3c.dom.Element;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
import java.io.InputStreamReader;
import java.io.Reader;
import java.net.URL;
@@ -31,6 +23,14 @@
import java.util.Map;
import java.util.Set;
+import org.hornetq.core.deployers.Deployer;
+import org.hornetq.core.deployers.DeploymentManager;
+import org.hornetq.core.logging.Logger;
+import org.hornetq.core.server.HornetQComponent;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
/**
* @author <a href="ataylor at redhat.com">Andy Taylor</a>
*/
Modified: trunk/src/main/org/hornetq/core/filter/impl/FilterImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/filter/impl/FilterImpl.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/src/main/org/hornetq/core/filter/impl/FilterImpl.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -21,7 +21,6 @@
import org.hornetq.core.logging.Logger;
import org.hornetq.core.server.ServerMessage;
import org.hornetq.utils.SimpleString;
-import org.hornetq.core.filter.impl.FilterParser;
/**
* This class implements a HornetQ filter
Modified: trunk/src/main/org/hornetq/core/journal/TestableJournal.java
===================================================================
--- trunk/src/main/org/hornetq/core/journal/TestableJournal.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/src/main/org/hornetq/core/journal/TestableJournal.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -13,7 +13,6 @@
package org.hornetq.core.journal;
-import org.hornetq.core.journal.impl.JournalFile;
/**
*
Modified: trunk/src/main/org/hornetq/core/journal/impl/JournalImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/journal/impl/JournalImpl.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/src/main/org/hornetq/core/journal/impl/JournalImpl.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -54,7 +54,6 @@
import org.hornetq.core.remoting.spi.HornetQBuffer;
import org.hornetq.utils.DataConstants;
import org.hornetq.utils.Pair;
-import org.hornetq.utils.VariableLatch;
import org.hornetq.utils.concurrent.LinkedBlockingDeque;
/**
Modified: trunk/src/main/org/hornetq/core/journal/impl/JournalTransaction.java
===================================================================
--- trunk/src/main/org/hornetq/core/journal/impl/JournalTransaction.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/src/main/org/hornetq/core/journal/impl/JournalTransaction.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -24,7 +24,6 @@
import org.hornetq.core.exception.HornetQException;
import org.hornetq.core.remoting.spi.HornetQBuffer;
import org.hornetq.utils.DataConstants;
-import org.hornetq.utils.Pair;
/**
* A JournalTransaction
Modified: trunk/src/main/org/hornetq/core/management/HornetQServerControl.java
===================================================================
--- trunk/src/main/org/hornetq/core/management/HornetQServerControl.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/src/main/org/hornetq/core/management/HornetQServerControl.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -13,11 +13,11 @@
package org.hornetq.core.management;
-import org.hornetq.core.config.Configuration;
-
import static javax.management.MBeanOperationInfo.ACTION;
import static javax.management.MBeanOperationInfo.INFO;
+import org.hornetq.core.config.Configuration;
+
/**
* This interface describes the core management interface exposed by the server
*/
Modified: trunk/src/main/org/hornetq/core/management/jmx/impl/ReplicationAwareHornetQServerControlWrapper.java
===================================================================
--- trunk/src/main/org/hornetq/core/management/jmx/impl/ReplicationAwareHornetQServerControlWrapper.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/src/main/org/hornetq/core/management/jmx/impl/ReplicationAwareHornetQServerControlWrapper.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -13,15 +13,15 @@
package org.hornetq.core.management.jmx.impl;
+import javax.management.MBeanInfo;
+
import org.hornetq.core.config.Configuration;
import org.hornetq.core.management.HornetQServerControl;
import org.hornetq.core.management.ReplicationOperationInvoker;
import org.hornetq.core.management.ResourceNames;
+import org.hornetq.core.management.impl.HornetQServerControlImpl;
import org.hornetq.core.management.impl.MBeanInfoHelper;
-import org.hornetq.core.management.impl.HornetQServerControlImpl;
-import javax.management.MBeanInfo;
-
/**
* A ReplicationAwareHornetQServerControlWrapper
*
Modified: trunk/src/main/org/hornetq/core/paging/PagingStoreFactory.java
===================================================================
--- trunk/src/main/org/hornetq/core/paging/PagingStoreFactory.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/src/main/org/hornetq/core/paging/PagingStoreFactory.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -14,7 +14,6 @@
package org.hornetq.core.paging;
import java.util.List;
-import java.util.concurrent.Executor;
import org.hornetq.core.journal.SequentialFileFactory;
import org.hornetq.core.persistence.StorageManager;
Modified: trunk/src/main/org/hornetq/core/paging/impl/PagingStoreFactoryNIO.java
===================================================================
--- trunk/src/main/org/hornetq/core/paging/impl/PagingStoreFactoryNIO.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/src/main/org/hornetq/core/paging/impl/PagingStoreFactoryNIO.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -23,7 +23,6 @@
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
-import java.util.concurrent.Executor;
import org.hornetq.core.journal.SequentialFileFactory;
import org.hornetq.core.journal.impl.NIOSequentialFileFactory;
Modified: trunk/src/main/org/hornetq/core/paging/impl/PagingStoreImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/paging/impl/PagingStoreImpl.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/src/main/org/hornetq/core/paging/impl/PagingStoreImpl.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -42,7 +42,6 @@
import org.hornetq.core.transaction.Transaction;
import org.hornetq.core.transaction.TransactionPropertyIndexes;
import org.hornetq.core.transaction.impl.TransactionImpl;
-import org.hornetq.utils.Future;
import org.hornetq.utils.SimpleString;
/**
Modified: trunk/src/main/org/hornetq/core/persistence/StorageManager.java
===================================================================
--- trunk/src/main/org/hornetq/core/persistence/StorageManager.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/src/main/org/hornetq/core/persistence/StorageManager.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -21,9 +21,9 @@
import org.hornetq.core.paging.PageTransactionInfo;
import org.hornetq.core.paging.PagingManager;
import org.hornetq.core.postoffice.Binding;
+import org.hornetq.core.server.HornetQComponent;
import org.hornetq.core.server.LargeServerMessage;
import org.hornetq.core.server.MessageReference;
-import org.hornetq.core.server.HornetQComponent;
import org.hornetq.core.server.Queue;
import org.hornetq.core.server.ServerMessage;
import org.hornetq.core.transaction.ResourceManager;
Modified: trunk/src/main/org/hornetq/core/persistence/impl/journal/JournalLargeServerMessage.java
===================================================================
--- trunk/src/main/org/hornetq/core/persistence/impl/journal/JournalLargeServerMessage.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/src/main/org/hornetq/core/persistence/impl/journal/JournalLargeServerMessage.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -17,7 +17,6 @@
import java.nio.ByteBuffer;
-import org.hornetq.core.exception.HornetQException;
import org.hornetq.core.journal.SequentialFile;
import org.hornetq.core.logging.Logger;
import org.hornetq.core.remoting.spi.HornetQBuffer;
Modified: trunk/src/main/org/hornetq/core/postoffice/Address.java
===================================================================
--- trunk/src/main/org/hornetq/core/postoffice/Address.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/src/main/org/hornetq/core/postoffice/Address.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -12,10 +12,10 @@
*/
package org.hornetq.core.postoffice;
+import java.util.List;
+
import org.hornetq.utils.SimpleString;
-import java.util.List;
-
/**
* USed to hold a hierarchichal style address, delimited by a '.'.
*
Modified: trunk/src/main/org/hornetq/core/postoffice/impl/AddressImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/postoffice/impl/AddressImpl.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/src/main/org/hornetq/core/postoffice/impl/AddressImpl.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -12,19 +12,18 @@
*/
package org.hornetq.core.postoffice.impl;
-import org.hornetq.core.postoffice.Address;
-import org.hornetq.utils.SimpleString;
-
import static org.hornetq.core.postoffice.impl.WildcardAddressManager.ANY_WORDS;
import static org.hornetq.core.postoffice.impl.WildcardAddressManager.ANY_WORDS_SIMPLESTRING;
import static org.hornetq.core.postoffice.impl.WildcardAddressManager.DELIM;
import static org.hornetq.core.postoffice.impl.WildcardAddressManager.SINGLE_WORD;
import static org.hornetq.core.postoffice.impl.WildcardAddressManager.SINGLE_WORD_SIMPLESTRING;
-
import java.util.ArrayList;
import java.util.List;
+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/WildcardAddressManager.java
===================================================================
--- trunk/src/main/org/hornetq/core/postoffice/impl/WildcardAddressManager.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/src/main/org/hornetq/core/postoffice/impl/WildcardAddressManager.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -14,10 +14,8 @@
import java.util.Collection;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import org.hornetq.core.logging.Logger;
import org.hornetq.core.postoffice.Address;
Modified: trunk/src/main/org/hornetq/core/remoting/RemotingConnection.java
===================================================================
--- trunk/src/main/org/hornetq/core/remoting/RemotingConnection.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/src/main/org/hornetq/core/remoting/RemotingConnection.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -13,13 +13,13 @@
package org.hornetq.core.remoting;
+import java.util.List;
+
import org.hornetq.core.exception.HornetQException;
import org.hornetq.core.remoting.spi.BufferHandler;
import org.hornetq.core.remoting.spi.Connection;
import org.hornetq.core.remoting.spi.HornetQBuffer;
-import java.util.List;
-
/**
* A RemotingConnection
*
Modified: trunk/src/main/org/hornetq/core/remoting/impl/ChannelImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/remoting/impl/ChannelImpl.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/src/main/org/hornetq/core/remoting/impl/ChannelImpl.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -13,18 +13,6 @@
package org.hornetq.core.remoting.impl;
-import org.hornetq.core.exception.HornetQException;
-import org.hornetq.core.logging.Logger;
-import org.hornetq.core.remoting.Channel;
-import org.hornetq.core.remoting.ChannelHandler;
-import org.hornetq.core.remoting.CommandConfirmationHandler;
-import org.hornetq.core.remoting.Packet;
-import org.hornetq.core.remoting.RemotingConnection;
-import org.hornetq.core.remoting.impl.wireformat.HornetQExceptionMessage;
-import org.hornetq.core.remoting.impl.wireformat.PacketImpl;
-import org.hornetq.core.remoting.impl.wireformat.PacketsConfirmedMessage;
-import org.hornetq.core.remoting.spi.HornetQBuffer;
-
import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.EARLY_RESPONSE;
import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.PACKETS_CONFIRMED;
import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.REPLICATION_RESPONSE;
@@ -39,6 +27,18 @@
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReentrantLock;
+import org.hornetq.core.exception.HornetQException;
+import org.hornetq.core.logging.Logger;
+import org.hornetq.core.remoting.Channel;
+import org.hornetq.core.remoting.ChannelHandler;
+import org.hornetq.core.remoting.CommandConfirmationHandler;
+import org.hornetq.core.remoting.Packet;
+import org.hornetq.core.remoting.RemotingConnection;
+import org.hornetq.core.remoting.impl.wireformat.HornetQExceptionMessage;
+import org.hornetq.core.remoting.impl.wireformat.PacketImpl;
+import org.hornetq.core.remoting.impl.wireformat.PacketsConfirmedMessage;
+import org.hornetq.core.remoting.spi.HornetQBuffer;
+
/**
* A ChannelImpl
*
Modified: trunk/src/main/org/hornetq/core/remoting/impl/ssl/SSLSupport.java
===================================================================
--- trunk/src/main/org/hornetq/core/remoting/impl/ssl/SSLSupport.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/src/main/org/hornetq/core/remoting/impl/ssl/SSLSupport.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -17,7 +17,6 @@
import java.io.IOException;
import java.io.InputStream;
import java.net.MalformedURLException;
-import java.net.URI;
import java.net.URL;
import java.security.GeneralSecurityException;
import java.security.KeyStore;
Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionDeleteQueueMessage.java
===================================================================
--- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionDeleteQueueMessage.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionDeleteQueueMessage.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -14,7 +14,6 @@
package org.hornetq.core.remoting.impl.wireformat;
import org.hornetq.core.remoting.spi.HornetQBuffer;
-import org.hornetq.utils.DataConstants;
import org.hornetq.utils.SimpleString;
/**
Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAForgetMessage.java
===================================================================
--- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAForgetMessage.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAForgetMessage.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -16,7 +16,6 @@
import javax.transaction.xa.Xid;
import org.hornetq.core.remoting.spi.HornetQBuffer;
-import org.hornetq.utils.DataConstants;
/**
Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAJoinMessage.java
===================================================================
--- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAJoinMessage.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAJoinMessage.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -16,7 +16,6 @@
import javax.transaction.xa.Xid;
import org.hornetq.core.remoting.spi.HornetQBuffer;
-import org.hornetq.utils.DataConstants;
/**
Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAPrepareMessage.java
===================================================================
--- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAPrepareMessage.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAPrepareMessage.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -16,7 +16,6 @@
import javax.transaction.xa.Xid;
import org.hornetq.core.remoting.spi.HornetQBuffer;
-import org.hornetq.utils.DataConstants;
/**
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
Modified: trunk/src/main/org/hornetq/core/remoting/spi/HornetQBuffer.java
===================================================================
--- trunk/src/main/org/hornetq/core/remoting/spi/HornetQBuffer.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/src/main/org/hornetq/core/remoting/spi/HornetQBuffer.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -13,7 +13,6 @@
package org.hornetq.core.remoting.spi;
-import org.hornetq.core.buffers.ChannelBuffer;
import org.hornetq.utils.SimpleString;
/**
Modified: trunk/src/main/org/hornetq/core/security/impl/JAASSecurityManager.java
===================================================================
--- trunk/src/main/org/hornetq/core/security/impl/JAASSecurityManager.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/src/main/org/hornetq/core/security/impl/JAASSecurityManager.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -13,23 +13,24 @@
package org.hornetq.core.security.impl;
-import org.hornetq.core.logging.Logger;
-import org.hornetq.core.security.CheckType;
-import org.hornetq.core.security.HornetQSecurityManager;
-import org.hornetq.core.security.Role;
-import org.hornetq.core.server.HornetQComponent;
+import java.security.Principal;
+import java.security.acl.Group;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
import javax.security.auth.Subject;
import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.login.Configuration;
import javax.security.auth.login.LoginContext;
import javax.security.auth.login.LoginException;
-import java.security.Principal;
-import java.security.acl.Group;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
+import org.hornetq.core.logging.Logger;
+import org.hornetq.core.security.CheckType;
+import org.hornetq.core.security.HornetQSecurityManager;
+import org.hornetq.core.security.Role;
+import org.hornetq.core.server.HornetQComponent;
+
/**
* This implementation delegates to the JAAS security interfaces.
*
Modified: trunk/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -26,7 +26,6 @@
import org.hornetq.core.client.ClientSessionFactory;
import org.hornetq.core.client.SendAcknowledgementHandler;
import org.hornetq.core.client.impl.ClientSessionFactoryImpl;
-import org.hornetq.core.client.impl.ClientSessionImpl;
import org.hornetq.core.client.impl.ClientSessionInternal;
import org.hornetq.core.client.management.impl.ManagementHelper;
import org.hornetq.core.config.TransportConfiguration;
Modified: trunk/src/main/org/hornetq/core/server/cluster/impl/BroadcastGroupImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/cluster/impl/BroadcastGroupImpl.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/src/main/org/hornetq/core/server/cluster/impl/BroadcastGroupImpl.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -21,7 +21,6 @@
import java.util.concurrent.ScheduledFuture;
import org.hornetq.core.buffers.ChannelBuffers;
-import org.hornetq.core.client.management.impl.ManagementHelper;
import org.hornetq.core.config.TransportConfiguration;
import org.hornetq.core.logging.Logger;
import org.hornetq.core.management.Notification;
Modified: trunk/src/main/org/hornetq/core/server/impl/HornetQPacketHandler.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/impl/HornetQPacketHandler.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/src/main/org/hornetq/core/server/impl/HornetQPacketHandler.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -42,13 +42,11 @@
import org.hornetq.core.remoting.impl.wireformat.replication.ReplicateRemoteConsumerAddedMessage;
import org.hornetq.core.remoting.impl.wireformat.replication.ReplicateRemoteConsumerRemovedMessage;
import org.hornetq.core.remoting.impl.wireformat.replication.ReplicateStartupInfoMessage;
-import org.hornetq.core.server.MessageReference;
import org.hornetq.core.server.HornetQServer;
+import org.hornetq.core.server.MessageReference;
import org.hornetq.core.server.Queue;
import org.hornetq.core.server.cluster.ClusterConnection;
import org.hornetq.core.server.cluster.RemoteQueueBinding;
-import org.hornetq.core.transaction.Transaction;
-import org.hornetq.core.transaction.impl.TransactionImpl;
/**
* A packet handler for all packets that need to be handled at the server level
Modified: trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -52,8 +52,8 @@
import org.hornetq.core.filter.impl.FilterImpl;
import org.hornetq.core.logging.Logger;
import org.hornetq.core.management.ManagementService;
+import org.hornetq.core.management.impl.HornetQServerControlImpl;
import org.hornetq.core.management.impl.ManagementServiceImpl;
-import org.hornetq.core.management.impl.HornetQServerControlImpl;
import org.hornetq.core.paging.PagingManager;
import org.hornetq.core.paging.impl.PagingManagerImpl;
import org.hornetq.core.paging.impl.PagingStoreFactoryNIO;
@@ -83,9 +83,9 @@
import org.hornetq.core.security.impl.SecurityStoreImpl;
import org.hornetq.core.server.ActivateCallback;
import org.hornetq.core.server.Divert;
+import org.hornetq.core.server.HornetQServer;
import org.hornetq.core.server.MemoryManager;
import org.hornetq.core.server.MessageReference;
-import org.hornetq.core.server.HornetQServer;
import org.hornetq.core.server.Queue;
import org.hornetq.core.server.QueueFactory;
import org.hornetq.core.server.ServerSession;
Modified: trunk/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java
===================================================================
--- trunk/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -84,9 +84,9 @@
import org.hornetq.core.remoting.spi.HornetQBuffer;
import org.hornetq.core.security.CheckType;
import org.hornetq.core.security.SecurityStore;
+import org.hornetq.core.server.HornetQServer;
import org.hornetq.core.server.LargeServerMessage;
import org.hornetq.core.server.MessageReference;
-import org.hornetq.core.server.HornetQServer;
import org.hornetq.core.server.Queue;
import org.hornetq.core.server.QueueFactory;
import org.hornetq.core.server.ServerConsumer;
Modified: trunk/src/main/org/hornetq/core/settings/impl/HierarchicalObjectRepository.java
===================================================================
--- trunk/src/main/org/hornetq/core/settings/impl/HierarchicalObjectRepository.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/src/main/org/hornetq/core/settings/impl/HierarchicalObjectRepository.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -13,11 +13,6 @@
package org.hornetq.core.settings.impl;
-import org.hornetq.core.logging.Logger;
-import org.hornetq.core.settings.HierarchicalRepository;
-import org.hornetq.core.settings.HierarchicalRepositoryChangeListener;
-import org.hornetq.core.settings.Mergeable;
-
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
@@ -26,7 +21,12 @@
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
+import org.hornetq.core.logging.Logger;
+import org.hornetq.core.settings.HierarchicalRepository;
+import org.hornetq.core.settings.HierarchicalRepositoryChangeListener;
+import org.hornetq.core.settings.Mergeable;
+
/**
* allows objects to be mapped against a regex pattern and held in order in a list
*
Modified: trunk/src/main/org/hornetq/integration/bootstrap/HornetQBootstrapServer.java
===================================================================
--- trunk/src/main/org/hornetq/integration/bootstrap/HornetQBootstrapServer.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/src/main/org/hornetq/integration/bootstrap/HornetQBootstrapServer.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -13,12 +13,6 @@
package org.hornetq.integration.bootstrap;
-import org.hornetq.core.logging.Logger;
-import org.jboss.kernel.plugins.bootstrap.basic.BasicBootstrap;
-import org.jboss.kernel.plugins.deployment.xml.BeanXMLDeployer;
-import org.jboss.kernel.spi.config.KernelConfig;
-import org.jboss.kernel.spi.deployment.KernelDeployment;
-
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
@@ -31,6 +25,12 @@
import java.util.TimerTask;
import java.util.concurrent.CopyOnWriteArrayList;
+import org.hornetq.core.logging.Logger;
+import org.jboss.kernel.plugins.bootstrap.basic.BasicBootstrap;
+import org.jboss.kernel.plugins.deployment.xml.BeanXMLDeployer;
+import org.jboss.kernel.spi.config.KernelConfig;
+import org.jboss.kernel.spi.deployment.KernelDeployment;
+
/**
* This is the method in which the HornetQ server can be deployed externall outside of jBoss. Alternatively a user can embed
* by using the same code as in main
Modified: trunk/src/main/org/hornetq/integration/logging/BaseLoggerHandler.java
===================================================================
--- trunk/src/main/org/hornetq/integration/logging/BaseLoggerHandler.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/src/main/org/hornetq/integration/logging/BaseLoggerHandler.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -13,8 +13,8 @@
package org.hornetq.integration.logging;
import java.util.logging.Handler;
+import java.util.logging.Level;
import java.util.logging.LogRecord;
-import java.util.logging.Level;
/**
* @author <a href="mailto:andy.taylor at jboss.org">Andy Taylor</a>
Modified: trunk/src/main/org/hornetq/integration/logging/HornetQLoggerPlugin.java
===================================================================
--- trunk/src/main/org/hornetq/integration/logging/HornetQLoggerPlugin.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/src/main/org/hornetq/integration/logging/HornetQLoggerPlugin.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -13,11 +13,11 @@
package org.hornetq.integration.logging;
-import org.jboss.logging.LoggerPlugin;
-
import java.util.logging.Level;
import java.util.logging.Logger;
+import org.jboss.logging.LoggerPlugin;
+
/**
* @author <a href="ataylor at redhat.com">Andy Taylor</a>
*/
Modified: trunk/src/main/org/hornetq/integration/logging/Log4jLoggerHandler.java
===================================================================
--- trunk/src/main/org/hornetq/integration/logging/Log4jLoggerHandler.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/src/main/org/hornetq/integration/logging/Log4jLoggerHandler.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -12,10 +12,10 @@
*/
package org.hornetq.integration.logging;
+import java.util.logging.Level;
+
import org.apache.log4j.Logger;
-import java.util.logging.Level;
-
/**
* @author <a href="mailto:andy.taylor at jboss.org">Andy Taylor</a>
*/
Modified: trunk/src/main/org/hornetq/integration/security/JBossASSecurityManager.java
===================================================================
--- trunk/src/main/org/hornetq/integration/security/JBossASSecurityManager.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/src/main/org/hornetq/integration/security/JBossASSecurityManager.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -13,6 +13,13 @@
package org.hornetq.integration.security;
+import java.security.Principal;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.naming.InitialContext;
+import javax.security.auth.Subject;
+
import org.hornetq.core.logging.Logger;
import org.hornetq.core.security.CheckType;
import org.hornetq.core.security.HornetQSecurityManager;
@@ -22,12 +29,6 @@
import org.jboss.security.RealmMapping;
import org.jboss.security.SimplePrincipal;
-import javax.naming.InitialContext;
-import javax.security.auth.Subject;
-import java.security.Principal;
-import java.util.HashSet;
-import java.util.Set;
-
/**
* This implementation delegates to the JBoss AS security interfaces (which in turn use JAAS)
* It can be used when running HornetQ in JBoss AS
Modified: trunk/src/main/org/hornetq/integration/transports/netty/HornetQChannelHandler.java
===================================================================
--- trunk/src/main/org/hornetq/integration/transports/netty/HornetQChannelHandler.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/src/main/org/hornetq/integration/transports/netty/HornetQChannelHandler.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -14,7 +14,6 @@
import org.hornetq.core.exception.HornetQException;
import org.hornetq.core.logging.Logger;
-import org.hornetq.core.remoting.Packet;
import org.hornetq.core.remoting.spi.BufferHandler;
import org.hornetq.core.remoting.spi.ConnectionLifeCycleListener;
import org.jboss.netty.buffer.ChannelBuffer;
Modified: trunk/src/main/org/hornetq/integration/transports/netty/HttpAcceptorHandler.java
===================================================================
--- trunk/src/main/org/hornetq/integration/transports/netty/HttpAcceptorHandler.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/src/main/org/hornetq/integration/transports/netty/HttpAcceptorHandler.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -12,13 +12,20 @@
*/
package org.hornetq.integration.transports.netty;
+import static org.jboss.netty.channel.Channels.write;
+
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.Executor;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
import org.jboss.netty.buffer.ChannelBuffer;
import org.jboss.netty.buffer.ChannelBuffers;
import org.jboss.netty.channel.Channel;
import org.jboss.netty.channel.ChannelHandlerContext;
import org.jboss.netty.channel.ChannelPipelineCoverage;
import org.jboss.netty.channel.ChannelStateEvent;
-import static org.jboss.netty.channel.Channels.write;
import org.jboss.netty.channel.MessageEvent;
import org.jboss.netty.channel.SimpleChannelHandler;
import org.jboss.netty.channel.UpstreamMessageEvent;
@@ -30,12 +37,6 @@
import org.jboss.netty.handler.codec.http.HttpResponseStatus;
import org.jboss.netty.handler.codec.http.HttpVersion;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.Executor;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-
/**
* takes care of making sure that every request has a response and also that any uninitiated responses always wait for a response.
* @author <a href="mailto:andy.taylor at jboss.org">Andy Taylor</a>
Modified: trunk/src/main/org/hornetq/integration/transports/netty/NettyConnection.java
===================================================================
--- trunk/src/main/org/hornetq/integration/transports/netty/NettyConnection.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/src/main/org/hornetq/integration/transports/netty/NettyConnection.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -20,7 +20,6 @@
import org.hornetq.core.remoting.spi.HornetQBuffer;
import org.jboss.netty.channel.Channel;
import org.jboss.netty.channel.ChannelFuture;
-import org.jboss.netty.channel.ChannelFutureListener;
import org.jboss.netty.handler.ssl.SslHandler;
/**
Modified: trunk/src/main/org/hornetq/integration/transports/netty/NettyConnector.java
===================================================================
--- trunk/src/main/org/hornetq/integration/transports/netty/NettyConnector.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/src/main/org/hornetq/integration/transports/netty/NettyConnector.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -12,6 +12,25 @@
*/
package org.hornetq.integration.transports.netty;
+import static org.jboss.netty.channel.Channels.pipeline;
+import static org.jboss.netty.channel.Channels.write;
+
+import java.net.ConnectException;
+import java.net.InetSocketAddress;
+import java.net.SocketAddress;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentMap;
+import java.util.concurrent.Executor;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLException;
+
import org.hornetq.core.exception.HornetQException;
import org.hornetq.core.logging.Logger;
import org.hornetq.core.remoting.impl.ssl.SSLSupport;
@@ -30,8 +49,6 @@
import org.jboss.netty.channel.ChannelPipelineCoverage;
import org.jboss.netty.channel.ChannelPipelineFactory;
import org.jboss.netty.channel.ChannelStateEvent;
-import static org.jboss.netty.channel.Channels.pipeline;
-import static org.jboss.netty.channel.Channels.write;
import org.jboss.netty.channel.MessageEvent;
import org.jboss.netty.channel.SimpleChannelHandler;
import org.jboss.netty.channel.UpstreamMessageEvent;
@@ -54,21 +71,6 @@
import org.jboss.netty.handler.codec.http.HttpVersion;
import org.jboss.netty.handler.ssl.SslHandler;
-import javax.net.ssl.SSLContext;
-import javax.net.ssl.SSLException;
-import java.net.ConnectException;
-import java.net.InetSocketAddress;
-import java.net.SocketAddress;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.Executor;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-
/**
* A NettyConnector
*
Modified: trunk/src/main/org/hornetq/jms/server/JMSServerManager.java
===================================================================
--- trunk/src/main/org/hornetq/jms/server/JMSServerManager.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/src/main/org/hornetq/jms/server/JMSServerManager.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -13,13 +13,14 @@
package org.hornetq.jms.server;
+import java.util.List;
+
+import javax.naming.Context;
+
import org.hornetq.core.config.TransportConfiguration;
import org.hornetq.core.server.HornetQComponent;
import org.hornetq.utils.Pair;
-import javax.naming.Context;
-import java.util.List;
-
/**
* The JMS Management interface.
*
Modified: trunk/src/main/org/hornetq/jms/server/management/impl/TopicControlImpl.java
===================================================================
--- trunk/src/main/org/hornetq/jms/server/management/impl/TopicControlImpl.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/src/main/org/hornetq/jms/server/management/impl/TopicControlImpl.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -21,8 +21,8 @@
import org.hornetq.core.exception.HornetQException;
import org.hornetq.core.logging.Logger;
import org.hornetq.core.management.AddressControl;
+import org.hornetq.core.management.HornetQServerControl;
import org.hornetq.core.management.ManagementService;
-import org.hornetq.core.management.HornetQServerControl;
import org.hornetq.core.management.QueueControl;
import org.hornetq.core.management.ResourceNames;
import org.hornetq.jms.HornetQTopic;
Modified: trunk/src/main/org/hornetq/jms/server/management/jmx/impl/ReplicationAwareJMSServerControlWrapper.java
===================================================================
--- trunk/src/main/org/hornetq/jms/server/management/jmx/impl/ReplicationAwareJMSServerControlWrapper.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/src/main/org/hornetq/jms/server/management/jmx/impl/ReplicationAwareJMSServerControlWrapper.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -28,7 +28,6 @@
import org.hornetq.core.management.jmx.impl.ReplicationAwareStandardMBeanWrapper;
import org.hornetq.jms.server.management.JMSServerControl;
import org.hornetq.jms.server.management.impl.JMSServerControlImpl;
-import org.hornetq.jms.server.management.impl.JMSServerControlImpl.NotificationType;
/**
* A ReplicationAwareJMSServerControlWrapper
Modified: trunk/src/main/org/hornetq/ra/ConnectionFactoryProperties.java
===================================================================
--- trunk/src/main/org/hornetq/ra/ConnectionFactoryProperties.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/src/main/org/hornetq/ra/ConnectionFactoryProperties.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -12,10 +12,10 @@
*/
package org.hornetq.ra;
+import java.util.Map;
+
import org.hornetq.core.logging.Logger;
-import java.util.Map;
-
/**
* @author <a href="mailto:andy.taylor at jboss.org">Andy Taylor</a>
*/
Modified: trunk/src/main/org/hornetq/ra/HornetQRAMCFProperties.java
===================================================================
--- trunk/src/main/org/hornetq/ra/HornetQRAMCFProperties.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/src/main/org/hornetq/ra/HornetQRAMCFProperties.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -203,12 +203,13 @@
*/
package org.hornetq.ra;
-import org.hornetq.core.logging.Logger;
+import java.io.Serializable;
import javax.jms.Queue;
import javax.jms.Topic;
-import java.io.Serializable;
+import org.hornetq.core.logging.Logger;
+
/**
* The MCF default properties - these are set in the <tx-connection-factory> at the jms-ds.xml
*
Modified: trunk/src/main/org/hornetq/ra/HornetQRAProperties.java
===================================================================
--- trunk/src/main/org/hornetq/ra/HornetQRAProperties.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/src/main/org/hornetq/ra/HornetQRAProperties.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -12,10 +12,10 @@
*/
package org.hornetq.ra;
+import java.io.Serializable;
+
import org.hornetq.core.logging.Logger;
-import java.io.Serializable;
-
/**
* The RA default properties - these are set in the ra.xml file
*
Modified: trunk/src/main/org/hornetq/ra/inflow/HornetQActivationSpec.java
===================================================================
--- trunk/src/main/org/hornetq/ra/inflow/HornetQActivationSpec.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/src/main/org/hornetq/ra/inflow/HornetQActivationSpec.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -12,19 +12,20 @@
*/
package org.hornetq.ra.inflow;
-import org.hornetq.core.logging.Logger;
-import org.hornetq.ra.ConnectionFactoryProperties;
-import org.hornetq.ra.HornetQResourceAdapter;
-import org.hornetq.ra.Util;
+import java.util.HashMap;
+import java.util.Map;
import javax.jms.Session;
import javax.resource.ResourceException;
import javax.resource.spi.ActivationSpec;
import javax.resource.spi.InvalidPropertyException;
import javax.resource.spi.ResourceAdapter;
-import java.util.HashMap;
-import java.util.Map;
+import org.hornetq.core.logging.Logger;
+import org.hornetq.ra.ConnectionFactoryProperties;
+import org.hornetq.ra.HornetQResourceAdapter;
+import org.hornetq.ra.Util;
+
/**
* The activation spec
* These properties are set on the MDB ActivactionProperties
Modified: trunk/src/main/org/hornetq/utils/XMLUtil.java
===================================================================
--- trunk/src/main/org/hornetq/utils/XMLUtil.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/src/main/org/hornetq/utils/XMLUtil.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -13,6 +13,22 @@
package org.hornetq.utils;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.io.StringReader;
+import java.lang.reflect.Method;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.XMLConstants;
+import javax.xml.parsers.DocumentBuilder;
+import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.validation.Schema;
+import javax.xml.validation.SchemaFactory;
+import javax.xml.validation.Validator;
+
import org.hornetq.core.logging.Logger;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -22,21 +38,6 @@
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
-import javax.xml.XMLConstants;
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.validation.Schema;
-import javax.xml.validation.SchemaFactory;
-import javax.xml.validation.Validator;
-import java.io.InputStreamReader;
-import java.io.Reader;
-import java.io.StringReader;
-import java.lang.reflect.Method;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.List;
-
/**
* @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
Modified: trunk/src/main/org/hornetq/utils/concurrent/BlockingDeque.java
===================================================================
--- trunk/src/main/org/hornetq/utils/concurrent/BlockingDeque.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/src/main/org/hornetq/utils/concurrent/BlockingDeque.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -5,8 +5,9 @@
*/
package org.hornetq.utils.concurrent; // XXX This belongs in java.util!!! XXX
-import java.util.concurrent.*; // XXX This import goes away XXX
-import java.util.*;
+import java.util.Collection;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.TimeUnit;
/**
* A {@link Deque} that additionally supports operations that wait for
Modified: trunk/src/main/org/hornetq/utils/concurrent/Deque.java
===================================================================
--- trunk/src/main/org/hornetq/utils/concurrent/Deque.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/src/main/org/hornetq/utils/concurrent/Deque.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -5,7 +5,12 @@
*/
package org.hornetq.utils.concurrent; // XXX This belongs in java.util!!! XXX
-import java.util.*; // XXX This import goes away XXX
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.NoSuchElementException;
+import java.util.Queue;
+import java.util.Stack;
/**
* A linear collection that supports element insertion and removal at
Modified: trunk/src/main/org/hornetq/utils/concurrent/LinkedBlockingDeque.java
===================================================================
--- trunk/src/main/org/hornetq/utils/concurrent/LinkedBlockingDeque.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/src/main/org/hornetq/utils/concurrent/LinkedBlockingDeque.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -6,9 +6,13 @@
package org.hornetq.utils.concurrent;
-import java.util.*;
-import java.util.concurrent.*;
-import java.util.concurrent.locks.*;
+import java.util.AbstractQueue;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.NoSuchElementException;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.locks.Condition;
+import java.util.concurrent.locks.ReentrantLock;
/**
* An optionally-bounded {@linkplain BlockingDeque blocking deque} based on
Modified: trunk/src/main/org/hornetq/utils/json/JSONObject.java
===================================================================
--- trunk/src/main/org/hornetq/utils/json/JSONObject.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/src/main/org/hornetq/utils/json/JSONObject.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -28,8 +28,8 @@
import java.io.IOException;
import java.io.Writer;
import java.lang.reflect.Field;
+import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
-import java.lang.reflect.Method;
import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
Modified: trunk/tests/jms-tests/src/org/hornetq/jms/tests/ConnectionTest.java
===================================================================
--- trunk/tests/jms-tests/src/org/hornetq/jms/tests/ConnectionTest.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/ConnectionTest.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -25,8 +25,6 @@
import javax.jms.TopicConnection;
import javax.jms.TopicConnectionFactory;
-import junit.framework.TestCase;
-
import org.hornetq.core.logging.Logger;
/**
Modified: trunk/tests/jms-tests/src/org/hornetq/jms/tests/HornetQServerTestCase.java
===================================================================
--- trunk/tests/jms-tests/src/org/hornetq/jms/tests/HornetQServerTestCase.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/HornetQServerTestCase.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -13,16 +13,13 @@
package org.hornetq.jms.tests;
-import com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionManagerImple;
+import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
-import org.hornetq.core.logging.Logger;
-import org.hornetq.core.security.Role;
-import org.hornetq.core.server.HornetQServer;
-import org.hornetq.jms.server.JMSServerManager;
-import org.hornetq.jms.tests.tools.ServerManagement;
-import org.hornetq.jms.tests.tools.container.Server;
-import org.hornetq.jms.tests.util.ProxyAssertSupport;
-
import javax.jms.Connection;
import javax.jms.ConnectionFactory;
import javax.jms.Destination;
@@ -35,13 +32,17 @@
import javax.jms.XAConnectionFactory;
import javax.naming.InitialContext;
import javax.transaction.TransactionManager;
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionManagerImple;
+
+import org.hornetq.core.logging.Logger;
+import org.hornetq.core.security.Role;
+import org.hornetq.core.server.HornetQServer;
+import org.hornetq.jms.server.JMSServerManager;
+import org.hornetq.jms.tests.tools.ServerManagement;
+import org.hornetq.jms.tests.tools.container.Server;
+import org.hornetq.jms.tests.util.ProxyAssertSupport;
+
/**
* @author <a href="mailto:adrian at jboss.org">Adrian Brock</a>
* @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
Modified: trunk/tests/jms-tests/src/org/hornetq/jms/tests/MessageProducerTest.java
===================================================================
--- trunk/tests/jms-tests/src/org/hornetq/jms/tests/MessageProducerTest.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/MessageProducerTest.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -13,8 +13,7 @@
package org.hornetq.jms.tests;
-import org.hornetq.jms.tests.message.SimpleJMSMessage;
-import org.hornetq.jms.tests.message.SimpleJMSTextMessage;
+import java.io.Serializable;
import javax.jms.Connection;
import javax.jms.DeliveryMode;
@@ -24,8 +23,10 @@
import javax.jms.MessageProducer;
import javax.jms.Session;
import javax.jms.TextMessage;
-import java.io.Serializable;
+import org.hornetq.jms.tests.message.SimpleJMSMessage;
+import org.hornetq.jms.tests.message.SimpleJMSTextMessage;
+
/**
* @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
* @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
Modified: trunk/tests/jms-tests/src/org/hornetq/jms/tests/SecurityTest.java
===================================================================
--- trunk/tests/jms-tests/src/org/hornetq/jms/tests/SecurityTest.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/SecurityTest.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -13,12 +13,13 @@
package org.hornetq.jms.tests;
+import java.util.ArrayList;
+
import javax.jms.Connection;
import javax.jms.ConnectionFactory;
import javax.jms.IllegalStateException;
import javax.jms.JMSSecurityException;
import javax.jms.Session;
-import java.util.ArrayList;
/**
* Test JMS Security.
Modified: trunk/tests/joram-tests/src/org/hornetq/jms/GenericAdmin.java
===================================================================
--- trunk/tests/joram-tests/src/org/hornetq/jms/GenericAdmin.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/joram-tests/src/org/hornetq/jms/GenericAdmin.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -14,7 +14,6 @@
package org.hornetq.jms;
import javax.naming.Context;
-import javax.naming.InitialContext;
import javax.naming.NamingException;
import org.jboss.logging.Logger;
Modified: trunk/tests/joram-tests/src/org/objectweb/jtests/jms/conform/connection/TopicConnectionTest.java
===================================================================
--- trunk/tests/joram-tests/src/org/objectweb/jtests/jms/conform/connection/TopicConnectionTest.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/joram-tests/src/org/objectweb/jtests/jms/conform/connection/TopicConnectionTest.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -13,9 +13,7 @@
package org.objectweb.jtests.jms.conform.connection;
-import javax.jms.InvalidClientIDException;
import javax.jms.JMSException;
-import javax.jms.TopicConnection;
import junit.framework.Test;
import junit.framework.TestSuite;
Modified: trunk/tests/joram-tests/src/org/objectweb/jtests/jms/framework/JMSTestCase.java
===================================================================
--- trunk/tests/joram-tests/src/org/objectweb/jtests/jms/framework/JMSTestCase.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/joram-tests/src/org/objectweb/jtests/jms/framework/JMSTestCase.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -18,11 +18,11 @@
import javax.jms.JMSException;
+import junit.framework.TestCase;
+
import org.objectweb.jtests.jms.admin.Admin;
import org.objectweb.jtests.jms.admin.AdminFactory;
-import junit.framework.TestCase;
-
/**
* Class extending <code>junit.framework.TestCase</code> to
* provide a new <code>fail()</code> method with an <code>Exception</code>
Modified: trunk/tests/src/org/hornetq/tests/integration/client/AcknowledgeTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/AcknowledgeTest.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/src/org/hornetq/tests/integration/client/AcknowledgeTest.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -12,6 +12,9 @@
*/
package org.hornetq.tests.integration.client;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -24,9 +27,6 @@
import org.hornetq.tests.util.ServiceTestBase;
import org.hornetq.utils.SimpleString;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
/**
* @author <a href="mailto:andy.taylor at 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-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/src/org/hornetq/tests/integration/client/CommitRollbackTest.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -12,6 +12,9 @@
*/
package org.hornetq.tests.integration.client;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -24,9 +27,6 @@
import org.hornetq.tests.util.ServiceTestBase;
import org.hornetq.utils.SimpleString;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
/**
* @author <a href="mailto:andy.taylor at jboss.org">Andy Taylor</a>
*/
Modified: trunk/tests/src/org/hornetq/tests/integration/client/CompactingTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/CompactingTest.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/src/org/hornetq/tests/integration/client/CompactingTest.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -25,8 +25,8 @@
import org.hornetq.core.config.Configuration;
import org.hornetq.core.config.impl.ConfigurationImpl;
import org.hornetq.core.exception.HornetQException;
+import org.hornetq.core.server.HornetQServer;
import org.hornetq.core.server.JournalType;
-import org.hornetq.core.server.HornetQServer;
import org.hornetq.tests.util.ServiceTestBase;
/**
Modified: trunk/tests/src/org/hornetq/tests/integration/client/DeliveryOrderTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/DeliveryOrderTest.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/src/org/hornetq/tests/integration/client/DeliveryOrderTest.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -12,6 +12,10 @@
*/
package org.hornetq.tests.integration.client;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -23,10 +27,6 @@
import org.hornetq.tests.util.ServiceTestBase;
import org.hornetq.utils.SimpleString;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-
/**
* @author <a href="mailto:andy.taylor at jboss.org">Andy Taylor</a>
*/
Modified: trunk/tests/src/org/hornetq/tests/integration/client/MessageExpirationTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/MessageExpirationTest.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/src/org/hornetq/tests/integration/client/MessageExpirationTest.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -20,17 +20,10 @@
import org.hornetq.core.client.ClientProducer;
import org.hornetq.core.client.ClientSession;
import org.hornetq.core.client.ClientSessionFactory;
-import org.hornetq.core.client.impl.ClientSessionFactoryImpl;
-import org.hornetq.core.config.Configuration;
-import org.hornetq.core.config.TransportConfiguration;
-import org.hornetq.core.config.impl.ConfigurationImpl;
import org.hornetq.core.message.impl.MessageImpl;
-import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory;
-import org.hornetq.core.server.HornetQ;
import org.hornetq.core.server.HornetQServer;
import org.hornetq.core.settings.impl.AddressSettings;
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/MessageGroupingTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/MessageGroupingTest.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/src/org/hornetq/tests/integration/client/MessageGroupingTest.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -32,7 +32,6 @@
import org.hornetq.core.message.impl.MessageImpl;
import org.hornetq.core.server.HornetQ;
import org.hornetq.core.server.HornetQServer;
-import org.hornetq.core.settings.impl.AddressSettings;
import org.hornetq.core.transaction.impl.XidImpl;
import org.hornetq.tests.util.UnitTestCase;
import org.hornetq.utils.SimpleString;
Modified: trunk/tests/src/org/hornetq/tests/integration/client/MessageHandlerTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/MessageHandlerTest.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/src/org/hornetq/tests/integration/client/MessageHandlerTest.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -12,6 +12,9 @@
*/
package org.hornetq.tests.integration.client;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -23,9 +26,6 @@
import org.hornetq.tests.util.ServiceTestBase;
import org.hornetq.utils.SimpleString;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
/**
* @author <a href="mailto:andy.taylor at jboss.org">Andy Taylor</a>
*/
Modified: trunk/tests/src/org/hornetq/tests/integration/client/ProducerTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/ProducerTest.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/src/org/hornetq/tests/integration/client/ProducerTest.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -12,6 +12,9 @@
*/
package org.hornetq.tests.integration.client;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
import org.hornetq.core.client.ClientSession;
@@ -26,9 +29,6 @@
import org.hornetq.tests.util.ServiceTestBase;
import org.hornetq.utils.SimpleString;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
/**
* @author <a href="mailto:andy.taylor at jboss.org">Andy Taylor</a>
*/
Modified: trunk/tests/src/org/hornetq/tests/integration/client/RequestorTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/RequestorTest.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/src/org/hornetq/tests/integration/client/RequestorTest.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -13,6 +13,9 @@
package org.hornetq.tests.integration.client;
+import static org.hornetq.tests.util.RandomUtil.randomLong;
+import static org.hornetq.tests.util.RandomUtil.randomSimpleString;
+
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -33,9 +36,6 @@
import org.hornetq.tests.util.UnitTestCase;
import org.hornetq.utils.SimpleString;
-import static org.hornetq.tests.util.RandomUtil.randomLong;
-import static org.hornetq.tests.util.RandomUtil.randomSimpleString;
-
/**
* A ClientRequestorTest
*
Modified: trunk/tests/src/org/hornetq/tests/integration/client/SessionSendAcknowledgementHandlerTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/SessionSendAcknowledgementHandlerTest.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/src/org/hornetq/tests/integration/client/SessionSendAcknowledgementHandlerTest.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -13,6 +13,9 @@
package org.hornetq.tests.integration.client;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
import org.hornetq.core.client.ClientSession;
@@ -24,9 +27,6 @@
import org.hornetq.tests.util.ServiceTestBase;
import org.hornetq.utils.SimpleString;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
/**
* A SendAcknowledgementsTest
*
Modified: trunk/tests/src/org/hornetq/tests/integration/client/TemporaryQueueTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/client/TemporaryQueueTest.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/src/org/hornetq/tests/integration/client/TemporaryQueueTest.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -13,6 +13,11 @@
package org.hornetq.tests.integration.client;
+import static org.hornetq.tests.util.RandomUtil.randomSimpleString;
+
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -32,11 +37,6 @@
import org.hornetq.tests.util.ServiceTestBase;
import org.hornetq.utils.SimpleString;
-import static org.hornetq.tests.util.RandomUtil.randomSimpleString;
-
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
/**
* A TemporaryQueueTest
*
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -42,9 +42,9 @@
import org.hornetq.core.postoffice.PostOffice;
import org.hornetq.core.postoffice.QueueBinding;
import org.hornetq.core.postoffice.impl.LocalQueueBinding;
-import org.hornetq.core.server.JournalType;
import org.hornetq.core.server.HornetQ;
import org.hornetq.core.server.HornetQServer;
+import org.hornetq.core.server.JournalType;
import org.hornetq.core.server.cluster.ClusterConnection;
import org.hornetq.core.server.cluster.RemoteQueueBinding;
import org.hornetq.integration.transports.netty.TransportConstants;
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/ActivationTimeoutTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/ActivationTimeoutTest.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/ActivationTimeoutTest.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -22,7 +22,6 @@
import org.hornetq.core.client.ClientSession;
import org.hornetq.core.client.impl.ClientSessionFactoryImpl;
import org.hornetq.core.client.impl.ClientSessionFactoryInternal;
-import org.hornetq.core.client.impl.ClientSessionImpl;
import org.hornetq.core.client.impl.ClientSessionInternal;
import org.hornetq.core.config.Configuration;
import org.hornetq.core.config.TransportConfiguration;
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/AutomaticFailoverWithDiscoveryTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/AutomaticFailoverWithDiscoveryTest.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/AutomaticFailoverWithDiscoveryTest.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -18,7 +18,6 @@
import org.hornetq.core.client.ClientProducer;
import org.hornetq.core.client.ClientSession;
import org.hornetq.core.client.impl.ClientSessionFactoryImpl;
-import org.hornetq.core.client.impl.ClientSessionImpl;
import org.hornetq.core.client.impl.ClientSessionInternal;
import org.hornetq.core.exception.HornetQException;
import org.hornetq.core.logging.Logger;
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverExpiredMessageTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverExpiredMessageTest.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverExpiredMessageTest.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -22,7 +22,6 @@
import org.hornetq.core.client.ClientSession;
import org.hornetq.core.client.impl.ClientSessionFactoryImpl;
import org.hornetq.core.client.impl.ClientSessionFactoryInternal;
-import org.hornetq.core.client.impl.ClientSessionImpl;
import org.hornetq.core.client.impl.ClientSessionInternal;
import org.hornetq.core.config.Configuration;
import org.hornetq.core.config.TransportConfiguration;
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverManagementTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverManagementTest.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverManagementTest.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -25,7 +25,6 @@
import org.hornetq.core.client.impl.ClientMessageImpl;
import org.hornetq.core.client.impl.ClientSessionFactoryImpl;
import org.hornetq.core.client.impl.ClientSessionFactoryInternal;
-import org.hornetq.core.client.impl.ClientSessionImpl;
import org.hornetq.core.client.impl.ClientSessionInternal;
import org.hornetq.core.client.management.impl.ManagementHelper;
import org.hornetq.core.config.Configuration;
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverPreAcknowledgeTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverPreAcknowledgeTest.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverPreAcknowledgeTest.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -21,7 +21,6 @@
import org.hornetq.core.client.ClientSession;
import org.hornetq.core.client.impl.ClientSessionFactoryImpl;
import org.hornetq.core.client.impl.ClientSessionFactoryInternal;
-import org.hornetq.core.client.impl.ClientSessionImpl;
import org.hornetq.core.client.impl.ClientSessionInternal;
import org.hornetq.core.config.Configuration;
import org.hornetq.core.config.TransportConfiguration;
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverScheduledMessageTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverScheduledMessageTest.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverScheduledMessageTest.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -22,7 +22,6 @@
import org.hornetq.core.client.ClientSession;
import org.hornetq.core.client.impl.ClientSessionFactoryImpl;
import org.hornetq.core.client.impl.ClientSessionFactoryInternal;
-import org.hornetq.core.client.impl.ClientSessionImpl;
import org.hornetq.core.client.impl.ClientSessionInternal;
import org.hornetq.core.config.Configuration;
import org.hornetq.core.config.TransportConfiguration;
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -28,9 +28,9 @@
import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory;
import org.hornetq.core.remoting.impl.invm.InVMRegistry;
import org.hornetq.core.remoting.impl.invm.TransportConstants;
-import org.hornetq.core.server.JournalType;
import org.hornetq.core.server.HornetQ;
import org.hornetq.core.server.HornetQServer;
+import org.hornetq.core.server.JournalType;
import org.hornetq.core.settings.impl.AddressSettings;
import org.hornetq.tests.util.ServiceTestBase;
import org.hornetq.utils.Pair;
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailureListenerOnFailoverTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailureListenerOnFailoverTest.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailureListenerOnFailoverTest.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -23,7 +23,6 @@
import org.hornetq.core.client.ClientSession;
import org.hornetq.core.client.impl.ClientSessionFactoryImpl;
import org.hornetq.core.client.impl.ClientSessionFactoryInternal;
-import org.hornetq.core.client.impl.ClientSessionImpl;
import org.hornetq.core.client.impl.ClientSessionInternal;
import org.hornetq.core.config.Configuration;
import org.hornetq.core.config.TransportConfiguration;
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailureOnCreateConnectionTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailureOnCreateConnectionTest.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailureOnCreateConnectionTest.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -19,7 +19,6 @@
import org.hornetq.core.client.ClientSession;
import org.hornetq.core.client.impl.ClientSessionFactoryImpl;
import org.hornetq.core.client.impl.ClientSessionFactoryInternal;
-import org.hornetq.core.client.impl.ClientSessionImpl;
import org.hornetq.core.client.impl.ClientSessionInternal;
import org.hornetq.core.config.Configuration;
import org.hornetq.core.config.TransportConfiguration;
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/LargeMessageMultiThreadFailoverTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/LargeMessageMultiThreadFailoverTest.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/LargeMessageMultiThreadFailoverTest.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -23,11 +23,10 @@
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.InVMConnection;
import org.hornetq.core.remoting.impl.invm.InVMRegistry;
import org.hornetq.core.remoting.impl.invm.TransportConstants;
-import org.hornetq.core.server.JournalType;
import org.hornetq.core.server.HornetQ;
+import org.hornetq.core.server.JournalType;
/**
* A LargeMessageMultiThreadFailoverTest
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/MultiThreadFailoverSupport.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/MultiThreadFailoverSupport.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/MultiThreadFailoverSupport.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -22,7 +22,6 @@
import org.hornetq.core.client.ClientSession;
import org.hornetq.core.client.ClientSessionFactory;
import org.hornetq.core.client.impl.ClientSessionFactoryInternal;
-import org.hornetq.core.client.impl.ClientSessionImpl;
import org.hornetq.core.client.impl.ClientSessionInternal;
import org.hornetq.core.exception.HornetQException;
import org.hornetq.core.logging.Logger;
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/PagingFailoverMultiThreadTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/PagingFailoverMultiThreadTest.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/PagingFailoverMultiThreadTest.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -16,8 +16,6 @@
import java.io.File;
import java.util.HashMap;
import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.CountDownLatch;
@@ -38,15 +36,12 @@
import org.hornetq.core.config.impl.ConfigurationImpl;
import org.hornetq.core.exception.HornetQException;
import org.hornetq.core.logging.Logger;
-import org.hornetq.core.postoffice.QueueBinding;
import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory;
import org.hornetq.core.remoting.impl.invm.InVMRegistry;
import org.hornetq.core.remoting.impl.invm.TransportConstants;
-import org.hornetq.core.server.JournalType;
-import org.hornetq.core.server.MessageReference;
import org.hornetq.core.server.HornetQ;
import org.hornetq.core.server.HornetQServer;
-import org.hornetq.core.server.impl.QueueImpl;
+import org.hornetq.core.server.JournalType;
import org.hornetq.core.settings.impl.AddressSettings;
import org.hornetq.jms.client.HornetQBytesMessage;
import org.hornetq.utils.SimpleString;
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/PagingFailoverTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/PagingFailoverTest.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/PagingFailoverTest.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -22,7 +22,6 @@
import org.hornetq.core.client.ClientProducer;
import org.hornetq.core.client.ClientSession;
import org.hornetq.core.client.ClientSessionFactory;
-import org.hornetq.core.client.impl.ClientSessionImpl;
import org.hornetq.core.client.impl.ClientSessionInternal;
import org.hornetq.core.exception.HornetQException;
import org.hornetq.core.logging.Logger;
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/PreserveOrderDuringFailoverTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/PreserveOrderDuringFailoverTest.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/PreserveOrderDuringFailoverTest.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -18,7 +18,6 @@
import org.hornetq.core.client.ClientProducer;
import org.hornetq.core.client.ClientSession;
import org.hornetq.core.client.ClientSessionFactory;
-import org.hornetq.core.client.impl.ClientSessionImpl;
import org.hornetq.core.client.impl.ClientSessionInternal;
import org.hornetq.core.exception.HornetQException;
import org.hornetq.core.logging.Logger;
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/ReconnectTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/ReconnectTest.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/ReconnectTest.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -19,7 +19,6 @@
import org.hornetq.core.client.ClientSession;
import org.hornetq.core.client.impl.ClientSessionFactoryImpl;
import org.hornetq.core.client.impl.ClientSessionFactoryInternal;
-import org.hornetq.core.client.impl.ClientSessionImpl;
import org.hornetq.core.client.impl.ClientSessionInternal;
import org.hornetq.core.config.Configuration;
import org.hornetq.core.config.TransportConfiguration;
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/ReconnectWithBackupTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/ReconnectWithBackupTest.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/ReconnectWithBackupTest.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -22,7 +22,6 @@
import org.hornetq.core.client.ClientSession;
import org.hornetq.core.client.impl.ClientSessionFactoryImpl;
import org.hornetq.core.client.impl.ClientSessionFactoryInternal;
-import org.hornetq.core.client.impl.ClientSessionImpl;
import org.hornetq.core.client.impl.ClientSessionInternal;
import org.hornetq.core.config.Configuration;
import org.hornetq.core.config.TransportConfiguration;
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/ReplicateConnectionFailureTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/ReplicateConnectionFailureTest.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/ReplicateConnectionFailureTest.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -18,8 +18,6 @@
import org.hornetq.core.client.ClientSession;
import org.hornetq.core.client.impl.ClientSessionFactoryImpl;
-import org.hornetq.core.client.impl.ClientSessionFactoryInternal;
-import org.hornetq.core.client.impl.ClientSessionImpl;
import org.hornetq.core.client.impl.ClientSessionInternal;
import org.hornetq.core.client.impl.ConnectionManagerImpl;
import org.hornetq.core.config.Configuration;
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/SimpleAutomaticFailoverTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/SimpleAutomaticFailoverTest.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/SimpleAutomaticFailoverTest.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -27,7 +27,6 @@
import org.hornetq.core.client.ClientSessionFactory;
import org.hornetq.core.client.impl.ClientSessionFactoryImpl;
import org.hornetq.core.client.impl.ClientSessionFactoryInternal;
-import org.hornetq.core.client.impl.ClientSessionImpl;
import org.hornetq.core.client.impl.ClientSessionInternal;
import org.hornetq.core.config.Configuration;
import org.hornetq.core.config.TransportConfiguration;
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/SimpleManualFailoverTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/SimpleManualFailoverTest.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/SimpleManualFailoverTest.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -25,7 +25,6 @@
import org.hornetq.core.client.ClientSessionFactory;
import org.hornetq.core.client.impl.ClientSessionFactoryImpl;
import org.hornetq.core.client.impl.ClientSessionFactoryInternal;
-import org.hornetq.core.client.impl.ClientSessionImpl;
import org.hornetq.core.client.impl.ClientSessionInternal;
import org.hornetq.core.config.Configuration;
import org.hornetq.core.config.TransportConfiguration;
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/XALargeMessageMultiThreadFailoverTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/XALargeMessageMultiThreadFailoverTest.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/XALargeMessageMultiThreadFailoverTest.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -24,8 +24,8 @@
import org.hornetq.core.config.impl.ConfigurationImpl;
import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory;
import org.hornetq.core.remoting.impl.invm.TransportConstants;
+import org.hornetq.core.server.HornetQ;
import org.hornetq.core.server.JournalType;
-import org.hornetq.core.server.HornetQ;
/**
* A LargeMessageMultiThreadFailoverTest
Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/management/ReplicationAwareHornetQServerControlWrapperTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/cluster/management/ReplicationAwareHornetQServerControlWrapperTest.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/src/org/hornetq/tests/integration/cluster/management/ReplicationAwareHornetQServerControlWrapperTest.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -27,8 +27,8 @@
import org.hornetq.core.client.impl.ClientSessionFactoryImpl;
import org.hornetq.core.client.impl.ClientSessionFactoryInternal;
import org.hornetq.core.config.TransportConfiguration;
+import org.hornetq.core.management.HornetQServerControl;
import org.hornetq.core.management.MessageCounterInfo;
-import org.hornetq.core.management.HornetQServerControl;
import org.hornetq.core.management.ObjectNames;
import org.hornetq.core.management.QueueControl;
import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory;
Modified: trunk/tests/src/org/hornetq/tests/integration/jms/ManualReconnectionToSingleServerTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/jms/ManualReconnectionToSingleServerTest.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/src/org/hornetq/tests/integration/jms/ManualReconnectionToSingleServerTest.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -50,8 +50,6 @@
import javax.jms.Topic;
import javax.naming.Context;
-import org.hornetq.core.client.impl.ClientSessionFactoryImpl;
-import org.hornetq.core.client.impl.ClientSessionImpl;
import org.hornetq.core.config.Configuration;
import org.hornetq.core.config.TransportConfiguration;
import org.hornetq.core.config.impl.ConfigurationImpl;
Modified: trunk/tests/src/org/hornetq/tests/integration/jms/bridge/BridgeTestBase.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/jms/bridge/BridgeTestBase.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/src/org/hornetq/tests/integration/jms/bridge/BridgeTestBase.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -12,6 +12,24 @@
*/
package org.hornetq.tests.integration.jms.bridge;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.jms.BytesMessage;
+import javax.jms.Connection;
+import javax.jms.ConnectionFactory;
+import javax.jms.DeliveryMode;
+import javax.jms.Destination;
+import javax.jms.Message;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
+import javax.jms.Queue;
+import javax.jms.Session;
+import javax.jms.TextMessage;
+import javax.jms.Topic;
+import javax.transaction.TransactionManager;
+
import com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionManagerImple;
import org.hornetq.core.config.Configuration;
@@ -36,23 +54,6 @@
import org.hornetq.tests.unit.util.InVMContext;
import org.hornetq.tests.util.UnitTestCase;
-import javax.jms.BytesMessage;
-import javax.jms.Connection;
-import javax.jms.ConnectionFactory;
-import javax.jms.DeliveryMode;
-import javax.jms.Destination;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.Queue;
-import javax.jms.Session;
-import javax.jms.TextMessage;
-import javax.jms.Topic;
-import javax.transaction.TransactionManager;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Set;
-
/**
*
* A BridgeTestBase
Modified: trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSFailoverTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSFailoverTest.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSFailoverTest.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -26,7 +26,6 @@
import javax.jms.TextMessage;
import org.hornetq.core.client.ClientSession;
-import org.hornetq.core.client.impl.ClientSessionImpl;
import org.hornetq.core.client.impl.ClientSessionInternal;
import org.hornetq.core.config.Configuration;
import org.hornetq.core.config.TransportConfiguration;
Modified: trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerDeployerTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerDeployerTest.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerDeployerTest.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -13,6 +13,12 @@
package org.hornetq.tests.integration.jms.server;
+import java.net.URL;
+
+import javax.jms.Queue;
+import javax.jms.Topic;
+import javax.naming.Context;
+
import org.hornetq.core.config.Configuration;
import org.hornetq.core.config.TransportConfiguration;
import org.hornetq.core.config.impl.ConfigurationImpl;
@@ -29,11 +35,6 @@
import org.hornetq.tests.util.ServiceTestBase;
import org.w3c.dom.Element;
-import javax.jms.Queue;
-import javax.jms.Topic;
-import javax.naming.Context;
-import java.net.URL;
-
/**
* A JMSServerDeployerTest
*
Modified: trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlTest.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlTest.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -15,7 +15,6 @@
import static org.hornetq.tests.util.RandomUtil.randomString;
-import java.util.Arrays;
import java.util.Map;
import javax.jms.Connection;
@@ -35,8 +34,6 @@
import org.hornetq.core.remoting.impl.invm.TransportConstants;
import org.hornetq.core.server.HornetQ;
import org.hornetq.core.server.HornetQServer;
-import org.hornetq.integration.transports.netty.NettyAcceptorFactory;
-import org.hornetq.integration.transports.netty.NettyConnectorFactory;
import org.hornetq.jms.server.JMSServerManager;
import org.hornetq.jms.server.impl.JMSServerManagerImpl;
import org.hornetq.jms.server.management.JMSServerControl;
Modified: trunk/tests/src/org/hornetq/tests/integration/largemessage/LargeMessageCleanupTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/largemessage/LargeMessageCleanupTest.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/src/org/hornetq/tests/integration/largemessage/LargeMessageCleanupTest.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -23,7 +23,6 @@
import org.hornetq.core.client.ClientSession;
import org.hornetq.core.client.ClientSessionFactory;
import org.hornetq.core.client.impl.ClientSessionFactoryImpl;
-import org.hornetq.core.client.impl.ClientSessionImpl;
import org.hornetq.core.client.impl.ClientSessionInternal;
import org.hornetq.core.config.Configuration;
import org.hornetq.core.config.TransportConfiguration;
Modified: trunk/tests/src/org/hornetq/tests/integration/management/ManagementHelperTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/management/ManagementHelperTest.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/src/org/hornetq/tests/integration/management/ManagementHelperTest.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -29,7 +29,6 @@
import org.hornetq.core.client.management.impl.ManagementHelper;
import org.hornetq.core.logging.Logger;
import org.hornetq.core.message.Message;
-import org.hornetq.tests.util.RandomUtil;
/**
* A ManagementHelperTest
Modified: trunk/tests/src/org/hornetq/tests/integration/management/QueueControlTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/management/QueueControlTest.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/src/org/hornetq/tests/integration/management/QueueControlTest.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -33,8 +33,8 @@
import org.hornetq.core.config.TransportConfiguration;
import org.hornetq.core.config.impl.ConfigurationImpl;
import org.hornetq.core.management.DayCounterInfo;
+import org.hornetq.core.management.HornetQServerControl;
import org.hornetq.core.management.MessageCounterInfo;
-import org.hornetq.core.management.HornetQServerControl;
import org.hornetq.core.management.QueueControl;
import org.hornetq.core.message.impl.MessageImpl;
import org.hornetq.core.messagecounter.impl.MessageCounterManagerImpl;
Modified: trunk/tests/src/org/hornetq/tests/integration/security/SecurityTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/security/SecurityTest.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/src/org/hornetq/tests/integration/security/SecurityTest.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -12,6 +12,23 @@
*/
package org.hornetq.tests.integration.security;
+import java.io.IOException;
+import java.security.acl.Group;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import javax.security.auth.Subject;
+import javax.security.auth.callback.Callback;
+import javax.security.auth.callback.CallbackHandler;
+import javax.security.auth.callback.UnsupportedCallbackException;
+import javax.security.auth.login.AppConfigurationEntry;
+import javax.security.auth.login.LoginException;
+import javax.security.auth.spi.LoginModule;
+import javax.transaction.xa.XAResource;
+import javax.transaction.xa.Xid;
+
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -29,22 +46,6 @@
import org.hornetq.utils.SimpleString;
import org.jboss.security.SimpleGroup;
-import javax.security.auth.Subject;
-import javax.security.auth.callback.Callback;
-import javax.security.auth.callback.CallbackHandler;
-import javax.security.auth.callback.UnsupportedCallbackException;
-import javax.security.auth.login.AppConfigurationEntry;
-import javax.security.auth.login.LoginException;
-import javax.security.auth.spi.LoginModule;
-import javax.transaction.xa.XAResource;
-import javax.transaction.xa.Xid;
-import java.io.IOException;
-import java.security.acl.Group;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-
/**
* @author <a href="mailto:andy.taylor at jboss.org">Andy Taylor</a>
* @author <a href="mailto:clebert.suconic at jboss.org">Clebert Suconic</a>
Modified: trunk/tests/src/org/hornetq/tests/integration/server/ExpiryRunnerTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/server/ExpiryRunnerTest.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/src/org/hornetq/tests/integration/server/ExpiryRunnerTest.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -12,6 +12,11 @@
*/
package org.hornetq.tests.integration.server;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
import junit.framework.TestResult;
import junit.framework.TestSuite;
import junit.textui.TestRunner;
@@ -32,11 +37,6 @@
import org.hornetq.tests.util.UnitTestCase;
import org.hornetq.utils.SimpleString;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
/**
* @author <a href="mailto:andy.taylor at jboss.org">Andy Taylor</a>
*/
Modified: trunk/tests/src/org/hornetq/tests/integration/server/FakeStorageManager.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/server/FakeStorageManager.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/src/org/hornetq/tests/integration/server/FakeStorageManager.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -12,12 +12,12 @@
*/
package org.hornetq.tests.integration.server;
+import java.util.ArrayList;
+import java.util.List;
+
import org.hornetq.core.persistence.impl.nullpm.NullStorageManager;
import org.hornetq.core.server.ServerMessage;
-import java.util.ArrayList;
-import java.util.List;
-
/**
* @author <a href="mailto:andy.taylor at 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-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/src/org/hornetq/tests/integration/server/PredefinedQueueTest.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -14,6 +14,9 @@
package org.hornetq.tests.integration.server;
+import java.util.ArrayList;
+import java.util.List;
+
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -31,9 +34,6 @@
import org.hornetq.tests.util.ServiceTestBase;
import org.hornetq.utils.SimpleString;
-import java.util.ArrayList;
-import java.util.List;
-
/**
*
* A PredefinedQueueTest
Modified: trunk/tests/src/org/hornetq/tests/integration/xa/XaTimeoutTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/integration/xa/XaTimeoutTest.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/src/org/hornetq/tests/integration/xa/XaTimeoutTest.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -12,6 +12,17 @@
*/
package org.hornetq.tests.integration.xa;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.TimeUnit;
+
+import javax.transaction.xa.XAException;
+import javax.transaction.xa.XAResource;
+import javax.transaction.xa.Xid;
+
import org.hornetq.core.client.ClientConsumer;
import org.hornetq.core.client.ClientMessage;
import org.hornetq.core.client.ClientProducer;
@@ -32,17 +43,6 @@
import org.hornetq.utils.SimpleString;
import org.hornetq.utils.UUIDGenerator;
-import javax.transaction.xa.XAException;
-import javax.transaction.xa.XAResource;
-import javax.transaction.xa.Xid;
-
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
/**
* @author <a href="mailto:andy.taylor at jboss.org">Andy Taylor</a>
*/
Modified: trunk/tests/src/org/hornetq/tests/performance/paging/MeasurePagingMultiThreadTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/performance/paging/MeasurePagingMultiThreadTest.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/src/org/hornetq/tests/performance/paging/MeasurePagingMultiThreadTest.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -13,7 +13,6 @@
package org.hornetq.tests.performance.paging;
-import java.nio.ByteBuffer;
import java.util.HashMap;
import java.util.concurrent.CountDownLatch;
@@ -23,7 +22,6 @@
import org.hornetq.core.client.ClientSessionFactory;
import org.hornetq.core.config.Configuration;
import org.hornetq.core.exception.HornetQException;
-import org.hornetq.core.remoting.spi.HornetQBuffer;
import org.hornetq.core.server.HornetQServer;
import org.hornetq.core.settings.impl.AddressSettings;
import org.hornetq.tests.util.ServiceTestBase;
Modified: trunk/tests/src/org/hornetq/tests/stress/journal/LargeJournalStressTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/stress/journal/LargeJournalStressTest.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/src/org/hornetq/tests/stress/journal/LargeJournalStressTest.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -25,8 +25,8 @@
import org.hornetq.core.config.Configuration;
import org.hornetq.core.config.impl.ConfigurationImpl;
import org.hornetq.core.exception.HornetQException;
+import org.hornetq.core.server.HornetQServer;
import org.hornetq.core.server.JournalType;
-import org.hornetq.core.server.HornetQServer;
import org.hornetq.tests.util.ServiceTestBase;
/**
Modified: trunk/tests/src/org/hornetq/tests/stress/paging/PageStressTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/stress/paging/PageStressTest.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/src/org/hornetq/tests/stress/paging/PageStressTest.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -22,8 +22,8 @@
import org.hornetq.core.client.ClientSessionFactory;
import org.hornetq.core.config.Configuration;
import org.hornetq.core.exception.HornetQException;
+import org.hornetq.core.server.HornetQServer;
import org.hornetq.core.server.JournalType;
-import org.hornetq.core.server.HornetQServer;
import org.hornetq.core.settings.impl.AddressSettings;
import org.hornetq.tests.util.ServiceTestBase;
import org.hornetq.utils.SimpleString;
Modified: trunk/tests/src/org/hornetq/tests/timing/core/journal/impl/RealJournalImplAIOTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/timing/core/journal/impl/RealJournalImplAIOTest.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/src/org/hornetq/tests/timing/core/journal/impl/RealJournalImplAIOTest.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -14,7 +14,6 @@
package org.hornetq.tests.timing.core.journal.impl;
import java.io.File;
-import java.util.concurrent.Executors;
import org.hornetq.core.asyncio.impl.AsynchronousFileImpl;
import org.hornetq.core.journal.SequentialFileFactory;
Modified: trunk/tests/src/org/hornetq/tests/unit/core/asyncio/AIOTestBase.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/unit/core/asyncio/AIOTestBase.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/src/org/hornetq/tests/unit/core/asyncio/AIOTestBase.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -13,16 +13,16 @@
package org.hornetq.tests.unit.core.asyncio;
+import java.io.File;
+import java.nio.ByteBuffer;
+import java.util.concurrent.CountDownLatch;
+import java.util.concurrent.atomic.AtomicInteger;
+
import org.hornetq.core.asyncio.AIOCallback;
import org.hornetq.core.asyncio.impl.AsynchronousFileImpl;
import org.hornetq.core.exception.HornetQException;
import org.hornetq.tests.util.UnitTestCase;
-import java.io.File;
-import java.nio.ByteBuffer;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.atomic.AtomicInteger;
-
/**
* The base class for AIO Tests
* @author Clebert Suconic
Modified: trunk/tests/src/org/hornetq/tests/unit/core/deployers/impl/BasicUserCredentialsDeployerTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/unit/core/deployers/impl/BasicUserCredentialsDeployerTest.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/src/org/hornetq/tests/unit/core/deployers/impl/BasicUserCredentialsDeployerTest.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -13,6 +13,12 @@
package org.hornetq.tests.unit.core.deployers.impl;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
import org.hornetq.core.deployers.DeploymentManager;
import org.hornetq.core.deployers.impl.BasicUserCredentialsDeployer;
import org.hornetq.core.security.CheckType;
@@ -23,12 +29,6 @@
import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-
/**
* tests BasicUserCredentialsDeployer
*
Modified: trunk/tests/src/org/hornetq/tests/unit/core/deployers/impl/QueueDeployerTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/unit/core/deployers/impl/QueueDeployerTest.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/src/org/hornetq/tests/unit/core/deployers/impl/QueueDeployerTest.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -13,6 +13,9 @@
package org.hornetq.tests.unit.core.deployers.impl;
+import java.util.ArrayList;
+import java.util.List;
+
import org.hornetq.core.config.Configuration;
import org.hornetq.core.config.cluster.QueueConfiguration;
import org.hornetq.core.deployers.DeploymentManager;
@@ -22,9 +25,6 @@
import org.w3c.dom.Element;
import org.w3c.dom.NodeList;
-import java.util.ArrayList;
-import java.util.List;
-
/**
* A QueueDeployerTest
*
Modified: trunk/tests/src/org/hornetq/tests/unit/core/deployers/impl/XMLDeployerTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/unit/core/deployers/impl/XMLDeployerTest.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/src/org/hornetq/tests/unit/core/deployers/impl/XMLDeployerTest.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -13,16 +13,16 @@
package org.hornetq.tests.unit.core.deployers.impl;
+import java.net.URL;
+import java.util.ArrayList;
+import java.util.HashMap;
+
import org.hornetq.core.deployers.impl.XmlDeployer;
import org.hornetq.tests.util.UnitTestCase;
import org.hornetq.utils.XMLUtil;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-
/**
* tests the abstract xml deployer class
* @author <a href="ataylor at redhat.com">Andy Taylor</a>
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-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/src/org/hornetq/tests/unit/core/filter/impl/FilterParserTest.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -17,12 +17,12 @@
import java.util.HashMap;
import java.util.Map;
+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;
-import org.hornetq.core.filter.impl.FilterParser;
/**
Tests of the JavaCC LL(1) parser for the HornetQ filters
Modified: trunk/tests/src/org/hornetq/tests/unit/core/journal/impl/JournalImplTestBase.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/unit/core/journal/impl/JournalImplTestBase.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/src/org/hornetq/tests/unit/core/journal/impl/JournalImplTestBase.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -21,7 +21,6 @@
import java.util.ListIterator;
import java.util.Map;
-import org.hornetq.core.asyncio.impl.AsynchronousFileImpl;
import org.hornetq.core.journal.EncodingSupport;
import org.hornetq.core.journal.PreparedTransactionInfo;
import org.hornetq.core.journal.RecordInfo;
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-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/src/org/hornetq/tests/unit/core/paging/impl/PagingStoreImplTest.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -28,7 +28,6 @@
import javax.transaction.xa.Xid;
import org.hornetq.core.buffers.ChannelBuffers;
-import org.hornetq.core.config.impl.ConfigurationImpl;
import org.hornetq.core.journal.SequentialFile;
import org.hornetq.core.journal.SequentialFileFactory;
import org.hornetq.core.journal.impl.NIOSequentialFileFactory;
Modified: trunk/tests/src/org/hornetq/tests/unit/core/security/impl/HornetQSecurityManagerImplTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/unit/core/security/impl/HornetQSecurityManagerImplTest.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/src/org/hornetq/tests/unit/core/security/impl/HornetQSecurityManagerImplTest.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -13,13 +13,13 @@
package org.hornetq.tests.unit.core.security.impl;
+import java.util.HashSet;
+
import org.hornetq.core.security.CheckType;
import org.hornetq.core.security.Role;
import org.hornetq.core.security.impl.HornetQSecurityManagerImpl;
import org.hornetq.tests.util.UnitTestCase;
-import java.util.HashSet;
-
/**
* tests HornetQSecurityManagerImpl
*
Modified: trunk/tests/src/org/hornetq/tests/unit/core/security/impl/JAASSecurityManagerTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/unit/core/security/impl/JAASSecurityManagerTest.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/src/org/hornetq/tests/unit/core/security/impl/JAASSecurityManagerTest.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -13,30 +13,31 @@
package org.hornetq.tests.unit.core.security.impl;
-import org.hornetq.core.security.CheckType;
-import org.hornetq.core.security.Role;
-import org.hornetq.core.security.impl.JAASSecurityManager;
-import org.hornetq.tests.util.UnitTestCase;
-import org.jboss.security.SimpleGroup;
+import java.io.IOException;
+import java.security.Principal;
+import java.security.acl.Group;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
import javax.security.auth.Subject;
import javax.security.auth.callback.Callback;
import javax.security.auth.callback.CallbackHandler;
import javax.security.auth.callback.UnsupportedCallbackException;
import javax.security.auth.login.AppConfigurationEntry;
-import javax.security.auth.login.AppConfigurationEntry.LoginModuleControlFlag;
import javax.security.auth.login.Configuration;
import javax.security.auth.login.LoginException;
+import javax.security.auth.login.AppConfigurationEntry.LoginModuleControlFlag;
import javax.security.auth.spi.LoginModule;
-import java.io.IOException;
-import java.security.Principal;
-import java.security.acl.Group;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
+import org.hornetq.core.security.CheckType;
+import org.hornetq.core.security.Role;
+import org.hornetq.core.security.impl.JAASSecurityManager;
+import org.hornetq.tests.util.UnitTestCase;
+import org.jboss.security.SimpleGroup;
+
/**
* tests the JAASSecurityManager
*
Modified: trunk/tests/src/org/hornetq/tests/unit/core/settings/impl/RepositoryTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/unit/core/settings/impl/RepositoryTest.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/src/org/hornetq/tests/unit/core/settings/impl/RepositoryTest.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -13,15 +13,15 @@
package org.hornetq.tests.unit.core.settings.impl;
+import java.util.ArrayList;
+import java.util.HashSet;
+
import org.hornetq.core.security.Role;
import org.hornetq.core.settings.HierarchicalRepository;
import org.hornetq.core.settings.Mergeable;
import org.hornetq.core.settings.impl.HierarchicalObjectRepository;
import org.hornetq.tests.util.UnitTestCase;
-import java.util.ArrayList;
-import java.util.HashSet;
-
/**
* @author <a href="ataylor at redhat.com">Andy Taylor</a>
*/
Modified: trunk/tests/src/org/hornetq/tests/unit/jms/client/HornetQMapMessageTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/unit/jms/client/HornetQMapMessageTest.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/src/org/hornetq/tests/unit/jms/client/HornetQMapMessageTest.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -214,7 +214,6 @@
import static org.hornetq.tests.util.RandomUtil.randomLong;
import static org.hornetq.tests.util.RandomUtil.randomShort;
import static org.hornetq.tests.util.RandomUtil.randomString;
-import static org.hornetq.tests.util.UnitTestCase.assertEqualsByteArrays;
import javax.jms.MessageFormatException;
Modified: trunk/tests/src/org/hornetq/tests/unit/jms/client/HornetQStreamMessageTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/unit/jms/client/HornetQStreamMessageTest.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/src/org/hornetq/tests/unit/jms/client/HornetQStreamMessageTest.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -214,7 +214,6 @@
import static org.hornetq.tests.util.RandomUtil.randomLong;
import static org.hornetq.tests.util.RandomUtil.randomShort;
import static org.hornetq.tests.util.RandomUtil.randomString;
-import static org.hornetq.tests.util.UnitTestCase.assertEqualsByteArrays;
import java.util.ArrayList;
Modified: trunk/tests/src/org/hornetq/tests/unit/ra/ResourceAdapterTest.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/unit/ra/ResourceAdapterTest.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/src/org/hornetq/tests/unit/ra/ResourceAdapterTest.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -13,6 +13,22 @@
package org.hornetq.tests.unit.ra;
+import java.lang.reflect.Method;
+import java.util.Timer;
+
+import javax.jms.Connection;
+import javax.resource.spi.BootstrapContext;
+import javax.resource.spi.UnavailableException;
+import javax.resource.spi.XATerminator;
+import javax.resource.spi.endpoint.MessageEndpoint;
+import javax.resource.spi.endpoint.MessageEndpointFactory;
+import javax.resource.spi.work.ExecutionContext;
+import javax.resource.spi.work.Work;
+import javax.resource.spi.work.WorkException;
+import javax.resource.spi.work.WorkListener;
+import javax.resource.spi.work.WorkManager;
+import javax.transaction.xa.XAResource;
+
import org.hornetq.core.client.ClientSession;
import org.hornetq.core.client.ClientSessionFactory;
import org.hornetq.core.client.impl.ClientSessionFactoryImpl;
@@ -28,21 +44,6 @@
import org.hornetq.ra.inflow.HornetQActivationSpec;
import org.hornetq.tests.util.ServiceTestBase;
-import javax.jms.Connection;
-import javax.resource.spi.BootstrapContext;
-import javax.resource.spi.UnavailableException;
-import javax.resource.spi.XATerminator;
-import javax.resource.spi.endpoint.MessageEndpoint;
-import javax.resource.spi.endpoint.MessageEndpointFactory;
-import javax.resource.spi.work.ExecutionContext;
-import javax.resource.spi.work.Work;
-import javax.resource.spi.work.WorkException;
-import javax.resource.spi.work.WorkListener;
-import javax.resource.spi.work.WorkManager;
-import javax.transaction.xa.XAResource;
-import java.lang.reflect.Method;
-import java.util.Timer;
-
/**
* A ResourceAdapterTest
*
Modified: trunk/tests/src/org/hornetq/tests/util/JournalExample.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/util/JournalExample.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/src/org/hornetq/tests/util/JournalExample.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -20,7 +20,6 @@
import org.hornetq.core.journal.SequentialFileFactory;
import org.hornetq.core.journal.impl.AIOSequentialFileFactory;
import org.hornetq.core.journal.impl.JournalImpl;
-import org.hornetq.core.journal.impl.NIOSequentialFileFactory;
import org.hornetq.utils.TimeAndCounterIDGenerator;
/**
Modified: trunk/tests/src/org/hornetq/tests/util/ServiceTestBase.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/util/ServiceTestBase.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/src/org/hornetq/tests/util/ServiceTestBase.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -31,9 +31,9 @@
import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory;
import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory;
import org.hornetq.core.security.HornetQSecurityManager;
-import org.hornetq.core.server.JournalType;
import org.hornetq.core.server.HornetQ;
import org.hornetq.core.server.HornetQServer;
+import org.hornetq.core.server.JournalType;
import org.hornetq.core.settings.impl.AddressSettings;
import org.hornetq.integration.transports.netty.NettyAcceptorFactory;
import org.hornetq.integration.transports.netty.NettyConnectorFactory;
Modified: trunk/tests/src/org/hornetq/tests/util/UnitTestCase.java
===================================================================
--- trunk/tests/src/org/hornetq/tests/util/UnitTestCase.java 2009-08-21 08:38:45 UTC (rev 7853)
+++ trunk/tests/src/org/hornetq/tests/util/UnitTestCase.java 2009-08-21 08:50:00 UTC (rev 7854)
@@ -53,13 +53,12 @@
import org.hornetq.core.postoffice.QueueBinding;
import org.hornetq.core.postoffice.impl.LocalQueueBinding;
import org.hornetq.core.remoting.impl.invm.InVMRegistry;
-import org.hornetq.core.server.MessageReference;
import org.hornetq.core.server.HornetQServer;
+import org.hornetq.core.server.MessageReference;
import org.hornetq.core.server.Queue;
import org.hornetq.core.server.ServerMessage;
import org.hornetq.core.server.impl.ServerMessageImpl;
import org.hornetq.core.transaction.impl.XidImpl;
-import org.hornetq.integration.transports.netty.TransportConstants;
import org.hornetq.jms.client.HornetQTextMessage;
import org.hornetq.utils.SimpleString;
import org.hornetq.utils.UUIDGenerator;
More information about the hornetq-commits
mailing list