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

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