Author: timfox Date: 2010-01-06 05:23:35 -0500 (Wed, 06 Jan 2010) New Revision: 8730 Added: trunk/src/main/org/hornetq/api/core/HornetQBuffer.java trunk/src/main/org/hornetq/api/core/HornetQBuffers.java trunk/src/main/org/hornetq/api/core/HornetQException.java trunk/src/main/org/hornetq/api/core/Interceptor.java trunk/src/main/org/hornetq/api/core/Message.java trunk/src/main/org/hornetq/api/core/PropertyConversionException.java trunk/src/main/org/hornetq/api/core/TransportConfiguration.java trunk/src/main/org/hornetq/api/core/client/ClientSessionFactoryImpl.java Removed: trunk/src/main/org/hornetq/api/core/buffers/HornetQBuffer.java trunk/src/main/org/hornetq/api/core/buffers/HornetQBuffers.java trunk/src/main/org/hornetq/api/core/client/ClientSessionFactoryImpl.java trunk/src/main/org/hornetq/api/core/config/TransportConfiguration.java trunk/src/main/org/hornetq/api/core/exception/HornetQException.java trunk/src/main/org/hornetq/api/core/interceptor/Interceptor.java trunk/src/main/org/hornetq/api/core/message/Message.java trunk/src/main/org/hornetq/api/core/message/PropertyConversionException.java Modified: trunk/examples/core/embedded-remote/src/org/hornetq/core/example/EmbeddedRemoteExample.java trunk/examples/core/embedded-remote/src/org/hornetq/core/example/EmbeddedServer.java trunk/examples/core/embedded/src/org/hornetq/core/example/EmbeddedExample.java trunk/examples/core/microcontainer/src/org/hornetq/core/example/EmbeddedMicroContainerExample.java trunk/examples/core/perf/src/org/hornetq/core/example/PerfBase.java trunk/examples/jms/applet/src/org/hornetq/jms/example/AppletExample.java trunk/examples/jms/embedded/src/org/hornetq/jms/example/EmbeddedExample.java trunk/examples/jms/instantiate-connection-factory/src/org/hornetq/jms/example/InstantiateConnectionFactoryExample.java trunk/examples/jms/interceptor/src/org/hornetq/jms/example/SimpleInterceptor.java trunk/examples/jms/scheduled-message/src/org/hornetq/jms/example/ScheduledMessageExample.java trunk/examples/jms/send-acknowledgements/src/org/hornetq/jms/example/SendAcknowledgementsExample.java trunk/examples/jms/transaction-failover/src/org/hornetq/jms/example/TransactionFailoverExample.java trunk/src/main/org/hornetq/api/SimpleString.java trunk/src/main/org/hornetq/api/core/buffers/package-info.java trunk/src/main/org/hornetq/api/core/client/ClientConsumer.java trunk/src/main/org/hornetq/api/core/client/ClientMessage.java trunk/src/main/org/hornetq/api/core/client/ClientProducer.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/HornetQClient.java trunk/src/main/org/hornetq/api/core/client/SendAcknowledgementHandler.java trunk/src/main/org/hornetq/api/core/client/SessionFailureListener.java trunk/src/main/org/hornetq/api/core/management/HornetQServerControl.java trunk/src/main/org/hornetq/api/core/management/ManagementHelper.java trunk/src/main/org/hornetq/api/jms/HornetQJMSClient.java trunk/src/main/org/hornetq/api/jms/management/JMSManagementHelper.java trunk/src/main/org/hornetq/api/jms/management/JMSServerControl.java trunk/src/main/org/hornetq/core/asyncio/AsynchronousFile.java trunk/src/main/org/hornetq/core/asyncio/impl/AsynchronousFileImpl.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/ClientMessageInternal.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/FailoverManager.java trunk/src/main/org/hornetq/core/client/impl/FailoverManagerImpl.java trunk/src/main/org/hornetq/core/client/impl/LargeMessageBufferImpl.java trunk/src/main/org/hornetq/core/client/impl/LargeMessageBufferInternal.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/filter/impl/FilterImpl.java trunk/src/main/org/hornetq/core/journal/EncodingSupport.java trunk/src/main/org/hornetq/core/journal/SequentialFile.java trunk/src/main/org/hornetq/core/journal/impl/AbstractJournalUpdateTask.java trunk/src/main/org/hornetq/core/journal/impl/AbstractSequentialFile.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/journal/impl/JournalTransaction.java trunk/src/main/org/hornetq/core/journal/impl/NIOSequentialFile.java trunk/src/main/org/hornetq/core/journal/impl/SimpleWaitIOCallback.java trunk/src/main/org/hornetq/core/journal/impl/TimedBuffer.java trunk/src/main/org/hornetq/core/journal/impl/dataformat/ByteArrayEncoding.java trunk/src/main/org/hornetq/core/journal/impl/dataformat/JournalAddRecord.java trunk/src/main/org/hornetq/core/journal/impl/dataformat/JournalAddRecordTX.java trunk/src/main/org/hornetq/core/journal/impl/dataformat/JournalCompleteRecordTX.java trunk/src/main/org/hornetq/core/journal/impl/dataformat/JournalDeleteRecord.java trunk/src/main/org/hornetq/core/journal/impl/dataformat/JournalDeleteRecordTX.java trunk/src/main/org/hornetq/core/journal/impl/dataformat/JournalInternalRecord.java trunk/src/main/org/hornetq/core/journal/impl/dataformat/JournalRollbackRecordTX.java trunk/src/main/org/hornetq/core/management/impl/AcceptorControlImpl.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/BodyEncoder.java trunk/src/main/org/hornetq/core/message/impl/MessageImpl.java trunk/src/main/org/hornetq/core/message/impl/MessageInternal.java trunk/src/main/org/hornetq/core/paging/impl/PageImpl.java trunk/src/main/org/hornetq/core/paging/impl/PageTransactionInfoImpl.java trunk/src/main/org/hornetq/core/paging/impl/PagedMessageImpl.java trunk/src/main/org/hornetq/core/paging/impl/PagingStoreImpl.java trunk/src/main/org/hornetq/core/persistence/impl/journal/BatchingIDGenerator.java trunk/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java trunk/src/main/org/hornetq/core/persistence/impl/journal/LargeServerMessageImpl.java trunk/src/main/org/hornetq/core/persistence/impl/journal/OperationContextImpl.java trunk/src/main/org/hornetq/core/persistence/impl/nullpm/NullStorageLargeServerMessage.java trunk/src/main/org/hornetq/core/persistence/impl/nullpm/NullStorageManager.java trunk/src/main/org/hornetq/core/postoffice/impl/BindingsImpl.java trunk/src/main/org/hornetq/core/postoffice/impl/PostOfficeImpl.java trunk/src/main/org/hornetq/core/remoting/Channel.java trunk/src/main/org/hornetq/core/remoting/FailureListener.java trunk/src/main/org/hornetq/core/remoting/Packet.java trunk/src/main/org/hornetq/core/remoting/RemotingConnection.java trunk/src/main/org/hornetq/core/remoting/impl/AbstractBufferHandler.java trunk/src/main/org/hornetq/core/remoting/impl/ChannelImpl.java trunk/src/main/org/hornetq/core/remoting/impl/PacketDecoder.java trunk/src/main/org/hornetq/core/remoting/impl/RemotingConnectionImpl.java trunk/src/main/org/hornetq/core/remoting/impl/invm/InVMAcceptor.java trunk/src/main/org/hornetq/core/remoting/impl/invm/InVMConnection.java trunk/src/main/org/hornetq/core/remoting/impl/invm/InVMConnector.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/CreateQueueMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/CreateReplicationSessionMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/CreateSessionMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/CreateSessionResponseMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/HornetQExceptionMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/MessagePacket.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/PacketImpl.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/PacketsConfirmedMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/Ping.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReattachSessionMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReattachSessionResponseMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationAddMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationAddTXMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationCommitMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationCompareDataMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationDeleteMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationDeleteTXMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationLargeMessageBeingMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationLargeMessageWriteMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationLargemessageEndMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationPageEventMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationPageWriteMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationPrepareMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/RollbackMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionAcknowledgeMessage.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/SessionConsumerCloseMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionConsumerFlowCreditMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionContinuationMessage.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/SessionExpiredMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionForceConsumerDelivery.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/SessionReceiveContinuationMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionReceiveLargeMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionReceiveMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionRequestProducerCreditsMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionSendContinuationMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionSendLargeMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionSendMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXACommitMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAEndMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAForgetMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAGetInDoubtXidsResponseMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAGetTimeoutResponseMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAJoinMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAPrepareMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAResponseMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAResumeMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXARollbackMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXASetTimeoutMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXASetTimeoutResponseMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAStartMessage.java trunk/src/main/org/hornetq/core/remoting/impl/wireformat/XidCodecSupport.java trunk/src/main/org/hornetq/core/remoting/server/RemotingService.java trunk/src/main/org/hornetq/core/remoting/server/impl/RemotingServiceImpl.java trunk/src/main/org/hornetq/core/replication/ReplicationEndpoint.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/impl/SecurityStoreImpl.java trunk/src/main/org/hornetq/core/server/cluster/BroadcastGroup.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/impl/HornetQPacketHandler.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/QueueImpl.java trunk/src/main/org/hornetq/core/server/impl/ServerConsumerImpl.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/transaction/Transaction.java trunk/src/main/org/hornetq/core/transaction/impl/TransactionImpl.java trunk/src/main/org/hornetq/integration/transports/netty/HornetQChannelHandler.java trunk/src/main/org/hornetq/integration/transports/netty/NettyAcceptor.java trunk/src/main/org/hornetq/integration/transports/netty/NettyConnection.java trunk/src/main/org/hornetq/integration/transports/netty/NettyConnector.java trunk/src/main/org/hornetq/jms/HornetQConnectionFactory.java trunk/src/main/org/hornetq/jms/client/HornetQBytesMessage.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/HornetQStreamMessage.java trunk/src/main/org/hornetq/jms/client/HornetQTextMessage.java trunk/src/main/org/hornetq/jms/client/JMSExceptionHelper.java trunk/src/main/org/hornetq/jms/client/JMSMessageListenerWrapper.java trunk/src/main/org/hornetq/jms/management/impl/JMSQueueControlImpl.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/jms/server/recovery/HornetQXAResourceWrapper.java trunk/src/main/org/hornetq/ra/HornetQResourceAdapter.java trunk/src/main/org/hornetq/ra/inflow/HornetQMessageHandler.java trunk/src/main/org/hornetq/spi/core/remoting/BufferHandler.java trunk/src/main/org/hornetq/spi/core/remoting/Connection.java trunk/src/main/org/hornetq/spi/core/remoting/ConnectionLifeCycleListener.java trunk/src/main/org/hornetq/utils/TypedProperties.java trunk/src/main/org/hornetq/utils/UTF8Util.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/joram-tests/src/org/hornetq/jms/HornetQAdmin.java trunk/tests/joram-tests/src/org/hornetq/jms/SpawnedJMSServer.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/AcknowledgeTest.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/ConsumerTest.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/FailureDeadlockTest.java trunk/tests/src/org/hornetq/tests/integration/client/HornetQCrashTest.java trunk/tests/src/org/hornetq/tests/integration/client/IncompatibleVersionTest.java trunk/tests/src/org/hornetq/tests/integration/client/LargeMessageTest.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/MessagePriorityTest.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/ProducerCloseTest.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/SelfExpandingBufferTest.java trunk/tests/src/org/hornetq/tests/integration/client/SessionCloseTest.java trunk/tests/src/org/hornetq/tests/integration/client/SessionClosedOnRemotingConnectionFailureTest.java trunk/tests/src/org/hornetq/tests/integration/client/SessionCreateAndDeleteQueueTest.java trunk/tests/src/org/hornetq/tests/integration/client/SessionCreateConsumerTest.java trunk/tests/src/org/hornetq/tests/integration/client/SessionCreateProducerTest.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/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/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/CrashClient.java trunk/tests/src/org/hornetq/tests/integration/clientcrash/DummyInterceptor.java trunk/tests/src/org/hornetq/tests/integration/clientcrash/DummyInterceptorB.java trunk/tests/src/org/hornetq/tests/integration/clientcrash/GracefulClient.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/BridgeTestBase.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/AsynchronousFailoverTest.java trunk/tests/src/org/hornetq/tests/integration/cluster/failover/ClusterWithBackupFailoverTestBase.java trunk/tests/src/org/hornetq/tests/integration/cluster/failover/DelayInterceptor.java trunk/tests/src/org/hornetq/tests/integration/cluster/failover/DelayInterceptor2.java trunk/tests/src/org/hornetq/tests/integration/cluster/failover/DelayInterceptor3.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/GroupingFailoverReplicationTest.java trunk/tests/src/org/hornetq/tests/integration/cluster/failover/GroupingFailoverSharedServerTest.java trunk/tests/src/org/hornetq/tests/integration/cluster/failover/GroupingFailoverTestBase.java trunk/tests/src/org/hornetq/tests/integration/cluster/failover/LargeMessageFailoverTest.java trunk/tests/src/org/hornetq/tests/integration/cluster/failover/NettyAsynchronousFailoverTest.java trunk/tests/src/org/hornetq/tests/integration/cluster/failover/NettyFailoverTest.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/MultiThreadRandomReattachTest.java trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/MultiThreadRandomReattachTestBase.java trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/MultiThreadReattachSupport.java trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/NettyMultiThreadRandomReattachTest.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/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/http/NettyHttpTest.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/ManualReconnectionToSingleServerTest.java trunk/tests/src/org/hornetq/tests/integration/jms/bridge/BridgeTestBase.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/connection/CloseConnectionOnGCTest.java trunk/tests/src/org/hornetq/tests/integration/jms/connection/CloseDestroyedConnectionTest.java trunk/tests/src/org/hornetq/tests/integration/jms/connection/ExceptionListenerTest.java trunk/tests/src/org/hornetq/tests/integration/jms/consumer/ConsumerTest.java trunk/tests/src/org/hornetq/tests/integration/jms/divert/DivertAndACKClientTest.java trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerDeployerTest.java trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerStartStopTest.java trunk/tests/src/org/hornetq/tests/integration/jms/server/config/JMSConfigurationTest.java trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSQueueControlTest.java trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControl2Test.java trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlTest.java trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSUtil.java trunk/tests/src/org/hornetq/tests/integration/jms/server/management/TopicControlTest.java trunk/tests/src/org/hornetq/tests/integration/jms/server/management/TopicControlUsingJMSTest.java trunk/tests/src/org/hornetq/tests/integration/largemessage/LargeMessageTestBase.java trunk/tests/src/org/hornetq/tests/integration/largemessage/mock/MockConnector.java trunk/tests/src/org/hornetq/tests/integration/management/AcceptorControlTest.java trunk/tests/src/org/hornetq/tests/integration/management/AcceptorControlUsingCoreTest.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/BroadcastGroupControlUsingCoreTest.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/ClusterConnectionControlUsingCoreTest.java trunk/tests/src/org/hornetq/tests/integration/management/DiscoveryGroupControlTest.java trunk/tests/src/org/hornetq/tests/integration/management/DiscoveryGroupControlUsingCoreTest.java trunk/tests/src/org/hornetq/tests/integration/management/DivertControlTest.java trunk/tests/src/org/hornetq/tests/integration/management/DivertControlUsingCoreTest.java trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlTest.java trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlUsingCoreTest.java trunk/tests/src/org/hornetq/tests/integration/management/JMXDomainTest.java trunk/tests/src/org/hornetq/tests/integration/management/ManagementHelperTest.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/SecurityManagementTestBase.java trunk/tests/src/org/hornetq/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java trunk/tests/src/org/hornetq/tests/integration/management/SecurityManagementWithDefaultConfigurationTest.java trunk/tests/src/org/hornetq/tests/integration/management/SecurityManagementWithModifiedConfigurationTest.java trunk/tests/src/org/hornetq/tests/integration/management/SecurityNotificationTest.java trunk/tests/src/org/hornetq/tests/integration/persistence/DeleteQueueRestartTest.java trunk/tests/src/org/hornetq/tests/integration/remoting/NetworkAddressTestBase.java trunk/tests/src/org/hornetq/tests/integration/remoting/PingTest.java trunk/tests/src/org/hornetq/tests/integration/remoting/ReconnectTest.java trunk/tests/src/org/hornetq/tests/integration/remoting/SynchronousCloseTest.java trunk/tests/src/org/hornetq/tests/integration/replication/ReplicationOrderTest.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/NettySecurityClientTest.java trunk/tests/src/org/hornetq/tests/integration/security/SecurityTest.java trunk/tests/src/org/hornetq/tests/integration/security/SimpleClient.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/opt/SendTest.java trunk/tests/src/org/hornetq/tests/performance/paging/MeasurePagingMultiThreadTest.java trunk/tests/src/org/hornetq/tests/stress/journal/CompactingStressTest.java trunk/tests/src/org/hornetq/tests/stress/journal/LargeJournalStressTest.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/stress/remote/PingStressTest.java trunk/tests/src/org/hornetq/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java trunk/tests/src/org/hornetq/tests/timing/util/UTF8Test.java trunk/tests/src/org/hornetq/tests/unit/core/asyncio/AIOTestBase.java trunk/tests/src/org/hornetq/tests/unit/core/asyncio/AsynchronousFileTest.java trunk/tests/src/org/hornetq/tests/unit/core/client/impl/LargeMessageBufferTest.java trunk/tests/src/org/hornetq/tests/unit/core/config/impl/FileConfigurationTest.java trunk/tests/src/org/hornetq/tests/unit/core/config/impl/TransportConfigurationTest.java trunk/tests/src/org/hornetq/tests/unit/core/filter/impl/FilterTest.java trunk/tests/src/org/hornetq/tests/unit/core/journal/impl/SequentialFileFactoryTestBase.java trunk/tests/src/org/hornetq/tests/unit/core/journal/impl/TimedBufferTest.java trunk/tests/src/org/hornetq/tests/unit/core/journal/impl/fakes/FakeSequentialFileFactory.java trunk/tests/src/org/hornetq/tests/unit/core/journal/impl/fakes/SimpleEncoding.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/PagingStoreImplTest.java trunk/tests/src/org/hornetq/tests/unit/core/persistence/impl/BatchIDGeneratorUnitTest.java trunk/tests/src/org/hornetq/tests/unit/core/postoffice/impl/BindingsImplTest.java trunk/tests/src/org/hornetq/tests/unit/core/remoting/HornetQBufferTestBase.java trunk/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/ChannelBufferWrapper2Test.java trunk/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/ChannelBufferWrapperTest.java trunk/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java trunk/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java trunk/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyConnectionTest.java trunk/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyConnectorTest.java trunk/tests/src/org/hornetq/tests/unit/jms/client/JMSExceptionHelperTest.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/unit/util/UTF8Test.java trunk/tests/src/org/hornetq/tests/util/JMSTestBase.java trunk/tests/src/org/hornetq/tests/util/ServiceTestBase.java trunk/tests/src/org/hornetq/tests/util/UnitTestCase.java Log: moved some more classes around Modified: trunk/examples/core/embedded/src/org/hornetq/core/example/EmbeddedExample.java =================================================================== --- trunk/examples/core/embedded/src/org/hornetq/core/example/EmbeddedExample.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/examples/core/embedded/src/org/hornetq/core/example/EmbeddedExample.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -15,8 +15,8 @@ import java.util.Date; import java.util.HashMap; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; -import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; Modified: trunk/examples/core/embedded-remote/src/org/hornetq/core/example/EmbeddedRemoteExample.java =================================================================== --- trunk/examples/core/embedded-remote/src/org/hornetq/core/example/EmbeddedRemoteExample.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/examples/core/embedded-remote/src/org/hornetq/core/example/EmbeddedRemoteExample.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -14,8 +14,8 @@ import java.util.Date; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; -import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.common.example.SpawnedVMSupport; import org.hornetq.integration.transports.netty.NettyConnectorFactory; Modified: trunk/examples/core/embedded-remote/src/org/hornetq/core/example/EmbeddedServer.java =================================================================== --- trunk/examples/core/embedded-remote/src/org/hornetq/core/example/EmbeddedServer.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/examples/core/embedded-remote/src/org/hornetq/core/example/EmbeddedServer.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -15,7 +15,7 @@ import java.util.HashSet; -import org.hornetq.api.core.config.TransportConfiguration; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.server.HornetQServer; Modified: trunk/examples/core/microcontainer/src/org/hornetq/core/example/EmbeddedMicroContainerExample.java =================================================================== --- trunk/examples/core/microcontainer/src/org/hornetq/core/example/EmbeddedMicroContainerExample.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/examples/core/microcontainer/src/org/hornetq/core/example/EmbeddedMicroContainerExample.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -14,8 +14,8 @@ import java.util.Date; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; -import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.integration.bootstrap.HornetQBootstrapServer; import org.hornetq.integration.transports.netty.NettyConnectorFactory; Modified: trunk/examples/core/perf/src/org/hornetq/core/example/PerfBase.java =================================================================== --- trunk/examples/core/perf/src/org/hornetq/core/example/PerfBase.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/examples/core/perf/src/org/hornetq/core/example/PerfBase.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -22,9 +22,9 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.logging.Logger; +import org.hornetq.api.core.Message; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; -import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.message.Message; import org.hornetq.integration.transports.netty.NettyConnectorFactory; import org.hornetq.integration.transports.netty.TransportConstants; import org.hornetq.utils.TokenBucketLimiter; Modified: trunk/examples/jms/applet/src/org/hornetq/jms/example/AppletExample.java =================================================================== --- trunk/examples/jms/applet/src/org/hornetq/jms/example/AppletExample.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/examples/jms/applet/src/org/hornetq/jms/example/AppletExample.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -43,9 +43,9 @@ import javax.swing.SwingConstants; import javax.swing.SwingUtilities; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.integration.transports.netty.NettyConnectorFactory; Modified: trunk/examples/jms/embedded/src/org/hornetq/jms/example/EmbeddedExample.java =================================================================== --- trunk/examples/jms/embedded/src/org/hornetq/jms/example/EmbeddedExample.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/examples/jms/embedded/src/org/hornetq/jms/example/EmbeddedExample.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -25,7 +25,7 @@ import javax.naming.Context; import javax.naming.InitialContext; -import org.hornetq.api.core.config.TransportConfiguration; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.server.HornetQServer; Modified: trunk/examples/jms/instantiate-connection-factory/src/org/hornetq/jms/example/InstantiateConnectionFactoryExample.java =================================================================== --- trunk/examples/jms/instantiate-connection-factory/src/org/hornetq/jms/example/InstantiateConnectionFactoryExample.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/examples/jms/instantiate-connection-factory/src/org/hornetq/jms/example/InstantiateConnectionFactoryExample.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -23,7 +23,7 @@ import javax.jms.Session; import javax.jms.TextMessage; -import org.hornetq.api.core.config.TransportConfiguration; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.common.example.HornetQExample; import org.hornetq.integration.transports.netty.NettyConnectorFactory; 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:04:55 UTC (rev 8729) +++ trunk/examples/jms/interceptor/src/org/hornetq/jms/example/SimpleInterceptor.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -14,9 +14,9 @@ package org.hornetq.jms.example; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.interceptor.Interceptor; -import org.hornetq.api.core.message.Message; +import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.Interceptor; +import org.hornetq.api.core.Message; import org.hornetq.core.remoting.Packet; import org.hornetq.core.remoting.RemotingConnection; import org.hornetq.core.remoting.impl.wireformat.SessionSendMessage; Modified: trunk/examples/jms/scheduled-message/src/org/hornetq/jms/example/ScheduledMessageExample.java =================================================================== --- trunk/examples/jms/scheduled-message/src/org/hornetq/jms/example/ScheduledMessageExample.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/examples/jms/scheduled-message/src/org/hornetq/jms/example/ScheduledMessageExample.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -24,7 +24,7 @@ import javax.jms.TextMessage; import javax.naming.InitialContext; -import org.hornetq.api.core.message.Message; +import org.hornetq.api.core.Message; import org.hornetq.common.example.HornetQExample; /** Modified: trunk/examples/jms/send-acknowledgements/src/org/hornetq/jms/example/SendAcknowledgementsExample.java =================================================================== --- trunk/examples/jms/send-acknowledgements/src/org/hornetq/jms/example/SendAcknowledgementsExample.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/examples/jms/send-acknowledgements/src/org/hornetq/jms/example/SendAcknowledgementsExample.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -20,9 +20,9 @@ import javax.jms.Session; import javax.naming.InitialContext; +import org.hornetq.api.core.Message; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.SendAcknowledgementHandler; -import org.hornetq.api.core.message.Message; import org.hornetq.common.example.HornetQExample; import org.hornetq.jms.client.HornetQSession; Modified: trunk/examples/jms/transaction-failover/src/org/hornetq/jms/example/TransactionFailoverExample.java =================================================================== --- trunk/examples/jms/transaction-failover/src/org/hornetq/jms/example/TransactionFailoverExample.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/examples/jms/transaction-failover/src/org/hornetq/jms/example/TransactionFailoverExample.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -22,7 +22,7 @@ import javax.jms.TransactionRolledBackException; import javax.naming.InitialContext; -import org.hornetq.api.core.message.Message; +import org.hornetq.api.core.Message; import org.hornetq.common.example.HornetQExample; /** Modified: trunk/src/main/org/hornetq/api/SimpleString.java =================================================================== --- trunk/src/main/org/hornetq/api/SimpleString.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/api/SimpleString.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -30,11 +30,6 @@ * */ - // TODO - implement an intern() method like in java.lang.String, since many Strings e.g. addresses, queue names, remote node ids are duplicated heavily - //in bindings taking up more memory than they should - //Intern can be called when receiving a sent message at the server (destination) - //Also when receiving bindings remotely via bridge, the address, queue name and node id can be interned - // public class SimpleString implements CharSequence, Serializable, Comparable<SimpleString> { private static final long serialVersionUID = 4204223851422244307L; Copied: trunk/src/main/org/hornetq/api/core/HornetQBuffer.java (from rev 8723, trunk/src/main/org/hornetq/api/core/buffers/HornetQBuffer.java) =================================================================== --- trunk/src/main/org/hornetq/api/core/HornetQBuffer.java (rev 0) +++ trunk/src/main/org/hornetq/api/core/HornetQBuffer.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -0,0 +1,1087 @@ +/* + * 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.nio.ByteBuffer; + +import org.hornetq.api.SimpleString; +import org.jboss.netty.buffer.ChannelBuffer; + +/** + * + * A HornetQBuffer wraps a Netty's ChannelBuffer and is used throughout HornetQ code base. + * + * Much of it derived from Netty ChannelBuffer by Trustin Lee + * + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + * @see HornetQBuffers + * + */ +public interface HornetQBuffer +{ + /** + * Returns the underlying Netty's ChannelBuffer + * + * @return the underlying Netty's ChannelBuffer + */ + ChannelBuffer channelBuffer(); + + /** + * Returns the number of bytes this buffer can contain. + */ + int capacity(); + + /** + * Returns the {@code readerIndex} of this buffer. + */ + int readerIndex(); + + /** + * Sets the {@code readerIndex} of this buffer. + * + * @throws IndexOutOfBoundsException + * if the specified {@code readerIndex} is + * less than {@code 0} or + * greater than {@code this.writerIndex} + */ + void readerIndex(int readerIndex); + + /** + * Returns the {@code writerIndex} of this buffer. + */ + int writerIndex(); + + /** + * Sets the {@code writerIndex} of this buffer. + * + * @throws IndexOutOfBoundsException + * if the specified {@code writerIndex} is + * less than {@code this.readerIndex} or + * greater than {@code this.capacity} + */ + void writerIndex(int writerIndex); + + /** + * Sets the {@code readerIndex} and {@code writerIndex} of this buffer + * in one shot. This method is useful when you have to worry about the + * invocation order of {@link #readerIndex(int)} and {@link #writerIndex(int)} + * methods. For example, the following code will fail: + * + * <pre> + * // Create a buffer whose readerIndex, writerIndex and capacity are + * // 0, 0 and 8 respectively. + * ChannelBuffer buf = ChannelBuffers.buffer(8); + * + * // IndexOutOfBoundsException is thrown because the specified + * // readerIndex (2) cannot be greater than the current writerIndex (0). + * buf.readerIndex(2); + * buf.writerIndex(4); + * </pre> + * + * The following code will also fail: + * + * <pre> + * // Create a buffer whose readerIndex, writerIndex and capacity are + * // 0, 8 and 8 respectively. + * ChannelBuffer buf = ChannelBuffers.wrappedBuffer(new byte[8]); + * + * // readerIndex becomes 8. + * buf.readLong(); + * + * // IndexOutOfBoundsException is thrown because the specified + * // writerIndex (4) cannot be less than the current readerIndex (8). + * buf.writerIndex(4); + * buf.readerIndex(2); + * </pre> + * + * By contrast, {@link #setIndex(int, int)} guarantees that it never + * throws an {@link IndexOutOfBoundsException} as long as the specified + * indexes meet basic constraints, regardless what the current index + * values of the buffer are: + * + * <pre> + * // No matter what the current state of the buffer is, the following + * // call always succeeds as long as the capacity of the buffer is not + * // less than 4. + * buf.setIndex(2, 4); + * </pre> + * + * @throws IndexOutOfBoundsException + * if the specified {@code readerIndex} is less than 0, + * if the specified {@code writerIndex} is less than the specified + * {@code readerIndex} or if the specified {@code writerIndex} is + * greater than {@code this.capacity} + */ + void setIndex(int readerIndex, int writerIndex); + + /** + * Returns the number of readable bytes which is equal to + * {@code (this.writerIndex - this.readerIndex)}. + */ + int readableBytes(); + + /** + * Returns the number of writable bytes which is equal to + * {@code (this.capacity - this.writerIndex)}. + */ + int writableBytes(); + + /** + * Returns {@code true} + * if and only if {@code (this.writerIndex - this.readerIndex)} is greater + * than {@code 0}. + */ + boolean readable(); + + /** + * Returns {@code true} + * if and only if {@code (this.capacity - this.writerIndex)} is greater + * than {@code 0}. + */ + boolean writable(); + + /** + * Sets the {@code readerIndex} and {@code writerIndex} of this buffer to + * {@code 0}. + * This method is identical to {@link #setIndex(int, int) setIndex(0, 0)}. + * <p> + * Please note that the behavior of this method is different + * from that of NIO buffer, which sets the {@code limit} to + * the {@code capacity} of the buffer. + */ + void clear(); + + /** + * Marks the current {@code readerIndex} in this buffer. You can + * reposition the current {@code readerIndex} to the marked + * {@code readerIndex} by calling {@link #resetReaderIndex()}. + * The initial value of the marked {@code readerIndex} is {@code 0}. + */ + void markReaderIndex(); + + /** + * Repositions the current {@code readerIndex} to the marked + * {@code readerIndex} in this buffer. + * + * @throws IndexOutOfBoundsException + * if the current {@code writerIndex} is less than the marked + * {@code readerIndex} + */ + void resetReaderIndex(); + + /** + * Marks the current {@code writerIndex} in this buffer. You can + * reposition the current {@code writerIndex} to the marked + * {@code writerIndex} by calling {@link #resetWriterIndex()}. + * The initial value of the marked {@code writerIndex} is {@code 0}. + */ + void markWriterIndex(); + + /** + * Repositions the current {@code writerIndex} to the marked + * {@code writerIndex} in this buffer. + * + * @throws IndexOutOfBoundsException + * if the current {@code readerIndex} is greater than the marked + * {@code writerIndex} + */ + void resetWriterIndex(); + + /** + * Discards the bytes between the 0th index and {@code readerIndex}. + * It moves the bytes between {@code readerIndex} and {@code writerIndex} + * to the 0th index, and sets {@code readerIndex} and {@code writerIndex} + * to {@code 0} and {@code oldWriterIndex - oldReaderIndex} respectively. + * <p> + * Please refer to the class documentation for more detailed explanation. + */ + void discardReadBytes(); + + /** + * Gets a byte at the specified absolute {@code index} in this buffer. + * This method does not modify {@code readerIndex} or {@code writerIndex} of + * this buffer. + * + * @throws IndexOutOfBoundsException + * if the specified {@code index} is less than {@code 0} or + * {@code index + 1} is greater than {@code this.capacity} + */ + byte getByte(int index); + + /** + * Gets an unsigned byte at the specified absolute {@code index} in this + * buffer. This method does not modify {@code readerIndex} or + * {@code writerIndex} of this buffer. + * + * @throws IndexOutOfBoundsException + * if the specified {@code index} is less than {@code 0} or + * {@code index + 1} is greater than {@code this.capacity} + */ + short getUnsignedByte(int index); + + /** + * Gets a 16-bit short integer at the specified absolute {@code index} in + * this buffer. This method does not modify {@code readerIndex} or + * {@code writerIndex} of this buffer. + * + * @throws IndexOutOfBoundsException + * if the specified {@code index} is less than {@code 0} or + * {@code index + 2} is greater than {@code this.capacity} + */ + short getShort(int index); + + /** + * Gets an unsigned 16-bit short integer at the specified absolute + * {@code index} in this buffer. This method does not modify + * {@code readerIndex} or {@code writerIndex} of this buffer. + * + * @throws IndexOutOfBoundsException + * if the specified {@code index} is less than {@code 0} or + * {@code index + 2} is greater than {@code this.capacity} + */ + int getUnsignedShort(int index); + + /** + * Gets a 32-bit integer at the specified absolute {@code index} in + * this buffer. This method does not modify {@code readerIndex} or + * {@code writerIndex} of this buffer. + * + * @throws IndexOutOfBoundsException + * if the specified {@code index} is less than {@code 0} or + * {@code index + 4} is greater than {@code this.capacity} + */ + int getInt(int index); + + /** + * Gets an unsigned 32-bit integer at the specified absolute {@code index} + * in this buffer. This method does not modify {@code readerIndex} or + * {@code writerIndex} of this buffer. + * + * @throws IndexOutOfBoundsException + * if the specified {@code index} is less than {@code 0} or + * {@code index + 4} is greater than {@code this.capacity} + */ + long getUnsignedInt(int index); + + /** + * Gets a 64-bit long integer at the specified absolute {@code index} in + * this buffer. This method does not modify {@code readerIndex} or + * {@code writerIndex} of this buffer. + * + * @throws IndexOutOfBoundsException + * if the specified {@code index} is less than {@code 0} or + * {@code index + 8} is greater than {@code this.capacity} + */ + long getLong(int index); + + /** + * Transfers this buffer's data to the specified destination starting at + * the specified absolute {@code index} until the destination becomes + * non-writable. This method is basically same with + * {@link #getBytes(int, HornetQBuffer, int, int)}, except that this + * method increases the {@code writerIndex} of the destination by the + * number of the transferred bytes while + * {@link #getBytes(int, HornetQBuffer, int, int)} does not. + * This method does not modify {@code readerIndex} or {@code writerIndex} of + * the source buffer (i.e. {@code this}). + * + * @throws IndexOutOfBoundsException + * if the specified {@code index} is less than {@code 0} or + * if {@code index + dst.writableBytes} is greater than + * {@code this.capacity} + */ + void getBytes(int index, HornetQBuffer dst); + + /** + * Transfers this buffer's data to the specified destination starting at + * the specified absolute {@code index}. This method is basically same + * with {@link #getBytes(int, HornetQBuffer, int, int)}, except that this + * method increases the {@code writerIndex} of the destination by the + * number of the transferred bytes while + * {@link #getBytes(int, HornetQBuffer, int, int)} does not. + * This method does not modify {@code readerIndex} or {@code writerIndex} of + * the source buffer (i.e. {@code this}). + * + * @param length the number of bytes to transfer + * + * @throws IndexOutOfBoundsException + * if the specified {@code index} is less than {@code 0}, + * if {@code index + length} is greater than + * {@code this.capacity}, or + * if {@code length} is greater than {@code dst.writableBytes} + */ + void getBytes(int index, HornetQBuffer dst, int length); + + /** + * Transfers this buffer's data to the specified destination starting at + * the specified absolute {@code index}. + * This method does not modify {@code readerIndex} or {@code writerIndex} + * of both the source (i.e. {@code this}) and the destination. + * + * @param dstIndex the first index of the destination + * @param length the number of bytes to transfer + * + * @throws IndexOutOfBoundsException + * if the specified {@code index} is less than {@code 0}, + * if the specified {@code dstIndex} is less than {@code 0}, + * if {@code index + length} is greater than + * {@code this.capacity}, or + * if {@code dstIndex + length} is greater than + * {@code dst.capacity} + */ + void getBytes(int index, HornetQBuffer dst, int dstIndex, int length); + + /** + * Transfers this buffer's data to the specified destination starting at + * the specified absolute {@code index}. + * This method does not modify {@code readerIndex} or {@code writerIndex} of + * this buffer + * + * @throws IndexOutOfBoundsException + * if the specified {@code index} is less than {@code 0} or + * if {@code index + dst.length} is greater than + * {@code this.capacity} + */ + void getBytes(int index, byte[] dst); + + /** + * Transfers this buffer's data to the specified destination starting at + * the specified absolute {@code index}. + * This method does not modify {@code readerIndex} or {@code writerIndex} + * of this buffer. + * + * @param dstIndex the first index of the destination + * @param length the number of bytes to transfer + * + * @throws IndexOutOfBoundsException + * if the specified {@code index} is less than {@code 0}, + * if the specified {@code dstIndex} is less than {@code 0}, + * if {@code index + length} is greater than + * {@code this.capacity}, or + * if {@code dstIndex + length} is greater than + * {@code dst.length} + */ + void getBytes(int index, byte[] dst, int dstIndex, int length); + + /** + * Transfers this buffer's data to the specified destination starting at + * the specified absolute {@code index} until the destination's position + * reaches its limit. + * This method does not modify {@code readerIndex} or {@code writerIndex} of + * this buffer while the destination's {@code position} will be increased. + * + * @throws IndexOutOfBoundsException + * if the specified {@code index} is less than {@code 0} or + * if {@code index + dst.remaining()} is greater than + * {@code this.capacity} + */ + void getBytes(int index, ByteBuffer dst); + + /** + * Gets a char at the specified absolute {@code index} in + * this buffer. This method does not modify {@code readerIndex} or + * {@code writerIndex} of this buffer. + * + * @throws IndexOutOfBoundsException + * if the specified {@code index} is less than {@code 0} or + * {@code index + 2} is greater than {@code this.capacity} + */ + char getChar(int index); + + /** + * Gets a float at the specified absolute {@code index} in + * this buffer. This method does not modify {@code readerIndex} or + * {@code writerIndex} of this buffer. + * + * @throws IndexOutOfBoundsException + * if the specified {@code index} is less than {@code 0} or + * {@code index + 4} is greater than {@code this.capacity} + */ + float getFloat(int index); + + /** + * Gets a double at the specified absolute {@code index} in + * this buffer. This method does not modify {@code readerIndex} or + * {@code writerIndex} of this buffer. + * + * @throws IndexOutOfBoundsException + * if the specified {@code index} is less than {@code 0} or + * {@code index + 8} is greater than {@code this.capacity} + */ + double getDouble(int index); + + /** + * Sets the specified byte at the specified absolute {@code index} in this + * buffer. + * This method does not modify {@code readerIndex} or {@code writerIndex} of + * this buffer. + * + * @throws IndexOutOfBoundsException + * if the specified {@code index} is less than {@code 0} or + * {@code index + 1} is greater than {@code this.capacity} + */ + void setByte(int index, byte value); + + /** + * Sets the specified 16-bit short integer at the specified absolute + * {@code index} in this buffer. + * This method does not modify {@code readerIndex} or {@code writerIndex} of + * this buffer. + * + * @throws IndexOutOfBoundsException + * if the specified {@code index} is less than {@code 0} or + * {@code index + 2} is greater than {@code this.capacity} + */ + void setShort(int index, short value); + + /** + * Sets the specified 32-bit integer at the specified absolute + * {@code index} in this buffer. + * This method does not modify {@code readerIndex} or {@code writerIndex} of + * this buffer. + * + * @throws IndexOutOfBoundsException + * if the specified {@code index} is less than {@code 0} or + * {@code index + 4} is greater than {@code this.capacity} + */ + void setInt(int index, int value); + + /** + * Sets the specified 64-bit long integer at the specified absolute + * {@code index} in this buffer. + * This method does not modify {@code readerIndex} or {@code writerIndex} of + * this buffer. + * + * @throws IndexOutOfBoundsException + * if the specified {@code index} is less than {@code 0} or + * {@code index + 8} is greater than {@code this.capacity} + */ + void setLong(int index, long value); + + /** + * Transfers the specified source buffer's data to this buffer starting at + * the specified absolute {@code index} until the destination becomes + * unreadable. This method is basically same with + * {@link #setBytes(int, HornetQBuffer, int, int)}, except that this + * method increases the {@code readerIndex} of the source buffer by + * the number of the transferred bytes while + * {@link #getBytes(int, HornetQBuffer, int, int)} does not. + * This method does not modify {@code readerIndex} or {@code writerIndex} of + * the source buffer (i.e. {@code this}). + * + * @throws IndexOutOfBoundsException + * if the specified {@code index} is less than {@code 0} or + * if {@code index + src.readableBytes} is greater than + * {@code this.capacity} + */ + void setBytes(int index, HornetQBuffer src); + + /** + * Transfers the specified source buffer's data to this buffer starting at + * the specified absolute {@code index}. This method is basically same + * with {@link #setBytes(int, HornetQBuffer, int, int)}, except that this + * method increases the {@code readerIndex} of the source buffer by + * the number of the transferred bytes while + * {@link #getBytes(int, HornetQBuffer, int, int)} does not. + * This method does not modify {@code readerIndex} or {@code writerIndex} of + * the source buffer (i.e. {@code this}). + * + * @param length the number of bytes to transfer + * + * @throws IndexOutOfBoundsException + * if the specified {@code index} is less than {@code 0}, + * if {@code index + length} is greater than + * {@code this.capacity}, or + * if {@code length} is greater than {@code src.readableBytes} + */ + void setBytes(int index, HornetQBuffer src, int length); + + /** + * Transfers the specified source buffer's data to this buffer starting at + * the specified absolute {@code index}. + * This method does not modify {@code readerIndex} or {@code writerIndex} + * of both the source (i.e. {@code this}) and the destination. + * + * @param srcIndex the first index of the source + * @param length the number of bytes to transfer + * + * @throws IndexOutOfBoundsException + * if the specified {@code index} is less than {@code 0}, + * if the specified {@code srcIndex} is less than {@code 0}, + * if {@code index + length} is greater than + * {@code this.capacity}, or + * if {@code srcIndex + length} is greater than + * {@code src.capacity} + */ + void setBytes(int index, HornetQBuffer src, int srcIndex, int length); + + /** + * Transfers the specified source array's data to this buffer starting at + * the specified absolute {@code index}. + * This method does not modify {@code readerIndex} or {@code writerIndex} of + * this buffer. + * + * @throws IndexOutOfBoundsException + * if the specified {@code index} is less than {@code 0} or + * if {@code index + src.length} is greater than + * {@code this.capacity} + */ + void setBytes(int index, byte[] src); + + /** + * Transfers the specified source array's data to this buffer starting at + * the specified absolute {@code index}. + * This method does not modify {@code readerIndex} or {@code writerIndex} of + * this buffer. + * + * @throws IndexOutOfBoundsException + * if the specified {@code index} is less than {@code 0}, + * if the specified {@code srcIndex} is less than {@code 0}, + * if {@code index + length} is greater than + * {@code this.capacity}, or + * if {@code srcIndex + length} is greater than {@code src.length} + */ + void setBytes(int index, byte[] src, int srcIndex, int length); + + /** + * Transfers the specified source buffer's data to this buffer starting at + * the specified absolute {@code index} until the source buffer's position + * reaches its limit. + * This method does not modify {@code readerIndex} or {@code writerIndex} of + * this buffer. + * + * @throws IndexOutOfBoundsException + * if the specified {@code index} is less than {@code 0} or + * if {@code index + src.remaining()} is greater than + * {@code this.capacity} + */ + void setBytes(int index, ByteBuffer src); + + /** + * Sets the specified char at the specified absolute + * {@code index} in this buffer. + * This method does not modify {@code readerIndex} or {@code writerIndex} of + * this buffer. + * + * @throws IndexOutOfBoundsException + * if the specified {@code index} is less than {@code 0} or + * {@code index + 2} is greater than {@code this.capacity} + */ + void setChar(int index, char value); + + /** + * Sets the specified float at the specified absolute + * {@code index} in this buffer. + * This method does not modify {@code readerIndex} or {@code writerIndex} of + * this buffer. + * + * @throws IndexOutOfBoundsException + * if the specified {@code index} is less than {@code 0} or + * {@code index + 4} is greater than {@code this.capacity} + */ + void setFloat(int index, float value); + + /** + * Sets the specified double at the specified absolute + * {@code index} in this buffer. + * This method does not modify {@code readerIndex} or {@code writerIndex} of + * this buffer. + * + * @throws IndexOutOfBoundsException + * if the specified {@code index} is less than {@code 0} or + * {@code index + 8} is greater than {@code this.capacity} + */ + void setDouble(int index, double value); + + /** + * Gets a byte at the current {@code readerIndex} and increases + * the {@code readerIndex} by {@code 1} in this buffer. + * + * @throws IndexOutOfBoundsException + * if {@code this.readableBytes} is less than {@code 1} + */ + byte readByte(); + + /** + * Gets an unsigned byte at the current {@code readerIndex} and increases + * the {@code readerIndex} by {@code 1} in this buffer. + * + * @throws IndexOutOfBoundsException + * if {@code this.readableBytes} is less than {@code 1} + */ + short readUnsignedByte(); + + /** + * Gets a 16-bit short integer at the current {@code readerIndex} + * and increases the {@code readerIndex} by {@code 2} in this buffer. + * + * @throws IndexOutOfBoundsException + * if {@code this.readableBytes} is less than {@code 2} + */ + short readShort(); + + /** + * Gets an unsigned 16-bit short integer at the current {@code readerIndex} + * and increases the {@code readerIndex} by {@code 2} in this buffer. + * + * @throws IndexOutOfBoundsException + * if {@code this.readableBytes} is less than {@code 2} + */ + int readUnsignedShort(); + + /** + * Gets a 32-bit integer at the current {@code readerIndex} + * and increases the {@code readerIndex} by {@code 4} in this buffer. + * + * @throws IndexOutOfBoundsException + * if {@code this.readableBytes} is less than {@code 4} + */ + int readInt(); + + /** + * Gets an unsigned 32-bit integer at the current {@code readerIndex} + * and increases the {@code readerIndex} by {@code 4} in this buffer. + * + * @throws IndexOutOfBoundsException + * if {@code this.readableBytes} is less than {@code 4} + */ + long readUnsignedInt(); + + /** + * Gets a 64-bit integer at the current {@code readerIndex} + * and increases the {@code readerIndex} by {@code 8} in this buffer. + * + * @throws IndexOutOfBoundsException + * if {@code this.readableBytes} is less than {@code 8} + */ + long readLong(); + + /** + * Gets a char at the current {@code readerIndex} + * and increases the {@code readerIndex} by {@code 2} in this buffer. + * + * @throws IndexOutOfBoundsException + * if {@code this.readableBytes} is less than {@code 2} + */ + char readChar(); + + /** + * Gets a float at the current {@code readerIndex} + * and increases the {@code readerIndex} by {@code 4} in this buffer. + * + * @throws IndexOutOfBoundsException + * if {@code this.readableBytes} is less than {@code 4} + */ + float readFloat(); + + /** + * Gets a double at the current {@code readerIndex} + * and increases the {@code readerIndex} by {@code 8} in this buffer. + * + * @throws IndexOutOfBoundsException + * if {@code this.readableBytes} is less than {@code 8} + */ + double readDouble(); + + /** + * Gets a boolean at the current {@code readerIndex} + * and increases the {@code readerIndex} by {@code 1} in this buffer. + * + * @throws IndexOutOfBoundsException + * if {@code this.readableBytes} is less than {@code 1} + */ + boolean readBoolean(); + + /** + * Gets a SimpleString (potentially {@code null}) at the current {@code readerIndex} + */ + SimpleString readNullableSimpleString(); + + /** + * Gets a String (potentially {@code null}) at the current {@code readerIndex} + */ + String readNullableString(); + + /** + * Gets a non-null SimpleString at the current {@code readerIndex} + */ + SimpleString readSimpleString(); + + /** + * Gets a non-null String at the current {@code readerIndex} + */ + String readString(); + + /** + * Gets a UTF-8 String at the current {@code readerIndex} + */ + String readUTF(); + + /** + * Transfers this buffer's data to a newly created buffer starting at + * the current {@code readerIndex} and increases the {@code readerIndex} + * by the number of the transferred bytes (= {@code length}). + * The returned buffer's {@code readerIndex} and {@code writerIndex} are + * {@code 0} and {@code length} respectively. + * + * @param length the number of bytes to transfer + * + * @return the newly created buffer which contains the transferred bytes + * + * @throws IndexOutOfBoundsException + * if {@code length} is greater than {@code this.readableBytes} + */ + HornetQBuffer readBytes(int length); + + /** + * Returns a new slice of this buffer's sub-region starting at the current + * {@code readerIndex} and increases the {@code readerIndex} by the size + * of the new slice (= {@code length}). + * + * @param length the size of the new slice + * + * @return the newly created slice + * + * @throws IndexOutOfBoundsException + * if {@code length} is greater than {@code this.readableBytes} + */ + HornetQBuffer readSlice(int length); + + /** + * Transfers this buffer's data to the specified destination starting at + * the current {@code readerIndex} until the destination becomes + * non-writable, and increases the {@code readerIndex} by the number of the + * transferred bytes. This method is basically same with + * {@link #readBytes(HornetQBuffer, int, int)}, except that this method + * increases the {@code writerIndex} of the destination by the number of + * the transferred bytes while {@link #readBytes(HornetQBuffer, int, int)} + * does not. + * + * @throws IndexOutOfBoundsException + * if {@code dst.writableBytes} is greater than + * {@code this.readableBytes} + */ + void readBytes(HornetQBuffer dst); + + /** + * Transfers this buffer's data to the specified destination starting at + * the current {@code readerIndex} and increases the {@code readerIndex} + * by the number of the transferred bytes (= {@code length}). This method + * is basically same with {@link #readBytes(HornetQBuffer, int, int)}, + * except that this method increases the {@code writerIndex} of the + * destination by the number of the transferred bytes (= {@code length}) + * while {@link #readBytes(HornetQBuffer, int, int)} does not. + * + * @throws IndexOutOfBoundsException + * if {@code length} is greater than {@code this.readableBytes} or + * if {@code length} is greater than {@code dst.writableBytes} + */ + void readBytes(HornetQBuffer dst, int length); + + /** + * Transfers this buffer's data to the specified destination starting at + * the current {@code readerIndex} and increases the {@code readerIndex} + * by the number of the transferred bytes (= {@code length}). + * + * @param dstIndex the first index of the destination + * @param length the number of bytes to transfer + * + * @throws IndexOutOfBoundsException + * if the specified {@code dstIndex} is less than {@code 0}, + * if {@code length} is greater than {@code this.readableBytes}, or + * if {@code dstIndex + length} is greater than + * {@code dst.capacity} + */ + void readBytes(HornetQBuffer dst, int dstIndex, int length); + + /** + * Transfers this buffer's data to the specified destination starting at + * the current {@code readerIndex} and increases the {@code readerIndex} + * by the number of the transferred bytes (= {@code dst.length}). + * + * @throws IndexOutOfBoundsException + * if {@code dst.length} is greater than {@code this.readableBytes} + */ + void readBytes(byte[] dst); + + /** + * Transfers this buffer's data to the specified destination starting at + * the current {@code readerIndex} and increases the {@code readerIndex} + * by the number of the transferred bytes (= {@code length}). + * + * @param dstIndex the first index of the destination + * @param length the number of bytes to transfer + * + * @throws IndexOutOfBoundsException + * if the specified {@code dstIndex} is less than {@code 0}, + * if {@code length} is greater than {@code this.readableBytes}, or + * if {@code dstIndex + length} is greater than {@code dst.length} + */ + void readBytes(byte[] dst, int dstIndex, int length); + + /** + * Transfers this buffer's data to the specified destination starting at + * the current {@code readerIndex} until the destination's position + * reaches its limit, and increases the {@code readerIndex} by the + * number of the transferred bytes. + * + * @throws IndexOutOfBoundsException + * if {@code dst.remaining()} is greater than + * {@code this.readableBytes} + */ + void readBytes(ByteBuffer dst); + + /** + * Increases the current {@code readerIndex} by the specified + * {@code length} in this buffer. + * + * @throws IndexOutOfBoundsException + * if {@code length} is greater than {@code this.readableBytes} + */ + void skipBytes(int length); + + /** + * Sets the specified byte at the current {@code writerIndex} + * and increases the {@code writerIndex} by {@code 1} in this buffer. + * + * @throws IndexOutOfBoundsException + * if {@code this.writableBytes} is less than {@code 1} + */ + void writeByte(byte value); + + /** + * Sets the specified 16-bit short integer at the current + * {@code writerIndex} and increases the {@code writerIndex} by {@code 2} + * in this buffer. + * + * @throws IndexOutOfBoundsException + * if {@code this.writableBytes} is less than {@code 2} + */ + void writeShort(short value); + + /** + * Sets the specified 32-bit integer at the current {@code writerIndex} + * and increases the {@code writerIndex} by {@code 4} in this buffer. + * + * @throws IndexOutOfBoundsException + * if {@code this.writableBytes} is less than {@code 4} + */ + void writeInt(int value); + + /** + * Sets the specified 64-bit long integer at the current + * {@code writerIndex} and increases the {@code writerIndex} by {@code 8} + * in this buffer. + * + * @throws IndexOutOfBoundsException + * if {@code this.writableBytes} is less than {@code 8} + */ + void writeLong(long value); + + /** + * Sets the specified char at the current {@code writerIndex} + * and increases the {@code writerIndex} by {@code 2} in this buffer. + * + * @throws IndexOutOfBoundsException + * if {@code this.writableBytes} is less than {@code 2} + */ + void writeChar(char chr); + + /** + * Sets the specified float at the current {@code writerIndex} + * and increases the {@code writerIndex} by {@code 4} in this buffer. + * + * @throws IndexOutOfBoundsException + * if {@code this.writableBytes} is less than {@code 4} + */ + void writeFloat(float value); + + /** + * Sets the specified double at the current {@code writerIndex} + * and increases the {@code writerIndex} by {@code 8} in this buffer. + * + * @throws IndexOutOfBoundsException + * if {@code this.writableBytes} is less than {@code 8} + */ + void writeDouble(double value); + + /** + * Sets the specified boolean at the current {@code writerIndex} + */ + void writeBoolean(boolean val); + + /** + * Sets the specified SimpleString (potentially {@code null}) at the current {@code writerIndex} + */ + void writeNullableSimpleString(SimpleString val); + + /** + * Sets the specified String (potentially {@code null}) at the current {@code writerIndex} + */ + void writeNullableString(String val); + + /** + * Sets the specified non-null SimpleString at the current {@code writerIndex} + */ + void writeSimpleString(SimpleString val); + + /** + * Sets the specified non-null String at the current {@code writerIndex} + */ + void writeString(String val); + + /** + * Sets the specified UTF-8 String at the current {@code writerIndex} + */ + + void writeUTF(String utf); + + /** + * Transfers the specified source buffer's data to this buffer starting at + * the current {@code writerIndex} and increases the {@code writerIndex} + * by the number of the transferred bytes (= {@code length}). This method + * is basically same with {@link #writeBytes(HornetQBuffer, int, int)}, + * except that this method increases the {@code readerIndex} of the source + * buffer by the number of the transferred bytes (= {@code length}) while + * {@link #writeBytes(HornetQBuffer, int, int)} does not. + * + * @param length the number of bytes to transfer + * + * @throws IndexOutOfBoundsException + * if {@code length} is greater than {@code this.writableBytes} or + * if {@code length} is greater then {@code src.readableBytes} + */ + void writeBytes(HornetQBuffer src, int length); + + /** + * Transfers the specified source buffer's data to this buffer starting at + * the current {@code writerIndex} and increases the {@code writerIndex} + * by the number of the transferred bytes (= {@code length}). + * + * @param srcIndex the first index of the source + * @param length the number of bytes to transfer + * + * @throws IndexOutOfBoundsException + * if the specified {@code srcIndex} is less than {@code 0}, + * if {@code srcIndex + length} is greater than + * {@code src.capacity}, or + * if {@code length} is greater than {@code this.writableBytes} + */ + void writeBytes(HornetQBuffer src, int srcIndex, int length); + + /** + * Transfers the specified source array's data to this buffer starting at + * the current {@code writerIndex} and increases the {@code writerIndex} + * by the number of the transferred bytes (= {@code src.length}). + * + * @throws IndexOutOfBoundsException + * if {@code src.length} is greater than {@code this.writableBytes} + */ + void writeBytes(byte[] src); + + /** + * Transfers the specified source array's data to this buffer starting at + * the current {@code writerIndex} and increases the {@code writerIndex} + * by the number of the transferred bytes (= {@code length}). + * + * @param srcIndex the first index of the source + * @param length the number of bytes to transfer + * + * @throws IndexOutOfBoundsException + * if the specified {@code srcIndex} is less than {@code 0}, + * if {@code srcIndex + length} is greater than + * {@code src.length}, or + * if {@code length} is greater than {@code this.writableBytes} + */ + void writeBytes(byte[] src, int srcIndex, int length); + + /** + * Transfers the specified source buffer's data to this buffer starting at + * the current {@code writerIndex} until the source buffer's position + * reaches its limit, and increases the {@code writerIndex} by the + * number of the transferred bytes. + * + * @throws IndexOutOfBoundsException + * if {@code src.remaining()} is greater than + * {@code this.writableBytes} + */ + void writeBytes(ByteBuffer src); + + /** + * Returns a copy of this buffer's readable bytes. Modifying the content + * of the returned buffer or this buffer does not affect each other at all. + * This method is identical to {@code buf.copy(buf.readerIndex(), buf.readableBytes())}. + * This method does not modify {@code readerIndex} or {@code writerIndex} of + * this buffer. + * + */ + HornetQBuffer copy(); + + /** + * Returns a copy of this buffer's sub-region. Modifying the content of + * the returned buffer or this buffer does not affect each other at all. + * This method does not modify {@code readerIndex} or {@code writerIndex} of + * this buffer. + */ + HornetQBuffer copy(int index, int length); + + /** + * Returns a slice of this buffer's readable bytes. Modifying the content + * of the returned buffer or this buffer affects each other's content + * while they maintain separate indexes and marks. This method is + * identical to {@code buf.slice(buf.readerIndex(), buf.readableBytes())}. + * This method does not modify {@code readerIndex} or {@code writerIndex} of + * this buffer. + */ + HornetQBuffer slice(); + + /** + * Returns a slice of this buffer's sub-region. Modifying the content of + * the returned buffer or this buffer affects each other's content while + * they maintain separate indexes and marks. + * This method does not modify {@code readerIndex} or {@code writerIndex} of + * this buffer. + */ + HornetQBuffer slice(int index, int length); + + /** + * Returns a buffer which shares the whole region of this buffer. + * Modifying the content of the returned buffer or this buffer affects + * each other's content while they maintain separate indexes and marks. + * This method is identical to {@code buf.slice(0, buf.capacity())}. + * This method does not modify {@code readerIndex} or {@code writerIndex} of + * this buffer. + */ + HornetQBuffer duplicate(); + + /** + * Converts this buffer's readable bytes into a NIO buffer. The returned + * buffer might or might not share the content with this buffer, while + * they have separate indexes and marks. This method is identical to + * {@code buf.toByteBuffer(buf.readerIndex(), buf.readableBytes())}. + * This method does not modify {@code readerIndex} or {@code writerIndex} of + * this buffer. + */ + ByteBuffer toByteBuffer(); + + /** + * Converts this buffer's sub-region into a NIO buffer. The returned + * buffer might or might not share the content with this buffer, while + * they have separate indexes and marks. + * This method does not modify {@code readerIndex} or {@code writerIndex} of + * this buffer. + */ + ByteBuffer toByteBuffer(int index, int length); +} Copied: trunk/src/main/org/hornetq/api/core/HornetQBuffers.java (from rev 8723, trunk/src/main/org/hornetq/api/core/buffers/HornetQBuffers.java) =================================================================== --- trunk/src/main/org/hornetq/api/core/HornetQBuffers.java (rev 0) +++ trunk/src/main/org/hornetq/api/core/HornetQBuffers.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -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.api.core; + +import java.nio.ByteBuffer; + +import org.hornetq.core.buffers.impl.ChannelBufferWrapper; +import org.jboss.netty.buffer.ChannelBuffer; +import org.jboss.netty.buffer.ChannelBuffers; + +/** + * Factory class to create HornetQBuffers + * + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + */ +public class HornetQBuffers +{ + /** + * Creates a <em>self-expanding</em> HornetQBuffer with the given initial size + * + * @param size the initial size of the created HornetQBuffer + * @return a self-expanding HornetQBuffer starting with the given size + */ + public static HornetQBuffer dynamicBuffer(final int size) + { + return new ChannelBufferWrapper(ChannelBuffers.dynamicBuffer(size)); + } + + /** + * Creates a <em>self-expanding</em> HornetQBuffer filled with the given byte array + * + * @param bytes the created buffer will be initially filled with this byte array + * @return a self-expanding HornetQBuffer filled with the given byte array + */ + public static HornetQBuffer dynamicBuffer(final byte[] bytes) + { + ChannelBuffer buff = ChannelBuffers.dynamicBuffer(bytes.length); + + buff.writeBytes(bytes); + + return new ChannelBufferWrapper(buff); + } + + /** + * Creates a HornetQBuffer wrapping the underlying NIO ByteBuffer + * + * The position on this buffer won't affect the position on the inner buffer + * + * @param underlying the underlying NIO ByteBuffer + * @return a HornetQBuffer wrapping the underlying NIO ByteBuffer + */ + public static HornetQBuffer wrappedBuffer(final ByteBuffer underlying) + { + HornetQBuffer buff = new ChannelBufferWrapper(ChannelBuffers.wrappedBuffer(underlying)); + + buff.clear(); + + return buff; + } + + /** + * Creates a HornetQBuffer wrapping the underlying byte array + * + * @param underlying the underlying byte array + * @return a HornetQBuffer wrapping the underlying byte array + */ + public static HornetQBuffer wrappedBuffer(final byte[] underlying) + { + return new ChannelBufferWrapper(ChannelBuffers.wrappedBuffer(underlying)); + } + + /** + * Creates a <em>fixed</em> HornetQBuffer of the given size + * + * @param size the size of the created HornetQBuffer + * @return a fixed HornetQBuffer with the given size + */ + public static HornetQBuffer fixedBuffer(final int size) + { + return new ChannelBufferWrapper(ChannelBuffers.buffer(size)); + } +} Copied: trunk/src/main/org/hornetq/api/core/HornetQException.java (from rev 8723, trunk/src/main/org/hornetq/api/core/exception/HornetQException.java) =================================================================== --- trunk/src/main/org/hornetq/api/core/HornetQException.java (rev 0) +++ trunk/src/main/org/hornetq/api/core/HornetQException.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -0,0 +1,220 @@ +/* + * 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; + +/** + * + * HornetQException is the root exception for HornetQ API. + * + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + */ +public class HornetQException extends Exception +{ + private static final long serialVersionUID = -4802014152804997417L; + + // Error codes ------------------------------------------------- + + /** + * Internal error which prevented HornetQ to perform. + */ + public static final int INTERNAL_ERROR = 000; + + /** + * A packet of unsupported type was received by HornetQ PacketHandler. + */ + public static final int UNSUPPORTED_PACKET = 001; + + /** + * A client is not able to connect to HornetQ server. + */ + public static final int NOT_CONNECTED = 002; + + /** + * A client timed out will connecting to HornetQ server. + */ + public static final int CONNECTION_TIMEDOUT = 003; + + /** + * A client was disconnected from HornetQ server when the server has shut down. + */ + public static final int DISCONNECTED = 004; + + /** + * A blocking call from a client was unblocked during failover. + */ + public static final int UNBLOCKED = 005; + + /** + * Unexpected I/O error occured on the server. + */ + public static final int IO_ERROR = 006; + + /** + * An operation failed because a queue does not exist on the server. + */ + public static final int QUEUE_DOES_NOT_EXIST = 100; + + /** + * An operation failed because a queue exists on the server. + */ + public static final int QUEUE_EXISTS = 101; + + /** + * A client operation failed because the calling resource + * (ClientSession, ClientProducer, etc.) is closed. + */ + public static final int OBJECT_CLOSED = 102; + + /** + * An filter expression has not been validated + */ + public static final int INVALID_FILTER_EXPRESSION = 103; + + /** + * A HornetQ resource is not in a legal state (e.g. calling + * ClientConsumer.receive() if a MessageHandler is set) + */ + public static final int ILLEGAL_STATE = 104; + + /** + * A security problem occured (authentication issues, permission issues,...) + */ + public static final int SECURITY_EXCEPTION = 105; + + /** + * An operation failed because an address does not exist on the server. + */ + public static final int ADDRESS_DOES_NOT_EXIST = 106; + + /** + * An operation failed because an address exists on the server. + */ + public static final int ADDRESS_EXISTS = 107; + + /** + * A incompatibility between HornetQ versions on the client and the server has been detected + */ + public static final int INCOMPATIBLE_CLIENT_SERVER_VERSIONS = 108; + + /** + * An operation failed because a session exists on the server. + */ + public static final int SESSION_EXISTS = 109; + + /** + * An problem occurred while manipulating the body of a large message. + */ + public static final int LARGE_MESSAGE_ERROR_BODY = 110; + + /** + * A transaction was rolled back. + */ + public static final int TRANSACTION_ROLLED_BACK = 111; + + /** + * The creation of a session was rejected by the server (e.g. if the + * server is starting and has not finish to be initialized) + */ + public static final int SESSION_CREATION_REJECTED = 112; + + // Native Error codes ---------------------------------------------- + + /** + * A internal error occured in the AIO native code + */ + public static final int NATIVE_ERROR_INTERNAL = 200; + + /** + * A buffer is invalid in the AIO native code + */ + public static final int NATIVE_ERROR_INVALID_BUFFER = 201; + + /** + * Alignment error in the AIO native code + */ + public static final int NATIVE_ERROR_NOT_ALIGNED = 202; + + /** + * AIO has not been properly initialized + */ + public static final int NATIVE_ERROR_CANT_INITIALIZE_AIO = 203; + + /** + * AIO has not been properly released + */ + public static final int NATIVE_ERROR_CANT_RELEASE_AIO = 204; + + /** + * A closed file has not be properly reopened + */ + public static final int NATIVE_ERROR_CANT_OPEN_CLOSE_FILE = 205; + + /** + * An error occured while allocating a queue in AIO native code + */ + public static final int NATIVE_ERROR_CANT_ALLOCATE_QUEUE = 206; + + /** + * An error occured while pre-allocating a file in AIO native code + */ + public static final int NATIVE_ERROR_PREALLOCATE_FILE = 208; + + /** + * An error occurred while allocating memory in the AIO native code + */ + public static final int NATIVE_ERROR_ALLOCATE_MEMORY = 209; + + /** + * AIO is full + */ + public static final int NATIVE_ERROR_AIO_FULL = 211; + + private int code; + + public HornetQException() + { + } + + public HornetQException(final int code) + { + this.code = code; + } + + public HornetQException(final int code, final String msg) + { + super(msg); + + this.code = code; + } + + public HornetQException(final int code, final String msg, final Throwable cause) + { + super(msg, cause); + + this.code = code; + } + + public int getCode() + { + return code; + } + + @Override + public String toString() + { + return "HornetQException[errorCode=" + code + " message=" + getMessage() + "]"; + } + +} Copied: trunk/src/main/org/hornetq/api/core/Interceptor.java (from rev 8723, trunk/src/main/org/hornetq/api/core/interceptor/Interceptor.java) =================================================================== --- trunk/src/main/org/hornetq/api/core/Interceptor.java (rev 0) +++ trunk/src/main/org/hornetq/api/core/Interceptor.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -0,0 +1,39 @@ +/* + * 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 org.hornetq.core.remoting.Packet; +import org.hornetq.core.remoting.RemotingConnection; + +/** + * This is class is a simple way to intercepting server calls on HornetQ. + * <p/> + * To Add this interceptor, you have to modify hornetq-configuration.xml + * + * @author clebert.suconic(a)jboss.com + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + */ +public interface Interceptor +{ + /** + * gets called when a packet is received prior to be sent to the channel + * + * @param packet the packet being received + * @param connection the connection the packet was received on + * @return true to process the next interceptor and handle the packet, + * false to abort processing of the packet + * @throws HornetQException + */ + boolean intercept(Packet packet, RemotingConnection connection) throws HornetQException; +} Copied: trunk/src/main/org/hornetq/api/core/Message.java (from rev 8723, trunk/src/main/org/hornetq/api/core/message/Message.java) =================================================================== --- trunk/src/main/org/hornetq/api/core/Message.java (rev 0) +++ trunk/src/main/org/hornetq/api/core/Message.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -0,0 +1,490 @@ +/* + * 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.util.Map; +import java.util.Set; + +import org.hornetq.api.SimpleString; + +/** + * A Message is a routable instance that has a payload. + * <br/> + * The payload (the "body") is opaque to the messaging system. + * A Message also has a fixed set of headers (required by the messaging system) + * and properties (defined by the users) that can be used by the messaging system + * to route the message (e.g. to ensure it matches a queue filter). + * <br> + * <h2>Message Properties</h2> + * + * Message can contain properties specified by the users. + * It is possible to convert from some types to other types as specified + * by the following table: + * <pre> + * | | boolean byte short int long float double String byte[] + * |---------------------------------------------------------------- + * |boolean | X X + * |byte | X X X X X + * |short | X X X X + * |int | X X X + * |long | X X + * |float | X X X + * |double | X X + * |String | X X X X X X X X + * |byte[] | X + * |----------------------------------------------------------------- + * </pre> + * <br> + * If conversion is not allowed (for example calling {@code getFloatProperty} on a property set a {@code boolean}), + * a PropertyConversionException will be thrown. + * + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * @author <a href="mailto:clebert.suconic@jboss.com">ClebertSuconic</a> + * @version <tt>$Revision: 3341 $</tt> + * + * $Id: Message.java 3341 2007-11-19 14:34:57Z timfox $ + */ +public interface Message +{ + public static final SimpleString HDR_ACTUAL_EXPIRY_TIME = new SimpleString("_HQ_ACTUAL_EXPIRY"); + + public static final SimpleString HDR_ORIGINAL_ADDRESS = new SimpleString("_HQ_ORIG_ADDRESS"); + + public static final SimpleString HDR_ORIG_MESSAGE_ID = new SimpleString("_HQ_ORIG_MESSAGE_ID"); + + public static final SimpleString HDR_GROUP_ID = new SimpleString("_HQ_GROUP_ID"); + + public static final SimpleString HDR_SCHEDULED_DELIVERY_TIME = new SimpleString("_HQ_SCHED_DELIVERY"); + + public static final SimpleString HDR_DUPLICATE_DETECTION_ID = new SimpleString("_HQ_DUPL_ID"); + + public static final SimpleString HDR_LAST_VALUE_NAME = new SimpleString("_HQ_LVQ_NAME"); + + /** + * Returns the messageID. + * <br> + * The messageID is set when the message is handled by the server. + */ + long getMessageID(); + + /** + * Returns the address this message is sent to. + */ + SimpleString getAddress(); + + /** + * Sets the address to send this message to. + * + * @param address address to send the message to + */ + void setAddress(SimpleString address); + + /** + * Returns this message type. + */ + byte getType(); + + /** + * Returns whether this message is durable or not. + */ + boolean isDurable(); + + /** + * Sets whether this message is durable or not. + * + * @param durable {@code true} to flag this message as durable, {@code false} else + */ + void setDurable(boolean durable); + + /** + * Returns the expiration time of this message. + */ + long getExpiration(); + + /** + * Returns whether this message is expired or not. + */ + boolean isExpired(); + + /** + * Sets the expiration of this message. + * + * @param expiration expiration time + */ + void setExpiration(long expiration); + + /** + * Returns the message timestamp. + * <br> + * The timestamp corresponds to the time this message + * was handled by a HornetQ server. + */ + long getTimestamp(); + + /** + * Sets the message timestamp. + * + * @param timestamp timestamp + */ + void setTimestamp(long timestamp); + + /** + * Returns the message priority. + * + * Values range from 0 (less priority) to 9 (more priority) inclusive. + */ + byte getPriority(); + + /** + * Sets the message priority. + * + * Value must be between 0 and 9 inclusive. + * + * @param priority the new message priority + */ + void setPriority(byte priority); + + /** + * Returns the size of the <em>encoded</em> message. + */ + int getEncodeSize(); + + /** + * Returns whether this message is a <em>large message</em> or a regular message. + */ + boolean isLargeMessage(); + + /** + * Returns the message body as a HornetQBuffer + */ + HornetQBuffer getBodyBuffer(); + + // Properties + // ----------------------------------------------------------------- + + /** + * Puts a boolean property in this message. + * + * @param key property name + * @param value property value + */ + void putBooleanProperty(SimpleString key, boolean value); + + /** + * @see #putBooleanProperty(SimpleString, boolean) + */ + void putBooleanProperty(String key, boolean value); + + /** + * Puts a byte property in this message. + * + * @param key property name + * @param value property value + */ + void putByteProperty(SimpleString key, byte value); + + /** + * @see #putByteProperty(SimpleString, byte) + */ + void putByteProperty(String key, byte value); + + /** + * Puts a byte[] property in this message. + * + * @param key property name + * @param value property value + */ + void putBytesProperty(SimpleString key, byte[] value); + + /** + * @see #putBytesProperty(SimpleString, byte[]) + */ + void putBytesProperty(String key, byte[] value); + + /** + * Puts a short property in this message. + * + * @param key property name + * @param value property value + */ + void putShortProperty(SimpleString key, short value); + + /** + * @see #putShortProperty(SimpleString, short) + */ + void putShortProperty(String key, short value); + + /** + * Puts a int property in this message. + * + * @param key property name + * @param value property value + */ + void putIntProperty(SimpleString key, int value); + + /** + * @see #putIntProperty(SimpleString, int) + */ + void putIntProperty(String key, int value); + + /** + * Puts a long property in this message. + * + * @param key property name + * @param value property value + */ + void putLongProperty(SimpleString key, long value); + + /** + * @see #putLongProperty(SimpleString, long) + */ + void putLongProperty(String key, long value); + + /** + * Puts a float property in this message. + * + * @param key property name + * @param value property value + */ + void putFloatProperty(SimpleString key, float value); + + /** + * @see #putFloatProperty(SimpleString, float) + */ + void putFloatProperty(String key, float value); + + /** + * Puts a double property in this message. + * + * @param key property name + * @param value property value + */ + void putDoubleProperty(SimpleString key, double value); + + /** + * @see #putDoubleProperty(SimpleString, double) + */ + void putDoubleProperty(String key, double value); + + /** + * Puts a SimpleString property in this message. + * + * @param key property name + * @param value property value + */ + void putStringProperty(SimpleString key, SimpleString value); + + /** + * Puts a String property in this message. + * + * @param key property name + * @param value property value + */ + void putStringProperty(String key, String value); + + /** + * Puts an Object property in this message. + * <br> + * Accepted types are: + * <ul> + * <li>Boolean</li> + * <li>Byte</li> + * <li>Short</li> + * <li>Integer</li> + * <li>Long</li> + * <li>Float</li> + * <li>Double</li> + * <li>String</li> + * <li>SimpleString</li> + * </ul> + * + * Using any other type will throw a PropertyConversionException. + * + * @param key property name + * @param value property value + * + * @throws PropertyConversionException if the value is not one of the accepted property types. + */ + void putObjectProperty(SimpleString key, Object value) throws PropertyConversionException; + + /** + * @see #putObjectProperty(SimpleString, Object) + */ + void putObjectProperty(String key, Object value) throws PropertyConversionException; + + /** + * Removes the property corresponding to the specified key. + * @param key property name + * @return the value corresponding to the specified key or @{code null} + */ + Object removeProperty(SimpleString key); + + + /** + * @see #removeProperty(SimpleString) + */ + Object removeProperty(String key); + + /** + * Returns {@code true} if this message contains a property with the given key, {@code false} else. + * + * @param key property name + */ + boolean containsProperty(SimpleString key); + + /** + * @see #containsProperty(SimpleString) + */ + boolean containsProperty(String key); + + /** + * Returns the property corresponding to the specified key as a Boolean. + * + * @throws PropertyConversionException if the value can not be converted to a Boolean + */ + Boolean getBooleanProperty(SimpleString key) throws PropertyConversionException; + + /** + * @see #getBooleanProperty(SimpleString) + */ + Boolean getBooleanProperty(String key) throws PropertyConversionException; + + /** + * Returns the property corresponding to the specified key as a Byte. + * + * @throws PropertyConversionException if the value can not be converted to a Byte + */ + Byte getByteProperty(SimpleString key) throws PropertyConversionException; + + /** + * @see #getByteProperty(SimpleString) + */ + Byte getByteProperty(String key) throws PropertyConversionException; + + /** + * Returns the property corresponding to the specified key as a Double. + * + * @throws PropertyConversionException if the value can not be converted to a Double + */ + Double getDoubleProperty(SimpleString key) throws PropertyConversionException; + + /** + * @see #getDoubleProperty(SimpleString) + */ + Double getDoubleProperty(String key) throws PropertyConversionException; + + /** + * Returns the property corresponding to the specified key as an Integer. + * + * @throws PropertyConversionException if the value can not be converted to an Integer + */ + Integer getIntProperty(SimpleString key) throws PropertyConversionException; + + /** + * @see #getIntProperty(SimpleString) + */ + Integer getIntProperty(String key) throws PropertyConversionException; + + /** + * Returns the property corresponding to the specified key as a Long. + * + * @throws PropertyConversionException if the value can not be converted to a Long + */ + Long getLongProperty(SimpleString key) throws PropertyConversionException; + + /** + * @see #getLongProperty(SimpleString) + */ + Long getLongProperty(String key) throws PropertyConversionException; + + /** + * Returns the property corresponding to the specified key + */ + Object getObjectProperty(SimpleString key); + + /** + * @see #getBooleanProperty(SimpleString) + */ + Object getObjectProperty(String key); + + /** + * Returns the property corresponding to the specified key as a Short. + * + * @throws PropertyConversionException if the value can not be converted to a Short + */ + Short getShortProperty(SimpleString key) throws PropertyConversionException; + + /** + * @see #getShortProperty(SimpleString) + */ + Short getShortProperty(String key) throws PropertyConversionException; + + /** + * Returns the property corresponding to the specified key as a Float. + * + * @throws PropertyConversionException if the value can not be converted to a Float + */ + Float getFloatProperty(SimpleString key) throws PropertyConversionException; + + /** + * @see #getFloatProperty(SimpleString) + */ + Float getFloatProperty(String key) throws PropertyConversionException; + + /** + * Returns the property corresponding to the specified key as a String. + * + * @throws PropertyConversionException if the value can not be converted to a String + */ + String getStringProperty(SimpleString key) throws PropertyConversionException; + + /** + * @see #getStringProperty(SimpleString) + */ + String getStringProperty(String key) throws PropertyConversionException; + + /** + * Returns the property corresponding to the specified key as a SimpleString. + * + * @throws PropertyConversionException if the value can not be converted to a SimpleString + */ + SimpleString getSimpleStringProperty(SimpleString key) throws PropertyConversionException; + + /** + * @see #getSimpleStringProperty(SimpleString) + */ + SimpleString getSimpleStringProperty(String key) throws PropertyConversionException; + + /** + * Returns the property corresponding to the specified key as a byte[]. + * + * @throws PropertyConversionException if the value can not be converted to a byte[] + */ + byte[] getBytesProperty(SimpleString key) throws PropertyConversionException; + + /** + * @see #getBytesProperty(SimpleString) + */ + byte[] getBytesProperty(String key) throws PropertyConversionException; + + /** + * Returns all the names of the properties for this message. + */ + Set<SimpleString> getPropertyNames(); + + /** + * @return Returns the message in Map form, useful when encoding to JSON + */ + Map<String, Object> toMap(); +} Copied: trunk/src/main/org/hornetq/api/core/PropertyConversionException.java (from rev 8723, trunk/src/main/org/hornetq/api/core/message/PropertyConversionException.java) =================================================================== --- trunk/src/main/org/hornetq/api/core/PropertyConversionException.java (rev 0) +++ trunk/src/main/org/hornetq/api/core/PropertyConversionException.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -0,0 +1,54 @@ +/* + * 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; + +/** + * A PropertyConversionException is thrown by Message methods + * when a property can not be converted to the expected type. + * + * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> + * + * @see Message + * + */ +public class PropertyConversionException extends RuntimeException +{ + + // Constants ----------------------------------------------------- + + private static final long serialVersionUID = -3010008708334904332L; + + // Attributes ---------------------------------------------------- + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + + public PropertyConversionException(final String message) + { + super(message); + } + + // Public -------------------------------------------------------- + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- + +} Copied: trunk/src/main/org/hornetq/api/core/TransportConfiguration.java (from rev 8723, trunk/src/main/org/hornetq/api/core/config/TransportConfiguration.java) =================================================================== --- trunk/src/main/org/hornetq/api/core/TransportConfiguration.java (rev 0) +++ trunk/src/main/org/hornetq/api/core/TransportConfiguration.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -0,0 +1,364 @@ +/* + * 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.HashMap; +import java.util.Map; + +import org.hornetq.utils.UUIDGenerator; + +/** + * A TransportConfiguration is used by a client to specify a connections to a server and its back up if one exists.<br><br> + * <p/> + * Typically the constructors take the classname and paramaters for needed to create the connection. These will be + * different dependant on what connector is beingused i.e. Netty or InVM etc. An example:<br><br> + * <p/> + * <code> + * HashMap<String, Object> map = new HashMap<String, Object>();<br> + * map.put("host", "localhost");<br> + * map.put("port", 5445);<br> + * TransportConfiguration config = new TransportConfiguration(InVMConnectorFactory.class.getName(), map); <br> + * ClientSessionFactory sf = new ClientSessionFactoryImpl(config); <br> + * </code><br><br> + * + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + */ +public class TransportConfiguration implements Serializable +{ + private static final long serialVersionUID = -3994528421527392679L; + + private String name; + + private String factoryClassName; + + private Map<String, Object> params; + + private static final byte TYPE_BOOLEAN = 0; + + private static final byte TYPE_INT = 1; + + private static final byte TYPE_LONG = 2; + + private static final byte TYPE_STRING = 3; + + /** + * Utility method for splitting a comma separated list of hosts + * + * @param commaSeparatedHosts the comma separated host string + * @return the hosts + */ + public static String[] splitHosts(final String commaSeparatedHosts) + { + if (commaSeparatedHosts == null) + { + return new String[0]; + } + String[] hosts = commaSeparatedHosts.split(","); + + for (int i = 0; i < hosts.length; i++) + { + hosts[i] = hosts[i].trim(); + } + return hosts; + } + + /** + * Creates a default TransportConfiguration with no configured transport. + */ + public TransportConfiguration() + { + } + + /** + * Creates a TransportConfiguration with a specific name providing the class name of the {@link org.hornetq.spi.core.remoting.ConnectorFactory} + * and any params needed. + * + * @param className The class name of the ConnectorFactory + * @param params The params needed by the ConnectorFactory + * @param name The name of this TransportConfiguration + */ + public TransportConfiguration(final String className, final Map<String, Object> params, final String name) + { + factoryClassName = className; + + this.params = params; + + this.name = name; + } + + /** + * Creates a TransportConfiguration providing the class name of the {@link org.hornetq.spi.core.remoting.ConnectorFactory} + * and any params needed. + * + * @param className The class name of the ConnectorFactory + * @param params The params needed by the ConnectorFactory + */ + public TransportConfiguration(final String className, final Map<String, Object> params) + { + this(className, params, UUIDGenerator.getInstance().generateStringUUID()); + } + + /** + * Creates a TransportConfiguration providing the class name of the {@link org.hornetq.spi.core.remoting.ConnectorFactory} + * + * @param className The class name of the ConnectorFactory + */ + public TransportConfiguration(final String className) + { + this(className, new HashMap<String, Object>(), UUIDGenerator.getInstance().generateStringUUID()); + } + + /** + * Returns the name of this TransportConfiguration. + * + * @return the name + */ + public String getName() + { + return name; + } + + /** + * Returns the class name of ConnectorFactory being used by this TransportConfiguration + * + * @return The classname + */ + public String getFactoryClassName() + { + return factoryClassName; + } + + /** + * Returns any params set for this TransportConfiguration + * + * @return the params + */ + public Map<String, Object> getParams() + { + return params; + } + + @Override + public int hashCode() + { + return factoryClassName.hashCode(); + } + + @Override + public boolean equals(final Object other) + { + if (other instanceof TransportConfiguration == false) + { + return false; + } + + TransportConfiguration kother = (TransportConfiguration) other; + + if (factoryClassName.equals(kother.factoryClassName)) + { + if (params == null) + { + return kother.params == null; + } + else + { + if (kother.params == null) + { + return false; + } + else if (params.size() == kother.params.size()) + { + for (Map.Entry<String, Object> entry : params.entrySet()) + { + Object thisVal = entry.getValue(); + + Object otherVal = kother.params.get(entry.getKey()); + + if (otherVal == null || !otherVal.equals(thisVal)) + { + return false; + } + } + return true; + } + else + { + return false; + } + } + } + else + { + return false; + } + } + + @Override + public String toString() + { + StringBuilder str = new StringBuilder(replaceWildcardChars(factoryClassName)); + + if (params != null) + { + if (!params.isEmpty()) + { + str.append("?"); + } + + boolean first = true; + for (Map.Entry<String, Object> entry : params.entrySet()) + { + if (!first) + { + str.append("&"); + } + String encodedKey = replaceWildcardChars(entry.getKey()); + + String val = entry.getValue().toString(); + String encodedVal = replaceWildcardChars(val); + + str.append(encodedKey).append('=').append(encodedVal); + + first = false; + } + } + + return str.toString(); + } + + /** + * Encodes this TransportConfiguration into a buffer. + * <p/> + * Note that this is only used internally HornetQ. + * + * @param buffer the buffer to encode into + */ + public void encode(final HornetQBuffer buffer) + { + buffer.writeString(name); + buffer.writeString(factoryClassName); + + buffer.writeInt(params == null ? 0 : params.size()); + + if (params != null) + { + for (Map.Entry<String, Object> entry : params.entrySet()) + { + buffer.writeString(entry.getKey()); + + Object val = entry.getValue(); + + if (val instanceof Boolean) + { + buffer.writeByte(TransportConfiguration.TYPE_BOOLEAN); + buffer.writeBoolean((Boolean) val); + } + else if (val instanceof Integer) + { + buffer.writeByte(TransportConfiguration.TYPE_INT); + buffer.writeInt((Integer) val); + } + else if (val instanceof Long) + { + buffer.writeByte(TransportConfiguration.TYPE_LONG); + buffer.writeLong((Long) val); + } + else if (val instanceof String) + { + buffer.writeByte(TransportConfiguration.TYPE_STRING); + buffer.writeString((String) val); + } + else + { + throw new IllegalArgumentException("Invalid type " + val); + } + } + } + } + + /** + * Decodes this TransportConfiguration from a buffer. + * <p/> + * Note this is only used internally by HornetQ + * + * @param buffer the biffer to decode from + */ + public void decode(final HornetQBuffer buffer) + { + name = buffer.readString(); + factoryClassName = buffer.readString(); + + int num = buffer.readInt(); + + if (params == null) + { + if (num > 0) + { + params = new HashMap<String, Object>(); + } + } + else + { + params.clear(); + } + + for (int i = 0; i < num; i++) + { + String key = buffer.readString(); + + byte type = buffer.readByte(); + + Object val; + + switch (type) + { + case TYPE_BOOLEAN: + { + val = buffer.readBoolean(); + + break; + } + case TYPE_INT: + { + val = buffer.readInt(); + + break; + } + case TYPE_LONG: + { + val = buffer.readLong(); + + break; + } + case TYPE_STRING: + { + val = buffer.readString(); + + break; + } + default: + { + throw new IllegalArgumentException("Invalid type " + type); + } + } + + params.put(key, val); + } + } + + private String replaceWildcardChars(final String str) + { + return str.replace('.', '-'); + } +} Deleted: trunk/src/main/org/hornetq/api/core/buffers/HornetQBuffer.java =================================================================== --- trunk/src/main/org/hornetq/api/core/buffers/HornetQBuffer.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/api/core/buffers/HornetQBuffer.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -1,1087 +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.core.buffers; - -import java.nio.ByteBuffer; - -import org.hornetq.api.SimpleString; -import org.jboss.netty.buffer.ChannelBuffer; - -/** - * - * A HornetQBuffer wraps a Netty's ChannelBuffer and is used throughout HornetQ code base. - * - * Much of it derived from Netty ChannelBuffer by Trustin Lee - * - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - * @see HornetQBuffers - * - */ -public interface HornetQBuffer -{ - /** - * Returns the underlying Netty's ChannelBuffer - * - * @return the underlying Netty's ChannelBuffer - */ - ChannelBuffer channelBuffer(); - - /** - * Returns the number of bytes this buffer can contain. - */ - int capacity(); - - /** - * Returns the {@code readerIndex} of this buffer. - */ - int readerIndex(); - - /** - * Sets the {@code readerIndex} of this buffer. - * - * @throws IndexOutOfBoundsException - * if the specified {@code readerIndex} is - * less than {@code 0} or - * greater than {@code this.writerIndex} - */ - void readerIndex(int readerIndex); - - /** - * Returns the {@code writerIndex} of this buffer. - */ - int writerIndex(); - - /** - * Sets the {@code writerIndex} of this buffer. - * - * @throws IndexOutOfBoundsException - * if the specified {@code writerIndex} is - * less than {@code this.readerIndex} or - * greater than {@code this.capacity} - */ - void writerIndex(int writerIndex); - - /** - * Sets the {@code readerIndex} and {@code writerIndex} of this buffer - * in one shot. This method is useful when you have to worry about the - * invocation order of {@link #readerIndex(int)} and {@link #writerIndex(int)} - * methods. For example, the following code will fail: - * - * <pre> - * // Create a buffer whose readerIndex, writerIndex and capacity are - * // 0, 0 and 8 respectively. - * ChannelBuffer buf = ChannelBuffers.buffer(8); - * - * // IndexOutOfBoundsException is thrown because the specified - * // readerIndex (2) cannot be greater than the current writerIndex (0). - * buf.readerIndex(2); - * buf.writerIndex(4); - * </pre> - * - * The following code will also fail: - * - * <pre> - * // Create a buffer whose readerIndex, writerIndex and capacity are - * // 0, 8 and 8 respectively. - * ChannelBuffer buf = ChannelBuffers.wrappedBuffer(new byte[8]); - * - * // readerIndex becomes 8. - * buf.readLong(); - * - * // IndexOutOfBoundsException is thrown because the specified - * // writerIndex (4) cannot be less than the current readerIndex (8). - * buf.writerIndex(4); - * buf.readerIndex(2); - * </pre> - * - * By contrast, {@link #setIndex(int, int)} guarantees that it never - * throws an {@link IndexOutOfBoundsException} as long as the specified - * indexes meet basic constraints, regardless what the current index - * values of the buffer are: - * - * <pre> - * // No matter what the current state of the buffer is, the following - * // call always succeeds as long as the capacity of the buffer is not - * // less than 4. - * buf.setIndex(2, 4); - * </pre> - * - * @throws IndexOutOfBoundsException - * if the specified {@code readerIndex} is less than 0, - * if the specified {@code writerIndex} is less than the specified - * {@code readerIndex} or if the specified {@code writerIndex} is - * greater than {@code this.capacity} - */ - void setIndex(int readerIndex, int writerIndex); - - /** - * Returns the number of readable bytes which is equal to - * {@code (this.writerIndex - this.readerIndex)}. - */ - int readableBytes(); - - /** - * Returns the number of writable bytes which is equal to - * {@code (this.capacity - this.writerIndex)}. - */ - int writableBytes(); - - /** - * Returns {@code true} - * if and only if {@code (this.writerIndex - this.readerIndex)} is greater - * than {@code 0}. - */ - boolean readable(); - - /** - * Returns {@code true} - * if and only if {@code (this.capacity - this.writerIndex)} is greater - * than {@code 0}. - */ - boolean writable(); - - /** - * Sets the {@code readerIndex} and {@code writerIndex} of this buffer to - * {@code 0}. - * This method is identical to {@link #setIndex(int, int) setIndex(0, 0)}. - * <p> - * Please note that the behavior of this method is different - * from that of NIO buffer, which sets the {@code limit} to - * the {@code capacity} of the buffer. - */ - void clear(); - - /** - * Marks the current {@code readerIndex} in this buffer. You can - * reposition the current {@code readerIndex} to the marked - * {@code readerIndex} by calling {@link #resetReaderIndex()}. - * The initial value of the marked {@code readerIndex} is {@code 0}. - */ - void markReaderIndex(); - - /** - * Repositions the current {@code readerIndex} to the marked - * {@code readerIndex} in this buffer. - * - * @throws IndexOutOfBoundsException - * if the current {@code writerIndex} is less than the marked - * {@code readerIndex} - */ - void resetReaderIndex(); - - /** - * Marks the current {@code writerIndex} in this buffer. You can - * reposition the current {@code writerIndex} to the marked - * {@code writerIndex} by calling {@link #resetWriterIndex()}. - * The initial value of the marked {@code writerIndex} is {@code 0}. - */ - void markWriterIndex(); - - /** - * Repositions the current {@code writerIndex} to the marked - * {@code writerIndex} in this buffer. - * - * @throws IndexOutOfBoundsException - * if the current {@code readerIndex} is greater than the marked - * {@code writerIndex} - */ - void resetWriterIndex(); - - /** - * Discards the bytes between the 0th index and {@code readerIndex}. - * It moves the bytes between {@code readerIndex} and {@code writerIndex} - * to the 0th index, and sets {@code readerIndex} and {@code writerIndex} - * to {@code 0} and {@code oldWriterIndex - oldReaderIndex} respectively. - * <p> - * Please refer to the class documentation for more detailed explanation. - */ - void discardReadBytes(); - - /** - * Gets a byte at the specified absolute {@code index} in this buffer. - * This method does not modify {@code readerIndex} or {@code writerIndex} of - * this buffer. - * - * @throws IndexOutOfBoundsException - * if the specified {@code index} is less than {@code 0} or - * {@code index + 1} is greater than {@code this.capacity} - */ - byte getByte(int index); - - /** - * Gets an unsigned byte at the specified absolute {@code index} in this - * buffer. This method does not modify {@code readerIndex} or - * {@code writerIndex} of this buffer. - * - * @throws IndexOutOfBoundsException - * if the specified {@code index} is less than {@code 0} or - * {@code index + 1} is greater than {@code this.capacity} - */ - short getUnsignedByte(int index); - - /** - * Gets a 16-bit short integer at the specified absolute {@code index} in - * this buffer. This method does not modify {@code readerIndex} or - * {@code writerIndex} of this buffer. - * - * @throws IndexOutOfBoundsException - * if the specified {@code index} is less than {@code 0} or - * {@code index + 2} is greater than {@code this.capacity} - */ - short getShort(int index); - - /** - * Gets an unsigned 16-bit short integer at the specified absolute - * {@code index} in this buffer. This method does not modify - * {@code readerIndex} or {@code writerIndex} of this buffer. - * - * @throws IndexOutOfBoundsException - * if the specified {@code index} is less than {@code 0} or - * {@code index + 2} is greater than {@code this.capacity} - */ - int getUnsignedShort(int index); - - /** - * Gets a 32-bit integer at the specified absolute {@code index} in - * this buffer. This method does not modify {@code readerIndex} or - * {@code writerIndex} of this buffer. - * - * @throws IndexOutOfBoundsException - * if the specified {@code index} is less than {@code 0} or - * {@code index + 4} is greater than {@code this.capacity} - */ - int getInt(int index); - - /** - * Gets an unsigned 32-bit integer at the specified absolute {@code index} - * in this buffer. This method does not modify {@code readerIndex} or - * {@code writerIndex} of this buffer. - * - * @throws IndexOutOfBoundsException - * if the specified {@code index} is less than {@code 0} or - * {@code index + 4} is greater than {@code this.capacity} - */ - long getUnsignedInt(int index); - - /** - * Gets a 64-bit long integer at the specified absolute {@code index} in - * this buffer. This method does not modify {@code readerIndex} or - * {@code writerIndex} of this buffer. - * - * @throws IndexOutOfBoundsException - * if the specified {@code index} is less than {@code 0} or - * {@code index + 8} is greater than {@code this.capacity} - */ - long getLong(int index); - - /** - * Transfers this buffer's data to the specified destination starting at - * the specified absolute {@code index} until the destination becomes - * non-writable. This method is basically same with - * {@link #getBytes(int, HornetQBuffer, int, int)}, except that this - * method increases the {@code writerIndex} of the destination by the - * number of the transferred bytes while - * {@link #getBytes(int, HornetQBuffer, int, int)} does not. - * This method does not modify {@code readerIndex} or {@code writerIndex} of - * the source buffer (i.e. {@code this}). - * - * @throws IndexOutOfBoundsException - * if the specified {@code index} is less than {@code 0} or - * if {@code index + dst.writableBytes} is greater than - * {@code this.capacity} - */ - void getBytes(int index, HornetQBuffer dst); - - /** - * Transfers this buffer's data to the specified destination starting at - * the specified absolute {@code index}. This method is basically same - * with {@link #getBytes(int, HornetQBuffer, int, int)}, except that this - * method increases the {@code writerIndex} of the destination by the - * number of the transferred bytes while - * {@link #getBytes(int, HornetQBuffer, int, int)} does not. - * This method does not modify {@code readerIndex} or {@code writerIndex} of - * the source buffer (i.e. {@code this}). - * - * @param length the number of bytes to transfer - * - * @throws IndexOutOfBoundsException - * if the specified {@code index} is less than {@code 0}, - * if {@code index + length} is greater than - * {@code this.capacity}, or - * if {@code length} is greater than {@code dst.writableBytes} - */ - void getBytes(int index, HornetQBuffer dst, int length); - - /** - * Transfers this buffer's data to the specified destination starting at - * the specified absolute {@code index}. - * This method does not modify {@code readerIndex} or {@code writerIndex} - * of both the source (i.e. {@code this}) and the destination. - * - * @param dstIndex the first index of the destination - * @param length the number of bytes to transfer - * - * @throws IndexOutOfBoundsException - * if the specified {@code index} is less than {@code 0}, - * if the specified {@code dstIndex} is less than {@code 0}, - * if {@code index + length} is greater than - * {@code this.capacity}, or - * if {@code dstIndex + length} is greater than - * {@code dst.capacity} - */ - void getBytes(int index, HornetQBuffer dst, int dstIndex, int length); - - /** - * Transfers this buffer's data to the specified destination starting at - * the specified absolute {@code index}. - * This method does not modify {@code readerIndex} or {@code writerIndex} of - * this buffer - * - * @throws IndexOutOfBoundsException - * if the specified {@code index} is less than {@code 0} or - * if {@code index + dst.length} is greater than - * {@code this.capacity} - */ - void getBytes(int index, byte[] dst); - - /** - * Transfers this buffer's data to the specified destination starting at - * the specified absolute {@code index}. - * This method does not modify {@code readerIndex} or {@code writerIndex} - * of this buffer. - * - * @param dstIndex the first index of the destination - * @param length the number of bytes to transfer - * - * @throws IndexOutOfBoundsException - * if the specified {@code index} is less than {@code 0}, - * if the specified {@code dstIndex} is less than {@code 0}, - * if {@code index + length} is greater than - * {@code this.capacity}, or - * if {@code dstIndex + length} is greater than - * {@code dst.length} - */ - void getBytes(int index, byte[] dst, int dstIndex, int length); - - /** - * Transfers this buffer's data to the specified destination starting at - * the specified absolute {@code index} until the destination's position - * reaches its limit. - * This method does not modify {@code readerIndex} or {@code writerIndex} of - * this buffer while the destination's {@code position} will be increased. - * - * @throws IndexOutOfBoundsException - * if the specified {@code index} is less than {@code 0} or - * if {@code index + dst.remaining()} is greater than - * {@code this.capacity} - */ - void getBytes(int index, ByteBuffer dst); - - /** - * Gets a char at the specified absolute {@code index} in - * this buffer. This method does not modify {@code readerIndex} or - * {@code writerIndex} of this buffer. - * - * @throws IndexOutOfBoundsException - * if the specified {@code index} is less than {@code 0} or - * {@code index + 2} is greater than {@code this.capacity} - */ - char getChar(int index); - - /** - * Gets a float at the specified absolute {@code index} in - * this buffer. This method does not modify {@code readerIndex} or - * {@code writerIndex} of this buffer. - * - * @throws IndexOutOfBoundsException - * if the specified {@code index} is less than {@code 0} or - * {@code index + 4} is greater than {@code this.capacity} - */ - float getFloat(int index); - - /** - * Gets a double at the specified absolute {@code index} in - * this buffer. This method does not modify {@code readerIndex} or - * {@code writerIndex} of this buffer. - * - * @throws IndexOutOfBoundsException - * if the specified {@code index} is less than {@code 0} or - * {@code index + 8} is greater than {@code this.capacity} - */ - double getDouble(int index); - - /** - * Sets the specified byte at the specified absolute {@code index} in this - * buffer. - * This method does not modify {@code readerIndex} or {@code writerIndex} of - * this buffer. - * - * @throws IndexOutOfBoundsException - * if the specified {@code index} is less than {@code 0} or - * {@code index + 1} is greater than {@code this.capacity} - */ - void setByte(int index, byte value); - - /** - * Sets the specified 16-bit short integer at the specified absolute - * {@code index} in this buffer. - * This method does not modify {@code readerIndex} or {@code writerIndex} of - * this buffer. - * - * @throws IndexOutOfBoundsException - * if the specified {@code index} is less than {@code 0} or - * {@code index + 2} is greater than {@code this.capacity} - */ - void setShort(int index, short value); - - /** - * Sets the specified 32-bit integer at the specified absolute - * {@code index} in this buffer. - * This method does not modify {@code readerIndex} or {@code writerIndex} of - * this buffer. - * - * @throws IndexOutOfBoundsException - * if the specified {@code index} is less than {@code 0} or - * {@code index + 4} is greater than {@code this.capacity} - */ - void setInt(int index, int value); - - /** - * Sets the specified 64-bit long integer at the specified absolute - * {@code index} in this buffer. - * This method does not modify {@code readerIndex} or {@code writerIndex} of - * this buffer. - * - * @throws IndexOutOfBoundsException - * if the specified {@code index} is less than {@code 0} or - * {@code index + 8} is greater than {@code this.capacity} - */ - void setLong(int index, long value); - - /** - * Transfers the specified source buffer's data to this buffer starting at - * the specified absolute {@code index} until the destination becomes - * unreadable. This method is basically same with - * {@link #setBytes(int, HornetQBuffer, int, int)}, except that this - * method increases the {@code readerIndex} of the source buffer by - * the number of the transferred bytes while - * {@link #getBytes(int, HornetQBuffer, int, int)} does not. - * This method does not modify {@code readerIndex} or {@code writerIndex} of - * the source buffer (i.e. {@code this}). - * - * @throws IndexOutOfBoundsException - * if the specified {@code index} is less than {@code 0} or - * if {@code index + src.readableBytes} is greater than - * {@code this.capacity} - */ - void setBytes(int index, HornetQBuffer src); - - /** - * Transfers the specified source buffer's data to this buffer starting at - * the specified absolute {@code index}. This method is basically same - * with {@link #setBytes(int, HornetQBuffer, int, int)}, except that this - * method increases the {@code readerIndex} of the source buffer by - * the number of the transferred bytes while - * {@link #getBytes(int, HornetQBuffer, int, int)} does not. - * This method does not modify {@code readerIndex} or {@code writerIndex} of - * the source buffer (i.e. {@code this}). - * - * @param length the number of bytes to transfer - * - * @throws IndexOutOfBoundsException - * if the specified {@code index} is less than {@code 0}, - * if {@code index + length} is greater than - * {@code this.capacity}, or - * if {@code length} is greater than {@code src.readableBytes} - */ - void setBytes(int index, HornetQBuffer src, int length); - - /** - * Transfers the specified source buffer's data to this buffer starting at - * the specified absolute {@code index}. - * This method does not modify {@code readerIndex} or {@code writerIndex} - * of both the source (i.e. {@code this}) and the destination. - * - * @param srcIndex the first index of the source - * @param length the number of bytes to transfer - * - * @throws IndexOutOfBoundsException - * if the specified {@code index} is less than {@code 0}, - * if the specified {@code srcIndex} is less than {@code 0}, - * if {@code index + length} is greater than - * {@code this.capacity}, or - * if {@code srcIndex + length} is greater than - * {@code src.capacity} - */ - void setBytes(int index, HornetQBuffer src, int srcIndex, int length); - - /** - * Transfers the specified source array's data to this buffer starting at - * the specified absolute {@code index}. - * This method does not modify {@code readerIndex} or {@code writerIndex} of - * this buffer. - * - * @throws IndexOutOfBoundsException - * if the specified {@code index} is less than {@code 0} or - * if {@code index + src.length} is greater than - * {@code this.capacity} - */ - void setBytes(int index, byte[] src); - - /** - * Transfers the specified source array's data to this buffer starting at - * the specified absolute {@code index}. - * This method does not modify {@code readerIndex} or {@code writerIndex} of - * this buffer. - * - * @throws IndexOutOfBoundsException - * if the specified {@code index} is less than {@code 0}, - * if the specified {@code srcIndex} is less than {@code 0}, - * if {@code index + length} is greater than - * {@code this.capacity}, or - * if {@code srcIndex + length} is greater than {@code src.length} - */ - void setBytes(int index, byte[] src, int srcIndex, int length); - - /** - * Transfers the specified source buffer's data to this buffer starting at - * the specified absolute {@code index} until the source buffer's position - * reaches its limit. - * This method does not modify {@code readerIndex} or {@code writerIndex} of - * this buffer. - * - * @throws IndexOutOfBoundsException - * if the specified {@code index} is less than {@code 0} or - * if {@code index + src.remaining()} is greater than - * {@code this.capacity} - */ - void setBytes(int index, ByteBuffer src); - - /** - * Sets the specified char at the specified absolute - * {@code index} in this buffer. - * This method does not modify {@code readerIndex} or {@code writerIndex} of - * this buffer. - * - * @throws IndexOutOfBoundsException - * if the specified {@code index} is less than {@code 0} or - * {@code index + 2} is greater than {@code this.capacity} - */ - void setChar(int index, char value); - - /** - * Sets the specified float at the specified absolute - * {@code index} in this buffer. - * This method does not modify {@code readerIndex} or {@code writerIndex} of - * this buffer. - * - * @throws IndexOutOfBoundsException - * if the specified {@code index} is less than {@code 0} or - * {@code index + 4} is greater than {@code this.capacity} - */ - void setFloat(int index, float value); - - /** - * Sets the specified double at the specified absolute - * {@code index} in this buffer. - * This method does not modify {@code readerIndex} or {@code writerIndex} of - * this buffer. - * - * @throws IndexOutOfBoundsException - * if the specified {@code index} is less than {@code 0} or - * {@code index + 8} is greater than {@code this.capacity} - */ - void setDouble(int index, double value); - - /** - * Gets a byte at the current {@code readerIndex} and increases - * the {@code readerIndex} by {@code 1} in this buffer. - * - * @throws IndexOutOfBoundsException - * if {@code this.readableBytes} is less than {@code 1} - */ - byte readByte(); - - /** - * Gets an unsigned byte at the current {@code readerIndex} and increases - * the {@code readerIndex} by {@code 1} in this buffer. - * - * @throws IndexOutOfBoundsException - * if {@code this.readableBytes} is less than {@code 1} - */ - short readUnsignedByte(); - - /** - * Gets a 16-bit short integer at the current {@code readerIndex} - * and increases the {@code readerIndex} by {@code 2} in this buffer. - * - * @throws IndexOutOfBoundsException - * if {@code this.readableBytes} is less than {@code 2} - */ - short readShort(); - - /** - * Gets an unsigned 16-bit short integer at the current {@code readerIndex} - * and increases the {@code readerIndex} by {@code 2} in this buffer. - * - * @throws IndexOutOfBoundsException - * if {@code this.readableBytes} is less than {@code 2} - */ - int readUnsignedShort(); - - /** - * Gets a 32-bit integer at the current {@code readerIndex} - * and increases the {@code readerIndex} by {@code 4} in this buffer. - * - * @throws IndexOutOfBoundsException - * if {@code this.readableBytes} is less than {@code 4} - */ - int readInt(); - - /** - * Gets an unsigned 32-bit integer at the current {@code readerIndex} - * and increases the {@code readerIndex} by {@code 4} in this buffer. - * - * @throws IndexOutOfBoundsException - * if {@code this.readableBytes} is less than {@code 4} - */ - long readUnsignedInt(); - - /** - * Gets a 64-bit integer at the current {@code readerIndex} - * and increases the {@code readerIndex} by {@code 8} in this buffer. - * - * @throws IndexOutOfBoundsException - * if {@code this.readableBytes} is less than {@code 8} - */ - long readLong(); - - /** - * Gets a char at the current {@code readerIndex} - * and increases the {@code readerIndex} by {@code 2} in this buffer. - * - * @throws IndexOutOfBoundsException - * if {@code this.readableBytes} is less than {@code 2} - */ - char readChar(); - - /** - * Gets a float at the current {@code readerIndex} - * and increases the {@code readerIndex} by {@code 4} in this buffer. - * - * @throws IndexOutOfBoundsException - * if {@code this.readableBytes} is less than {@code 4} - */ - float readFloat(); - - /** - * Gets a double at the current {@code readerIndex} - * and increases the {@code readerIndex} by {@code 8} in this buffer. - * - * @throws IndexOutOfBoundsException - * if {@code this.readableBytes} is less than {@code 8} - */ - double readDouble(); - - /** - * Gets a boolean at the current {@code readerIndex} - * and increases the {@code readerIndex} by {@code 1} in this buffer. - * - * @throws IndexOutOfBoundsException - * if {@code this.readableBytes} is less than {@code 1} - */ - boolean readBoolean(); - - /** - * Gets a SimpleString (potentially {@code null}) at the current {@code readerIndex} - */ - SimpleString readNullableSimpleString(); - - /** - * Gets a String (potentially {@code null}) at the current {@code readerIndex} - */ - String readNullableString(); - - /** - * Gets a non-null SimpleString at the current {@code readerIndex} - */ - SimpleString readSimpleString(); - - /** - * Gets a non-null String at the current {@code readerIndex} - */ - String readString(); - - /** - * Gets a UTF-8 String at the current {@code readerIndex} - */ - String readUTF(); - - /** - * Transfers this buffer's data to a newly created buffer starting at - * the current {@code readerIndex} and increases the {@code readerIndex} - * by the number of the transferred bytes (= {@code length}). - * The returned buffer's {@code readerIndex} and {@code writerIndex} are - * {@code 0} and {@code length} respectively. - * - * @param length the number of bytes to transfer - * - * @return the newly created buffer which contains the transferred bytes - * - * @throws IndexOutOfBoundsException - * if {@code length} is greater than {@code this.readableBytes} - */ - HornetQBuffer readBytes(int length); - - /** - * Returns a new slice of this buffer's sub-region starting at the current - * {@code readerIndex} and increases the {@code readerIndex} by the size - * of the new slice (= {@code length}). - * - * @param length the size of the new slice - * - * @return the newly created slice - * - * @throws IndexOutOfBoundsException - * if {@code length} is greater than {@code this.readableBytes} - */ - HornetQBuffer readSlice(int length); - - /** - * Transfers this buffer's data to the specified destination starting at - * the current {@code readerIndex} until the destination becomes - * non-writable, and increases the {@code readerIndex} by the number of the - * transferred bytes. This method is basically same with - * {@link #readBytes(HornetQBuffer, int, int)}, except that this method - * increases the {@code writerIndex} of the destination by the number of - * the transferred bytes while {@link #readBytes(HornetQBuffer, int, int)} - * does not. - * - * @throws IndexOutOfBoundsException - * if {@code dst.writableBytes} is greater than - * {@code this.readableBytes} - */ - void readBytes(HornetQBuffer dst); - - /** - * Transfers this buffer's data to the specified destination starting at - * the current {@code readerIndex} and increases the {@code readerIndex} - * by the number of the transferred bytes (= {@code length}). This method - * is basically same with {@link #readBytes(HornetQBuffer, int, int)}, - * except that this method increases the {@code writerIndex} of the - * destination by the number of the transferred bytes (= {@code length}) - * while {@link #readBytes(HornetQBuffer, int, int)} does not. - * - * @throws IndexOutOfBoundsException - * if {@code length} is greater than {@code this.readableBytes} or - * if {@code length} is greater than {@code dst.writableBytes} - */ - void readBytes(HornetQBuffer dst, int length); - - /** - * Transfers this buffer's data to the specified destination starting at - * the current {@code readerIndex} and increases the {@code readerIndex} - * by the number of the transferred bytes (= {@code length}). - * - * @param dstIndex the first index of the destination - * @param length the number of bytes to transfer - * - * @throws IndexOutOfBoundsException - * if the specified {@code dstIndex} is less than {@code 0}, - * if {@code length} is greater than {@code this.readableBytes}, or - * if {@code dstIndex + length} is greater than - * {@code dst.capacity} - */ - void readBytes(HornetQBuffer dst, int dstIndex, int length); - - /** - * Transfers this buffer's data to the specified destination starting at - * the current {@code readerIndex} and increases the {@code readerIndex} - * by the number of the transferred bytes (= {@code dst.length}). - * - * @throws IndexOutOfBoundsException - * if {@code dst.length} is greater than {@code this.readableBytes} - */ - void readBytes(byte[] dst); - - /** - * Transfers this buffer's data to the specified destination starting at - * the current {@code readerIndex} and increases the {@code readerIndex} - * by the number of the transferred bytes (= {@code length}). - * - * @param dstIndex the first index of the destination - * @param length the number of bytes to transfer - * - * @throws IndexOutOfBoundsException - * if the specified {@code dstIndex} is less than {@code 0}, - * if {@code length} is greater than {@code this.readableBytes}, or - * if {@code dstIndex + length} is greater than {@code dst.length} - */ - void readBytes(byte[] dst, int dstIndex, int length); - - /** - * Transfers this buffer's data to the specified destination starting at - * the current {@code readerIndex} until the destination's position - * reaches its limit, and increases the {@code readerIndex} by the - * number of the transferred bytes. - * - * @throws IndexOutOfBoundsException - * if {@code dst.remaining()} is greater than - * {@code this.readableBytes} - */ - void readBytes(ByteBuffer dst); - - /** - * Increases the current {@code readerIndex} by the specified - * {@code length} in this buffer. - * - * @throws IndexOutOfBoundsException - * if {@code length} is greater than {@code this.readableBytes} - */ - void skipBytes(int length); - - /** - * Sets the specified byte at the current {@code writerIndex} - * and increases the {@code writerIndex} by {@code 1} in this buffer. - * - * @throws IndexOutOfBoundsException - * if {@code this.writableBytes} is less than {@code 1} - */ - void writeByte(byte value); - - /** - * Sets the specified 16-bit short integer at the current - * {@code writerIndex} and increases the {@code writerIndex} by {@code 2} - * in this buffer. - * - * @throws IndexOutOfBoundsException - * if {@code this.writableBytes} is less than {@code 2} - */ - void writeShort(short value); - - /** - * Sets the specified 32-bit integer at the current {@code writerIndex} - * and increases the {@code writerIndex} by {@code 4} in this buffer. - * - * @throws IndexOutOfBoundsException - * if {@code this.writableBytes} is less than {@code 4} - */ - void writeInt(int value); - - /** - * Sets the specified 64-bit long integer at the current - * {@code writerIndex} and increases the {@code writerIndex} by {@code 8} - * in this buffer. - * - * @throws IndexOutOfBoundsException - * if {@code this.writableBytes} is less than {@code 8} - */ - void writeLong(long value); - - /** - * Sets the specified char at the current {@code writerIndex} - * and increases the {@code writerIndex} by {@code 2} in this buffer. - * - * @throws IndexOutOfBoundsException - * if {@code this.writableBytes} is less than {@code 2} - */ - void writeChar(char chr); - - /** - * Sets the specified float at the current {@code writerIndex} - * and increases the {@code writerIndex} by {@code 4} in this buffer. - * - * @throws IndexOutOfBoundsException - * if {@code this.writableBytes} is less than {@code 4} - */ - void writeFloat(float value); - - /** - * Sets the specified double at the current {@code writerIndex} - * and increases the {@code writerIndex} by {@code 8} in this buffer. - * - * @throws IndexOutOfBoundsException - * if {@code this.writableBytes} is less than {@code 8} - */ - void writeDouble(double value); - - /** - * Sets the specified boolean at the current {@code writerIndex} - */ - void writeBoolean(boolean val); - - /** - * Sets the specified SimpleString (potentially {@code null}) at the current {@code writerIndex} - */ - void writeNullableSimpleString(SimpleString val); - - /** - * Sets the specified String (potentially {@code null}) at the current {@code writerIndex} - */ - void writeNullableString(String val); - - /** - * Sets the specified non-null SimpleString at the current {@code writerIndex} - */ - void writeSimpleString(SimpleString val); - - /** - * Sets the specified non-null String at the current {@code writerIndex} - */ - void writeString(String val); - - /** - * Sets the specified UTF-8 String at the current {@code writerIndex} - */ - - void writeUTF(String utf); - - /** - * Transfers the specified source buffer's data to this buffer starting at - * the current {@code writerIndex} and increases the {@code writerIndex} - * by the number of the transferred bytes (= {@code length}). This method - * is basically same with {@link #writeBytes(HornetQBuffer, int, int)}, - * except that this method increases the {@code readerIndex} of the source - * buffer by the number of the transferred bytes (= {@code length}) while - * {@link #writeBytes(HornetQBuffer, int, int)} does not. - * - * @param length the number of bytes to transfer - * - * @throws IndexOutOfBoundsException - * if {@code length} is greater than {@code this.writableBytes} or - * if {@code length} is greater then {@code src.readableBytes} - */ - void writeBytes(HornetQBuffer src, int length); - - /** - * Transfers the specified source buffer's data to this buffer starting at - * the current {@code writerIndex} and increases the {@code writerIndex} - * by the number of the transferred bytes (= {@code length}). - * - * @param srcIndex the first index of the source - * @param length the number of bytes to transfer - * - * @throws IndexOutOfBoundsException - * if the specified {@code srcIndex} is less than {@code 0}, - * if {@code srcIndex + length} is greater than - * {@code src.capacity}, or - * if {@code length} is greater than {@code this.writableBytes} - */ - void writeBytes(HornetQBuffer src, int srcIndex, int length); - - /** - * Transfers the specified source array's data to this buffer starting at - * the current {@code writerIndex} and increases the {@code writerIndex} - * by the number of the transferred bytes (= {@code src.length}). - * - * @throws IndexOutOfBoundsException - * if {@code src.length} is greater than {@code this.writableBytes} - */ - void writeBytes(byte[] src); - - /** - * Transfers the specified source array's data to this buffer starting at - * the current {@code writerIndex} and increases the {@code writerIndex} - * by the number of the transferred bytes (= {@code length}). - * - * @param srcIndex the first index of the source - * @param length the number of bytes to transfer - * - * @throws IndexOutOfBoundsException - * if the specified {@code srcIndex} is less than {@code 0}, - * if {@code srcIndex + length} is greater than - * {@code src.length}, or - * if {@code length} is greater than {@code this.writableBytes} - */ - void writeBytes(byte[] src, int srcIndex, int length); - - /** - * Transfers the specified source buffer's data to this buffer starting at - * the current {@code writerIndex} until the source buffer's position - * reaches its limit, and increases the {@code writerIndex} by the - * number of the transferred bytes. - * - * @throws IndexOutOfBoundsException - * if {@code src.remaining()} is greater than - * {@code this.writableBytes} - */ - void writeBytes(ByteBuffer src); - - /** - * Returns a copy of this buffer's readable bytes. Modifying the content - * of the returned buffer or this buffer does not affect each other at all. - * This method is identical to {@code buf.copy(buf.readerIndex(), buf.readableBytes())}. - * This method does not modify {@code readerIndex} or {@code writerIndex} of - * this buffer. - * - */ - HornetQBuffer copy(); - - /** - * Returns a copy of this buffer's sub-region. Modifying the content of - * the returned buffer or this buffer does not affect each other at all. - * This method does not modify {@code readerIndex} or {@code writerIndex} of - * this buffer. - */ - HornetQBuffer copy(int index, int length); - - /** - * Returns a slice of this buffer's readable bytes. Modifying the content - * of the returned buffer or this buffer affects each other's content - * while they maintain separate indexes and marks. This method is - * identical to {@code buf.slice(buf.readerIndex(), buf.readableBytes())}. - * This method does not modify {@code readerIndex} or {@code writerIndex} of - * this buffer. - */ - HornetQBuffer slice(); - - /** - * Returns a slice of this buffer's sub-region. Modifying the content of - * the returned buffer or this buffer affects each other's content while - * they maintain separate indexes and marks. - * This method does not modify {@code readerIndex} or {@code writerIndex} of - * this buffer. - */ - HornetQBuffer slice(int index, int length); - - /** - * Returns a buffer which shares the whole region of this buffer. - * Modifying the content of the returned buffer or this buffer affects - * each other's content while they maintain separate indexes and marks. - * This method is identical to {@code buf.slice(0, buf.capacity())}. - * This method does not modify {@code readerIndex} or {@code writerIndex} of - * this buffer. - */ - HornetQBuffer duplicate(); - - /** - * Converts this buffer's readable bytes into a NIO buffer. The returned - * buffer might or might not share the content with this buffer, while - * they have separate indexes and marks. This method is identical to - * {@code buf.toByteBuffer(buf.readerIndex(), buf.readableBytes())}. - * This method does not modify {@code readerIndex} or {@code writerIndex} of - * this buffer. - */ - ByteBuffer toByteBuffer(); - - /** - * Converts this buffer's sub-region into a NIO buffer. The returned - * buffer might or might not share the content with this buffer, while - * they have separate indexes and marks. - * This method does not modify {@code readerIndex} or {@code writerIndex} of - * this buffer. - */ - ByteBuffer toByteBuffer(int index, int length); -} Deleted: trunk/src/main/org/hornetq/api/core/buffers/HornetQBuffers.java =================================================================== --- trunk/src/main/org/hornetq/api/core/buffers/HornetQBuffers.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/api/core/buffers/HornetQBuffers.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -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.api.core.buffers; - -import java.nio.ByteBuffer; - -import org.hornetq.core.buffers.impl.ChannelBufferWrapper; -import org.jboss.netty.buffer.ChannelBuffer; -import org.jboss.netty.buffer.ChannelBuffers; - -/** - * Factory class to create HornetQBuffers - * - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - */ -public class HornetQBuffers -{ - /** - * Creates a <em>self-expanding</em> HornetQBuffer with the given initial size - * - * @param size the initial size of the created HornetQBuffer - * @return a self-expanding HornetQBuffer starting with the given size - */ - public static HornetQBuffer dynamicBuffer(final int size) - { - return new ChannelBufferWrapper(ChannelBuffers.dynamicBuffer(size)); - } - - /** - * Creates a <em>self-expanding</em> HornetQBuffer filled with the given byte array - * - * @param bytes the created buffer will be initially filled with this byte array - * @return a self-expanding HornetQBuffer filled with the given byte array - */ - public static HornetQBuffer dynamicBuffer(final byte[] bytes) - { - ChannelBuffer buff = ChannelBuffers.dynamicBuffer(bytes.length); - - buff.writeBytes(bytes); - - return new ChannelBufferWrapper(buff); - } - - /** - * Creates a HornetQBuffer wrapping the underlying NIO ByteBuffer - * - * The position on this buffer won't affect the position on the inner buffer - * - * @param underlying the underlying NIO ByteBuffer - * @return a HornetQBuffer wrapping the underlying NIO ByteBuffer - */ - public static HornetQBuffer wrappedBuffer(final ByteBuffer underlying) - { - HornetQBuffer buff = new ChannelBufferWrapper(ChannelBuffers.wrappedBuffer(underlying)); - - buff.clear(); - - return buff; - } - - /** - * Creates a HornetQBuffer wrapping the underlying byte array - * - * @param underlying the underlying byte array - * @return a HornetQBuffer wrapping the underlying byte array - */ - public static HornetQBuffer wrappedBuffer(final byte[] underlying) - { - return new ChannelBufferWrapper(ChannelBuffers.wrappedBuffer(underlying)); - } - - /** - * Creates a <em>fixed</em> HornetQBuffer of the given size - * - * @param size the size of the created HornetQBuffer - * @return a fixed HornetQBuffer with the given size - */ - public static HornetQBuffer fixedBuffer(final int size) - { - return new ChannelBufferWrapper(ChannelBuffers.buffer(size)); - } -} Modified: trunk/src/main/org/hornetq/api/core/buffers/package-info.java =================================================================== --- trunk/src/main/org/hornetq/api/core/buffers/package-info.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/api/core/buffers/package-info.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -26,7 +26,7 @@ * * <h2>Usage</h2> * - * Always use the static methods declared at {@link org.hornetq.api.core.buffers.HornetQBuffers} to create the buffers. + * Always use the static methods declared at {@link org.hornetq.api.core.HornetQBuffers} to create the buffers. */ package org.hornetq.api.core.buffers; Modified: trunk/src/main/org/hornetq/api/core/client/ClientConsumer.java =================================================================== --- trunk/src/main/org/hornetq/api/core/client/ClientConsumer.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/api/core/client/ClientConsumer.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,7 +13,7 @@ package org.hornetq.api.core.client; -import org.hornetq.api.core.exception.HornetQException; +import org.hornetq.api.core.HornetQException; /** * A ClientConsumer receives messages from HornetQ queues. Modified: trunk/src/main/org/hornetq/api/core/client/ClientMessage.java =================================================================== --- trunk/src/main/org/hornetq/api/core/client/ClientMessage.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/api/core/client/ClientMessage.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -16,8 +16,8 @@ import java.io.InputStream; import java.io.OutputStream; -import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.message.Message; +import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.Message; /** * 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:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/api/core/client/ClientProducer.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -14,8 +14,8 @@ package org.hornetq.api.core.client; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.message.Message; +import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.Message; /** * 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/ClientSession.java =================================================================== --- trunk/src/main/org/hornetq/api/core/client/ClientSession.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/api/core/client/ClientSession.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -18,7 +18,7 @@ import javax.transaction.xa.XAResource; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.exception.HornetQException; +import org.hornetq.api.core.HornetQException; /** * 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:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/api/core/client/ClientSessionFactory.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -16,10 +16,10 @@ 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.TransportConfiguration; import org.hornetq.api.core.client.loadbalance.ConnectionLoadBalancingPolicy; -import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.interceptor.Interceptor; /** * A ClientSessionFactory is the entry point to create and configure HornetQ resources to produce and consume messages. @@ -410,7 +410,7 @@ * assign a group ID to the messages they sent. * * if <code>true</code>, a random unique group ID is created and set on each message for the property - * {@link org.hornetq.api.core.message.Message#HDR_GROUP_ID}. + * {@link org.hornetq.api.core.Message#HDR_GROUP_ID}. * Default value is {@link HornetQClient#DEFAULT_AUTO_GROUP}. * * @return whether producers will automatically assign a group ID to their messages @@ -426,7 +426,7 @@ void setAutoGroup(boolean autoGroup); /** - * Returns the group ID that will be eventually set on each message for the property {@link org.hornetq.api.core.message.Message#HDR_GROUP_ID}. + * Returns the group ID that will be eventually set on each message for the property {@link org.hornetq.api.core.Message#HDR_GROUP_ID}. * * Default value is is <code>null</code> and no group ID will be set on the messages. * Deleted: trunk/src/main/org/hornetq/api/core/client/ClientSessionFactoryImpl.java =================================================================== --- trunk/src/main/org/hornetq/api/core/client/ClientSessionFactoryImpl.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/api/core/client/ClientSessionFactoryImpl.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -1,1116 +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.core.client; - -import java.io.Serializable; -import java.net.InetAddress; -import java.util.ArrayList; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.CopyOnWriteArrayList; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.ThreadFactory; -import java.util.concurrent.TimeUnit; - -import org.hornetq.api.Pair; -import org.hornetq.api.core.client.loadbalance.ConnectionLoadBalancingPolicy; -import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.interceptor.Interceptor; -import org.hornetq.core.client.impl.ClientSessionFactoryInternal; -import org.hornetq.core.client.impl.FailoverManager; -import org.hornetq.core.client.impl.FailoverManagerImpl; -import org.hornetq.core.cluster.DiscoveryEntry; -import org.hornetq.core.cluster.DiscoveryGroup; -import org.hornetq.core.cluster.DiscoveryListener; -import org.hornetq.core.cluster.impl.DiscoveryGroupImpl; -import org.hornetq.core.logging.Logger; -import org.hornetq.utils.HornetQThreadFactory; -import org.hornetq.utils.UUIDGenerator; - -/** - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * @author <a href="mailto:clebert.suconic@jboss.org">Clebert Suconic</a> - * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> - * @author <a href="mailto:ataylor@redhat.com">Andy Taylor</a> - * @version <tt>$Revision: 3602 $</tt> - * - */ -public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, DiscoveryListener, Serializable -{ - // Constants - // ------------------------------------------------------------------------------------ - - private static final long serialVersionUID = 2512460695662741413L; - - private static final Logger log = Logger.getLogger(ClientSessionFactoryImpl.class); - - // Attributes - // ----------------------------------------------------------------------------------- - - private final Map<Pair<TransportConfiguration, TransportConfiguration>, FailoverManager> failoverManagerMap = new LinkedHashMap<Pair<TransportConfiguration, TransportConfiguration>, FailoverManager>(); - - private volatile boolean receivedBroadcast = false; - - private ExecutorService threadPool; - - private ScheduledExecutorService scheduledThreadPool; - - private DiscoveryGroup discoveryGroup; - - private ConnectionLoadBalancingPolicy loadBalancingPolicy; - - private FailoverManager[] failoverManagerArray; - - private boolean readOnly; - - // Settable attributes: - - private boolean cacheLargeMessagesClient = HornetQClient.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT; - - private List<Pair<TransportConfiguration, TransportConfiguration>> staticConnectors; - - private String discoveryAddress; - - private int discoveryPort; - - private long discoveryRefreshTimeout; - - private long discoveryInitialWaitTimeout; - - private long clientFailureCheckPeriod; - - private long connectionTTL; - - private long callTimeout; - - private int minLargeMessageSize; - - private int consumerWindowSize; - - private int consumerMaxRate; - - private int confirmationWindowSize; - - private int producerWindowSize; - - private int producerMaxRate; - - private boolean blockOnAcknowledge; - - private boolean blockOnDurableSend; - - private boolean blockOnNonDurableSend; - - private boolean autoGroup; - - private boolean preAcknowledge; - - private String connectionLoadBalancingPolicyClassName; - - private int ackBatchSize; - - private boolean useGlobalPools; - - private int scheduledThreadPoolMaxSize; - - private int threadPoolMaxSize; - - private long retryInterval; - - private double retryIntervalMultiplier; - - private long maxRetryInterval; - - private int reconnectAttempts; - - private int initialMessagePacketSize; - - private volatile boolean closed; - - private boolean failoverOnServerShutdown; - - private final List<Interceptor> interceptors = new CopyOnWriteArrayList<Interceptor>(); - - private static ExecutorService globalThreadPool; - - private static ScheduledExecutorService globalScheduledThreadPool; - - private String groupID; - - private static synchronized ExecutorService getGlobalThreadPool() - { - if (ClientSessionFactoryImpl.globalThreadPool == null) - { - ThreadFactory factory = new HornetQThreadFactory("HornetQ-client-global-threads", true); - - ClientSessionFactoryImpl.globalThreadPool = Executors.newCachedThreadPool(factory); - } - - return ClientSessionFactoryImpl.globalThreadPool; - } - - private static synchronized ScheduledExecutorService getGlobalScheduledThreadPool() - { - if (ClientSessionFactoryImpl.globalScheduledThreadPool == null) - { - ThreadFactory factory = new HornetQThreadFactory("HornetQ-client-global-scheduled-threads", true); - - ClientSessionFactoryImpl.globalScheduledThreadPool = Executors.newScheduledThreadPool(HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, - factory); - } - - return ClientSessionFactoryImpl.globalScheduledThreadPool; - } - - private void setThreadPools() - { - if (useGlobalPools) - { - threadPool = ClientSessionFactoryImpl.getGlobalThreadPool(); - - scheduledThreadPool = ClientSessionFactoryImpl.getGlobalScheduledThreadPool(); - } - else - { - ThreadFactory factory = new HornetQThreadFactory("HornetQ-client-factory-threads-" + System.identityHashCode(this), - true); - - if (threadPoolMaxSize == -1) - { - threadPool = Executors.newCachedThreadPool(factory); - } - else - { - threadPool = Executors.newFixedThreadPool(threadPoolMaxSize, factory); - } - - factory = new HornetQThreadFactory("HornetQ-client-factory-pinger-threads-" + System.identityHashCode(this), - true); - - scheduledThreadPool = Executors.newScheduledThreadPool(scheduledThreadPoolMaxSize, factory); - } - } - - private synchronized void initialise() throws Exception - { - if (!readOnly) - { - setThreadPools(); - - instantiateLoadBalancingPolicy(); - - if (discoveryAddress != null) - { - InetAddress groupAddress = InetAddress.getByName(discoveryAddress); - - discoveryGroup = new DiscoveryGroupImpl(UUIDGenerator.getInstance().generateStringUUID(), - discoveryAddress, - groupAddress, - discoveryPort, - discoveryRefreshTimeout); - - discoveryGroup.registerListener(this); - - discoveryGroup.start(); - } - else if (staticConnectors != null) - { - for (Pair<TransportConfiguration, TransportConfiguration> pair : staticConnectors) - { - FailoverManager cm = new FailoverManagerImpl(this, - pair.a, - pair.b, - failoverOnServerShutdown, - callTimeout, - clientFailureCheckPeriod, - connectionTTL, - retryInterval, - retryIntervalMultiplier, - maxRetryInterval, - reconnectAttempts, - threadPool, - scheduledThreadPool, - interceptors); - - failoverManagerMap.put(pair, cm); - } - - updatefailoverManagerArray(); - } - else - { - throw new IllegalStateException("Before using a session factory you must either set discovery address and port or " + "provide some static transport configuration"); - } - readOnly = true; - } - } - - // Static - // --------------------------------------------------------------------------------------- - - // Constructors - // --------------------------------------------------------------------------------- - - public ClientSessionFactoryImpl(final ClientSessionFactory other) - { - discoveryAddress = other.getDiscoveryAddress(); - - discoveryPort = other.getDiscoveryPort(); - - staticConnectors = other.getStaticConnectors(); - - discoveryRefreshTimeout = other.getDiscoveryRefreshTimeout(); - - clientFailureCheckPeriod = other.getClientFailureCheckPeriod(); - - connectionTTL = other.getConnectionTTL(); - - callTimeout = other.getCallTimeout(); - - minLargeMessageSize = other.getMinLargeMessageSize(); - - consumerWindowSize = other.getConsumerWindowSize(); - - consumerMaxRate = other.getConsumerMaxRate(); - - confirmationWindowSize = other.getConfirmationWindowSize(); - - producerWindowSize = other.getProducerWindowSize(); - - producerMaxRate = other.getProducerMaxRate(); - - blockOnAcknowledge = other.isBlockOnAcknowledge(); - - blockOnDurableSend = other.isBlockOnDurableSend(); - - blockOnNonDurableSend = other.isBlockOnNonDurableSend(); - - autoGroup = other.isAutoGroup(); - - preAcknowledge = other.isPreAcknowledge(); - - ackBatchSize = other.getAckBatchSize(); - - connectionLoadBalancingPolicyClassName = other.getConnectionLoadBalancingPolicyClassName(); - - discoveryInitialWaitTimeout = other.getDiscoveryInitialWaitTimeout(); - - useGlobalPools = other.isUseGlobalPools(); - - scheduledThreadPoolMaxSize = other.getScheduledThreadPoolMaxSize(); - - threadPoolMaxSize = other.getThreadPoolMaxSize(); - - retryInterval = other.getRetryInterval(); - - retryIntervalMultiplier = other.getRetryIntervalMultiplier(); - - maxRetryInterval = other.getMaxRetryInterval(); - - reconnectAttempts = other.getReconnectAttempts(); - - failoverOnServerShutdown = other.isFailoverOnServerShutdown(); - - cacheLargeMessagesClient = other.isCacheLargeMessagesClient(); - - initialMessagePacketSize = other.getInitialMessagePacketSize(); - - groupID = other.getGroupID(); - } - - public ClientSessionFactoryImpl() - { - discoveryRefreshTimeout = HornetQClient.DEFAULT_DISCOVERY_REFRESH_TIMEOUT; - - clientFailureCheckPeriod = HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD; - - connectionTTL = HornetQClient.DEFAULT_CONNECTION_TTL; - - callTimeout = HornetQClient.DEFAULT_CALL_TIMEOUT; - - minLargeMessageSize = HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE; - - consumerWindowSize = HornetQClient.DEFAULT_CONSUMER_WINDOW_SIZE; - - consumerMaxRate = HornetQClient.DEFAULT_CONSUMER_MAX_RATE; - - confirmationWindowSize = HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE; - - producerWindowSize = HornetQClient.DEFAULT_PRODUCER_WINDOW_SIZE; - - producerMaxRate = HornetQClient.DEFAULT_PRODUCER_MAX_RATE; - - blockOnAcknowledge = HornetQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE; - - blockOnDurableSend = HornetQClient.DEFAULT_BLOCK_ON_DURABLE_SEND; - - blockOnNonDurableSend = HornetQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND; - - autoGroup = HornetQClient.DEFAULT_AUTO_GROUP; - - preAcknowledge = HornetQClient.DEFAULT_PRE_ACKNOWLEDGE; - - ackBatchSize = HornetQClient.DEFAULT_ACK_BATCH_SIZE; - - connectionLoadBalancingPolicyClassName = HornetQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME; - - discoveryInitialWaitTimeout = HornetQClient.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT; - - useGlobalPools = HornetQClient.DEFAULT_USE_GLOBAL_POOLS; - - scheduledThreadPoolMaxSize = HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE; - - threadPoolMaxSize = HornetQClient.DEFAULT_THREAD_POOL_MAX_SIZE; - - retryInterval = HornetQClient.DEFAULT_RETRY_INTERVAL; - - retryIntervalMultiplier = HornetQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER; - - maxRetryInterval = HornetQClient.DEFAULT_MAX_RETRY_INTERVAL; - - reconnectAttempts = HornetQClient.DEFAULT_RECONNECT_ATTEMPTS; - - failoverOnServerShutdown = HornetQClient.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN; - - cacheLargeMessagesClient = HornetQClient.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT; - - initialMessagePacketSize = HornetQClient.DEFAULT_INITIAL_MESSAGE_PACKET_SIZE; - } - - public ClientSessionFactoryImpl(final String discoveryAddress, final int discoveryPort) - { - this(); - - this.discoveryAddress = discoveryAddress; - - this.discoveryPort = discoveryPort; - } - - public ClientSessionFactoryImpl(final List<Pair<TransportConfiguration, TransportConfiguration>> staticConnectors) - { - this(); - - this.staticConnectors = staticConnectors; - } - - public ClientSessionFactoryImpl(final TransportConfiguration connectorConfig, - final TransportConfiguration backupConnectorConfig) - { - this(); - - staticConnectors = new ArrayList<Pair<TransportConfiguration, TransportConfiguration>>(); - - staticConnectors.add(new Pair<TransportConfiguration, TransportConfiguration>(connectorConfig, - backupConnectorConfig)); - } - - public ClientSessionFactoryImpl(final TransportConfiguration connectorConfig) - { - this(connectorConfig, null); - } - - // ClientSessionFactory implementation------------------------------------------------------------ - - public synchronized boolean isCacheLargeMessagesClient() - { - return cacheLargeMessagesClient; - } - - public synchronized void setCacheLargeMessagesClient(final boolean cached) - { - cacheLargeMessagesClient = cached; - } - - public synchronized List<Pair<TransportConfiguration, TransportConfiguration>> getStaticConnectors() - { - return staticConnectors; - } - - public synchronized void setStaticConnectors(final List<Pair<TransportConfiguration, TransportConfiguration>> staticConnectors) - { - checkWrite(); - - this.staticConnectors = staticConnectors; - } - - public synchronized long getClientFailureCheckPeriod() - { - return clientFailureCheckPeriod; - } - - public synchronized void setClientFailureCheckPeriod(final long clientFailureCheckPeriod) - { - checkWrite(); - this.clientFailureCheckPeriod = clientFailureCheckPeriod; - } - - public synchronized long getConnectionTTL() - { - return connectionTTL; - } - - public synchronized void setConnectionTTL(final long connectionTTL) - { - checkWrite(); - this.connectionTTL = connectionTTL; - } - - public synchronized long getCallTimeout() - { - return callTimeout; - } - - public synchronized void setCallTimeout(final long callTimeout) - { - checkWrite(); - this.callTimeout = callTimeout; - } - - public synchronized int getMinLargeMessageSize() - { - return minLargeMessageSize; - } - - public synchronized void setMinLargeMessageSize(final int minLargeMessageSize) - { - checkWrite(); - this.minLargeMessageSize = minLargeMessageSize; - } - - public synchronized int getConsumerWindowSize() - { - return consumerWindowSize; - } - - public synchronized void setConsumerWindowSize(final int consumerWindowSize) - { - checkWrite(); - this.consumerWindowSize = consumerWindowSize; - } - - public synchronized int getConsumerMaxRate() - { - return consumerMaxRate; - } - - public synchronized void setConsumerMaxRate(final int consumerMaxRate) - { - checkWrite(); - this.consumerMaxRate = consumerMaxRate; - } - - public synchronized int getConfirmationWindowSize() - { - return confirmationWindowSize; - } - - public synchronized void setConfirmationWindowSize(final int confirmationWindowSize) - { - checkWrite(); - this.confirmationWindowSize = confirmationWindowSize; - } - - public synchronized int getProducerWindowSize() - { - return producerWindowSize; - } - - public synchronized void setProducerWindowSize(final int producerWindowSize) - { - checkWrite(); - this.producerWindowSize = producerWindowSize; - } - - public synchronized int getProducerMaxRate() - { - return producerMaxRate; - } - - public synchronized void setProducerMaxRate(final int producerMaxRate) - { - checkWrite(); - this.producerMaxRate = producerMaxRate; - } - - public synchronized boolean isBlockOnAcknowledge() - { - return blockOnAcknowledge; - } - - public synchronized void setBlockOnAcknowledge(final boolean blockOnAcknowledge) - { - checkWrite(); - this.blockOnAcknowledge = blockOnAcknowledge; - } - - public synchronized boolean isBlockOnDurableSend() - { - return blockOnDurableSend; - } - - public synchronized void setBlockOnDurableSend(final boolean blockOnDurableSend) - { - checkWrite(); - this.blockOnDurableSend = blockOnDurableSend; - } - - public synchronized boolean isBlockOnNonDurableSend() - { - return blockOnNonDurableSend; - } - - public synchronized void setBlockOnNonDurableSend(final boolean blockOnNonDurableSend) - { - checkWrite(); - this.blockOnNonDurableSend = blockOnNonDurableSend; - } - - public synchronized boolean isAutoGroup() - { - return autoGroup; - } - - public synchronized void setAutoGroup(final boolean autoGroup) - { - checkWrite(); - this.autoGroup = autoGroup; - } - - public synchronized boolean isPreAcknowledge() - { - return preAcknowledge; - } - - public synchronized void setPreAcknowledge(final boolean preAcknowledge) - { - checkWrite(); - this.preAcknowledge = preAcknowledge; - } - - public synchronized int getAckBatchSize() - { - return ackBatchSize; - } - - public synchronized void setAckBatchSize(final int ackBatchSize) - { - checkWrite(); - this.ackBatchSize = ackBatchSize; - } - - public synchronized long getDiscoveryInitialWaitTimeout() - { - return discoveryInitialWaitTimeout; - } - - public synchronized void setDiscoveryInitialWaitTimeout(final long initialWaitTimeout) - { - checkWrite(); - discoveryInitialWaitTimeout = initialWaitTimeout; - } - - public synchronized boolean isUseGlobalPools() - { - return useGlobalPools; - } - - public synchronized void setUseGlobalPools(final boolean useGlobalPools) - { - checkWrite(); - this.useGlobalPools = useGlobalPools; - } - - public synchronized int getScheduledThreadPoolMaxSize() - { - return scheduledThreadPoolMaxSize; - } - - public synchronized void setScheduledThreadPoolMaxSize(final int scheduledThreadPoolMaxSize) - { - checkWrite(); - this.scheduledThreadPoolMaxSize = scheduledThreadPoolMaxSize; - } - - public synchronized int getThreadPoolMaxSize() - { - return threadPoolMaxSize; - } - - public synchronized void setThreadPoolMaxSize(final int threadPoolMaxSize) - { - checkWrite(); - this.threadPoolMaxSize = threadPoolMaxSize; - } - - public synchronized long getRetryInterval() - { - return retryInterval; - } - - public synchronized void setRetryInterval(final long retryInterval) - { - checkWrite(); - this.retryInterval = retryInterval; - } - - public synchronized long getMaxRetryInterval() - { - return maxRetryInterval; - } - - public synchronized void setMaxRetryInterval(final long retryInterval) - { - checkWrite(); - maxRetryInterval = retryInterval; - } - - public synchronized double getRetryIntervalMultiplier() - { - return retryIntervalMultiplier; - } - - public synchronized void setRetryIntervalMultiplier(final double retryIntervalMultiplier) - { - checkWrite(); - this.retryIntervalMultiplier = retryIntervalMultiplier; - } - - public synchronized int getReconnectAttempts() - { - return reconnectAttempts; - } - - public synchronized void setReconnectAttempts(final int reconnectAttempts) - { - checkWrite(); - this.reconnectAttempts = reconnectAttempts; - } - - public synchronized boolean isFailoverOnServerShutdown() - { - return failoverOnServerShutdown; - } - - public synchronized void setFailoverOnServerShutdown(final boolean failoverOnServerShutdown) - { - checkWrite(); - this.failoverOnServerShutdown = failoverOnServerShutdown; - } - - public synchronized String getConnectionLoadBalancingPolicyClassName() - { - return connectionLoadBalancingPolicyClassName; - } - - public synchronized void setConnectionLoadBalancingPolicyClassName(final String loadBalancingPolicyClassName) - { - checkWrite(); - connectionLoadBalancingPolicyClassName = loadBalancingPolicyClassName; - } - - public synchronized String getDiscoveryAddress() - { - return discoveryAddress; - } - - public synchronized void setDiscoveryAddress(final String discoveryAddress) - { - checkWrite(); - this.discoveryAddress = discoveryAddress; - } - - public synchronized int getDiscoveryPort() - { - return discoveryPort; - } - - public synchronized void setDiscoveryPort(final int discoveryPort) - { - checkWrite(); - this.discoveryPort = discoveryPort; - } - - public synchronized long getDiscoveryRefreshTimeout() - { - return discoveryRefreshTimeout; - } - - public void addInterceptor(final Interceptor interceptor) - { - interceptors.add(interceptor); - } - - public boolean removeInterceptor(final Interceptor interceptor) - { - return interceptors.remove(interceptor); - } - - public synchronized void setDiscoveryRefreshTimeout(final long discoveryRefreshTimeout) - { - checkWrite(); - this.discoveryRefreshTimeout = discoveryRefreshTimeout; - } - - public synchronized int getInitialMessagePacketSize() - { - return initialMessagePacketSize; - } - - public synchronized void setInitialMessagePacketSize(final int size) - { - checkWrite(); - initialMessagePacketSize = size; - } - - public ClientSession createSession(final String username, - final String password, - final boolean xa, - final boolean autoCommitSends, - final boolean autoCommitAcks, - final boolean preAcknowledge, - final int ackBatchSize) throws HornetQException - { - return createSessionInternal(username, - password, - xa, - autoCommitSends, - autoCommitAcks, - preAcknowledge, - ackBatchSize); - } - - public ClientSession createSession(final boolean autoCommitSends, - final boolean autoCommitAcks, - final int ackBatchSize) throws HornetQException - { - return createSessionInternal(null, null, false, autoCommitSends, autoCommitAcks, preAcknowledge, ackBatchSize); - } - - public ClientSession createXASession() throws HornetQException - { - return createSessionInternal(null, null, true, false, false, preAcknowledge, ackBatchSize); - } - - public ClientSession createTransactedSession() throws HornetQException - { - return createSessionInternal(null, null, false, false, false, preAcknowledge, ackBatchSize); - } - - public ClientSession createSession() throws HornetQException - { - return createSessionInternal(null, null, false, true, true, preAcknowledge, ackBatchSize); - } - - public ClientSession createSession(final boolean autoCommitSends, final boolean autoCommitAcks) throws HornetQException - { - return createSessionInternal(null, null, false, autoCommitSends, autoCommitAcks, preAcknowledge, ackBatchSize); - } - - public ClientSession createSession(final boolean xa, final boolean autoCommitSends, final boolean autoCommitAcks) throws HornetQException - { - return createSessionInternal(null, null, xa, autoCommitSends, autoCommitAcks, preAcknowledge, ackBatchSize); - } - - public ClientSession createSession(final boolean xa, - final boolean autoCommitSends, - final boolean autoCommitAcks, - final boolean preAcknowledge) throws HornetQException - { - return createSessionInternal(null, null, xa, autoCommitSends, autoCommitAcks, preAcknowledge, ackBatchSize); - } - - public int numSessions() - { - int num = 0; - - for (FailoverManager failoverManager : failoverManagerMap.values()) - { - num += failoverManager.numSessions(); - } - - return num; - } - - public int numConnections() - { - int num = 0; - - for (FailoverManager failoverManager : failoverManagerMap.values()) - { - num += failoverManager.numConnections(); - } - - return num; - } - - public void close() - { - if (closed) - { - return; - } - - if (discoveryGroup != null) - { - try - { - discoveryGroup.stop(); - } - catch (Exception e) - { - ClientSessionFactoryImpl.log.error("Failed to stop discovery group", e); - } - } - - for (FailoverManager failoverManager : failoverManagerMap.values()) - { - failoverManager.causeExit(); - } - - failoverManagerMap.clear(); - - if (!useGlobalPools) - { - if (threadPool != null) - { - threadPool.shutdown(); - - try - { - if (!threadPool.awaitTermination(10000, TimeUnit.MILLISECONDS)) - { - ClientSessionFactoryImpl.log.warn("Timed out waiting for pool to terminate"); - } - } - catch (InterruptedException ignore) - { - } - } - - if (scheduledThreadPool != null) - { - scheduledThreadPool.shutdown(); - - try - { - if (!scheduledThreadPool.awaitTermination(10000, TimeUnit.MILLISECONDS)) - { - ClientSessionFactoryImpl.log.warn("Timed out waiting for scheduled pool to terminate"); - } - } - catch (InterruptedException ignore) - { - } - } - } - - closed = true; - } - - public ClientSessionFactory copy() - { - return new ClientSessionFactoryImpl(this); - } - - public void setGroupID(final String groupID) - { - this.groupID = groupID; - } - - public String getGroupID() - { - return groupID; - } - - // DiscoveryListener implementation -------------------------------------------------------- - - public synchronized void connectorsChanged() - { - receivedBroadcast = true; - - Map<String, DiscoveryEntry> newConnectors = discoveryGroup.getDiscoveryEntryMap(); - - Set<Pair<TransportConfiguration, TransportConfiguration>> connectorSet = new HashSet<Pair<TransportConfiguration, TransportConfiguration>>(); - - for (DiscoveryEntry entry : newConnectors.values()) - { - connectorSet.add(entry.getConnectorPair()); - } - - Iterator<Map.Entry<Pair<TransportConfiguration, TransportConfiguration>, FailoverManager>> iter = failoverManagerMap.entrySet() - .iterator(); - while (iter.hasNext()) - { - Map.Entry<Pair<TransportConfiguration, TransportConfiguration>, FailoverManager> entry = iter.next(); - - if (!connectorSet.contains(entry.getKey())) - { - // failoverManager no longer there - we should remove it - - iter.remove(); - } - } - - for (Pair<TransportConfiguration, TransportConfiguration> connectorPair : connectorSet) - { - if (!failoverManagerMap.containsKey(connectorPair)) - { - // Create a new failoverManager - - FailoverManager failoverManager = new FailoverManagerImpl(this, - connectorPair.a, - connectorPair.b, - failoverOnServerShutdown, - callTimeout, - clientFailureCheckPeriod, - connectionTTL, - retryInterval, - retryIntervalMultiplier, - maxRetryInterval, - reconnectAttempts, - threadPool, - scheduledThreadPool, - interceptors); - - failoverManagerMap.put(connectorPair, failoverManager); - } - } - - updatefailoverManagerArray(); - } - - public FailoverManager[] getFailoverManagers() - { - return failoverManagerArray; - } - - // Protected ------------------------------------------------------------------------------ - - @Override - protected void finalize() throws Throwable - { - close(); - - super.finalize(); - } - - // Private -------------------------------------------------------------------------------- - - private void checkWrite() - { - if (readOnly) - { - throw new IllegalStateException("Cannot set attribute on SessionFactory after it has been used"); - } - } - - private ClientSession createSessionInternal(final String username, - final String password, - final boolean xa, - final boolean autoCommitSends, - final boolean autoCommitAcks, - final boolean preAcknowledge, - final int ackBatchSize) throws HornetQException - { - if (closed) - { - throw new IllegalStateException("Cannot create session, factory is closed (maybe it has been garbage collected)"); - } - - try - { - initialise(); - } - catch (Exception e) - { - throw new HornetQException(HornetQException.INTERNAL_ERROR, "Failed to initialise session factory", e); - } - - if (discoveryGroup != null && !receivedBroadcast) - { - boolean ok = discoveryGroup.waitForBroadcast(discoveryInitialWaitTimeout); - - if (!ok) - { - throw new HornetQException(HornetQException.CONNECTION_TIMEDOUT, - "Timed out waiting to receive initial broadcast from discovery group"); - } - } - - synchronized (this) - { - int pos = loadBalancingPolicy.select(failoverManagerArray.length); - - FailoverManager failoverManager = failoverManagerArray[pos]; - - ClientSession session = failoverManager.createSession(username, - password, - xa, - autoCommitSends, - autoCommitAcks, - preAcknowledge, - ackBatchSize, - cacheLargeMessagesClient, - minLargeMessageSize, - blockOnAcknowledge, - autoGroup, - confirmationWindowSize, - producerWindowSize, - consumerWindowSize, - producerMaxRate, - consumerMaxRate, - blockOnNonDurableSend, - blockOnDurableSend, - initialMessagePacketSize, - groupID); - - return session; - } - } - - private void instantiateLoadBalancingPolicy() - { - if (connectionLoadBalancingPolicyClassName == null) - { - throw new IllegalStateException("Please specify a load balancing policy class name on the session factory"); - } - - ClassLoader loader = Thread.currentThread().getContextClassLoader(); - try - { - Class<?> clazz = loader.loadClass(connectionLoadBalancingPolicyClassName); - loadBalancingPolicy = (ConnectionLoadBalancingPolicy)clazz.newInstance(); - } - catch (Exception e) - { - throw new IllegalArgumentException("Unable to instantiate load balancing policy \"" + connectionLoadBalancingPolicyClassName + - "\"", - e); - } - } - - private synchronized void updatefailoverManagerArray() - { - failoverManagerArray = new FailoverManager[failoverManagerMap.size()]; - - failoverManagerMap.values().toArray(failoverManagerArray); - } - -} Added: trunk/src/main/org/hornetq/api/core/client/ClientSessionFactoryImpl.java =================================================================== --- trunk/src/main/org/hornetq/api/core/client/ClientSessionFactoryImpl.java (rev 0) +++ trunk/src/main/org/hornetq/api/core/client/ClientSessionFactoryImpl.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -0,0 +1,1116 @@ +/* + * 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.client; + +import java.io.Serializable; +import java.net.InetAddress; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.Iterator; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.CopyOnWriteArrayList; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +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.TransportConfiguration; +import org.hornetq.api.core.client.loadbalance.ConnectionLoadBalancingPolicy; +import org.hornetq.core.client.impl.ClientSessionFactoryInternal; +import org.hornetq.core.client.impl.FailoverManager; +import org.hornetq.core.client.impl.FailoverManagerImpl; +import org.hornetq.core.cluster.DiscoveryEntry; +import org.hornetq.core.cluster.DiscoveryGroup; +import org.hornetq.core.cluster.DiscoveryListener; +import org.hornetq.core.cluster.impl.DiscoveryGroupImpl; +import org.hornetq.core.logging.Logger; +import org.hornetq.utils.HornetQThreadFactory; +import org.hornetq.utils.UUIDGenerator; + +/** + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * @author <a href="mailto:clebert.suconic@jboss.org">Clebert Suconic</a> + * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> + * @author <a href="mailto:ataylor@redhat.com">Andy Taylor</a> + * @version <tt>$Revision: 3602 $</tt> + * + */ +public class ClientSessionFactoryImpl implements ClientSessionFactoryInternal, DiscoveryListener, Serializable +{ + // Constants + // ------------------------------------------------------------------------------------ + + private static final long serialVersionUID = 2512460695662741413L; + + private static final Logger log = Logger.getLogger(ClientSessionFactoryImpl.class); + + // Attributes + // ----------------------------------------------------------------------------------- + + private final Map<Pair<TransportConfiguration, TransportConfiguration>, FailoverManager> failoverManagerMap = new LinkedHashMap<Pair<TransportConfiguration, TransportConfiguration>, FailoverManager>(); + + private volatile boolean receivedBroadcast = false; + + private ExecutorService threadPool; + + private ScheduledExecutorService scheduledThreadPool; + + private DiscoveryGroup discoveryGroup; + + private ConnectionLoadBalancingPolicy loadBalancingPolicy; + + private FailoverManager[] failoverManagerArray; + + private boolean readOnly; + + // Settable attributes: + + private boolean cacheLargeMessagesClient = HornetQClient.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT; + + private List<Pair<TransportConfiguration, TransportConfiguration>> staticConnectors; + + private String discoveryAddress; + + private int discoveryPort; + + private long discoveryRefreshTimeout; + + private long discoveryInitialWaitTimeout; + + private long clientFailureCheckPeriod; + + private long connectionTTL; + + private long callTimeout; + + private int minLargeMessageSize; + + private int consumerWindowSize; + + private int consumerMaxRate; + + private int confirmationWindowSize; + + private int producerWindowSize; + + private int producerMaxRate; + + private boolean blockOnAcknowledge; + + private boolean blockOnDurableSend; + + private boolean blockOnNonDurableSend; + + private boolean autoGroup; + + private boolean preAcknowledge; + + private String connectionLoadBalancingPolicyClassName; + + private int ackBatchSize; + + private boolean useGlobalPools; + + private int scheduledThreadPoolMaxSize; + + private int threadPoolMaxSize; + + private long retryInterval; + + private double retryIntervalMultiplier; + + private long maxRetryInterval; + + private int reconnectAttempts; + + private int initialMessagePacketSize; + + private volatile boolean closed; + + private boolean failoverOnServerShutdown; + + private final List<Interceptor> interceptors = new CopyOnWriteArrayList<Interceptor>(); + + private static ExecutorService globalThreadPool; + + private static ScheduledExecutorService globalScheduledThreadPool; + + private String groupID; + + private static synchronized ExecutorService getGlobalThreadPool() + { + if (ClientSessionFactoryImpl.globalThreadPool == null) + { + ThreadFactory factory = new HornetQThreadFactory("HornetQ-client-global-threads", true); + + ClientSessionFactoryImpl.globalThreadPool = Executors.newCachedThreadPool(factory); + } + + return ClientSessionFactoryImpl.globalThreadPool; + } + + private static synchronized ScheduledExecutorService getGlobalScheduledThreadPool() + { + if (ClientSessionFactoryImpl.globalScheduledThreadPool == null) + { + ThreadFactory factory = new HornetQThreadFactory("HornetQ-client-global-scheduled-threads", true); + + ClientSessionFactoryImpl.globalScheduledThreadPool = Executors.newScheduledThreadPool(HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, + factory); + } + + return ClientSessionFactoryImpl.globalScheduledThreadPool; + } + + private void setThreadPools() + { + if (useGlobalPools) + { + threadPool = ClientSessionFactoryImpl.getGlobalThreadPool(); + + scheduledThreadPool = ClientSessionFactoryImpl.getGlobalScheduledThreadPool(); + } + else + { + ThreadFactory factory = new HornetQThreadFactory("HornetQ-client-factory-threads-" + System.identityHashCode(this), + true); + + if (threadPoolMaxSize == -1) + { + threadPool = Executors.newCachedThreadPool(factory); + } + else + { + threadPool = Executors.newFixedThreadPool(threadPoolMaxSize, factory); + } + + factory = new HornetQThreadFactory("HornetQ-client-factory-pinger-threads-" + System.identityHashCode(this), + true); + + scheduledThreadPool = Executors.newScheduledThreadPool(scheduledThreadPoolMaxSize, factory); + } + } + + private synchronized void initialise() throws Exception + { + if (!readOnly) + { + setThreadPools(); + + instantiateLoadBalancingPolicy(); + + if (discoveryAddress != null) + { + InetAddress groupAddress = InetAddress.getByName(discoveryAddress); + + discoveryGroup = new DiscoveryGroupImpl(UUIDGenerator.getInstance().generateStringUUID(), + discoveryAddress, + groupAddress, + discoveryPort, + discoveryRefreshTimeout); + + discoveryGroup.registerListener(this); + + discoveryGroup.start(); + } + else if (staticConnectors != null) + { + for (Pair<TransportConfiguration, TransportConfiguration> pair : staticConnectors) + { + FailoverManager cm = new FailoverManagerImpl(this, + pair.a, + pair.b, + failoverOnServerShutdown, + callTimeout, + clientFailureCheckPeriod, + connectionTTL, + retryInterval, + retryIntervalMultiplier, + maxRetryInterval, + reconnectAttempts, + threadPool, + scheduledThreadPool, + interceptors); + + failoverManagerMap.put(pair, cm); + } + + updatefailoverManagerArray(); + } + else + { + throw new IllegalStateException("Before using a session factory you must either set discovery address and port or " + "provide some static transport configuration"); + } + readOnly = true; + } + } + + // Static + // --------------------------------------------------------------------------------------- + + // Constructors + // --------------------------------------------------------------------------------- + + public ClientSessionFactoryImpl(final ClientSessionFactory other) + { + discoveryAddress = other.getDiscoveryAddress(); + + discoveryPort = other.getDiscoveryPort(); + + staticConnectors = other.getStaticConnectors(); + + discoveryRefreshTimeout = other.getDiscoveryRefreshTimeout(); + + clientFailureCheckPeriod = other.getClientFailureCheckPeriod(); + + connectionTTL = other.getConnectionTTL(); + + callTimeout = other.getCallTimeout(); + + minLargeMessageSize = other.getMinLargeMessageSize(); + + consumerWindowSize = other.getConsumerWindowSize(); + + consumerMaxRate = other.getConsumerMaxRate(); + + confirmationWindowSize = other.getConfirmationWindowSize(); + + producerWindowSize = other.getProducerWindowSize(); + + producerMaxRate = other.getProducerMaxRate(); + + blockOnAcknowledge = other.isBlockOnAcknowledge(); + + blockOnDurableSend = other.isBlockOnDurableSend(); + + blockOnNonDurableSend = other.isBlockOnNonDurableSend(); + + autoGroup = other.isAutoGroup(); + + preAcknowledge = other.isPreAcknowledge(); + + ackBatchSize = other.getAckBatchSize(); + + connectionLoadBalancingPolicyClassName = other.getConnectionLoadBalancingPolicyClassName(); + + discoveryInitialWaitTimeout = other.getDiscoveryInitialWaitTimeout(); + + useGlobalPools = other.isUseGlobalPools(); + + scheduledThreadPoolMaxSize = other.getScheduledThreadPoolMaxSize(); + + threadPoolMaxSize = other.getThreadPoolMaxSize(); + + retryInterval = other.getRetryInterval(); + + retryIntervalMultiplier = other.getRetryIntervalMultiplier(); + + maxRetryInterval = other.getMaxRetryInterval(); + + reconnectAttempts = other.getReconnectAttempts(); + + failoverOnServerShutdown = other.isFailoverOnServerShutdown(); + + cacheLargeMessagesClient = other.isCacheLargeMessagesClient(); + + initialMessagePacketSize = other.getInitialMessagePacketSize(); + + groupID = other.getGroupID(); + } + + public ClientSessionFactoryImpl() + { + discoveryRefreshTimeout = HornetQClient.DEFAULT_DISCOVERY_REFRESH_TIMEOUT; + + clientFailureCheckPeriod = HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD; + + connectionTTL = HornetQClient.DEFAULT_CONNECTION_TTL; + + callTimeout = HornetQClient.DEFAULT_CALL_TIMEOUT; + + minLargeMessageSize = HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE; + + consumerWindowSize = HornetQClient.DEFAULT_CONSUMER_WINDOW_SIZE; + + consumerMaxRate = HornetQClient.DEFAULT_CONSUMER_MAX_RATE; + + confirmationWindowSize = HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE; + + producerWindowSize = HornetQClient.DEFAULT_PRODUCER_WINDOW_SIZE; + + producerMaxRate = HornetQClient.DEFAULT_PRODUCER_MAX_RATE; + + blockOnAcknowledge = HornetQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE; + + blockOnDurableSend = HornetQClient.DEFAULT_BLOCK_ON_DURABLE_SEND; + + blockOnNonDurableSend = HornetQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND; + + autoGroup = HornetQClient.DEFAULT_AUTO_GROUP; + + preAcknowledge = HornetQClient.DEFAULT_PRE_ACKNOWLEDGE; + + ackBatchSize = HornetQClient.DEFAULT_ACK_BATCH_SIZE; + + connectionLoadBalancingPolicyClassName = HornetQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME; + + discoveryInitialWaitTimeout = HornetQClient.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT; + + useGlobalPools = HornetQClient.DEFAULT_USE_GLOBAL_POOLS; + + scheduledThreadPoolMaxSize = HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE; + + threadPoolMaxSize = HornetQClient.DEFAULT_THREAD_POOL_MAX_SIZE; + + retryInterval = HornetQClient.DEFAULT_RETRY_INTERVAL; + + retryIntervalMultiplier = HornetQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER; + + maxRetryInterval = HornetQClient.DEFAULT_MAX_RETRY_INTERVAL; + + reconnectAttempts = HornetQClient.DEFAULT_RECONNECT_ATTEMPTS; + + failoverOnServerShutdown = HornetQClient.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN; + + cacheLargeMessagesClient = HornetQClient.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT; + + initialMessagePacketSize = HornetQClient.DEFAULT_INITIAL_MESSAGE_PACKET_SIZE; + } + + public ClientSessionFactoryImpl(final String discoveryAddress, final int discoveryPort) + { + this(); + + this.discoveryAddress = discoveryAddress; + + this.discoveryPort = discoveryPort; + } + + public ClientSessionFactoryImpl(final List<Pair<TransportConfiguration, TransportConfiguration>> staticConnectors) + { + this(); + + this.staticConnectors = staticConnectors; + } + + public ClientSessionFactoryImpl(final TransportConfiguration connectorConfig, + final TransportConfiguration backupConnectorConfig) + { + this(); + + staticConnectors = new ArrayList<Pair<TransportConfiguration, TransportConfiguration>>(); + + staticConnectors.add(new Pair<TransportConfiguration, TransportConfiguration>(connectorConfig, + backupConnectorConfig)); + } + + public ClientSessionFactoryImpl(final TransportConfiguration connectorConfig) + { + this(connectorConfig, null); + } + + // ClientSessionFactory implementation------------------------------------------------------------ + + public synchronized boolean isCacheLargeMessagesClient() + { + return cacheLargeMessagesClient; + } + + public synchronized void setCacheLargeMessagesClient(final boolean cached) + { + cacheLargeMessagesClient = cached; + } + + public synchronized List<Pair<TransportConfiguration, TransportConfiguration>> getStaticConnectors() + { + return staticConnectors; + } + + public synchronized void setStaticConnectors(final List<Pair<TransportConfiguration, TransportConfiguration>> staticConnectors) + { + checkWrite(); + + this.staticConnectors = staticConnectors; + } + + public synchronized long getClientFailureCheckPeriod() + { + return clientFailureCheckPeriod; + } + + public synchronized void setClientFailureCheckPeriod(final long clientFailureCheckPeriod) + { + checkWrite(); + this.clientFailureCheckPeriod = clientFailureCheckPeriod; + } + + public synchronized long getConnectionTTL() + { + return connectionTTL; + } + + public synchronized void setConnectionTTL(final long connectionTTL) + { + checkWrite(); + this.connectionTTL = connectionTTL; + } + + public synchronized long getCallTimeout() + { + return callTimeout; + } + + public synchronized void setCallTimeout(final long callTimeout) + { + checkWrite(); + this.callTimeout = callTimeout; + } + + public synchronized int getMinLargeMessageSize() + { + return minLargeMessageSize; + } + + public synchronized void setMinLargeMessageSize(final int minLargeMessageSize) + { + checkWrite(); + this.minLargeMessageSize = minLargeMessageSize; + } + + public synchronized int getConsumerWindowSize() + { + return consumerWindowSize; + } + + public synchronized void setConsumerWindowSize(final int consumerWindowSize) + { + checkWrite(); + this.consumerWindowSize = consumerWindowSize; + } + + public synchronized int getConsumerMaxRate() + { + return consumerMaxRate; + } + + public synchronized void setConsumerMaxRate(final int consumerMaxRate) + { + checkWrite(); + this.consumerMaxRate = consumerMaxRate; + } + + public synchronized int getConfirmationWindowSize() + { + return confirmationWindowSize; + } + + public synchronized void setConfirmationWindowSize(final int confirmationWindowSize) + { + checkWrite(); + this.confirmationWindowSize = confirmationWindowSize; + } + + public synchronized int getProducerWindowSize() + { + return producerWindowSize; + } + + public synchronized void setProducerWindowSize(final int producerWindowSize) + { + checkWrite(); + this.producerWindowSize = producerWindowSize; + } + + public synchronized int getProducerMaxRate() + { + return producerMaxRate; + } + + public synchronized void setProducerMaxRate(final int producerMaxRate) + { + checkWrite(); + this.producerMaxRate = producerMaxRate; + } + + public synchronized boolean isBlockOnAcknowledge() + { + return blockOnAcknowledge; + } + + public synchronized void setBlockOnAcknowledge(final boolean blockOnAcknowledge) + { + checkWrite(); + this.blockOnAcknowledge = blockOnAcknowledge; + } + + public synchronized boolean isBlockOnDurableSend() + { + return blockOnDurableSend; + } + + public synchronized void setBlockOnDurableSend(final boolean blockOnDurableSend) + { + checkWrite(); + this.blockOnDurableSend = blockOnDurableSend; + } + + public synchronized boolean isBlockOnNonDurableSend() + { + return blockOnNonDurableSend; + } + + public synchronized void setBlockOnNonDurableSend(final boolean blockOnNonDurableSend) + { + checkWrite(); + this.blockOnNonDurableSend = blockOnNonDurableSend; + } + + public synchronized boolean isAutoGroup() + { + return autoGroup; + } + + public synchronized void setAutoGroup(final boolean autoGroup) + { + checkWrite(); + this.autoGroup = autoGroup; + } + + public synchronized boolean isPreAcknowledge() + { + return preAcknowledge; + } + + public synchronized void setPreAcknowledge(final boolean preAcknowledge) + { + checkWrite(); + this.preAcknowledge = preAcknowledge; + } + + public synchronized int getAckBatchSize() + { + return ackBatchSize; + } + + public synchronized void setAckBatchSize(final int ackBatchSize) + { + checkWrite(); + this.ackBatchSize = ackBatchSize; + } + + public synchronized long getDiscoveryInitialWaitTimeout() + { + return discoveryInitialWaitTimeout; + } + + public synchronized void setDiscoveryInitialWaitTimeout(final long initialWaitTimeout) + { + checkWrite(); + discoveryInitialWaitTimeout = initialWaitTimeout; + } + + public synchronized boolean isUseGlobalPools() + { + return useGlobalPools; + } + + public synchronized void setUseGlobalPools(final boolean useGlobalPools) + { + checkWrite(); + this.useGlobalPools = useGlobalPools; + } + + public synchronized int getScheduledThreadPoolMaxSize() + { + return scheduledThreadPoolMaxSize; + } + + public synchronized void setScheduledThreadPoolMaxSize(final int scheduledThreadPoolMaxSize) + { + checkWrite(); + this.scheduledThreadPoolMaxSize = scheduledThreadPoolMaxSize; + } + + public synchronized int getThreadPoolMaxSize() + { + return threadPoolMaxSize; + } + + public synchronized void setThreadPoolMaxSize(final int threadPoolMaxSize) + { + checkWrite(); + this.threadPoolMaxSize = threadPoolMaxSize; + } + + public synchronized long getRetryInterval() + { + return retryInterval; + } + + public synchronized void setRetryInterval(final long retryInterval) + { + checkWrite(); + this.retryInterval = retryInterval; + } + + public synchronized long getMaxRetryInterval() + { + return maxRetryInterval; + } + + public synchronized void setMaxRetryInterval(final long retryInterval) + { + checkWrite(); + maxRetryInterval = retryInterval; + } + + public synchronized double getRetryIntervalMultiplier() + { + return retryIntervalMultiplier; + } + + public synchronized void setRetryIntervalMultiplier(final double retryIntervalMultiplier) + { + checkWrite(); + this.retryIntervalMultiplier = retryIntervalMultiplier; + } + + public synchronized int getReconnectAttempts() + { + return reconnectAttempts; + } + + public synchronized void setReconnectAttempts(final int reconnectAttempts) + { + checkWrite(); + this.reconnectAttempts = reconnectAttempts; + } + + public synchronized boolean isFailoverOnServerShutdown() + { + return failoverOnServerShutdown; + } + + public synchronized void setFailoverOnServerShutdown(final boolean failoverOnServerShutdown) + { + checkWrite(); + this.failoverOnServerShutdown = failoverOnServerShutdown; + } + + public synchronized String getConnectionLoadBalancingPolicyClassName() + { + return connectionLoadBalancingPolicyClassName; + } + + public synchronized void setConnectionLoadBalancingPolicyClassName(final String loadBalancingPolicyClassName) + { + checkWrite(); + connectionLoadBalancingPolicyClassName = loadBalancingPolicyClassName; + } + + public synchronized String getDiscoveryAddress() + { + return discoveryAddress; + } + + public synchronized void setDiscoveryAddress(final String discoveryAddress) + { + checkWrite(); + this.discoveryAddress = discoveryAddress; + } + + public synchronized int getDiscoveryPort() + { + return discoveryPort; + } + + public synchronized void setDiscoveryPort(final int discoveryPort) + { + checkWrite(); + this.discoveryPort = discoveryPort; + } + + public synchronized long getDiscoveryRefreshTimeout() + { + return discoveryRefreshTimeout; + } + + public void addInterceptor(final Interceptor interceptor) + { + interceptors.add(interceptor); + } + + public boolean removeInterceptor(final Interceptor interceptor) + { + return interceptors.remove(interceptor); + } + + public synchronized void setDiscoveryRefreshTimeout(final long discoveryRefreshTimeout) + { + checkWrite(); + this.discoveryRefreshTimeout = discoveryRefreshTimeout; + } + + public synchronized int getInitialMessagePacketSize() + { + return initialMessagePacketSize; + } + + public synchronized void setInitialMessagePacketSize(final int size) + { + checkWrite(); + initialMessagePacketSize = size; + } + + public ClientSession createSession(final String username, + final String password, + final boolean xa, + final boolean autoCommitSends, + final boolean autoCommitAcks, + final boolean preAcknowledge, + final int ackBatchSize) throws HornetQException + { + return createSessionInternal(username, + password, + xa, + autoCommitSends, + autoCommitAcks, + preAcknowledge, + ackBatchSize); + } + + public ClientSession createSession(final boolean autoCommitSends, + final boolean autoCommitAcks, + final int ackBatchSize) throws HornetQException + { + return createSessionInternal(null, null, false, autoCommitSends, autoCommitAcks, preAcknowledge, ackBatchSize); + } + + public ClientSession createXASession() throws HornetQException + { + return createSessionInternal(null, null, true, false, false, preAcknowledge, ackBatchSize); + } + + public ClientSession createTransactedSession() throws HornetQException + { + return createSessionInternal(null, null, false, false, false, preAcknowledge, ackBatchSize); + } + + public ClientSession createSession() throws HornetQException + { + return createSessionInternal(null, null, false, true, true, preAcknowledge, ackBatchSize); + } + + public ClientSession createSession(final boolean autoCommitSends, final boolean autoCommitAcks) throws HornetQException + { + return createSessionInternal(null, null, false, autoCommitSends, autoCommitAcks, preAcknowledge, ackBatchSize); + } + + public ClientSession createSession(final boolean xa, final boolean autoCommitSends, final boolean autoCommitAcks) throws HornetQException + { + return createSessionInternal(null, null, xa, autoCommitSends, autoCommitAcks, preAcknowledge, ackBatchSize); + } + + public ClientSession createSession(final boolean xa, + final boolean autoCommitSends, + final boolean autoCommitAcks, + final boolean preAcknowledge) throws HornetQException + { + return createSessionInternal(null, null, xa, autoCommitSends, autoCommitAcks, preAcknowledge, ackBatchSize); + } + + public int numSessions() + { + int num = 0; + + for (FailoverManager failoverManager : failoverManagerMap.values()) + { + num += failoverManager.numSessions(); + } + + return num; + } + + public int numConnections() + { + int num = 0; + + for (FailoverManager failoverManager : failoverManagerMap.values()) + { + num += failoverManager.numConnections(); + } + + return num; + } + + public void close() + { + if (closed) + { + return; + } + + if (discoveryGroup != null) + { + try + { + discoveryGroup.stop(); + } + catch (Exception e) + { + ClientSessionFactoryImpl.log.error("Failed to stop discovery group", e); + } + } + + for (FailoverManager failoverManager : failoverManagerMap.values()) + { + failoverManager.causeExit(); + } + + failoverManagerMap.clear(); + + if (!useGlobalPools) + { + if (threadPool != null) + { + threadPool.shutdown(); + + try + { + if (!threadPool.awaitTermination(10000, TimeUnit.MILLISECONDS)) + { + ClientSessionFactoryImpl.log.warn("Timed out waiting for pool to terminate"); + } + } + catch (InterruptedException ignore) + { + } + } + + if (scheduledThreadPool != null) + { + scheduledThreadPool.shutdown(); + + try + { + if (!scheduledThreadPool.awaitTermination(10000, TimeUnit.MILLISECONDS)) + { + ClientSessionFactoryImpl.log.warn("Timed out waiting for scheduled pool to terminate"); + } + } + catch (InterruptedException ignore) + { + } + } + } + + closed = true; + } + + public ClientSessionFactory copy() + { + return new ClientSessionFactoryImpl(this); + } + + public void setGroupID(final String groupID) + { + this.groupID = groupID; + } + + public String getGroupID() + { + return groupID; + } + + // DiscoveryListener implementation -------------------------------------------------------- + + public synchronized void connectorsChanged() + { + receivedBroadcast = true; + + Map<String, DiscoveryEntry> newConnectors = discoveryGroup.getDiscoveryEntryMap(); + + Set<Pair<TransportConfiguration, TransportConfiguration>> connectorSet = new HashSet<Pair<TransportConfiguration, TransportConfiguration>>(); + + for (DiscoveryEntry entry : newConnectors.values()) + { + connectorSet.add(entry.getConnectorPair()); + } + + Iterator<Map.Entry<Pair<TransportConfiguration, TransportConfiguration>, FailoverManager>> iter = failoverManagerMap.entrySet() + .iterator(); + while (iter.hasNext()) + { + Map.Entry<Pair<TransportConfiguration, TransportConfiguration>, FailoverManager> entry = iter.next(); + + if (!connectorSet.contains(entry.getKey())) + { + // failoverManager no longer there - we should remove it + + iter.remove(); + } + } + + for (Pair<TransportConfiguration, TransportConfiguration> connectorPair : connectorSet) + { + if (!failoverManagerMap.containsKey(connectorPair)) + { + // Create a new failoverManager + + FailoverManager failoverManager = new FailoverManagerImpl(this, + connectorPair.a, + connectorPair.b, + failoverOnServerShutdown, + callTimeout, + clientFailureCheckPeriod, + connectionTTL, + retryInterval, + retryIntervalMultiplier, + maxRetryInterval, + reconnectAttempts, + threadPool, + scheduledThreadPool, + interceptors); + + failoverManagerMap.put(connectorPair, failoverManager); + } + } + + updatefailoverManagerArray(); + } + + public FailoverManager[] getFailoverManagers() + { + return failoverManagerArray; + } + + // Protected ------------------------------------------------------------------------------ + + @Override + protected void finalize() throws Throwable + { + close(); + + super.finalize(); + } + + // Private -------------------------------------------------------------------------------- + + private void checkWrite() + { + if (readOnly) + { + throw new IllegalStateException("Cannot set attribute on SessionFactory after it has been used"); + } + } + + private ClientSession createSessionInternal(final String username, + final String password, + final boolean xa, + final boolean autoCommitSends, + final boolean autoCommitAcks, + final boolean preAcknowledge, + final int ackBatchSize) throws HornetQException + { + if (closed) + { + throw new IllegalStateException("Cannot create session, factory is closed (maybe it has been garbage collected)"); + } + + try + { + initialise(); + } + catch (Exception e) + { + throw new HornetQException(HornetQException.INTERNAL_ERROR, "Failed to initialise session factory", e); + } + + if (discoveryGroup != null && !receivedBroadcast) + { + boolean ok = discoveryGroup.waitForBroadcast(discoveryInitialWaitTimeout); + + if (!ok) + { + throw new HornetQException(HornetQException.CONNECTION_TIMEDOUT, + "Timed out waiting to receive initial broadcast from discovery group"); + } + } + + synchronized (this) + { + int pos = loadBalancingPolicy.select(failoverManagerArray.length); + + FailoverManager failoverManager = failoverManagerArray[pos]; + + ClientSession session = failoverManager.createSession(username, + password, + xa, + autoCommitSends, + autoCommitAcks, + preAcknowledge, + ackBatchSize, + cacheLargeMessagesClient, + minLargeMessageSize, + blockOnAcknowledge, + autoGroup, + confirmationWindowSize, + producerWindowSize, + consumerWindowSize, + producerMaxRate, + consumerMaxRate, + blockOnNonDurableSend, + blockOnDurableSend, + initialMessagePacketSize, + groupID); + + return session; + } + } + + private void instantiateLoadBalancingPolicy() + { + if (connectionLoadBalancingPolicyClassName == null) + { + throw new IllegalStateException("Please specify a load balancing policy class name on the session factory"); + } + + ClassLoader loader = Thread.currentThread().getContextClassLoader(); + try + { + Class<?> clazz = loader.loadClass(connectionLoadBalancingPolicyClassName); + loadBalancingPolicy = (ConnectionLoadBalancingPolicy)clazz.newInstance(); + } + catch (Exception e) + { + throw new IllegalArgumentException("Unable to instantiate load balancing policy \"" + connectionLoadBalancingPolicyClassName + + "\"", + e); + } + } + + private synchronized void updatefailoverManagerArray() + { + failoverManagerArray = new FailoverManager[failoverManagerMap.size()]; + + failoverManagerMap.values().toArray(failoverManagerArray); + } + +} 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:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/api/core/client/HornetQClient.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,8 +13,8 @@ package org.hornetq.api.core.client; import org.hornetq.api.Pair; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.loadbalance.RoundRobinConnectionLoadBalancingPolicy; -import org.hornetq.api.core.config.TransportConfiguration; import java.util.List; Modified: trunk/src/main/org/hornetq/api/core/client/SendAcknowledgementHandler.java =================================================================== --- trunk/src/main/org/hornetq/api/core/client/SendAcknowledgementHandler.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/api/core/client/SendAcknowledgementHandler.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,7 +13,7 @@ package org.hornetq.api.core.client; -import org.hornetq.api.core.message.Message; +import org.hornetq.api.core.Message; /** * A SendAcknowledgementHandler notifies a client when an message sent asynchronously has been received by the server. Modified: trunk/src/main/org/hornetq/api/core/client/SessionFailureListener.java =================================================================== --- trunk/src/main/org/hornetq/api/core/client/SessionFailureListener.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/api/core/client/SessionFailureListener.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,7 +13,7 @@ package org.hornetq.api.core.client; -import org.hornetq.api.core.exception.HornetQException; +import org.hornetq.api.core.HornetQException; import org.hornetq.core.remoting.FailureListener; /** Deleted: trunk/src/main/org/hornetq/api/core/config/TransportConfiguration.java =================================================================== --- trunk/src/main/org/hornetq/api/core/config/TransportConfiguration.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/api/core/config/TransportConfiguration.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -1,365 +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.core.config; - -import java.io.Serializable; -import java.util.HashMap; -import java.util.Map; - -import org.hornetq.api.core.buffers.HornetQBuffer; -import org.hornetq.utils.UUIDGenerator; - -/** - * A TransportConfiguration is used by a client to specify a connections to a server and its back up if one exists.<br><br> - * <p/> - * Typically the constructors take the classname and paramaters for needed to create the connection. These will be - * different dependant on what connector is beingused i.e. Netty or InVM etc. An example:<br><br> - * <p/> - * <code> - * HashMap<String, Object> map = new HashMap<String, Object>();<br> - * map.put("host", "localhost");<br> - * map.put("port", 5445);<br> - * TransportConfiguration config = new TransportConfiguration(InVMConnectorFactory.class.getName(), map); <br> - * ClientSessionFactory sf = new ClientSessionFactoryImpl(config); <br> - * </code><br><br> - * - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - */ -public class TransportConfiguration implements Serializable -{ - private static final long serialVersionUID = -3994528421527392679L; - - private String name; - - private String factoryClassName; - - private Map<String, Object> params; - - private static final byte TYPE_BOOLEAN = 0; - - private static final byte TYPE_INT = 1; - - private static final byte TYPE_LONG = 2; - - private static final byte TYPE_STRING = 3; - - /** - * Utility method for splitting a comma separated list of hosts - * - * @param commaSeparatedHosts the comma separated host string - * @return the hosts - */ - public static String[] splitHosts(final String commaSeparatedHosts) - { - if (commaSeparatedHosts == null) - { - return new String[0]; - } - String[] hosts = commaSeparatedHosts.split(","); - - for (int i = 0; i < hosts.length; i++) - { - hosts[i] = hosts[i].trim(); - } - return hosts; - } - - /** - * Creates a default TransportConfiguration with no configured transport. - */ - public TransportConfiguration() - { - } - - /** - * Creates a TransportConfiguration with a specific name providing the class name of the {@link org.hornetq.spi.core.remoting.ConnectorFactory} - * and any params needed. - * - * @param className The class name of the ConnectorFactory - * @param params The params needed by the ConnectorFactory - * @param name The name of this TransportConfiguration - */ - public TransportConfiguration(final String className, final Map<String, Object> params, final String name) - { - factoryClassName = className; - - this.params = params; - - this.name = name; - } - - /** - * Creates a TransportConfiguration providing the class name of the {@link org.hornetq.spi.core.remoting.ConnectorFactory} - * and any params needed. - * - * @param className The class name of the ConnectorFactory - * @param params The params needed by the ConnectorFactory - */ - public TransportConfiguration(final String className, final Map<String, Object> params) - { - this(className, params, UUIDGenerator.getInstance().generateStringUUID()); - } - - /** - * Creates a TransportConfiguration providing the class name of the {@link org.hornetq.spi.core.remoting.ConnectorFactory} - * - * @param className The class name of the ConnectorFactory - */ - public TransportConfiguration(final String className) - { - this(className, new HashMap<String, Object>(), UUIDGenerator.getInstance().generateStringUUID()); - } - - /** - * Returns the name of this TransportConfiguration. - * - * @return the name - */ - public String getName() - { - return name; - } - - /** - * Returns the class name of ConnectorFactory being used by this TransportConfiguration - * - * @return The classname - */ - public String getFactoryClassName() - { - return factoryClassName; - } - - /** - * Returns any params set for this TransportConfiguration - * - * @return the params - */ - public Map<String, Object> getParams() - { - return params; - } - - @Override - public int hashCode() - { - return factoryClassName.hashCode(); - } - - @Override - public boolean equals(final Object other) - { - if (other instanceof TransportConfiguration == false) - { - return false; - } - - TransportConfiguration kother = (TransportConfiguration) other; - - if (factoryClassName.equals(kother.factoryClassName)) - { - if (params == null) - { - return kother.params == null; - } - else - { - if (kother.params == null) - { - return false; - } - else if (params.size() == kother.params.size()) - { - for (Map.Entry<String, Object> entry : params.entrySet()) - { - Object thisVal = entry.getValue(); - - Object otherVal = kother.params.get(entry.getKey()); - - if (otherVal == null || !otherVal.equals(thisVal)) - { - return false; - } - } - return true; - } - else - { - return false; - } - } - } - else - { - return false; - } - } - - @Override - public String toString() - { - StringBuilder str = new StringBuilder(replaceWildcardChars(factoryClassName)); - - if (params != null) - { - if (!params.isEmpty()) - { - str.append("?"); - } - - boolean first = true; - for (Map.Entry<String, Object> entry : params.entrySet()) - { - if (!first) - { - str.append("&"); - } - String encodedKey = replaceWildcardChars(entry.getKey()); - - String val = entry.getValue().toString(); - String encodedVal = replaceWildcardChars(val); - - str.append(encodedKey).append('=').append(encodedVal); - - first = false; - } - } - - return str.toString(); - } - - /** - * Encodes this TransportConfiguration into a buffer. - * <p/> - * Note that this is only used internally HornetQ. - * - * @param buffer the buffer to encode into - */ - public void encode(final HornetQBuffer buffer) - { - buffer.writeString(name); - buffer.writeString(factoryClassName); - - buffer.writeInt(params == null ? 0 : params.size()); - - if (params != null) - { - for (Map.Entry<String, Object> entry : params.entrySet()) - { - buffer.writeString(entry.getKey()); - - Object val = entry.getValue(); - - if (val instanceof Boolean) - { - buffer.writeByte(TransportConfiguration.TYPE_BOOLEAN); - buffer.writeBoolean((Boolean) val); - } - else if (val instanceof Integer) - { - buffer.writeByte(TransportConfiguration.TYPE_INT); - buffer.writeInt((Integer) val); - } - else if (val instanceof Long) - { - buffer.writeByte(TransportConfiguration.TYPE_LONG); - buffer.writeLong((Long) val); - } - else if (val instanceof String) - { - buffer.writeByte(TransportConfiguration.TYPE_STRING); - buffer.writeString((String) val); - } - else - { - throw new IllegalArgumentException("Invalid type " + val); - } - } - } - } - - /** - * Decodes this TransportConfiguration from a buffer. - * <p/> - * Note this is only used internally by HornetQ - * - * @param buffer the biffer to decode from - */ - public void decode(final HornetQBuffer buffer) - { - name = buffer.readString(); - factoryClassName = buffer.readString(); - - int num = buffer.readInt(); - - if (params == null) - { - if (num > 0) - { - params = new HashMap<String, Object>(); - } - } - else - { - params.clear(); - } - - for (int i = 0; i < num; i++) - { - String key = buffer.readString(); - - byte type = buffer.readByte(); - - Object val; - - switch (type) - { - case TYPE_BOOLEAN: - { - val = buffer.readBoolean(); - - break; - } - case TYPE_INT: - { - val = buffer.readInt(); - - break; - } - case TYPE_LONG: - { - val = buffer.readLong(); - - break; - } - case TYPE_STRING: - { - val = buffer.readString(); - - break; - } - default: - { - throw new IllegalArgumentException("Invalid type " + type); - } - } - - params.put(key, val); - } - } - - private String replaceWildcardChars(final String str) - { - return str.replace('.', '-'); - } -} Deleted: trunk/src/main/org/hornetq/api/core/exception/HornetQException.java =================================================================== --- trunk/src/main/org/hornetq/api/core/exception/HornetQException.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/api/core/exception/HornetQException.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -1,220 +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.core.exception; - -/** - * - * HornetQException is the root exception for HornetQ API. - * - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - */ -public class HornetQException extends Exception -{ - private static final long serialVersionUID = -4802014152804997417L; - - // Error codes ------------------------------------------------- - - /** - * Internal error which prevented HornetQ to perform. - */ - public static final int INTERNAL_ERROR = 000; - - /** - * A packet of unsupported type was received by HornetQ PacketHandler. - */ - public static final int UNSUPPORTED_PACKET = 001; - - /** - * A client is not able to connect to HornetQ server. - */ - public static final int NOT_CONNECTED = 002; - - /** - * A client timed out will connecting to HornetQ server. - */ - public static final int CONNECTION_TIMEDOUT = 003; - - /** - * A client was disconnected from HornetQ server when the server has shut down. - */ - public static final int DISCONNECTED = 004; - - /** - * A blocking call from a client was unblocked during failover. - */ - public static final int UNBLOCKED = 005; - - /** - * Unexpected I/O error occured on the server. - */ - public static final int IO_ERROR = 006; - - /** - * An operation failed because a queue does not exist on the server. - */ - public static final int QUEUE_DOES_NOT_EXIST = 100; - - /** - * An operation failed because a queue exists on the server. - */ - public static final int QUEUE_EXISTS = 101; - - /** - * A client operation failed because the calling resource - * (ClientSession, ClientProducer, etc.) is closed. - */ - public static final int OBJECT_CLOSED = 102; - - /** - * An filter expression has not been validated - */ - public static final int INVALID_FILTER_EXPRESSION = 103; - - /** - * A HornetQ resource is not in a legal state (e.g. calling - * ClientConsumer.receive() if a MessageHandler is set) - */ - public static final int ILLEGAL_STATE = 104; - - /** - * A security problem occured (authentication issues, permission issues,...) - */ - public static final int SECURITY_EXCEPTION = 105; - - /** - * An operation failed because an address does not exist on the server. - */ - public static final int ADDRESS_DOES_NOT_EXIST = 106; - - /** - * An operation failed because an address exists on the server. - */ - public static final int ADDRESS_EXISTS = 107; - - /** - * A incompatibility between HornetQ versions on the client and the server has been detected - */ - public static final int INCOMPATIBLE_CLIENT_SERVER_VERSIONS = 108; - - /** - * An operation failed because a session exists on the server. - */ - public static final int SESSION_EXISTS = 109; - - /** - * An problem occurred while manipulating the body of a large message. - */ - public static final int LARGE_MESSAGE_ERROR_BODY = 110; - - /** - * A transaction was rolled back. - */ - public static final int TRANSACTION_ROLLED_BACK = 111; - - /** - * The creation of a session was rejected by the server (e.g. if the - * server is starting and has not finish to be initialized) - */ - public static final int SESSION_CREATION_REJECTED = 112; - - // Native Error codes ---------------------------------------------- - - /** - * A internal error occured in the AIO native code - */ - public static final int NATIVE_ERROR_INTERNAL = 200; - - /** - * A buffer is invalid in the AIO native code - */ - public static final int NATIVE_ERROR_INVALID_BUFFER = 201; - - /** - * Alignment error in the AIO native code - */ - public static final int NATIVE_ERROR_NOT_ALIGNED = 202; - - /** - * AIO has not been properly initialized - */ - public static final int NATIVE_ERROR_CANT_INITIALIZE_AIO = 203; - - /** - * AIO has not been properly released - */ - public static final int NATIVE_ERROR_CANT_RELEASE_AIO = 204; - - /** - * A closed file has not be properly reopened - */ - public static final int NATIVE_ERROR_CANT_OPEN_CLOSE_FILE = 205; - - /** - * An error occured while allocating a queue in AIO native code - */ - public static final int NATIVE_ERROR_CANT_ALLOCATE_QUEUE = 206; - - /** - * An error occured while pre-allocating a file in AIO native code - */ - public static final int NATIVE_ERROR_PREALLOCATE_FILE = 208; - - /** - * An error occurred while allocating memory in the AIO native code - */ - public static final int NATIVE_ERROR_ALLOCATE_MEMORY = 209; - - /** - * AIO is full - */ - public static final int NATIVE_ERROR_AIO_FULL = 211; - - private int code; - - public HornetQException() - { - } - - public HornetQException(final int code) - { - this.code = code; - } - - public HornetQException(final int code, final String msg) - { - super(msg); - - this.code = code; - } - - public HornetQException(final int code, final String msg, final Throwable cause) - { - super(msg, cause); - - this.code = code; - } - - public int getCode() - { - return code; - } - - @Override - public String toString() - { - return "HornetQException[errorCode=" + code + " message=" + getMessage() + "]"; - } - -} Deleted: trunk/src/main/org/hornetq/api/core/interceptor/Interceptor.java =================================================================== --- trunk/src/main/org/hornetq/api/core/interceptor/Interceptor.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/api/core/interceptor/Interceptor.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -1,40 +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.core.interceptor; - -import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.core.remoting.Packet; -import org.hornetq.core.remoting.RemotingConnection; - -/** - * This is class is a simple way to intercepting server calls on HornetQ. - * <p/> - * To Add this interceptor, you have to modify hornetq-configuration.xml - * - * @author clebert.suconic(a)jboss.com - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - */ -public interface Interceptor -{ - /** - * gets called when a packet is received prior to be sent to the channel - * - * @param packet the packet being received - * @param connection the connection the packet was received on - * @return true to process the next interceptor and handle the packet, - * false to abort processing of the packet - * @throws HornetQException - */ - boolean intercept(Packet packet, RemotingConnection connection) throws HornetQException; -} Modified: trunk/src/main/org/hornetq/api/core/management/HornetQServerControl.java =================================================================== --- trunk/src/main/org/hornetq/api/core/management/HornetQServerControl.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/api/core/management/HornetQServerControl.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -15,7 +15,7 @@ import javax.management.MBeanOperationInfo; -import org.hornetq.api.core.exception.HornetQException; +import org.hornetq.api.core.HornetQException; import org.hornetq.core.config.Configuration; /** 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:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/api/core/management/ManagementHelper.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -19,7 +19,7 @@ import java.util.Map; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.message.Message; +import org.hornetq.api.core.Message; import org.hornetq.core.logging.Logger; import org.hornetq.utils.json.JSONArray; import org.hornetq.utils.json.JSONObject; Deleted: trunk/src/main/org/hornetq/api/core/message/Message.java =================================================================== --- trunk/src/main/org/hornetq/api/core/message/Message.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/api/core/message/Message.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -1,491 +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.core.message; - -import java.util.Map; -import java.util.Set; - -import org.hornetq.api.SimpleString; -import org.hornetq.api.core.buffers.HornetQBuffer; - -/** - * A Message is a routable instance that has a payload. - * <br/> - * The payload (the "body") is opaque to the messaging system. - * A Message also has a fixed set of headers (required by the messaging system) - * and properties (defined by the users) that can be used by the messaging system - * to route the message (e.g. to ensure it matches a queue filter). - * <br> - * <h2>Message Properties</h2> - * - * Message can contain properties specified by the users. - * It is possible to convert from some types to other types as specified - * by the following table: - * <pre> - * | | boolean byte short int long float double String byte[] - * |---------------------------------------------------------------- - * |boolean | X X - * |byte | X X X X X - * |short | X X X X - * |int | X X X - * |long | X X - * |float | X X X - * |double | X X - * |String | X X X X X X X X - * |byte[] | X - * |----------------------------------------------------------------- - * </pre> - * <br> - * If conversion is not allowed (for example calling {@code getFloatProperty} on a property set a {@code boolean}), - * a PropertyConversionException will be thrown. - * - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * @author <a href="mailto:clebert.suconic@jboss.com">ClebertSuconic</a> - * @version <tt>$Revision: 3341 $</tt> - * - * $Id: Message.java 3341 2007-11-19 14:34:57Z timfox $ - */ -public interface Message -{ - public static final SimpleString HDR_ACTUAL_EXPIRY_TIME = new SimpleString("_HQ_ACTUAL_EXPIRY"); - - public static final SimpleString HDR_ORIGINAL_ADDRESS = new SimpleString("_HQ_ORIG_ADDRESS"); - - public static final SimpleString HDR_ORIG_MESSAGE_ID = new SimpleString("_HQ_ORIG_MESSAGE_ID"); - - public static final SimpleString HDR_GROUP_ID = new SimpleString("_HQ_GROUP_ID"); - - public static final SimpleString HDR_SCHEDULED_DELIVERY_TIME = new SimpleString("_HQ_SCHED_DELIVERY"); - - public static final SimpleString HDR_DUPLICATE_DETECTION_ID = new SimpleString("_HQ_DUPL_ID"); - - public static final SimpleString HDR_LAST_VALUE_NAME = new SimpleString("_HQ_LVQ_NAME"); - - /** - * Returns the messageID. - * <br> - * The messageID is set when the message is handled by the server. - */ - long getMessageID(); - - /** - * Returns the address this message is sent to. - */ - SimpleString getAddress(); - - /** - * Sets the address to send this message to. - * - * @param address address to send the message to - */ - void setAddress(SimpleString address); - - /** - * Returns this message type. - */ - byte getType(); - - /** - * Returns whether this message is durable or not. - */ - boolean isDurable(); - - /** - * Sets whether this message is durable or not. - * - * @param durable {@code true} to flag this message as durable, {@code false} else - */ - void setDurable(boolean durable); - - /** - * Returns the expiration time of this message. - */ - long getExpiration(); - - /** - * Returns whether this message is expired or not. - */ - boolean isExpired(); - - /** - * Sets the expiration of this message. - * - * @param expiration expiration time - */ - void setExpiration(long expiration); - - /** - * Returns the message timestamp. - * <br> - * The timestamp corresponds to the time this message - * was handled by a HornetQ server. - */ - long getTimestamp(); - - /** - * Sets the message timestamp. - * - * @param timestamp timestamp - */ - void setTimestamp(long timestamp); - - /** - * Returns the message priority. - * - * Values range from 0 (less priority) to 9 (more priority) inclusive. - */ - byte getPriority(); - - /** - * Sets the message priority. - * - * Value must be between 0 and 9 inclusive. - * - * @param priority the new message priority - */ - void setPriority(byte priority); - - /** - * Returns the size of the <em>encoded</em> message. - */ - int getEncodeSize(); - - /** - * Returns whether this message is a <em>large message</em> or a regular message. - */ - boolean isLargeMessage(); - - /** - * Returns the message body as a HornetQBuffer - */ - HornetQBuffer getBodyBuffer(); - - // Properties - // ----------------------------------------------------------------- - - /** - * Puts a boolean property in this message. - * - * @param key property name - * @param value property value - */ - void putBooleanProperty(SimpleString key, boolean value); - - /** - * @see #putBooleanProperty(SimpleString, boolean) - */ - void putBooleanProperty(String key, boolean value); - - /** - * Puts a byte property in this message. - * - * @param key property name - * @param value property value - */ - void putByteProperty(SimpleString key, byte value); - - /** - * @see #putByteProperty(SimpleString, byte) - */ - void putByteProperty(String key, byte value); - - /** - * Puts a byte[] property in this message. - * - * @param key property name - * @param value property value - */ - void putBytesProperty(SimpleString key, byte[] value); - - /** - * @see #putBytesProperty(SimpleString, byte[]) - */ - void putBytesProperty(String key, byte[] value); - - /** - * Puts a short property in this message. - * - * @param key property name - * @param value property value - */ - void putShortProperty(SimpleString key, short value); - - /** - * @see #putShortProperty(SimpleString, short) - */ - void putShortProperty(String key, short value); - - /** - * Puts a int property in this message. - * - * @param key property name - * @param value property value - */ - void putIntProperty(SimpleString key, int value); - - /** - * @see #putIntProperty(SimpleString, int) - */ - void putIntProperty(String key, int value); - - /** - * Puts a long property in this message. - * - * @param key property name - * @param value property value - */ - void putLongProperty(SimpleString key, long value); - - /** - * @see #putLongProperty(SimpleString, long) - */ - void putLongProperty(String key, long value); - - /** - * Puts a float property in this message. - * - * @param key property name - * @param value property value - */ - void putFloatProperty(SimpleString key, float value); - - /** - * @see #putFloatProperty(SimpleString, float) - */ - void putFloatProperty(String key, float value); - - /** - * Puts a double property in this message. - * - * @param key property name - * @param value property value - */ - void putDoubleProperty(SimpleString key, double value); - - /** - * @see #putDoubleProperty(SimpleString, double) - */ - void putDoubleProperty(String key, double value); - - /** - * Puts a SimpleString property in this message. - * - * @param key property name - * @param value property value - */ - void putStringProperty(SimpleString key, SimpleString value); - - /** - * Puts a String property in this message. - * - * @param key property name - * @param value property value - */ - void putStringProperty(String key, String value); - - /** - * Puts an Object property in this message. - * <br> - * Accepted types are: - * <ul> - * <li>Boolean</li> - * <li>Byte</li> - * <li>Short</li> - * <li>Integer</li> - * <li>Long</li> - * <li>Float</li> - * <li>Double</li> - * <li>String</li> - * <li>SimpleString</li> - * </ul> - * - * Using any other type will throw a PropertyConversionException. - * - * @param key property name - * @param value property value - * - * @throws PropertyConversionException if the value is not one of the accepted property types. - */ - void putObjectProperty(SimpleString key, Object value) throws PropertyConversionException; - - /** - * @see #putObjectProperty(SimpleString, Object) - */ - void putObjectProperty(String key, Object value) throws PropertyConversionException; - - /** - * Removes the property corresponding to the specified key. - * @param key property name - * @return the value corresponding to the specified key or @{code null} - */ - Object removeProperty(SimpleString key); - - - /** - * @see #removeProperty(SimpleString) - */ - Object removeProperty(String key); - - /** - * Returns {@code true} if this message contains a property with the given key, {@code false} else. - * - * @param key property name - */ - boolean containsProperty(SimpleString key); - - /** - * @see #containsProperty(SimpleString) - */ - boolean containsProperty(String key); - - /** - * Returns the property corresponding to the specified key as a Boolean. - * - * @throws PropertyConversionException if the value can not be converted to a Boolean - */ - Boolean getBooleanProperty(SimpleString key) throws PropertyConversionException; - - /** - * @see #getBooleanProperty(SimpleString) - */ - Boolean getBooleanProperty(String key) throws PropertyConversionException; - - /** - * Returns the property corresponding to the specified key as a Byte. - * - * @throws PropertyConversionException if the value can not be converted to a Byte - */ - Byte getByteProperty(SimpleString key) throws PropertyConversionException; - - /** - * @see #getByteProperty(SimpleString) - */ - Byte getByteProperty(String key) throws PropertyConversionException; - - /** - * Returns the property corresponding to the specified key as a Double. - * - * @throws PropertyConversionException if the value can not be converted to a Double - */ - Double getDoubleProperty(SimpleString key) throws PropertyConversionException; - - /** - * @see #getDoubleProperty(SimpleString) - */ - Double getDoubleProperty(String key) throws PropertyConversionException; - - /** - * Returns the property corresponding to the specified key as an Integer. - * - * @throws PropertyConversionException if the value can not be converted to an Integer - */ - Integer getIntProperty(SimpleString key) throws PropertyConversionException; - - /** - * @see #getIntProperty(SimpleString) - */ - Integer getIntProperty(String key) throws PropertyConversionException; - - /** - * Returns the property corresponding to the specified key as a Long. - * - * @throws PropertyConversionException if the value can not be converted to a Long - */ - Long getLongProperty(SimpleString key) throws PropertyConversionException; - - /** - * @see #getLongProperty(SimpleString) - */ - Long getLongProperty(String key) throws PropertyConversionException; - - /** - * Returns the property corresponding to the specified key - */ - Object getObjectProperty(SimpleString key); - - /** - * @see #getBooleanProperty(SimpleString) - */ - Object getObjectProperty(String key); - - /** - * Returns the property corresponding to the specified key as a Short. - * - * @throws PropertyConversionException if the value can not be converted to a Short - */ - Short getShortProperty(SimpleString key) throws PropertyConversionException; - - /** - * @see #getShortProperty(SimpleString) - */ - Short getShortProperty(String key) throws PropertyConversionException; - - /** - * Returns the property corresponding to the specified key as a Float. - * - * @throws PropertyConversionException if the value can not be converted to a Float - */ - Float getFloatProperty(SimpleString key) throws PropertyConversionException; - - /** - * @see #getFloatProperty(SimpleString) - */ - Float getFloatProperty(String key) throws PropertyConversionException; - - /** - * Returns the property corresponding to the specified key as a String. - * - * @throws PropertyConversionException if the value can not be converted to a String - */ - String getStringProperty(SimpleString key) throws PropertyConversionException; - - /** - * @see #getStringProperty(SimpleString) - */ - String getStringProperty(String key) throws PropertyConversionException; - - /** - * Returns the property corresponding to the specified key as a SimpleString. - * - * @throws PropertyConversionException if the value can not be converted to a SimpleString - */ - SimpleString getSimpleStringProperty(SimpleString key) throws PropertyConversionException; - - /** - * @see #getSimpleStringProperty(SimpleString) - */ - SimpleString getSimpleStringProperty(String key) throws PropertyConversionException; - - /** - * Returns the property corresponding to the specified key as a byte[]. - * - * @throws PropertyConversionException if the value can not be converted to a byte[] - */ - byte[] getBytesProperty(SimpleString key) throws PropertyConversionException; - - /** - * @see #getBytesProperty(SimpleString) - */ - byte[] getBytesProperty(String key) throws PropertyConversionException; - - /** - * Returns all the names of the properties for this message. - */ - Set<SimpleString> getPropertyNames(); - - /** - * @return Returns the message in Map form, useful when encoding to JSON - */ - Map<String, Object> toMap(); -} Deleted: trunk/src/main/org/hornetq/api/core/message/PropertyConversionException.java =================================================================== --- trunk/src/main/org/hornetq/api/core/message/PropertyConversionException.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/api/core/message/PropertyConversionException.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -1,54 +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.core.message; - -/** - * A PropertyConversionException is thrown by Message methods - * when a property can not be converted to the expected type. - * - * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> - * - * @see Message - * - */ -public class PropertyConversionException extends RuntimeException -{ - - // Constants ----------------------------------------------------- - - private static final long serialVersionUID = -3010008708334904332L; - - // Attributes ---------------------------------------------------- - - // Static -------------------------------------------------------- - - // Constructors -------------------------------------------------- - - - public PropertyConversionException(final String message) - { - super(message); - } - - // Public -------------------------------------------------------- - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- - -} Modified: trunk/src/main/org/hornetq/api/jms/HornetQJMSClient.java =================================================================== --- trunk/src/main/org/hornetq/api/jms/HornetQJMSClient.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/api/jms/HornetQJMSClient.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,8 +13,8 @@ package org.hornetq.api.jms; import org.hornetq.api.Pair; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.jms.HornetQConnectionFactory; import org.hornetq.jms.HornetQQueue; import org.hornetq.jms.HornetQTopic; Modified: trunk/src/main/org/hornetq/api/jms/management/JMSManagementHelper.java =================================================================== --- trunk/src/main/org/hornetq/api/jms/management/JMSManagementHelper.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/api/jms/management/JMSManagementHelper.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -33,7 +33,7 @@ // Static -------------------------------------------------------- - private static org.hornetq.api.core.message.Message getCoreMessage(final Message jmsMessage) + private static org.hornetq.api.core.Message getCoreMessage(final Message jmsMessage) { if (jmsMessage instanceof HornetQMessage == false) { Modified: trunk/src/main/org/hornetq/api/jms/management/JMSServerControl.java =================================================================== --- trunk/src/main/org/hornetq/api/jms/management/JMSServerControl.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/api/jms/management/JMSServerControl.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -17,8 +17,8 @@ import javax.management.MBeanOperationInfo; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.management.Operation; import org.hornetq.api.core.management.Parameter; import org.hornetq.spi.core.remoting.ConnectorFactory; Modified: trunk/src/main/org/hornetq/core/asyncio/AsynchronousFile.java =================================================================== --- trunk/src/main/org/hornetq/core/asyncio/AsynchronousFile.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/asyncio/AsynchronousFile.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -15,7 +15,7 @@ import java.nio.ByteBuffer; -import org.hornetq.api.core.exception.HornetQException; +import org.hornetq.api.core.HornetQException; /** * Modified: trunk/src/main/org/hornetq/core/asyncio/impl/AsynchronousFileImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/asyncio/impl/AsynchronousFileImpl.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/asyncio/impl/AsynchronousFileImpl.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -24,7 +24,7 @@ import java.util.concurrent.locks.ReentrantLock; import java.util.concurrent.locks.ReentrantReadWriteLock; -import org.hornetq.api.core.exception.HornetQException; +import org.hornetq.api.core.HornetQException; import org.hornetq.core.asyncio.AIOCallback; import org.hornetq.core.asyncio.AsynchronousFile; import org.hornetq.core.asyncio.BufferCallback; 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:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/buffers/impl/ChannelBufferWrapper.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -16,7 +16,7 @@ import java.nio.ByteBuffer; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; 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:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/buffers/impl/ResetLimitWrappedHornetQBuffer.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -16,7 +16,7 @@ import java.nio.ByteBuffer; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; 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:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/client/impl/ClientConsumerImpl.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -18,10 +18,10 @@ import java.util.concurrent.atomic.AtomicLong; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.buffers.HornetQBuffers; +import org.hornetq.api.core.HornetQBuffers; +import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.MessageHandler; -import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.list.PriorityLinkedList; import org.hornetq.core.list.impl.PriorityLinkedListImpl; import org.hornetq.core.logging.Logger; 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:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/client/impl/ClientConsumerInternal.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -14,9 +14,9 @@ package org.hornetq.core.client.impl; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.remoting.impl.wireformat.SessionQueueQueryResponseMessage; import org.hornetq.core.remoting.impl.wireformat.SessionReceiveContinuationMessage; import org.hornetq.core.remoting.impl.wireformat.SessionReceiveLargeMessage; 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:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/client/impl/ClientMessageImpl.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -19,9 +19,9 @@ import java.nio.ByteBuffer; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.buffers.HornetQBuffer; -import org.hornetq.api.core.buffers.HornetQBuffers; -import org.hornetq.api.core.exception.HornetQException; +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffers; +import org.hornetq.api.core.HornetQException; 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/ClientMessageInternal.java =================================================================== --- trunk/src/main/org/hornetq/core/client/impl/ClientMessageInternal.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/client/impl/ClientMessageInternal.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,7 +13,7 @@ package org.hornetq.core.client.impl; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.core.message.impl.MessageInternal; 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:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/client/impl/ClientProducerImpl.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -17,10 +17,10 @@ import java.io.InputStream; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.buffers.HornetQBuffer; -import org.hornetq.api.core.buffers.HornetQBuffers; -import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.message.Message; +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.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:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -25,13 +25,13 @@ import javax.transaction.xa.Xid; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; import org.hornetq.api.core.client.SendAcknowledgementHandler; import org.hornetq.api.core.client.SessionFailureListener; -import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.Channel; import org.hornetq.core.remoting.CommandConfirmationHandler; 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:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/client/impl/ClientSessionInternal.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -14,8 +14,8 @@ package org.hornetq.core.client.impl; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.remoting.RemotingConnection; import org.hornetq.core.remoting.impl.wireformat.SessionReceiveContinuationMessage; import org.hornetq.core.remoting.impl.wireformat.SessionReceiveLargeMessage; 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:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/client/impl/DelegatingSession.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -20,12 +20,12 @@ import javax.transaction.xa.Xid; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; import org.hornetq.api.core.client.SendAcknowledgementHandler; import org.hornetq.api.core.client.SessionFailureListener; -import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.RemotingConnection; import org.hornetq.core.remoting.impl.wireformat.SessionReceiveContinuationMessage; Modified: trunk/src/main/org/hornetq/core/client/impl/FailoverManager.java =================================================================== --- trunk/src/main/org/hornetq/core/client/impl/FailoverManager.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/client/impl/FailoverManager.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,9 +13,9 @@ package org.hornetq.core.client.impl; +import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.SessionFailureListener; -import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.remoting.RemotingConnection; /** Modified: trunk/src/main/org/hornetq/core/client/impl/FailoverManagerImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/client/impl/FailoverManagerImpl.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/client/impl/FailoverManagerImpl.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -27,13 +27,13 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.Lock; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.Interceptor; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.SessionFailureListener; -import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.interceptor.Interceptor; import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.Channel; import org.hornetq.core.remoting.ChannelHandler; 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:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/client/impl/LargeMessageBufferImpl.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -27,8 +27,8 @@ import java.util.concurrent.TimeUnit; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.buffers.HornetQBuffer; -import org.hornetq.api.core.exception.HornetQException; +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.HornetQException; 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/client/impl/LargeMessageBufferInternal.java =================================================================== --- trunk/src/main/org/hornetq/core/client/impl/LargeMessageBufferInternal.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/client/impl/LargeMessageBufferInternal.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -15,8 +15,8 @@ import java.io.OutputStream; -import org.hornetq.api.core.buffers.HornetQBuffer; -import org.hornetq.api.core.exception.HornetQException; +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.HornetQException; /** * A LargeMessageBufferInternal Modified: trunk/src/main/org/hornetq/core/cluster/DiscoveryEntry.java =================================================================== --- trunk/src/main/org/hornetq/core/cluster/DiscoveryEntry.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/cluster/DiscoveryEntry.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -14,7 +14,7 @@ package org.hornetq.core.cluster; import org.hornetq.api.Pair; -import org.hornetq.api.core.config.TransportConfiguration; +import org.hornetq.api.core.TransportConfiguration; /** * A DiscoveryEntry 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:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/cluster/impl/DiscoveryGroupImpl.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -25,9 +25,9 @@ import org.hornetq.api.Pair; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.buffers.HornetQBuffer; -import org.hornetq.api.core.buffers.HornetQBuffers; -import org.hornetq.api.core.config.TransportConfiguration; +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffers; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.management.NotificationType; import org.hornetq.core.cluster.DiscoveryEntry; import org.hornetq.core.cluster.DiscoveryGroup; Modified: trunk/src/main/org/hornetq/core/config/Configuration.java =================================================================== --- trunk/src/main/org/hornetq/core/config/Configuration.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/config/Configuration.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -19,8 +19,8 @@ import java.util.Set; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.interceptor.Interceptor; +import org.hornetq.api.core.Interceptor; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.server.JournalType; import org.hornetq.core.server.cluster.BridgeConfiguration; 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:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/config/impl/ConfigurationImpl.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -22,7 +22,7 @@ import java.util.Set; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.config.TransportConfiguration; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.core.config.Configuration; import org.hornetq.core.logging.impl.JULLogDelegateFactory; import org.hornetq.core.server.JournalType; 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:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/config/impl/FileConfiguration.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -23,9 +23,9 @@ import org.hornetq.api.Pair; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ClientSessionFactoryImpl; import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.core.logging.Logger; import org.hornetq.core.server.JournalType; import org.hornetq.core.server.cluster.BridgeConfiguration; 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:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/filter/impl/FilterImpl.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -17,7 +17,7 @@ import java.util.Map; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.exception.HornetQException; +import org.hornetq.api.core.HornetQException; 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/journal/EncodingSupport.java =================================================================== --- trunk/src/main/org/hornetq/core/journal/EncodingSupport.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/journal/EncodingSupport.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,7 +13,7 @@ package org.hornetq.core.journal; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; /** * Modified: trunk/src/main/org/hornetq/core/journal/SequentialFile.java =================================================================== --- trunk/src/main/org/hornetq/core/journal/SequentialFile.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/journal/SequentialFile.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -15,7 +15,7 @@ import java.nio.ByteBuffer; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; import org.hornetq.core.journal.impl.TimedBuffer; /** 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:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/journal/impl/AbstractJournalUpdateTask.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -19,8 +19,8 @@ import java.util.Set; import org.hornetq.api.Pair; -import org.hornetq.api.core.buffers.HornetQBuffer; -import org.hornetq.api.core.buffers.HornetQBuffers; +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffers; 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/AbstractSequentialFile.java =================================================================== --- trunk/src/main/org/hornetq/core/journal/impl/AbstractSequentialFile.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/journal/impl/AbstractSequentialFile.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -21,8 +21,8 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; -import org.hornetq.api.core.buffers.HornetQBuffer; -import org.hornetq.api.core.buffers.HornetQBuffers; +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffers; import org.hornetq.core.journal.EncodingSupport; import org.hornetq.core.journal.IOAsyncTask; import org.hornetq.core.journal.SequentialFile; 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:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/journal/impl/JournalCompactor.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -22,8 +22,8 @@ import java.util.concurrent.ConcurrentHashMap; import org.hornetq.api.Pair; -import org.hornetq.api.core.buffers.HornetQBuffer; -import org.hornetq.api.core.buffers.HornetQBuffers; +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffers; 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:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/journal/impl/JournalImpl.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -42,8 +42,8 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; import org.hornetq.api.Pair; -import org.hornetq.api.core.buffers.HornetQBuffer; -import org.hornetq.api.core.buffers.HornetQBuffers; +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffers; 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/journal/impl/JournalTransaction.java =================================================================== --- trunk/src/main/org/hornetq/core/journal/impl/JournalTransaction.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/journal/impl/JournalTransaction.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -21,7 +21,7 @@ import java.util.Set; import java.util.concurrent.atomic.AtomicInteger; -import org.hornetq.api.core.exception.HornetQException; +import org.hornetq.api.core.HornetQException; import org.hornetq.core.journal.impl.dataformat.JournalInternalRecord; /** Modified: trunk/src/main/org/hornetq/core/journal/impl/NIOSequentialFile.java =================================================================== --- trunk/src/main/org/hornetq/core/journal/impl/NIOSequentialFile.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/journal/impl/NIOSequentialFile.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -22,7 +22,7 @@ import java.util.concurrent.Semaphore; import java.util.concurrent.TimeUnit; -import org.hornetq.api.core.exception.HornetQException; +import org.hornetq.api.core.HornetQException; import org.hornetq.core.journal.IOAsyncTask; import org.hornetq.core.journal.SequentialFile; import org.hornetq.core.journal.SequentialFileFactory; Modified: trunk/src/main/org/hornetq/core/journal/impl/SimpleWaitIOCallback.java =================================================================== --- trunk/src/main/org/hornetq/core/journal/impl/SimpleWaitIOCallback.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/journal/impl/SimpleWaitIOCallback.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -16,7 +16,7 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; -import org.hornetq.api.core.exception.HornetQException; +import org.hornetq.api.core.HornetQException; import org.hornetq.core.logging.Logger; /** Modified: trunk/src/main/org/hornetq/core/journal/impl/TimedBuffer.java =================================================================== --- trunk/src/main/org/hornetq/core/journal/impl/TimedBuffer.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/journal/impl/TimedBuffer.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -23,8 +23,8 @@ import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicLong; -import org.hornetq.api.core.buffers.HornetQBuffer; -import org.hornetq.api.core.buffers.HornetQBuffers; +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffers; import org.hornetq.core.journal.EncodingSupport; import org.hornetq.core.journal.IOAsyncTask; import org.hornetq.core.journal.impl.dataformat.ByteArrayEncoding; Modified: trunk/src/main/org/hornetq/core/journal/impl/dataformat/ByteArrayEncoding.java =================================================================== --- trunk/src/main/org/hornetq/core/journal/impl/dataformat/ByteArrayEncoding.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/journal/impl/dataformat/ByteArrayEncoding.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,7 +13,7 @@ package org.hornetq.core.journal.impl.dataformat; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; import org.hornetq.core.journal.EncodingSupport; /** Modified: trunk/src/main/org/hornetq/core/journal/impl/dataformat/JournalAddRecord.java =================================================================== --- trunk/src/main/org/hornetq/core/journal/impl/dataformat/JournalAddRecord.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/journal/impl/dataformat/JournalAddRecord.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,7 +13,7 @@ package org.hornetq.core.journal.impl.dataformat; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; import org.hornetq.core.journal.EncodingSupport; import org.hornetq.core.journal.impl.JournalImpl; Modified: trunk/src/main/org/hornetq/core/journal/impl/dataformat/JournalAddRecordTX.java =================================================================== --- trunk/src/main/org/hornetq/core/journal/impl/dataformat/JournalAddRecordTX.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/journal/impl/dataformat/JournalAddRecordTX.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,7 +13,7 @@ package org.hornetq.core.journal.impl.dataformat; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; import org.hornetq.core.journal.EncodingSupport; import org.hornetq.core.journal.impl.JournalImpl; Modified: trunk/src/main/org/hornetq/core/journal/impl/dataformat/JournalCompleteRecordTX.java =================================================================== --- trunk/src/main/org/hornetq/core/journal/impl/dataformat/JournalCompleteRecordTX.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/journal/impl/dataformat/JournalCompleteRecordTX.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,7 +13,7 @@ package org.hornetq.core.journal.impl.dataformat; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; import org.hornetq.core.journal.EncodingSupport; import org.hornetq.core.journal.impl.JournalImpl; Modified: trunk/src/main/org/hornetq/core/journal/impl/dataformat/JournalDeleteRecord.java =================================================================== --- trunk/src/main/org/hornetq/core/journal/impl/dataformat/JournalDeleteRecord.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/journal/impl/dataformat/JournalDeleteRecord.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,7 +13,7 @@ package org.hornetq.core.journal.impl.dataformat; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; import org.hornetq.core.journal.impl.JournalImpl; /** Modified: trunk/src/main/org/hornetq/core/journal/impl/dataformat/JournalDeleteRecordTX.java =================================================================== --- trunk/src/main/org/hornetq/core/journal/impl/dataformat/JournalDeleteRecordTX.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/journal/impl/dataformat/JournalDeleteRecordTX.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,7 +13,7 @@ package org.hornetq.core.journal.impl.dataformat; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; import org.hornetq.core.journal.EncodingSupport; import org.hornetq.core.journal.impl.JournalImpl; Modified: trunk/src/main/org/hornetq/core/journal/impl/dataformat/JournalInternalRecord.java =================================================================== --- trunk/src/main/org/hornetq/core/journal/impl/dataformat/JournalInternalRecord.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/journal/impl/dataformat/JournalInternalRecord.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,7 +13,7 @@ package org.hornetq.core.journal.impl.dataformat; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; import org.hornetq.core.journal.EncodingSupport; /** Modified: trunk/src/main/org/hornetq/core/journal/impl/dataformat/JournalRollbackRecordTX.java =================================================================== --- trunk/src/main/org/hornetq/core/journal/impl/dataformat/JournalRollbackRecordTX.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/journal/impl/dataformat/JournalRollbackRecordTX.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,7 +13,7 @@ package org.hornetq.core.journal.impl.dataformat; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; import org.hornetq.core.journal.impl.JournalImpl; /** Modified: trunk/src/main/org/hornetq/core/management/impl/AcceptorControlImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/management/impl/AcceptorControlImpl.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/management/impl/AcceptorControlImpl.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -17,7 +17,7 @@ import javax.management.MBeanOperationInfo; -import org.hornetq.api.core.config.TransportConfiguration; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.management.AcceptorControl; import org.hornetq.api.core.management.AddressControl; 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:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/management/impl/HornetQServerControlImpl.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -34,8 +34,8 @@ import javax.transaction.xa.Xid; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.exception.HornetQException; +import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.management.AddressControl; import org.hornetq.api.core.management.HornetQServerControl; import org.hornetq.api.core.management.NotificationType; 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:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/management/impl/QueueControlImpl.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -19,10 +19,10 @@ import javax.management.MBeanOperationInfo; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.exception.HornetQException; +import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.Message; import org.hornetq.api.core.management.MessageCounterInfo; import org.hornetq.api.core.management.QueueControl; -import org.hornetq.api.core.message.Message; 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/message/BodyEncoder.java =================================================================== --- trunk/src/main/org/hornetq/core/message/BodyEncoder.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/message/BodyEncoder.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -15,8 +15,8 @@ import java.nio.ByteBuffer; -import org.hornetq.api.core.buffers.HornetQBuffer; -import org.hornetq.api.core.exception.HornetQException; +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.HornetQException; /** * Class used to encode message body into buffers. 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:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/message/impl/MessageImpl.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -19,10 +19,10 @@ import java.util.Set; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.buffers.HornetQBuffer; -import org.hornetq.api.core.buffers.HornetQBuffers; -import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.message.PropertyConversionException; +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.core.buffers.impl.ResetLimitWrappedHornetQBuffer; import org.hornetq.core.client.impl.LargeMessageBufferInternal; import org.hornetq.core.logging.Logger; Modified: trunk/src/main/org/hornetq/core/message/impl/MessageInternal.java =================================================================== --- trunk/src/main/org/hornetq/core/message/impl/MessageInternal.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/message/impl/MessageInternal.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -15,9 +15,9 @@ import java.io.InputStream; -import org.hornetq.api.core.buffers.HornetQBuffer; -import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.message.Message; +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.Message; import org.hornetq.core.message.BodyEncoder; /** 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:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/paging/impl/PageImpl.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -19,8 +19,8 @@ import java.util.concurrent.atomic.AtomicInteger; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.buffers.HornetQBuffer; -import org.hornetq.api.core.buffers.HornetQBuffers; +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffers; 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/PageTransactionInfoImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/paging/impl/PageTransactionInfoImpl.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/paging/impl/PageTransactionInfoImpl.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -17,7 +17,7 @@ import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; import org.hornetq.core.paging.PageTransactionInfo; import org.hornetq.utils.DataConstants; Modified: trunk/src/main/org/hornetq/core/paging/impl/PagedMessageImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/paging/impl/PagedMessageImpl.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/paging/impl/PagedMessageImpl.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,8 +13,8 @@ package org.hornetq.core.paging.impl; -import org.hornetq.api.core.buffers.HornetQBuffer; -import org.hornetq.api.core.buffers.HornetQBuffers; +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffers; import org.hornetq.core.logging.Logger; import org.hornetq.core.paging.PagedMessage; import org.hornetq.core.persistence.StorageManager; 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:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/paging/impl/PagingStoreImpl.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -28,7 +28,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.message.Message; +import org.hornetq.api.core.Message; 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/impl/journal/BatchingIDGenerator.java =================================================================== --- trunk/src/main/org/hornetq/core/persistence/impl/journal/BatchingIDGenerator.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/persistence/impl/journal/BatchingIDGenerator.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -15,7 +15,7 @@ import java.util.concurrent.atomic.AtomicLong; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; import org.hornetq.core.journal.EncodingSupport; import org.hornetq.core.journal.Journal; import org.hornetq.core.logging.Logger; 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:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -26,10 +26,10 @@ import org.hornetq.api.Pair; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.buffers.HornetQBuffer; -import org.hornetq.api.core.buffers.HornetQBuffers; -import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.message.Message; +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.core.config.Configuration; import org.hornetq.core.filter.Filter; import org.hornetq.core.journal.EncodingSupport; Modified: trunk/src/main/org/hornetq/core/persistence/impl/journal/LargeServerMessageImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/persistence/impl/journal/LargeServerMessageImpl.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/persistence/impl/journal/LargeServerMessageImpl.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -16,8 +16,8 @@ import java.nio.ByteBuffer; import java.util.concurrent.atomic.AtomicInteger; -import org.hornetq.api.core.buffers.HornetQBuffer; -import org.hornetq.api.core.exception.HornetQException; +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.HornetQException; import org.hornetq.core.journal.SequentialFile; import org.hornetq.core.logging.Logger; import org.hornetq.core.message.BodyEncoder; Modified: trunk/src/main/org/hornetq/core/persistence/impl/journal/OperationContextImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/persistence/impl/journal/OperationContextImpl.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/persistence/impl/journal/OperationContextImpl.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -19,7 +19,7 @@ import java.util.concurrent.Executor; import java.util.concurrent.atomic.AtomicInteger; -import org.hornetq.api.core.exception.HornetQException; +import org.hornetq.api.core.HornetQException; import org.hornetq.core.journal.IOAsyncTask; import org.hornetq.core.journal.impl.SimpleWaitIOCallback; import org.hornetq.core.logging.Logger; Modified: trunk/src/main/org/hornetq/core/persistence/impl/nullpm/NullStorageLargeServerMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/persistence/impl/nullpm/NullStorageLargeServerMessage.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/persistence/impl/nullpm/NullStorageLargeServerMessage.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,7 +13,7 @@ package org.hornetq.core.persistence.impl.nullpm; -import org.hornetq.api.core.buffers.HornetQBuffers; +import org.hornetq.api.core.HornetQBuffers; import org.hornetq.core.server.LargeServerMessage; import org.hornetq.core.server.impl.ServerMessageImpl; 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:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/persistence/impl/nullpm/NullStorageManager.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -22,8 +22,8 @@ import org.hornetq.api.Pair; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.buffers.HornetQBuffer; -import org.hornetq.api.core.buffers.HornetQBuffers; +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffers; 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/impl/BindingsImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/postoffice/impl/BindingsImpl.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/postoffice/impl/BindingsImpl.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -22,8 +22,8 @@ import java.util.concurrent.CopyOnWriteArrayList; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.message.Message; +import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.Message; 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/PostOfficeImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/postoffice/impl/PostOfficeImpl.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/postoffice/impl/PostOfficeImpl.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -26,10 +26,10 @@ import java.util.concurrent.ConcurrentMap; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.exception.HornetQException; +import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.Message; import org.hornetq.api.core.management.ManagementHelper; import org.hornetq.api.core.management.NotificationType; -import org.hornetq.api.core.message.Message; import org.hornetq.core.filter.Filter; import org.hornetq.core.journal.IOAsyncTask; import org.hornetq.core.logging.Logger; Modified: trunk/src/main/org/hornetq/core/remoting/Channel.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/Channel.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/remoting/Channel.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -14,7 +14,7 @@ import java.util.concurrent.locks.Lock; -import org.hornetq.api.core.exception.HornetQException; +import org.hornetq.api.core.HornetQException; /** * A channel is a way of interleaving data meant for different endpoints over the same {@link org.hornetq.core.remoting.RemotingConnection}. Modified: trunk/src/main/org/hornetq/core/remoting/FailureListener.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/FailureListener.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/remoting/FailureListener.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,7 +13,7 @@ package org.hornetq.core.remoting; -import org.hornetq.api.core.exception.HornetQException; +import org.hornetq.api.core.HornetQException; /** * A FailureListener notifies the user when a connection failure occurred. Modified: trunk/src/main/org/hornetq/core/remoting/Packet.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/Packet.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/remoting/Packet.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,7 +13,7 @@ package org.hornetq.core.remoting; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; /** * A Packet represents a pcaket of data transmitted over a connection. @@ -53,7 +53,7 @@ byte getType(); /** - * Encodes the packet and returns a {@link org.hornetq.api.core.buffers.HornetQBuffer} containing the data + * Encodes the packet and returns a {@link org.hornetq.api.core.HornetQBuffer} containing the data * * @param connection the connection * @return the buffer to encode to Modified: trunk/src/main/org/hornetq/core/remoting/RemotingConnection.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/RemotingConnection.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/remoting/RemotingConnection.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -15,8 +15,8 @@ import java.util.List; -import org.hornetq.api.core.buffers.HornetQBuffer; -import org.hornetq.api.core.exception.HornetQException; +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.HornetQException; import org.hornetq.spi.core.remoting.BufferHandler; import org.hornetq.spi.core.remoting.Connection; Modified: trunk/src/main/org/hornetq/core/remoting/impl/AbstractBufferHandler.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/AbstractBufferHandler.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/remoting/impl/AbstractBufferHandler.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -12,7 +12,7 @@ */ package org.hornetq.core.remoting.impl; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; import org.hornetq.core.logging.Logger; import org.hornetq.spi.core.remoting.BufferHandler; import org.hornetq.utils.DataConstants; Modified: trunk/src/main/org/hornetq/core/remoting/impl/ChannelImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/ChannelImpl.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/remoting/impl/ChannelImpl.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -19,8 +19,8 @@ import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import org.hornetq.api.core.buffers.HornetQBuffer; -import org.hornetq.api.core.exception.HornetQException; +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.HornetQException; import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.Channel; import org.hornetq.core.remoting.ChannelHandler; Modified: trunk/src/main/org/hornetq/core/remoting/impl/PacketDecoder.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/PacketDecoder.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/remoting/impl/PacketDecoder.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -78,7 +78,7 @@ import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_XA_START; import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.SESS_XA_SUSPEND; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.Packet; import org.hornetq.core.remoting.impl.wireformat.CreateQueueMessage; Modified: trunk/src/main/org/hornetq/core/remoting/impl/RemotingConnectionImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/RemotingConnectionImpl.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/remoting/impl/RemotingConnectionImpl.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -20,9 +20,9 @@ import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.Executor; -import org.hornetq.api.core.buffers.HornetQBuffer; -import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.interceptor.Interceptor; +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.Interceptor; import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.Channel; import org.hornetq.core.remoting.CloseListener; 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:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/remoting/impl/invm/InVMAcceptor.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -18,7 +18,7 @@ import java.util.concurrent.Executor; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.exception.HornetQException; +import org.hornetq.api.core.HornetQException; 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/invm/InVMConnection.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/invm/InVMConnection.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/remoting/impl/invm/InVMConnection.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -15,9 +15,9 @@ import java.util.concurrent.Executor; import java.util.concurrent.RejectedExecutionException; -import org.hornetq.api.core.buffers.HornetQBuffer; -import org.hornetq.api.core.buffers.HornetQBuffers; -import org.hornetq.api.core.exception.HornetQException; +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffers; +import org.hornetq.api.core.HornetQException; import org.hornetq.core.logging.Logger; import org.hornetq.spi.core.remoting.BufferHandler; import org.hornetq.spi.core.remoting.Connection; Modified: trunk/src/main/org/hornetq/core/remoting/impl/invm/InVMConnector.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/invm/InVMConnector.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/remoting/impl/invm/InVMConnector.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -17,7 +17,7 @@ import java.util.concurrent.ConcurrentMap; import java.util.concurrent.Executor; -import org.hornetq.api.core.exception.HornetQException; +import org.hornetq.api.core.HornetQException; import org.hornetq.core.logging.Logger; import org.hornetq.spi.core.remoting.Acceptor; import org.hornetq.spi.core.remoting.BufferHandler; 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:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/CreateQueueMessage.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -14,7 +14,7 @@ package org.hornetq.core.remoting.impl.wireformat; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; import org.hornetq.core.logging.Logger; /** Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/CreateReplicationSessionMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/CreateReplicationSessionMessage.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/CreateReplicationSessionMessage.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,7 +13,7 @@ package org.hornetq.core.remoting.impl.wireformat; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; /** * @author <a href="mailto:tim.fox@jboss.com">Clebert Suconic</a> Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/CreateSessionMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/CreateSessionMessage.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/CreateSessionMessage.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,7 +13,7 @@ package org.hornetq.core.remoting.impl.wireformat; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; /** * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/CreateSessionResponseMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/CreateSessionResponseMessage.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/CreateSessionResponseMessage.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,7 +13,7 @@ package org.hornetq.core.remoting.impl.wireformat; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; /** * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/HornetQExceptionMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/HornetQExceptionMessage.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/HornetQExceptionMessage.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,8 +13,8 @@ package org.hornetq.core.remoting.impl.wireformat; -import org.hornetq.api.core.buffers.HornetQBuffer; -import org.hornetq.api.core.exception.HornetQException; +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.HornetQException; import org.hornetq.core.logging.Logger; /** Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/MessagePacket.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/MessagePacket.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/MessagePacket.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,7 +13,7 @@ package org.hornetq.core.remoting.impl.wireformat; -import org.hornetq.api.core.message.Message; +import org.hornetq.api.core.Message; import org.hornetq.core.logging.Logger; import org.hornetq.core.message.impl.MessageInternal; Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/PacketImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/PacketImpl.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/PacketImpl.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,7 +13,7 @@ package org.hornetq.core.remoting.impl.wireformat; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.Packet; import org.hornetq.core.remoting.RemotingConnection; Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/PacketsConfirmedMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/PacketsConfirmedMessage.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/PacketsConfirmedMessage.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,7 +13,7 @@ package org.hornetq.core.remoting.impl.wireformat; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; /** * Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/Ping.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/Ping.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/Ping.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,7 +13,7 @@ package org.hornetq.core.remoting.impl.wireformat; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; /** * Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReattachSessionMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReattachSessionMessage.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReattachSessionMessage.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,7 +13,7 @@ package org.hornetq.core.remoting.impl.wireformat; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; /** * Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReattachSessionResponseMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReattachSessionResponseMessage.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReattachSessionResponseMessage.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,7 +13,7 @@ package org.hornetq.core.remoting.impl.wireformat; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; /** * Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationAddMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationAddMessage.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationAddMessage.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,7 +13,7 @@ package org.hornetq.core.remoting.impl.wireformat; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; import org.hornetq.core.journal.EncodingSupport; import org.hornetq.core.logging.Logger; Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationAddTXMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationAddTXMessage.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationAddTXMessage.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,7 +13,7 @@ package org.hornetq.core.remoting.impl.wireformat; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; import org.hornetq.core.journal.EncodingSupport; /** Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationCommitMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationCommitMessage.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationCommitMessage.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,7 +13,7 @@ package org.hornetq.core.remoting.impl.wireformat; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; /** * A ReplicationAddMessage Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationCompareDataMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationCompareDataMessage.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationCompareDataMessage.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,7 +13,7 @@ package org.hornetq.core.remoting.impl.wireformat; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; import org.hornetq.core.journal.JournalLoadInformation; /** Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationDeleteMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationDeleteMessage.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationDeleteMessage.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,7 +13,7 @@ package org.hornetq.core.remoting.impl.wireformat; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; /** * A ReplicationAddMessage Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationDeleteTXMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationDeleteTXMessage.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationDeleteTXMessage.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,7 +13,7 @@ package org.hornetq.core.remoting.impl.wireformat; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; import org.hornetq.core.journal.EncodingSupport; /** Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationLargeMessageBeingMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationLargeMessageBeingMessage.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationLargeMessageBeingMessage.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,7 +13,7 @@ package org.hornetq.core.remoting.impl.wireformat; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; /** * A ReplicationLargeMessageBeingMessage Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationLargeMessageWriteMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationLargeMessageWriteMessage.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationLargeMessageWriteMessage.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,7 +13,7 @@ package org.hornetq.core.remoting.impl.wireformat; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; /** * A ReplicationLargeMessageWriteMessage Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationLargemessageEndMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationLargemessageEndMessage.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationLargemessageEndMessage.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,7 +13,7 @@ package org.hornetq.core.remoting.impl.wireformat; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; /** * A ReplicationLargemessageEndMessage 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:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationPageEventMessage.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -14,7 +14,7 @@ package org.hornetq.core.remoting.impl.wireformat; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; /** * A ReplicationPageWrite Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationPageWriteMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationPageWriteMessage.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationPageWriteMessage.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,7 +13,7 @@ package org.hornetq.core.remoting.impl.wireformat; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; import org.hornetq.core.paging.PagedMessage; import org.hornetq.core.paging.impl.PagedMessageImpl; Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationPrepareMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationPrepareMessage.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/ReplicationPrepareMessage.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,7 +13,7 @@ package org.hornetq.core.remoting.impl.wireformat; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; import org.hornetq.core.journal.EncodingSupport; /** Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/RollbackMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/RollbackMessage.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/RollbackMessage.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,7 +13,7 @@ package org.hornetq.core.remoting.impl.wireformat; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; /** * A RollbackMessage Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionAcknowledgeMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionAcknowledgeMessage.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionAcknowledgeMessage.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,7 +13,7 @@ package org.hornetq.core.remoting.impl.wireformat; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; /** * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> 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:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionBindingQueryMessage.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -14,7 +14,7 @@ package org.hornetq.core.remoting.impl.wireformat; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; /** * 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:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionBindingQueryResponseMessage.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -17,7 +17,7 @@ import java.util.List; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; /** * Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionConsumerCloseMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionConsumerCloseMessage.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionConsumerCloseMessage.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,7 +13,7 @@ package org.hornetq.core.remoting.impl.wireformat; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; /** * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionConsumerFlowCreditMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionConsumerFlowCreditMessage.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionConsumerFlowCreditMessage.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,7 +13,7 @@ package org.hornetq.core.remoting.impl.wireformat; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; /** * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionContinuationMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionContinuationMessage.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionContinuationMessage.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,7 +13,7 @@ package org.hornetq.core.remoting.impl.wireformat; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; import org.hornetq.utils.DataConstants; /** 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:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionCreateConsumerMessage.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -14,7 +14,7 @@ package org.hornetq.core.remoting.impl.wireformat; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; /** * @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:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionDeleteQueueMessage.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -14,7 +14,7 @@ package org.hornetq.core.remoting.impl.wireformat; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; /** * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionExpiredMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionExpiredMessage.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionExpiredMessage.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,7 +13,7 @@ package org.hornetq.core.remoting.impl.wireformat; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; /** * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionForceConsumerDelivery.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionForceConsumerDelivery.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionForceConsumerDelivery.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,7 +13,7 @@ package org.hornetq.core.remoting.impl.wireformat; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; /** * 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:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionProducerCreditsMessage.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -14,7 +14,7 @@ package org.hornetq.core.remoting.impl.wireformat; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; /** * @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:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionQueueQueryMessage.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -14,7 +14,7 @@ package org.hornetq.core.remoting.impl.wireformat; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; /** * 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:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionQueueQueryResponseMessage.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -14,7 +14,7 @@ package org.hornetq.core.remoting.impl.wireformat; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; /** * Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionReceiveContinuationMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionReceiveContinuationMessage.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionReceiveContinuationMessage.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,7 +13,7 @@ package org.hornetq.core.remoting.impl.wireformat; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; import org.hornetq.utils.DataConstants; /** Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionReceiveLargeMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionReceiveLargeMessage.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionReceiveLargeMessage.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,7 +13,7 @@ package org.hornetq.core.remoting.impl.wireformat; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; /** * A SessionReceiveLargeMessage Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionReceiveMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionReceiveMessage.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionReceiveMessage.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,7 +13,7 @@ package org.hornetq.core.remoting.impl.wireformat; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; import org.hornetq.core.client.impl.ClientMessageImpl; import org.hornetq.core.logging.Logger; import org.hornetq.core.message.impl.MessageInternal; 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:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionRequestProducerCreditsMessage.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -14,7 +14,7 @@ package org.hornetq.core.remoting.impl.wireformat; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; /** * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionSendContinuationMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionSendContinuationMessage.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionSendContinuationMessage.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,7 +13,7 @@ package org.hornetq.core.remoting.impl.wireformat; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; /** * A SessionSendContinuationMessage Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionSendLargeMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionSendLargeMessage.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionSendLargeMessage.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,7 +13,7 @@ package org.hornetq.core.remoting.impl.wireformat; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; /** * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionSendMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionSendMessage.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionSendMessage.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,8 +13,8 @@ package org.hornetq.core.remoting.impl.wireformat; -import org.hornetq.api.core.buffers.HornetQBuffer; -import org.hornetq.api.core.message.Message; +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.Message; import org.hornetq.core.logging.Logger; import org.hornetq.core.message.impl.MessageInternal; import org.hornetq.core.remoting.RemotingConnection; Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXACommitMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXACommitMessage.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXACommitMessage.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -15,7 +15,7 @@ import javax.transaction.xa.Xid; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; /** * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAEndMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAEndMessage.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAEndMessage.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -15,7 +15,7 @@ import javax.transaction.xa.Xid; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; /** * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAForgetMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAForgetMessage.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAForgetMessage.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -15,7 +15,7 @@ import javax.transaction.xa.Xid; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; /** * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAGetInDoubtXidsResponseMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAGetInDoubtXidsResponseMessage.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAGetInDoubtXidsResponseMessage.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -18,7 +18,7 @@ import javax.transaction.xa.Xid; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; /** * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAGetTimeoutResponseMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAGetTimeoutResponseMessage.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAGetTimeoutResponseMessage.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,7 +13,7 @@ package org.hornetq.core.remoting.impl.wireformat; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; /** * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAJoinMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAJoinMessage.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAJoinMessage.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -15,7 +15,7 @@ import javax.transaction.xa.Xid; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; /** * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAPrepareMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAPrepareMessage.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAPrepareMessage.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -15,7 +15,7 @@ import javax.transaction.xa.Xid; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; /** * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAResponseMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAResponseMessage.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAResponseMessage.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,7 +13,7 @@ package org.hornetq.core.remoting.impl.wireformat; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; /** * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAResumeMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAResumeMessage.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAResumeMessage.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -15,7 +15,7 @@ import javax.transaction.xa.Xid; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; /** * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXARollbackMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXARollbackMessage.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXARollbackMessage.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -15,7 +15,7 @@ import javax.transaction.xa.Xid; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; /** * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXASetTimeoutMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXASetTimeoutMessage.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXASetTimeoutMessage.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,7 +13,7 @@ package org.hornetq.core.remoting.impl.wireformat; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; /** * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXASetTimeoutResponseMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXASetTimeoutResponseMessage.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXASetTimeoutResponseMessage.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,7 +13,7 @@ package org.hornetq.core.remoting.impl.wireformat; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; /** * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAStartMessage.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAStartMessage.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/SessionXAStartMessage.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -15,7 +15,7 @@ import javax.transaction.xa.Xid; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; /** * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> Modified: trunk/src/main/org/hornetq/core/remoting/impl/wireformat/XidCodecSupport.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/impl/wireformat/XidCodecSupport.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/remoting/impl/wireformat/XidCodecSupport.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -15,7 +15,7 @@ import javax.transaction.xa.Xid; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; import org.hornetq.core.transaction.impl.XidImpl; import org.hornetq.utils.DataConstants; Modified: trunk/src/main/org/hornetq/core/remoting/server/RemotingService.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/server/RemotingService.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/remoting/server/RemotingService.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -15,7 +15,7 @@ import java.util.Set; -import org.hornetq.api.core.interceptor.Interceptor; +import org.hornetq.api.core.Interceptor; import org.hornetq.core.remoting.RemotingConnection; import org.hornetq.core.server.HornetQComponent; Modified: trunk/src/main/org/hornetq/core/remoting/server/impl/RemotingServiceImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/remoting/server/impl/RemotingServiceImpl.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/remoting/server/impl/RemotingServiceImpl.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -22,11 +22,11 @@ import java.util.concurrent.Executor; import java.util.concurrent.ScheduledExecutorService; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.Interceptor; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.interceptor.Interceptor; import org.hornetq.core.config.Configuration; import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.Channel; Modified: trunk/src/main/org/hornetq/core/replication/ReplicationEndpoint.java =================================================================== --- trunk/src/main/org/hornetq/core/replication/ReplicationEndpoint.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/replication/ReplicationEndpoint.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,7 +13,7 @@ package org.hornetq.core.replication; -import org.hornetq.api.core.exception.HornetQException; +import org.hornetq.api.core.HornetQException; import org.hornetq.core.journal.JournalLoadInformation; import org.hornetq.core.remoting.Channel; import org.hornetq.core.remoting.ChannelHandler; Modified: trunk/src/main/org/hornetq/core/replication/ReplicationManager.java =================================================================== --- trunk/src/main/org/hornetq/core/replication/ReplicationManager.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/replication/ReplicationManager.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -16,7 +16,7 @@ import java.util.Set; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.exception.HornetQException; +import org.hornetq.api.core.HornetQException; 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:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/replication/impl/ReplicationEndpointImpl.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -17,7 +17,7 @@ import java.util.concurrent.ConcurrentMap; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.exception.HornetQException; +import org.hornetq.api.core.HornetQException; 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:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/replication/impl/ReplicationManagerImpl.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -19,9 +19,9 @@ import java.util.concurrent.ConcurrentLinkedQueue; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.client.SessionFailureListener; -import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.client.impl.FailoverManager; import org.hornetq.core.journal.EncodingSupport; import org.hornetq.core.journal.JournalLoadInformation; 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:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/security/impl/SecurityStoreImpl.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -20,7 +20,7 @@ import java.util.concurrent.ConcurrentMap; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.exception.HornetQException; +import org.hornetq.api.core.HornetQException; 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/cluster/BroadcastGroup.java =================================================================== --- trunk/src/main/org/hornetq/core/server/cluster/BroadcastGroup.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/server/cluster/BroadcastGroup.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -14,7 +14,7 @@ package org.hornetq.core.server.cluster; import org.hornetq.api.Pair; -import org.hornetq.api.core.config.TransportConfiguration; +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/impl/BridgeImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -22,13 +22,13 @@ 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.TransportConfiguration; import org.hornetq.api.core.client.*; -import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.exception.HornetQException; import org.hornetq.api.core.management.ManagementHelper; import org.hornetq.api.core.management.NotificationType; import org.hornetq.api.core.management.ResourceNames; -import org.hornetq.api.core.message.Message; import org.hornetq.core.client.impl.ClientSessionInternal; import org.hornetq.core.filter.Filter; import org.hornetq.core.filter.impl.FilterImpl; 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:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/server/cluster/impl/BroadcastGroupImpl.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -22,9 +22,9 @@ import org.hornetq.api.Pair; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.buffers.HornetQBuffer; -import org.hornetq.api.core.buffers.HornetQBuffers; -import org.hornetq.api.core.config.TransportConfiguration; +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffers; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.management.NotificationType; import org.hornetq.core.logging.Logger; import org.hornetq.core.server.cluster.BroadcastGroup; 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:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -26,8 +26,8 @@ import org.hornetq.api.Pair; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.management.ManagementHelper; import org.hornetq.api.core.management.NotificationType; import org.hornetq.core.cluster.DiscoveryEntry; 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:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -27,7 +27,7 @@ import org.hornetq.api.Pair; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.config.TransportConfiguration; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.core.cluster.DiscoveryGroup; import org.hornetq.core.cluster.impl.DiscoveryGroupImpl; import org.hornetq.core.config.Configuration; Modified: trunk/src/main/org/hornetq/core/server/impl/HornetQPacketHandler.java =================================================================== --- trunk/src/main/org/hornetq/core/server/impl/HornetQPacketHandler.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/server/impl/HornetQPacketHandler.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -18,7 +18,7 @@ import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.CREATE_REPLICATION; import static org.hornetq.core.remoting.impl.wireformat.PacketImpl.REATTACH_SESSION; -import org.hornetq.api.core.exception.HornetQException; +import org.hornetq.api.core.HornetQException; import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.Channel; import org.hornetq.core.remoting.ChannelHandler; 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:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -34,10 +34,10 @@ import org.hornetq.api.Pair; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.client.impl.FailoverManager; import org.hornetq.core.client.impl.FailoverManagerImpl; import org.hornetq.core.config.Configuration; 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:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/server/impl/LastValueQueue.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -17,7 +17,7 @@ import java.util.concurrent.ScheduledExecutorService; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.message.Message; +import org.hornetq.api.core.Message; 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/QueueImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/server/impl/QueueImpl.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/server/impl/QueueImpl.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -31,7 +31,7 @@ import java.util.concurrent.atomic.AtomicInteger; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.message.Message; +import org.hornetq.api.core.Message; 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/ServerConsumerImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/server/impl/ServerConsumerImpl.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/server/impl/ServerConsumerImpl.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -21,9 +21,9 @@ import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import org.hornetq.api.core.buffers.HornetQBuffer; -import org.hornetq.api.core.buffers.HornetQBuffers; -import org.hornetq.api.core.exception.HornetQException; +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffers; +import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.management.ManagementHelper; import org.hornetq.api.core.management.NotificationType; import org.hornetq.core.client.impl.ClientConsumerImpl; 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:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/server/impl/ServerMessageImpl.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -17,7 +17,7 @@ import java.util.concurrent.atomic.AtomicInteger; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.message.Message; +import org.hornetq.api.core.Message; 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:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -29,7 +29,7 @@ import javax.transaction.xa.Xid; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.exception.HornetQException; +import org.hornetq.api.core.HornetQException; 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:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/server/management/ManagementService.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -19,7 +19,7 @@ import javax.management.ObjectName; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.config.TransportConfiguration; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.management.ObjectNameBuilder; import org.hornetq.core.cluster.DiscoveryGroup; import org.hornetq.core.config.Configuration; 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:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/server/management/impl/ManagementServiceImpl.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -29,7 +29,7 @@ import javax.management.StandardMBean; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.config.TransportConfiguration; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.management.AcceptorControl; import org.hornetq.api.core.management.BridgeControl; import org.hornetq.api.core.management.BroadcastGroupControl; Modified: trunk/src/main/org/hornetq/core/transaction/Transaction.java =================================================================== --- trunk/src/main/org/hornetq/core/transaction/Transaction.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/transaction/Transaction.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -15,7 +15,7 @@ import javax.transaction.xa.Xid; -import org.hornetq.api.core.exception.HornetQException; +import org.hornetq.api.core.HornetQException; /** * A HornetQ internal transaction Modified: trunk/src/main/org/hornetq/core/transaction/impl/TransactionImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/transaction/impl/TransactionImpl.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/core/transaction/impl/TransactionImpl.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -18,7 +18,7 @@ import javax.transaction.xa.Xid; -import org.hornetq.api.core.exception.HornetQException; +import org.hornetq.api.core.HornetQException; import org.hornetq.core.journal.IOAsyncTask; import org.hornetq.core.logging.Logger; import org.hornetq.core.persistence.StorageManager; Modified: trunk/src/main/org/hornetq/integration/transports/netty/HornetQChannelHandler.java =================================================================== --- trunk/src/main/org/hornetq/integration/transports/netty/HornetQChannelHandler.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/integration/transports/netty/HornetQChannelHandler.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -12,7 +12,7 @@ */ package org.hornetq.integration.transports.netty; -import org.hornetq.api.core.exception.HornetQException; +import org.hornetq.api.core.HornetQException; import org.hornetq.core.buffers.impl.ChannelBufferWrapper; import org.hornetq.core.logging.Logger; import org.hornetq.spi.core.remoting.BufferHandler; 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:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/integration/transports/netty/NettyAcceptor.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -27,8 +27,8 @@ import javax.net.ssl.SSLContext; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.exception.HornetQException; +import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.management.NotificationType; import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.impl.ssl.SSLSupport; Modified: trunk/src/main/org/hornetq/integration/transports/netty/NettyConnection.java =================================================================== --- trunk/src/main/org/hornetq/integration/transports/netty/NettyConnection.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/integration/transports/netty/NettyConnection.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,8 +13,8 @@ package org.hornetq.integration.transports.netty; -import org.hornetq.api.core.buffers.HornetQBuffer; -import org.hornetq.api.core.exception.HornetQException; +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.HornetQException; import org.hornetq.core.buffers.impl.ChannelBufferWrapper; import org.hornetq.core.logging.Logger; import org.hornetq.spi.core.remoting.Connection; Modified: trunk/src/main/org/hornetq/integration/transports/netty/NettyConnector.java =================================================================== --- trunk/src/main/org/hornetq/integration/transports/netty/NettyConnector.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/integration/transports/netty/NettyConnector.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -28,7 +28,7 @@ import javax.net.ssl.SSLContext; import javax.net.ssl.SSLException; -import org.hornetq.api.core.exception.HornetQException; +import org.hornetq.api.core.HornetQException; import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.impl.ssl.SSLSupport; import org.hornetq.spi.core.remoting.BufferHandler; Modified: trunk/src/main/org/hornetq/jms/HornetQConnectionFactory.java =================================================================== --- trunk/src/main/org/hornetq/jms/HornetQConnectionFactory.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/jms/HornetQConnectionFactory.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -34,9 +34,9 @@ import javax.naming.Referenceable; import org.hornetq.api.Pair; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.core.logging.Logger; import org.hornetq.jms.client.HornetQConnection; import org.hornetq.jms.referenceable.ConnectionFactoryObjectFactory; Modified: trunk/src/main/org/hornetq/jms/client/HornetQBytesMessage.java =================================================================== --- trunk/src/main/org/hornetq/jms/client/HornetQBytesMessage.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/jms/client/HornetQBytesMessage.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -18,7 +18,7 @@ import javax.jms.MessageEOFException; import javax.jms.MessageFormatException; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; 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/client/HornetQConnection.java =================================================================== --- trunk/src/main/org/hornetq/jms/client/HornetQConnection.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/jms/client/HornetQConnection.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -40,10 +40,10 @@ import javax.jms.XATopicSession; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.SessionFailureListener; -import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.logging.Logger; import org.hornetq.core.version.Version; import org.hornetq.utils.UUIDGenerator; Modified: trunk/src/main/org/hornetq/jms/client/HornetQMapMessage.java =================================================================== --- trunk/src/main/org/hornetq/jms/client/HornetQMapMessage.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/jms/client/HornetQMapMessage.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -23,9 +23,9 @@ import javax.jms.MessageFormatException; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.PropertyConversionException; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.message.PropertyConversionException; 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:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/jms/client/HornetQMessage.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -34,11 +34,11 @@ import javax.jms.MessageNotWriteableException; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.PropertyConversionException; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.message.PropertyConversionException; import org.hornetq.jms.HornetQDestination; import org.hornetq.api.jms.HornetQMessageConstants; import org.hornetq.core.client.impl.ClientMessageImpl; @@ -570,7 +570,7 @@ { return message.containsProperty(new SimpleString(name)) || name.equals(HornetQMessage.JMSXDELIVERYCOUNT) || HornetQMessage.JMSXGROUPID.equals(name) && - message.containsProperty(org.hornetq.api.core.message.Message.HDR_GROUP_ID); + message.containsProperty(org.hornetq.api.core.Message.HDR_GROUP_ID); } public boolean getBooleanProperty(final String name) throws JMSException @@ -678,7 +678,7 @@ { if (HornetQMessage.JMSXGROUPID.equals(name)) { - return message.getStringProperty(org.hornetq.api.core.message.Message.HDR_GROUP_ID); + return message.getStringProperty(org.hornetq.api.core.Message.HDR_GROUP_ID); } else { @@ -779,7 +779,7 @@ if (HornetQMessage.JMSXGROUPID.equals(name)) { - message.putStringProperty(org.hornetq.api.core.message.Message.HDR_GROUP_ID, new SimpleString(value)); + message.putStringProperty(org.hornetq.api.core.Message.HDR_GROUP_ID, new SimpleString(value)); } else { Modified: trunk/src/main/org/hornetq/jms/client/HornetQMessageConsumer.java =================================================================== --- trunk/src/main/org/hornetq/jms/client/HornetQMessageConsumer.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/jms/client/HornetQMessageConsumer.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -25,10 +25,10 @@ import javax.jms.TopicSubscriber; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.MessageHandler; -import org.hornetq.api.core.exception.HornetQException; import org.hornetq.jms.HornetQDestination; import org.hornetq.core.logging.Logger; Modified: trunk/src/main/org/hornetq/jms/client/HornetQMessageProducer.java =================================================================== --- trunk/src/main/org/hornetq/jms/client/HornetQMessageProducer.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/jms/client/HornetQMessageProducer.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -31,10 +31,10 @@ import javax.jms.TopicPublisher; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.exception.HornetQException; import org.hornetq.jms.HornetQDestination; import org.hornetq.core.logging.Logger; import org.hornetq.utils.UUIDGenerator; Modified: trunk/src/main/org/hornetq/jms/client/HornetQQueueBrowser.java =================================================================== --- trunk/src/main/org/hornetq/jms/client/HornetQQueueBrowser.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/jms/client/HornetQQueueBrowser.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -21,10 +21,10 @@ import javax.jms.QueueBrowser; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.exception.HornetQException; import org.hornetq.jms.HornetQQueue; import org.hornetq.core.logging.Logger; Modified: trunk/src/main/org/hornetq/jms/client/HornetQSession.java =================================================================== --- trunk/src/main/org/hornetq/jms/client/HornetQSession.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/jms/client/HornetQSession.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -51,12 +51,12 @@ import javax.transaction.xa.XAResource; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientProducer; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSession.BindingQuery; import org.hornetq.api.core.client.ClientSession.QueueQuery; -import org.hornetq.api.core.exception.HornetQException; import org.hornetq.api.jms.*; import org.hornetq.core.filter.impl.FilterImpl; import org.hornetq.core.logging.Logger; Modified: trunk/src/main/org/hornetq/jms/client/HornetQStreamMessage.java =================================================================== --- trunk/src/main/org/hornetq/jms/client/HornetQStreamMessage.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/jms/client/HornetQStreamMessage.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -18,7 +18,7 @@ import javax.jms.MessageFormatException; import javax.jms.StreamMessage; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientSession; import org.hornetq.core.client.impl.ClientMessageImpl; Modified: trunk/src/main/org/hornetq/jms/client/HornetQTextMessage.java =================================================================== --- trunk/src/main/org/hornetq/jms/client/HornetQTextMessage.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/jms/client/HornetQTextMessage.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -17,7 +17,7 @@ import javax.jms.TextMessage; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; 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/client/JMSExceptionHelper.java =================================================================== --- trunk/src/main/org/hornetq/jms/client/JMSExceptionHelper.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/jms/client/JMSExceptionHelper.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -18,7 +18,7 @@ import javax.jms.JMSException; import javax.jms.JMSSecurityException; -import org.hornetq.api.core.exception.HornetQException; +import org.hornetq.api.core.HornetQException; /** * Modified: trunk/src/main/org/hornetq/jms/client/JMSMessageListenerWrapper.java =================================================================== --- trunk/src/main/org/hornetq/jms/client/JMSMessageListenerWrapper.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/jms/client/JMSMessageListenerWrapper.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -16,10 +16,10 @@ import javax.jms.MessageListener; import javax.jms.Session; +import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.MessageHandler; -import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.logging.Logger; /** Modified: trunk/src/main/org/hornetq/jms/management/impl/JMSQueueControlImpl.java =================================================================== --- trunk/src/main/org/hornetq/jms/management/impl/JMSQueueControlImpl.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/jms/management/impl/JMSQueueControlImpl.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -18,7 +18,7 @@ import javax.management.MBeanInfo; import javax.management.StandardMBean; -import org.hornetq.api.core.exception.HornetQException; +import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.management.MessageCounterInfo; import org.hornetq.api.core.management.QueueControl; import org.hornetq.api.jms.HornetQJMSClient; 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:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/jms/management/impl/JMSServerControlImpl.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -29,7 +29,7 @@ import javax.management.StandardMBean; import org.hornetq.api.Pair; -import org.hornetq.api.core.config.TransportConfiguration; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.management.ManagementHelper; import org.hornetq.api.jms.management.ConnectionFactoryControl; import org.hornetq.api.jms.management.JMSQueueControl; 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:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/jms/management/impl/JMSTopicControlImpl.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -22,7 +22,7 @@ import javax.management.StandardMBean; import org.hornetq.api.Pair; -import org.hornetq.api.core.exception.HornetQException; +import org.hornetq.api.core.HornetQException; 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:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/jms/server/JMSServerManager.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -18,7 +18,7 @@ import javax.naming.Context; import org.hornetq.api.Pair; -import org.hornetq.api.core.config.TransportConfiguration; +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:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/jms/server/config/ConnectionFactoryConfiguration.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -16,7 +16,7 @@ import java.util.List; import org.hornetq.api.Pair; -import org.hornetq.api.core.config.TransportConfiguration; +import org.hornetq.api.core.TransportConfiguration; /** * A ConnectionFactoryConfiguration Modified: trunk/src/main/org/hornetq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -17,9 +17,9 @@ import java.util.List; import org.hornetq.api.Pair; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ClientSessionFactoryImpl; import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.jms.server.config.ConnectionFactoryConfiguration; /** 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:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -17,8 +17,8 @@ import java.util.List; import org.hornetq.api.Pair; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.Validators; import org.hornetq.core.deployers.DeploymentManager; 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:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -27,7 +27,7 @@ import javax.naming.NamingException; import org.hornetq.api.Pair; -import org.hornetq.api.core.config.TransportConfiguration; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.jms.HornetQConnectionFactory; import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.jms.HornetQQueue; Modified: trunk/src/main/org/hornetq/jms/server/recovery/HornetQXAResourceWrapper.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/recovery/HornetQXAResourceWrapper.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/jms/server/recovery/HornetQXAResourceWrapper.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -19,9 +19,9 @@ import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; +import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; -import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.logging.Logger; /** Modified: trunk/src/main/org/hornetq/ra/HornetQResourceAdapter.java =================================================================== --- trunk/src/main/org/hornetq/ra/HornetQResourceAdapter.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/ra/HornetQResourceAdapter.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -27,11 +27,11 @@ import javax.resource.spi.work.WorkManager; import javax.transaction.xa.XAResource; +import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.exception.HornetQException; import org.hornetq.jms.HornetQConnectionFactory; import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.core.logging.Logger; Modified: trunk/src/main/org/hornetq/ra/inflow/HornetQMessageHandler.java =================================================================== --- trunk/src/main/org/hornetq/ra/inflow/HornetQMessageHandler.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/ra/inflow/HornetQMessageHandler.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -21,12 +21,12 @@ import javax.resource.spi.endpoint.MessageEndpointFactory; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.MessageHandler; import org.hornetq.api.core.client.ClientSession.QueueQuery; -import org.hornetq.api.core.exception.HornetQException; import org.hornetq.jms.HornetQTopic; import org.hornetq.core.logging.Logger; import org.hornetq.jms.client.HornetQMessage; Modified: trunk/src/main/org/hornetq/spi/core/remoting/BufferHandler.java =================================================================== --- trunk/src/main/org/hornetq/spi/core/remoting/BufferHandler.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/spi/core/remoting/BufferHandler.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -12,7 +12,7 @@ */ package org.hornetq.spi.core.remoting; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; /** * A BufferHandler that will handle buffers received by an acceptor. @@ -32,7 +32,7 @@ void bufferReceived(Object connectionID, HornetQBuffer buffer); /** - * called by the remoting connection prior to {@link org.hornetq.spi.core.remoting.BufferHandler#bufferReceived(Object, org.hornetq.api.core.buffers.HornetQBuffer)}. + * called by the remoting connection prior to {@link org.hornetq.spi.core.remoting.BufferHandler#bufferReceived(Object, org.hornetq.api.core.HornetQBuffer)}. * <p/> * The implementation should return true if there is enough data in the buffer to decode. otherwise false. * Modified: trunk/src/main/org/hornetq/spi/core/remoting/Connection.java =================================================================== --- trunk/src/main/org/hornetq/spi/core/remoting/Connection.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/spi/core/remoting/Connection.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,8 +13,8 @@ package org.hornetq.spi.core.remoting; -import org.hornetq.api.core.buffers.HornetQBuffer; -import org.hornetq.api.core.exception.HornetQException; +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.HornetQException; /** * The connection used by a channel to write data to. Modified: trunk/src/main/org/hornetq/spi/core/remoting/ConnectionLifeCycleListener.java =================================================================== --- trunk/src/main/org/hornetq/spi/core/remoting/ConnectionLifeCycleListener.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/spi/core/remoting/ConnectionLifeCycleListener.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -12,7 +12,7 @@ */ package org.hornetq.spi.core.remoting; -import org.hornetq.api.core.exception.HornetQException; +import org.hornetq.api.core.HornetQException; /** * A ConnectionLifeCycleListener is called by the remoting implementation to notify of connection events. Modified: trunk/src/main/org/hornetq/utils/TypedProperties.java =================================================================== --- trunk/src/main/org/hornetq/utils/TypedProperties.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/utils/TypedProperties.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -32,8 +32,8 @@ import java.util.Map.Entry; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.buffers.HornetQBuffer; -import org.hornetq.api.core.message.PropertyConversionException; +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.PropertyConversionException; import org.hornetq.core.logging.Logger; /** Modified: trunk/src/main/org/hornetq/utils/UTF8Util.java =================================================================== --- trunk/src/main/org/hornetq/utils/UTF8Util.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/src/main/org/hornetq/utils/UTF8Util.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -15,7 +15,7 @@ import java.lang.ref.SoftReference; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; import org.hornetq.core.logging.Logger; /** 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:04:55 UTC (rev 8729) +++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/CTSMiscellaneousTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -22,8 +22,8 @@ import javax.jms.Session; import org.hornetq.api.Pair; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.config.TransportConfiguration; 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:04:55 UTC (rev 8729) +++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/JMSTestCase.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -19,8 +19,8 @@ import javax.naming.InitialContext; import org.hornetq.api.Pair; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.config.TransportConfiguration; 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:04:55 UTC (rev 8729) +++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/message/MessageHeaderTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -34,14 +34,14 @@ import javax.transaction.xa.Xid; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.SendAcknowledgementHandler; import org.hornetq.api.core.client.SessionFailureListener; -import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.client.impl.ClientMessageImpl; import org.hornetq.core.remoting.FailureListener; import org.hornetq.jms.client.HornetQBytesMessage; 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:04:55 UTC (rev 8729) +++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/tools/container/LocalTestServer.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -27,8 +27,8 @@ import javax.naming.InitialContext; import org.hornetq.api.Pair; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.management.ObjectNameBuilder; import org.hornetq.api.core.management.ResourceNames; import org.hornetq.api.jms.management.JMSQueueControl; Modified: trunk/tests/joram-tests/src/org/hornetq/jms/HornetQAdmin.java =================================================================== --- trunk/tests/joram-tests/src/org/hornetq/jms/HornetQAdmin.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/joram-tests/src/org/hornetq/jms/HornetQAdmin.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -25,12 +25,12 @@ import junit.framework.Assert; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientRequestor; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactoryImpl; import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.management.ManagementHelper; import org.hornetq.api.core.management.ResourceNames; import org.hornetq.core.config.impl.ConfigurationImpl; Modified: trunk/tests/joram-tests/src/org/hornetq/jms/SpawnedJMSServer.java =================================================================== --- trunk/tests/joram-tests/src/org/hornetq/jms/SpawnedJMSServer.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/joram-tests/src/org/hornetq/jms/SpawnedJMSServer.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -19,7 +19,7 @@ import javax.naming.InitialContext; -import org.hornetq.api.core.config.TransportConfiguration; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.server.HornetQServer; Modified: trunk/tests/src/org/hornetq/tests/integration/DuplicateDetectionTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/DuplicateDetectionTest.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/DuplicateDetectionTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -19,9 +19,9 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.Message; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; -import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.message.Message; import org.hornetq.core.config.Configuration; import org.hornetq.core.logging.Logger; import org.hornetq.core.server.HornetQServer; Modified: trunk/tests/src/org/hornetq/tests/integration/InterceptorTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/InterceptorTest.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/InterceptorTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -15,14 +15,14 @@ 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.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.interceptor.Interceptor; -import org.hornetq.api.core.message.Message; 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/String64KLimitTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/String64KLimitTest.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/String64KLimitTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -16,8 +16,8 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; -import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/client/AcknowledgeTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -18,13 +18,13 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.MessageHandler; -import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.Queue; import org.hornetq.tests.util.ServiceTestBase; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/client/AutogroupIdTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -17,13 +17,13 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.MessageHandler; -import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.server.HornetQServer; import org.hornetq.tests.util.ServiceTestBase; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/client/CommitRollbackTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -18,13 +18,13 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.MessageHandler; -import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.Queue; import org.hornetq.tests.util.ServiceTestBase; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/client/ConsumerCloseTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -15,9 +15,9 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; -import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/client/ConsumerTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -18,14 +18,14 @@ 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.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.MessageHandler; -import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.interceptor.Interceptor; 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/client/CoreClientTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/CoreClientTest.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/client/CoreClientTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -16,9 +16,9 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; -import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/client/DeadLetterAddressTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -18,10 +18,10 @@ 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.TransportConfiguration; import org.hornetq.api.core.client.*; -import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.message.Message; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; import org.hornetq.core.server.HornetQServer; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/client/DeliveryOrderTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -19,13 +19,13 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.MessageHandler; -import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.server.HornetQServer; import org.hornetq.tests.util.ServiceTestBase; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/client/DurableQueueTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -16,8 +16,8 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; -import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.server.HornetQServer; import org.hornetq.tests.util.RandomUtil; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/client/ExpiryAddressTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -15,10 +15,10 @@ 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.TransportConfiguration; import org.hornetq.api.core.client.*; -import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.message.Message; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; import org.hornetq.core.server.HornetQServer; Modified: trunk/tests/src/org/hornetq/tests/integration/client/FailureDeadlockTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/FailureDeadlockTest.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/client/FailureDeadlockTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -17,8 +17,8 @@ import javax.jms.JMSException; import javax.jms.Session; -import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.exception.HornetQException; +import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.jms.HornetQConnectionFactory; import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.core.client.impl.ClientSessionInternal; Modified: trunk/tests/src/org/hornetq/tests/integration/client/HornetQCrashTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/HornetQCrashTest.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/client/HornetQCrashTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -3,11 +3,11 @@ import junit.framework.Assert; import junit.framework.TestCase; +import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.Interceptor; +import org.hornetq.api.core.Message; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; -import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.interceptor.Interceptor; -import org.hornetq.api.core.message.Message; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; Modified: trunk/tests/src/org/hornetq/tests/integration/client/IncompatibleVersionTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/IncompatibleVersionTest.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/client/IncompatibleVersionTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -19,10 +19,10 @@ import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; +import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.client.impl.FailoverManagerImpl; import org.hornetq.core.remoting.Channel; import org.hornetq.core.remoting.Packet; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/client/LargeMessageTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -21,8 +21,8 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.Message; import org.hornetq.api.core.client.*; -import org.hornetq.api.core.message.Message; import org.hornetq.core.client.impl.ClientConsumerInternal; import org.hornetq.core.config.Configuration; import org.hornetq.core.logging.Logger; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/client/MessageDurabilityTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -16,11 +16,11 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientProducer; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.server.HornetQServer; import org.hornetq.tests.util.RandomUtil; import org.hornetq.tests.util.ServiceTestBase; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/client/MessageExpirationTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -16,12 +16,12 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.Message; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.message.Message; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.Queue; import org.hornetq.core.settings.impl.AddressSettings; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/client/MessageGroupingConnectionFactoryTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -19,9 +19,9 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; -import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; import org.hornetq.core.server.HornetQServer; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/client/MessageGroupingTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -22,10 +22,10 @@ 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.TransportConfiguration; import org.hornetq.api.core.client.*; -import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.message.Message; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; import org.hornetq.core.server.HornetQServer; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/client/MessagePriorityTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -16,8 +16,8 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; -import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/client/NewDeadLetterAddressTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -15,9 +15,9 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; -import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.HornetQServers; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/client/PagingTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -21,13 +21,13 @@ import junit.framework.AssertionFailedError; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.Message; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.message.Message; import org.hornetq.core.config.Configuration; import org.hornetq.core.logging.Logger; import org.hornetq.core.paging.impl.TestSupportPageStore; Modified: trunk/tests/src/org/hornetq/tests/integration/client/ProducerCloseTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/ProducerCloseTest.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/client/ProducerCloseTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -14,9 +14,9 @@ import junit.framework.Assert; +import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; -import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/client/ProducerTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -18,12 +18,12 @@ 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.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.interceptor.Interceptor; 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/client/QueueBrowserTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/QueueBrowserTest.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/client/QueueBrowserTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -15,8 +15,8 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; -import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.core.logging.Logger; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.Queue; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/client/ReceiveImmediateTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -15,8 +15,8 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; -import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.core.config.Configuration; import org.hornetq.core.logging.Logger; import org.hornetq.core.server.HornetQServer; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/client/ReceiveTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -15,13 +15,13 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.MessageHandler; -import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.server.HornetQServer; import org.hornetq.tests.util.ServiceTestBase; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/client/RedeliveryConsumerTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -16,12 +16,12 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.config.Configuration; import org.hornetq.core.logging.Logger; import org.hornetq.core.server.HornetQServer; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/client/RequestorTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -16,9 +16,9 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; -import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.client.impl.ClientMessageImpl; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/client/SelfExpandingBufferTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -16,7 +16,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/client/SessionCloseTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -19,9 +19,9 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; -import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; Modified: trunk/tests/src/org/hornetq/tests/integration/client/SessionClosedOnRemotingConnectionFailureTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/SessionClosedOnRemotingConnectionFailureTest.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/client/SessionClosedOnRemotingConnectionFailureTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -15,9 +15,9 @@ import junit.framework.Assert; +import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; -import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.client.impl.ClientSessionInternal; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/client/SessionCreateAndDeleteQueueTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -15,8 +15,8 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.postoffice.Binding; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.Queue; Modified: trunk/tests/src/org/hornetq/tests/integration/client/SessionCreateConsumerTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/SessionCreateConsumerTest.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/client/SessionCreateConsumerTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -14,9 +14,9 @@ import junit.framework.Assert; +import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.client.impl.ClientSessionInternal; import org.hornetq.core.server.HornetQServer; import org.hornetq.tests.util.ServiceTestBase; Modified: trunk/tests/src/org/hornetq/tests/integration/client/SessionCreateProducerTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/SessionCreateProducerTest.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/client/SessionCreateProducerTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -14,9 +14,9 @@ import junit.framework.Assert; +import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.client.ClientProducer; import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.client.impl.ClientSessionInternal; import org.hornetq.core.server.HornetQServer; import org.hornetq.tests.util.ServiceTestBase; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/client/SessionFactoryTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -24,12 +24,12 @@ import junit.framework.Assert; import org.hornetq.api.Pair; +import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.ClientSessionFactoryImpl; import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/client/SessionSendAcknowledgementHandlerTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -19,12 +19,12 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.Message; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.SendAcknowledgementHandler; -import org.hornetq.api.core.message.Message; import org.hornetq.core.logging.Logger; import org.hornetq.core.server.HornetQServer; import org.hornetq.tests.util.ServiceTestBase; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/client/SessionTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -19,6 +19,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; @@ -27,7 +28,6 @@ import org.hornetq.api.core.client.SessionFailureListener; import org.hornetq.api.core.client.ClientSession.BindingQuery; import org.hornetq.api.core.client.ClientSession.QueueQuery; -import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.client.impl.ClientSessionInternal; import org.hornetq.core.remoting.RemotingConnection; import org.hornetq.core.server.HornetQServer; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/client/TemporaryQueueTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -20,10 +20,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.TransportConfiguration; import org.hornetq.api.core.client.*; -import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.interceptor.Interceptor; import org.hornetq.core.client.impl.ClientSessionInternal; import org.hornetq.core.config.Configuration; import org.hornetq.core.logging.Logger; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/client/TransactionDurabilityTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -15,8 +15,8 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; -import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.core.config.Configuration; import org.hornetq.core.logging.Logger; import org.hornetq.core.server.HornetQServer; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/client/WildCardRoutingTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -15,9 +15,9 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; -import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.HornetQServers; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/clientcrash/ClientCrashTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -16,9 +16,9 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.Message; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; -import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.message.Message; import org.hornetq.core.logging.Logger; import org.hornetq.jms.client.HornetQTextMessage; import org.hornetq.tests.util.SpawnedVMSupport; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/clientcrash/ClientExitTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -16,9 +16,9 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.Message; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; -import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.message.Message; import org.hornetq.core.logging.Logger; import org.hornetq.integration.transports.netty.NettyConnectorFactory; import org.hornetq.tests.util.RandomUtil; Modified: trunk/tests/src/org/hornetq/tests/integration/clientcrash/CrashClient.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/clientcrash/CrashClient.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/clientcrash/CrashClient.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -15,8 +15,8 @@ import java.util.Arrays; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; -import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.core.logging.Logger; import org.hornetq.jms.client.HornetQTextMessage; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/clientcrash/DummyInterceptor.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -16,8 +16,8 @@ import java.util.concurrent.atomic.AtomicInteger; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.interceptor.Interceptor; +import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.Interceptor; 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/clientcrash/DummyInterceptorB.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/clientcrash/DummyInterceptorB.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/clientcrash/DummyInterceptorB.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -15,8 +15,8 @@ import java.util.concurrent.atomic.AtomicInteger; -import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.interceptor.Interceptor; +import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.Interceptor; 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/clientcrash/GracefulClient.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/clientcrash/GracefulClient.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/clientcrash/GracefulClient.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,8 +13,8 @@ package org.hornetq.tests.integration.clientcrash; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; -import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.core.logging.Logger; import org.hornetq.integration.transports.netty.NettyConnectorFactory; import org.hornetq.jms.client.HornetQTextMessage; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeReconnectTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -22,9 +22,9 @@ import org.hornetq.api.Pair; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; -import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.RemotingConnection; import org.hornetq.core.remoting.impl.invm.InVMConnector; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeStartTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -22,8 +22,8 @@ import org.hornetq.api.Pair; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; -import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.impl.invm.TransportConstants; import org.hornetq.core.server.HornetQServer; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -22,8 +22,8 @@ import org.hornetq.api.Pair; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; -import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.impl.invm.TransportConstants; import org.hornetq.core.server.HornetQServer; Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeTestBase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeTestBase.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeTestBase.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -16,7 +16,7 @@ import java.util.ArrayList; import java.util.Map; -import org.hornetq.api.core.config.TransportConfiguration; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.remoting.impl.invm.InVMConnector; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -22,8 +22,8 @@ import org.hornetq.api.Pair; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; -import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.cluster.Bridge; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/SimpleTransformer.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -14,7 +14,7 @@ package org.hornetq.tests.integration.cluster.bridge; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -26,9 +26,9 @@ import org.hornetq.api.Pair; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.Message; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; -import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.message.Message; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusteredGroupingTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -18,9 +18,9 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.Message; import org.hornetq.api.core.management.ManagementHelper; import org.hornetq.api.core.management.NotificationType; -import org.hornetq.api.core.message.Message; import org.hornetq.core.server.group.GroupingHandler; import org.hornetq.core.server.group.impl.GroupBinding; import org.hornetq.core.server.group.impl.GroupingHandlerConfiguration; Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/AsynchronousFailoverTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/AsynchronousFailoverTest.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/AsynchronousFailoverTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -20,13 +20,13 @@ import junit.framework.Assert; +import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.SessionFailureListener; -import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.client.impl.ClientSessionFactoryInternal; import org.hornetq.core.client.impl.ClientSessionInternal; import org.hornetq.core.client.impl.DelegatingSession; Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/ClusterWithBackupFailoverTestBase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/ClusterWithBackupFailoverTestBase.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/ClusterWithBackupFailoverTestBase.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -24,7 +24,7 @@ import java.util.Map; -import org.hornetq.api.core.config.TransportConfiguration; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.core.client.impl.FailoverManagerImpl; import org.hornetq.core.logging.Logger; import org.hornetq.core.server.HornetQServer; Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/DelayInterceptor.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/DelayInterceptor.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/DelayInterceptor.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,8 +13,8 @@ package org.hornetq.tests.integration.cluster.failover; -import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.interceptor.Interceptor; +import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.Interceptor; import org.hornetq.core.remoting.Packet; import org.hornetq.core.remoting.RemotingConnection; import org.hornetq.core.remoting.impl.wireformat.PacketImpl; Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/DelayInterceptor2.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/DelayInterceptor2.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/DelayInterceptor2.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,8 +13,8 @@ package org.hornetq.tests.integration.cluster.failover; -import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.interceptor.Interceptor; +import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.Interceptor; 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/failover/DelayInterceptor3.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/DelayInterceptor3.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/DelayInterceptor3.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,8 +13,8 @@ package org.hornetq.tests.integration.cluster.failover; -import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.interceptor.Interceptor; +import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.Interceptor; 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/failover/FailoverTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTest.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -27,11 +27,11 @@ 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.TransportConfiguration; import org.hornetq.api.core.client.*; -import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.interceptor.Interceptor; -import org.hornetq.api.core.message.Message; import org.hornetq.core.client.impl.ClientSessionFactoryInternal; import org.hornetq.core.client.impl.ClientSessionInternal; import org.hornetq.core.logging.Logger; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -19,9 +19,9 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ClientSessionFactoryImpl; import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.core.client.impl.ClientSessionFactoryInternal; import org.hornetq.core.config.Configuration; import org.hornetq.core.remoting.impl.invm.InVMConnector; Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/GroupingFailoverReplicationTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/GroupingFailoverReplicationTest.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/GroupingFailoverReplicationTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -14,7 +14,7 @@ import java.util.Map; -import org.hornetq.api.core.config.TransportConfiguration; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/GroupingFailoverSharedServerTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/GroupingFailoverSharedServerTest.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/GroupingFailoverSharedServerTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -14,7 +14,7 @@ import java.util.Map; -import org.hornetq.api.core.config.TransportConfiguration; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.server.HornetQServer; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/GroupingFailoverTestBase.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -19,8 +19,8 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.message.Message; +import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.Message; 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/LargeMessageFailoverTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/LargeMessageFailoverTest.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/LargeMessageFailoverTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -16,7 +16,7 @@ import junit.framework.Assert; import junit.framework.TestSuite; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.HornetQClient; import org.hornetq.tests.util.UnitTestCase; Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/NettyAsynchronousFailoverTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/NettyAsynchronousFailoverTest.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/NettyAsynchronousFailoverTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,7 +13,7 @@ package org.hornetq.tests.integration.cluster.failover; -import org.hornetq.api.core.config.TransportConfiguration; +import org.hornetq.api.core.TransportConfiguration; /** * A NettyAsynchronousFailoverTest Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/NettyFailoverTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/NettyFailoverTest.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/NettyFailoverTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -16,7 +16,7 @@ import java.util.HashMap; import java.util.Map; -import org.hornetq.api.core.config.TransportConfiguration; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.integration.transports.netty.TransportConstants; /** 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/PagingFailoverTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -20,13 +20,13 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.SessionFailureListener; -import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.client.impl.ClientSessionFactoryInternal; import org.hornetq.core.client.impl.ClientSessionInternal; import org.hornetq.core.config.Configuration; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/ReplicatedDistributionTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -19,12 +19,12 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.SessionFailureListener; -import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.client.impl.ClientSessionInternal; import org.hornetq.core.remoting.RemotingConnection; import org.hornetq.core.settings.impl.AddressSettings; Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/MultiThreadRandomReattachTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/MultiThreadRandomReattachTest.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/MultiThreadRandomReattachTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,8 +13,8 @@ package org.hornetq.tests.integration.cluster.reattach; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/MultiThreadRandomReattachTestBase.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -23,9 +23,9 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; -import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.client.impl.ClientSessionFactoryInternal; import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.impl.invm.InVMRegistry; Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/MultiThreadReattachSupport.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/MultiThreadReattachSupport.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/MultiThreadReattachSupport.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -20,9 +20,9 @@ import junit.framework.Assert; +import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.client.impl.ClientSessionFactoryInternal; import org.hornetq.core.client.impl.ClientSessionInternal; import org.hornetq.core.logging.Logger; Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/NettyMultiThreadRandomReattachTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/NettyMultiThreadRandomReattachTest.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/NettyMultiThreadRandomReattachTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,9 +13,9 @@ package org.hornetq.tests.integration.cluster.reattach; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ClientSessionFactoryImpl; import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.core.client.impl.ClientSessionFactoryInternal; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/OrderReattachTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -22,13 +22,13 @@ import junit.framework.TestSuite; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.MessageHandler; -import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.client.impl.ClientSessionInternal; import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.impl.RemotingConnectionImpl; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/RandomReattachTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -23,9 +23,9 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; -import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.client.impl.ClientSessionInternal; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/ReattachTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -20,12 +20,12 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.SessionFailureListener; -import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.client.impl.ClientSessionFactoryInternal; import org.hornetq.core.client.impl.ClientSessionInternal; import org.hornetq.core.logging.Logger; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/discovery/DiscoveryTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -21,7 +21,7 @@ import org.hornetq.api.Pair; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.config.TransportConfiguration; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.management.NotificationType; import org.hornetq.core.cluster.DiscoveryEntry; import org.hornetq.core.cluster.DiscoveryGroup; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/divert/DivertTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -19,8 +19,8 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; -import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.core.config.Configuration; import org.hornetq.core.logging.Logger; import org.hornetq.core.server.HornetQServer; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/divert/PersistentDivertTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -19,8 +19,8 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; -import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.core.config.Configuration; import org.hornetq.core.logging.Logger; import org.hornetq.core.server.HornetQServer; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/http/CoreClientOverHttpTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -17,8 +17,8 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; -import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.server.HornetQServer; Modified: trunk/tests/src/org/hornetq/tests/integration/http/NettyHttpTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/http/NettyHttpTest.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/http/NettyHttpTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -22,8 +22,8 @@ import junit.framework.Assert; -import org.hornetq.api.core.buffers.HornetQBuffer; -import org.hornetq.api.core.exception.HornetQException; +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.HornetQException; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.remoting.impl.AbstractBufferHandler; import org.hornetq.integration.transports.netty.NettyAcceptor; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/jms/FloodServerTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -25,8 +25,8 @@ import javax.jms.Session; import org.hornetq.api.Pair; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; Modified: trunk/tests/src/org/hornetq/tests/integration/jms/HornetQConnectionFactoryTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/HornetQConnectionFactoryTest.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/jms/HornetQConnectionFactoryTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -24,9 +24,9 @@ import junit.framework.Assert; import org.hornetq.api.Pair; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.jms.HornetQConnectionFactory; import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.core.config.Configuration; Modified: trunk/tests/src/org/hornetq/tests/integration/jms/ManualReconnectionToSingleServerTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/ManualReconnectionToSingleServerTest.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/jms/ManualReconnectionToSingleServerTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -32,7 +32,7 @@ import junit.framework.Assert; -import org.hornetq.api.core.config.TransportConfiguration; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; Modified: trunk/tests/src/org/hornetq/tests/integration/jms/bridge/BridgeTestBase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/bridge/BridgeTestBase.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/jms/bridge/BridgeTestBase.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -34,7 +34,7 @@ import com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionManagerImple; -import org.hornetq.api.core.config.TransportConfiguration; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.management.ResourceNames; import org.hornetq.jms.HornetQConnectionFactory; import org.hornetq.api.jms.HornetQJMSClient; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/jms/client/PreACKJMSTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -25,8 +25,8 @@ import junit.framework.Assert; import org.hornetq.api.Pair; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.config.TransportConfiguration; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/jms/client/ReSendLargeMessageTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -31,8 +31,8 @@ import junit.framework.Assert; import org.hornetq.api.Pair; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.jms.HornetQMessageConstants; import org.hornetq.tests.util.JMSTestBase; import org.hornetq.tests.util.UnitTestCase; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -27,9 +27,9 @@ import junit.framework.Assert; import org.hornetq.api.Pair; +import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.client.impl.ClientSessionInternal; import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.RemotingConnection; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/jms/client/TextMessageTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -25,8 +25,8 @@ import junit.framework.Assert; import org.hornetq.api.Pair; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.tests.util.JMSTestBase; import org.hornetq.tests.util.RandomUtil; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSFailoverTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -30,9 +30,9 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.exception.HornetQException; import org.hornetq.jms.HornetQConnectionFactory; import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.jms.HornetQQueue; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSReconnectTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -29,9 +29,9 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.exception.HornetQException; import org.hornetq.jms.HornetQConnectionFactory; import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.jms.HornetQQueue; Modified: trunk/tests/src/org/hornetq/tests/integration/jms/connection/CloseConnectionOnGCTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/connection/CloseConnectionOnGCTest.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/jms/connection/CloseConnectionOnGCTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -22,7 +22,7 @@ import junit.framework.Assert; -import org.hornetq.api.core.config.TransportConfiguration; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.jms.HornetQConnectionFactory; import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.core.logging.Logger; Modified: trunk/tests/src/org/hornetq/tests/integration/jms/connection/CloseDestroyedConnectionTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/connection/CloseDestroyedConnectionTest.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/jms/connection/CloseDestroyedConnectionTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -21,8 +21,8 @@ import junit.framework.Assert; -import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.exception.HornetQException; +import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.jms.HornetQConnectionFactory; import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.core.client.impl.ClientSessionInternal; Modified: trunk/tests/src/org/hornetq/tests/integration/jms/connection/ExceptionListenerTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/connection/ExceptionListenerTest.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/jms/connection/ExceptionListenerTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -22,8 +22,8 @@ import junit.framework.Assert; -import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.exception.HornetQException; +import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.jms.HornetQConnectionFactory; import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.core.client.impl.ClientSessionInternal; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/jms/consumer/ConsumerTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -24,7 +24,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.config.TransportConfiguration; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.jms.HornetQConnectionFactory; import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.jms.HornetQQueue; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/jms/divert/DivertAndACKClientTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -25,8 +25,8 @@ import junit.framework.Assert; import org.hornetq.api.Pair; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.jms.HornetQQueue; import org.hornetq.core.config.Configuration; import org.hornetq.core.server.cluster.DivertConfiguration; Modified: trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerDeployerTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerDeployerTest.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerDeployerTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -21,7 +21,7 @@ import junit.framework.Assert; -import org.hornetq.api.core.config.TransportConfiguration; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.jms.HornetQConnectionFactory; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; Modified: trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerStartStopTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerStartStopTest.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerStartStopTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -22,7 +22,7 @@ import junit.framework.Assert; -import org.hornetq.api.core.config.TransportConfiguration; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.jms.HornetQConnectionFactory; import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.core.config.impl.FileConfiguration; Modified: trunk/tests/src/org/hornetq/tests/integration/jms/server/config/JMSConfigurationTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/server/config/JMSConfigurationTest.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/config/JMSConfigurationTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -21,7 +21,7 @@ import junit.framework.Assert; -import org.hornetq.api.core.config.TransportConfiguration; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.core.config.Configuration; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.server.HornetQServer; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSQueueControlTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -28,7 +28,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.config.TransportConfiguration; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.jms.HornetQConnectionFactory; import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.jms.HornetQQueue; Modified: trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -19,7 +19,7 @@ import javax.jms.QueueSession; import javax.jms.Session; -import org.hornetq.api.core.config.TransportConfiguration; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.management.ResourceNames; import org.hornetq.jms.HornetQConnectionFactory; import org.hornetq.api.jms.HornetQJMSClient; Modified: trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControl2Test.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControl2Test.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControl2Test.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -24,7 +24,7 @@ import junit.framework.Assert; -import org.hornetq.api.core.config.TransportConfiguration; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.jms.management.JMSServerControl; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; Modified: trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlTest.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -22,8 +22,8 @@ import junit.framework.Assert; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.management.ObjectNameBuilder; import org.hornetq.api.jms.management.JMSServerControl; import org.hornetq.core.config.Configuration; Modified: trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -19,7 +19,7 @@ import javax.jms.QueueSession; import javax.jms.Session; -import org.hornetq.api.core.config.TransportConfiguration; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.management.ResourceNames; import org.hornetq.jms.HornetQConnectionFactory; import org.hornetq.api.jms.HornetQJMSClient; Modified: trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSUtil.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSUtil.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSUtil.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -26,7 +26,7 @@ import junit.framework.Assert; -import org.hornetq.api.core.config.TransportConfiguration; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.jms.HornetQConnectionFactory; import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; Modified: trunk/tests/src/org/hornetq/tests/integration/jms/server/management/TopicControlTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/server/management/TopicControlTest.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/TopicControlTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -21,7 +21,7 @@ import junit.framework.Assert; -import org.hornetq.api.core.config.TransportConfiguration; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.jms.HornetQTopic; import org.hornetq.api.jms.management.SubscriptionInfo; Modified: trunk/tests/src/org/hornetq/tests/integration/jms/server/management/TopicControlUsingJMSTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/server/management/TopicControlUsingJMSTest.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/TopicControlUsingJMSTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -21,7 +21,7 @@ import junit.framework.Assert; -import org.hornetq.api.core.config.TransportConfiguration; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.management.ResourceNames; import org.hornetq.jms.HornetQConnectionFactory; import org.hornetq.api.jms.HornetQJMSClient; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/largemessage/LargeMessageTestBase.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -27,16 +27,16 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.buffers.HornetQBuffer; -import org.hornetq.api.core.buffers.HornetQBuffers; +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.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.MessageHandler; -import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.message.Message; import org.hornetq.core.logging.Logger; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.Queue; Modified: trunk/tests/src/org/hornetq/tests/integration/largemessage/mock/MockConnector.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/largemessage/mock/MockConnector.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/largemessage/mock/MockConnector.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -17,7 +17,7 @@ import java.util.concurrent.Executor; import java.util.concurrent.Executors; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; import org.hornetq.core.remoting.impl.invm.InVMConnection; import org.hornetq.core.remoting.impl.invm.InVMConnector; import org.hornetq.spi.core.remoting.BufferHandler; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/management/AcceptorControlTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -18,11 +18,11 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.ClientSessionFactoryImpl; import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.management.AcceptorControl; import org.hornetq.api.core.management.NotificationType; import org.hornetq.core.config.Configuration; Modified: trunk/tests/src/org/hornetq/tests/integration/management/AcceptorControlUsingCoreTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/AcceptorControlUsingCoreTest.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/management/AcceptorControlUsingCoreTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -15,11 +15,11 @@ import java.util.Map; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.ClientSessionFactoryImpl; import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.management.AcceptorControl; import org.hornetq.api.core.management.ResourceNames; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/management/AddressControlTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -19,8 +19,8 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; -import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.management.AddressControl; import org.hornetq.api.core.management.RoleInfo; import org.hornetq.core.config.Configuration; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/management/AddressControlUsingCoreTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -19,11 +19,11 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.ClientSessionFactoryImpl; import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.management.AddressControl; import org.hornetq.api.core.management.ResourceNames; import org.hornetq.core.config.Configuration; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/management/BridgeControlTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -23,8 +23,8 @@ import org.hornetq.api.Pair; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.management.BridgeControl; import org.hornetq.api.core.management.NotificationType; import org.hornetq.api.core.management.ObjectNameBuilder; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/management/BridgeControlUsingCoreTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -21,10 +21,10 @@ import junit.framework.Assert; import org.hornetq.api.Pair; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.management.ObjectNameBuilder; import org.hornetq.api.core.management.ResourceNames; import org.hornetq.core.config.Configuration; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/management/BroadcastGroupControlTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -19,7 +19,7 @@ import junit.framework.Assert; import org.hornetq.api.Pair; -import org.hornetq.api.core.config.TransportConfiguration; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.management.BroadcastGroupControl; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; Modified: trunk/tests/src/org/hornetq/tests/integration/management/BroadcastGroupControlUsingCoreTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/BroadcastGroupControlUsingCoreTest.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/management/BroadcastGroupControlUsingCoreTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,11 +13,11 @@ package org.hornetq.tests.integration.management; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.ClientSessionFactoryImpl; import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.management.BroadcastGroupControl; import org.hornetq.api.core.management.ResourceNames; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControl2Test.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -24,8 +24,8 @@ import junit.framework.Assert; import org.hornetq.api.Pair; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.management.ClusterConnectionControl; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControlTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -25,7 +25,7 @@ import org.hornetq.api.Pair; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.config.TransportConfiguration; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.management.ClusterConnectionControl; import org.hornetq.api.core.management.NotificationType; import org.hornetq.api.core.management.ObjectNameBuilder; Modified: trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControlUsingCoreTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControlUsingCoreTest.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControlUsingCoreTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -15,11 +15,11 @@ import java.util.Map; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.ClientSessionFactoryImpl; import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.management.ClusterConnectionControl; import org.hornetq.api.core.management.ResourceNames; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; Modified: trunk/tests/src/org/hornetq/tests/integration/management/DiscoveryGroupControlTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/DiscoveryGroupControlTest.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/management/DiscoveryGroupControlTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -15,7 +15,7 @@ import junit.framework.Assert; -import org.hornetq.api.core.config.TransportConfiguration; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.management.DiscoveryGroupControl; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; Modified: trunk/tests/src/org/hornetq/tests/integration/management/DiscoveryGroupControlUsingCoreTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/DiscoveryGroupControlUsingCoreTest.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/management/DiscoveryGroupControlUsingCoreTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,11 +13,11 @@ package org.hornetq.tests.integration.management; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.ClientSessionFactoryImpl; import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.management.DiscoveryGroupControl; import org.hornetq.api.core.management.ResourceNames; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/management/DivertControlTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -16,7 +16,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.config.TransportConfiguration; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.management.DivertControl; import org.hornetq.api.core.management.ObjectNameBuilder; import org.hornetq.core.config.Configuration; Modified: trunk/tests/src/org/hornetq/tests/integration/management/DivertControlUsingCoreTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/DivertControlUsingCoreTest.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/management/DivertControlUsingCoreTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,11 +13,11 @@ package org.hornetq.tests.integration.management; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.ClientSessionFactoryImpl; import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.management.DivertControl; import org.hornetq.api.core.management.ResourceNames; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -19,7 +19,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.config.TransportConfiguration; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.management.HornetQServerControl; import org.hornetq.api.core.management.ObjectNameBuilder; import org.hornetq.api.core.management.QueueControl; Modified: trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlUsingCoreTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlUsingCoreTest.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlUsingCoreTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,11 +13,11 @@ package org.hornetq.tests.integration.management; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.ClientSessionFactoryImpl; import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.management.HornetQServerControl; import org.hornetq.api.core.management.ResourceNames; import org.hornetq.core.config.Configuration; Modified: trunk/tests/src/org/hornetq/tests/integration/management/JMXDomainTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/JMXDomainTest.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/management/JMXDomainTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -16,7 +16,7 @@ import java.util.HashMap; import java.util.Map; -import org.hornetq.api.core.config.TransportConfiguration; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.management.ObjectNameBuilder; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; Modified: trunk/tests/src/org/hornetq/tests/integration/management/ManagementHelperTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/ManagementHelperTest.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/management/ManagementHelperTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -19,8 +19,8 @@ import junit.framework.Assert; import junit.framework.TestCase; +import org.hornetq.api.core.Message; import org.hornetq.api.core.management.ManagementHelper; -import org.hornetq.api.core.message.Message; 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/integration/management/NotificationTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/NotificationTest.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/management/NotificationTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -20,9 +20,9 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; -import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.exception.HornetQException; import org.hornetq.api.core.management.ManagementHelper; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/management/QueueControlTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -18,13 +18,13 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.Message; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; -import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.management.DayCounterInfo; import org.hornetq.api.core.management.HornetQServerControl; import org.hornetq.api.core.management.MessageCounterInfo; import org.hornetq.api.core.management.QueueControl; -import org.hornetq.api.core.message.Message; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.messagecounter.impl.MessageCounterManagerImpl; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/management/QueueControlUsingCoreTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -16,11 +16,11 @@ import java.util.Map; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.ClientSessionFactoryImpl; import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.management.QueueControl; import org.hornetq.api.core.management.ResourceNames; import org.hornetq.core.logging.Logger; Modified: trunk/tests/src/org/hornetq/tests/integration/management/SecurityManagementTestBase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/SecurityManagementTestBase.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/management/SecurityManagementTestBase.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -15,8 +15,8 @@ import junit.framework.Assert; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; -import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.management.ManagementHelper; import org.hornetq.api.core.management.ResourceNames; import org.hornetq.core.config.impl.ConfigurationImpl; Modified: trunk/tests/src/org/hornetq/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -15,7 +15,7 @@ import java.util.Set; -import org.hornetq.api.core.config.TransportConfiguration; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; Modified: trunk/tests/src/org/hornetq/tests/integration/management/SecurityManagementWithDefaultConfigurationTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/SecurityManagementWithDefaultConfigurationTest.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/management/SecurityManagementWithDefaultConfigurationTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,7 +13,7 @@ package org.hornetq.tests.integration.management; -import org.hornetq.api.core.config.TransportConfiguration; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; Modified: trunk/tests/src/org/hornetq/tests/integration/management/SecurityManagementWithModifiedConfigurationTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/SecurityManagementWithModifiedConfigurationTest.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/management/SecurityManagementWithModifiedConfigurationTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,7 +13,7 @@ package org.hornetq.tests.integration.management; -import org.hornetq.api.core.config.TransportConfiguration; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.server.HornetQServer; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/management/SecurityNotificationTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -22,9 +22,9 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; -import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.exception.HornetQException; import org.hornetq.api.core.management.ManagementHelper; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; Modified: trunk/tests/src/org/hornetq/tests/integration/persistence/DeleteQueueRestartTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/persistence/DeleteQueueRestartTest.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/persistence/DeleteQueueRestartTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -18,11 +18,11 @@ import junit.framework.Assert; +import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.server.HornetQServer; import org.hornetq.tests.util.ServiceTestBase; Modified: trunk/tests/src/org/hornetq/tests/integration/remoting/NetworkAddressTestBase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/remoting/NetworkAddressTestBase.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/remoting/NetworkAddressTestBase.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -26,11 +26,11 @@ import junit.framework.Assert; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.ClientSessionFactoryImpl; import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.core.config.Configuration; import org.hornetq.core.server.HornetQServer; import org.hornetq.tests.util.ServiceTestBase; Modified: trunk/tests/src/org/hornetq/tests/integration/remoting/PingTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/remoting/PingTest.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/remoting/PingTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -19,10 +19,10 @@ import junit.framework.Assert; +import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.Interceptor; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; -import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.interceptor.Interceptor; import org.hornetq.core.client.impl.ClientSessionFactoryInternal; import org.hornetq.core.client.impl.FailoverManagerImpl; import org.hornetq.core.config.Configuration; Modified: trunk/tests/src/org/hornetq/tests/integration/remoting/ReconnectTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/remoting/ReconnectTest.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/remoting/ReconnectTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -19,9 +19,9 @@ import junit.framework.Assert; +import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.SessionFailureListener; -import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.client.impl.ClientSessionInternal; import org.hornetq.core.logging.Logger; import org.hornetq.core.server.HornetQServer; Modified: trunk/tests/src/org/hornetq/tests/integration/remoting/SynchronousCloseTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/remoting/SynchronousCloseTest.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/remoting/SynchronousCloseTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -15,11 +15,11 @@ import junit.framework.Assert; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.ClientSessionFactoryImpl; import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.core.config.Configuration; import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; Modified: trunk/tests/src/org/hornetq/tests/integration/replication/ReplicationOrderTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/replication/ReplicationOrderTest.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/replication/ReplicationOrderTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -18,8 +18,8 @@ import junit.framework.Assert; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; -import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.remoting.impl.invm.TransportConstants; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/replication/ReplicationTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -29,13 +29,13 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.buffers.HornetQBuffer; -import org.hornetq.api.core.buffers.HornetQBuffers; +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.TransportConfiguration; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.interceptor.Interceptor; import org.hornetq.core.client.impl.FailoverManager; import org.hornetq.core.client.impl.FailoverManagerImpl; import org.hornetq.core.config.Configuration; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/scheduling/ScheduledMessageTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -18,12 +18,12 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.Message; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.message.Message; import org.hornetq.core.config.Configuration; import org.hornetq.core.logging.Logger; import org.hornetq.core.server.HornetQServer; Modified: trunk/tests/src/org/hornetq/tests/integration/security/NettySecurityClientTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/security/NettySecurityClientTest.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/security/NettySecurityClientTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -19,7 +19,7 @@ import junit.framework.Assert; -import org.hornetq.api.core.config.TransportConfiguration; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; import org.hornetq.core.server.HornetQServer; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/security/SecurityTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -32,12 +32,12 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.config.Configuration; import org.hornetq.core.security.Role; import org.hornetq.core.server.HornetQServer; Modified: trunk/tests/src/org/hornetq/tests/integration/security/SimpleClient.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/security/SimpleClient.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/security/SimpleClient.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,8 +13,8 @@ package org.hornetq.tests.integration.security; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; -import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.core.logging.Logger; import org.hornetq.jms.client.HornetQTextMessage; import org.hornetq.tests.util.RandomUtil; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/server/ExpiryRunnerTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -23,9 +23,9 @@ import junit.textui.TestRunner; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; -import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.HornetQServers; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/server/LVQRecoveryTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -18,10 +18,10 @@ 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.TransportConfiguration; import org.hornetq.api.core.client.*; -import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.message.Message; import org.hornetq.core.config.Configuration; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.settings.impl.AddressSettings; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/server/LVQTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -15,10 +15,10 @@ 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.TransportConfiguration; import org.hornetq.api.core.client.*; -import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.message.Message; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; import org.hornetq.core.server.HornetQServer; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/server/PredefinedQueueTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -19,9 +19,9 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; -import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.config.Configuration; import org.hornetq.core.logging.Logger; import org.hornetq.core.postoffice.Bindings; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/ssl/CoreClientOverSSLTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -19,10 +19,10 @@ 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.TransportConfiguration; import org.hornetq.api.core.client.*; -import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.message.Message; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; import org.hornetq.core.server.HornetQServer; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/xa/BasicXaRecoveryTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -22,12 +22,12 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.config.Configuration; import org.hornetq.core.logging.Logger; import org.hornetq.core.server.HornetQServer; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/xa/BasicXaTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -24,13 +24,13 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.MessageHandler; -import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.config.Configuration; import org.hornetq.core.logging.Logger; import org.hornetq.core.server.HornetQServer; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/integration/xa/XaTimeoutTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -26,9 +26,9 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.*; -import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.HornetQServers; Modified: trunk/tests/src/org/hornetq/tests/opt/SendTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/opt/SendTest.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/opt/SendTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -27,8 +27,8 @@ import javax.jms.Session; import javax.jms.TextMessage; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.jms.HornetQConnectionFactory; import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.core.config.Configuration; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/performance/paging/MeasurePagingMultiThreadTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -17,11 +17,11 @@ import java.util.concurrent.CountDownLatch; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.config.Configuration; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.settings.impl.AddressSettings; Modified: trunk/tests/src/org/hornetq/tests/stress/journal/CompactingStressTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/stress/journal/CompactingStressTest.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/stress/journal/CompactingStressTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -18,13 +18,13 @@ import junit.framework.Assert; +import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.Message; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.message.Message; import org.hornetq.core.asyncio.impl.AsynchronousFileImpl; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; Modified: trunk/tests/src/org/hornetq/tests/stress/journal/LargeJournalStressTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/stress/journal/LargeJournalStressTest.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/stress/journal/LargeJournalStressTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -18,12 +18,12 @@ import junit.framework.Assert; +import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.server.HornetQServer; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/stress/journal/MultiThreadConsumerStressTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -19,12 +19,12 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.server.HornetQServer; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/stress/journal/NIOMultiThreadCompactorStressTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -24,12 +24,12 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.asyncio.impl.AsynchronousFileImpl; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/stress/paging/PageStressTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -18,12 +18,12 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.client.ClientConsumer; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientProducer; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.config.Configuration; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.JournalType; Modified: trunk/tests/src/org/hornetq/tests/stress/remote/PingStressTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/stress/remote/PingStressTest.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/stress/remote/PingStressTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -15,13 +15,13 @@ import java.util.concurrent.CountDownLatch; +import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.Interceptor; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.ClientSessionFactoryImpl; import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.interceptor.Interceptor; import org.hornetq.core.config.Configuration; import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.Packet; Modified: trunk/tests/src/org/hornetq/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -40,7 +40,7 @@ import junit.framework.Assert; -import org.hornetq.api.core.config.TransportConfiguration; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.jms.HornetQConnectionFactory; import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.core.config.Configuration; Modified: trunk/tests/src/org/hornetq/tests/timing/util/UTF8Test.java =================================================================== --- trunk/tests/src/org/hornetq/tests/timing/util/UTF8Test.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/timing/util/UTF8Test.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -15,8 +15,8 @@ import junit.framework.Assert; -import org.hornetq.api.core.buffers.HornetQBuffer; -import org.hornetq.api.core.buffers.HornetQBuffers; +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffers; import org.hornetq.tests.util.UnitTestCase; import org.hornetq.utils.UTF8Util; Modified: trunk/tests/src/org/hornetq/tests/unit/core/asyncio/AIOTestBase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/asyncio/AIOTestBase.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/unit/core/asyncio/AIOTestBase.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -22,7 +22,7 @@ import junit.framework.Assert; -import org.hornetq.api.core.exception.HornetQException; +import org.hornetq.api.core.HornetQException; import org.hornetq.core.asyncio.AIOCallback; import org.hornetq.core.asyncio.impl.AsynchronousFileImpl; import org.hornetq.tests.util.UnitTestCase; Modified: trunk/tests/src/org/hornetq/tests/unit/core/asyncio/AsynchronousFileTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/asyncio/AsynchronousFileTest.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/unit/core/asyncio/AsynchronousFileTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -27,7 +27,7 @@ import junit.framework.Assert; import junit.framework.TestSuite; -import org.hornetq.api.core.exception.HornetQException; +import org.hornetq.api.core.HornetQException; import org.hornetq.core.asyncio.AIOCallback; import org.hornetq.core.asyncio.BufferCallback; import org.hornetq.core.asyncio.impl.AsynchronousFileImpl; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/unit/core/client/impl/LargeMessageBufferTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -28,11 +28,11 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.buffers.HornetQBuffer; -import org.hornetq.api.core.buffers.HornetQBuffers; +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffers; +import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.MessageHandler; -import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.client.impl.ClientConsumerInternal; import org.hornetq.core.client.impl.ClientMessageInternal; import org.hornetq.core.client.impl.LargeMessageBufferImpl; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/unit/core/config/impl/FileConfigurationTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -16,7 +16,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.config.TransportConfiguration; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.FileConfiguration; import org.hornetq.core.server.JournalType; Modified: trunk/tests/src/org/hornetq/tests/unit/core/config/impl/TransportConfigurationTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/config/impl/TransportConfigurationTest.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/unit/core/config/impl/TransportConfigurationTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -15,7 +15,7 @@ import junit.framework.Assert; -import org.hornetq.api.core.config.TransportConfiguration; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.tests.util.UnitTestCase; /** 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/unit/core/filter/impl/FilterTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -16,7 +16,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.exception.HornetQException; +import org.hornetq.api.core.HornetQException; 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/journal/impl/SequentialFileFactoryTestBase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/journal/impl/SequentialFileFactoryTestBase.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/unit/core/journal/impl/SequentialFileFactoryTestBase.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -20,8 +20,8 @@ import junit.framework.Assert; -import org.hornetq.api.core.buffers.HornetQBuffer; -import org.hornetq.api.core.buffers.HornetQBuffers; +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffers; import org.hornetq.core.asyncio.impl.AsynchronousFileImpl; import org.hornetq.core.journal.SequentialFile; import org.hornetq.core.journal.SequentialFileFactory; Modified: trunk/tests/src/org/hornetq/tests/unit/core/journal/impl/TimedBufferTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/journal/impl/TimedBufferTest.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/unit/core/journal/impl/TimedBufferTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -20,8 +20,8 @@ import junit.framework.Assert; -import org.hornetq.api.core.buffers.HornetQBuffer; -import org.hornetq.api.core.buffers.HornetQBuffers; +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffers; import org.hornetq.core.journal.IOAsyncTask; import org.hornetq.core.journal.impl.TimedBuffer; import org.hornetq.core.journal.impl.TimedBufferObserver; Modified: trunk/tests/src/org/hornetq/tests/unit/core/journal/impl/fakes/FakeSequentialFileFactory.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/journal/impl/fakes/FakeSequentialFileFactory.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/unit/core/journal/impl/fakes/FakeSequentialFileFactory.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -19,8 +19,8 @@ import java.util.Map; import java.util.concurrent.ConcurrentHashMap; -import org.hornetq.api.core.buffers.HornetQBuffer; -import org.hornetq.api.core.buffers.HornetQBuffers; +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffers; import org.hornetq.core.asyncio.BufferCallback; import org.hornetq.core.journal.EncodingSupport; import org.hornetq.core.journal.IOAsyncTask; Modified: trunk/tests/src/org/hornetq/tests/unit/core/journal/impl/fakes/SimpleEncoding.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/journal/impl/fakes/SimpleEncoding.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/unit/core/journal/impl/fakes/SimpleEncoding.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,7 +13,7 @@ package org.hornetq.tests.unit.core.journal.impl.fakes; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; import org.hornetq.core.journal.EncodingSupport; /** 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/unit/core/message/impl/MessageImplTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -18,7 +18,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.message.Message; +import org.hornetq.api.core.Message; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/unit/core/paging/impl/PageImplTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -20,7 +20,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; 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/PagingStoreImplTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/paging/impl/PagingStoreImplTest.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/unit/core/paging/impl/PagingStoreImplTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -32,8 +32,8 @@ import org.hornetq.api.Pair; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.buffers.HornetQBuffer; -import org.hornetq.api.core.buffers.HornetQBuffers; +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffers; 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/persistence/impl/BatchIDGeneratorUnitTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/persistence/impl/BatchIDGeneratorUnitTest.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/unit/core/persistence/impl/BatchIDGeneratorUnitTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -18,8 +18,8 @@ import junit.framework.Assert; -import org.hornetq.api.core.buffers.HornetQBuffer; -import org.hornetq.api.core.buffers.HornetQBuffers; +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffers; import org.hornetq.core.journal.Journal; import org.hornetq.core.journal.PreparedTransactionInfo; import org.hornetq.core.journal.RecordInfo; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/unit/core/postoffice/impl/BindingsImplTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -21,9 +21,9 @@ import javax.transaction.xa.Xid; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.buffers.HornetQBuffer; -import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.message.PropertyConversionException; +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.HornetQException; +import org.hornetq.api.core.PropertyConversionException; 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/remoting/HornetQBufferTestBase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/remoting/HornetQBufferTestBase.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/unit/core/remoting/HornetQBufferTestBase.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -16,7 +16,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; import org.hornetq.tests.util.RandomUtil; import org.hornetq.tests.util.UnitTestCase; Modified: trunk/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/ChannelBufferWrapper2Test.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/ChannelBufferWrapper2Test.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/ChannelBufferWrapper2Test.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,8 +13,8 @@ package org.hornetq.tests.unit.core.remoting.impl.netty; -import org.hornetq.api.core.buffers.HornetQBuffer; -import org.hornetq.api.core.buffers.HornetQBuffers; +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffers; import org.hornetq.tests.unit.core.remoting.HornetQBufferTestBase; /** Modified: trunk/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/ChannelBufferWrapperTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/ChannelBufferWrapperTest.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/ChannelBufferWrapperTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -13,7 +13,7 @@ package org.hornetq.tests.unit.core.remoting.impl.netty; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; import org.hornetq.core.buffers.impl.ChannelBufferWrapper; import org.hornetq.tests.unit.core.remoting.HornetQBufferTestBase; import org.jboss.netty.buffer.ChannelBuffer; Modified: trunk/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -18,8 +18,8 @@ import junit.framework.Assert; -import org.hornetq.api.core.buffers.HornetQBuffer; -import org.hornetq.api.core.exception.HornetQException; +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.HornetQException; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.remoting.impl.AbstractBufferHandler; import org.hornetq.integration.transports.netty.NettyAcceptor; Modified: trunk/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -19,8 +19,8 @@ import junit.framework.Assert; -import org.hornetq.api.core.buffers.HornetQBuffer; -import org.hornetq.api.core.exception.HornetQException; +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.HornetQException; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.remoting.impl.AbstractBufferHandler; import org.hornetq.integration.transports.netty.NettyAcceptor; Modified: trunk/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyConnectionTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyConnectionTest.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyConnectionTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -19,9 +19,9 @@ import junit.framework.Assert; -import org.hornetq.api.core.buffers.HornetQBuffer; -import org.hornetq.api.core.buffers.HornetQBuffers; -import org.hornetq.api.core.exception.HornetQException; +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffers; +import org.hornetq.api.core.HornetQException; import org.hornetq.integration.transports.netty.NettyConnection; import org.hornetq.spi.core.remoting.Connection; import org.hornetq.spi.core.remoting.ConnectionLifeCycleListener; Modified: trunk/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyConnectorTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyConnectorTest.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyConnectorTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -19,8 +19,8 @@ import junit.framework.Assert; -import org.hornetq.api.core.buffers.HornetQBuffer; -import org.hornetq.api.core.exception.HornetQException; +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.HornetQException; import org.hornetq.core.remoting.impl.AbstractBufferHandler; import org.hornetq.integration.transports.netty.NettyConnector; import org.hornetq.spi.core.remoting.BufferHandler; Modified: trunk/tests/src/org/hornetq/tests/unit/jms/client/JMSExceptionHelperTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/jms/client/JMSExceptionHelperTest.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/unit/jms/client/JMSExceptionHelperTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -21,7 +21,7 @@ import junit.framework.Assert; -import org.hornetq.api.core.exception.HornetQException; +import org.hornetq.api.core.HornetQException; import org.hornetq.jms.client.JMSExceptionHelper; import org.hornetq.tests.util.UnitTestCase; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/unit/util/TypedPropertiesConversionTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -17,7 +17,7 @@ import junit.framework.TestCase; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.message.PropertyConversionException; +import org.hornetq.api.core.PropertyConversionException; 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:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/unit/util/TypedPropertiesTest.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -18,8 +18,8 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.buffers.HornetQBuffer; -import org.hornetq.api.core.buffers.HornetQBuffers; +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffers; 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/UTF8Test.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/util/UTF8Test.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/unit/util/UTF8Test.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -21,8 +21,8 @@ import junit.framework.Assert; -import org.hornetq.api.core.buffers.HornetQBuffer; -import org.hornetq.api.core.buffers.HornetQBuffers; +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffers; import org.hornetq.tests.util.RandomUtil; import org.hornetq.tests.util.UnitTestCase; import org.hornetq.utils.DataConstants; Modified: trunk/tests/src/org/hornetq/tests/util/JMSTestBase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/util/JMSTestBase.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/util/JMSTestBase.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -21,8 +21,8 @@ import javax.naming.NamingException; import org.hornetq.api.Pair; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.core.config.Configuration; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.HornetQServers; Modified: trunk/tests/src/org/hornetq/tests/util/ServiceTestBase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/util/ServiceTestBase.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/util/ServiceTestBase.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -22,11 +22,11 @@ import junit.framework.Assert; +import org.hornetq.api.core.TransportConfiguration; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.client.ClientSessionFactoryImpl; import org.hornetq.api.core.client.HornetQClient; -import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; Modified: trunk/tests/src/org/hornetq/tests/util/UnitTestCase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/util/UnitTestCase.java 2010-01-06 10:04:55 UTC (rev 8729) +++ trunk/tests/src/org/hornetq/tests/util/UnitTestCase.java 2010-01-06 10:23:35 UTC (rev 8730) @@ -45,10 +45,10 @@ import junit.framework.TestSuite; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.buffers.HornetQBuffer; +import org.hornetq.api.core.HornetQBuffer; +import org.hornetq.api.core.HornetQException; import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.asyncio.impl.AsynchronousFileImpl; import org.hornetq.core.journal.impl.AIOSequentialFileFactory; import org.hornetq.core.logging.Logger;