January 2010 - hornetq-commits - Jboss List Archives

JBoss hornetq SVN: r8730 - in trunk: examples/core/embedded-remote/src/org/hornetq/core/example and 125 other directories.

by do-not-reply＠jboss.org

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)}. + * + * 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. + * + * 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 self-expanding 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 self-expanding 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 fixed 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. + * + * 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. + * + * 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). + * + * <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> + * + * 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. + * + * 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. + * + * 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 encoded message. + */ + int getEncodeSize(); + + /** + * Returns whether this message is a large message 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. + * + * 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. + * + * 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: + * + * <code> + * HashMap<String, Object> map = new HashMap<String, Object>(); + * map.put("host", "localhost"); + * map.put("port", 5445); + * TransportConfiguration config = new TransportConfiguration(InVMConnectorFactory.class.getName(), map); + * ClientSessionFactory sf = new ClientSessionFactoryImpl(config); + * </code> + * + * @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. + * + * 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. + * + * 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)}. - * - * 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. - * - * 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 self-expanding 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 self-expanding 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 fixed 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. - * - * 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: - * - * <code> - * HashMap<String, Object> map = new HashMap<String, Object>(); - * map.put("host", "localhost"); - * map.put("port", 5445); - * TransportConfiguration config = new TransportConfiguration(InVMConnectorFactory.class.getName(), map); - * ClientSessionFactory sf = new ClientSessionFactoryImpl(config); - * </code> - * - * @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. - * - * 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. - * - * 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. - * - * 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. - * - * 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). - * - * <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> - * - * 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. - * - * 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. - * - * 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 encoded message. - */ - int getEncodeSize(); - - /** - * Returns whether this message is a large message 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. - * - * 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)}. * * 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;

14 years, 11 months

1
0
0 / 0

JBoss hornetq SVN: r8729 - in trunk: examples/javaee and 1 other directories.

by do-not-reply＠jboss.org

Author: ataylor Date: 2010-01-06 05:04:55 -0500 (Wed, 06 Jan 2010) New Revision: 8729 Modified: trunk/examples/javaee/hornetq-javaee-examples.iml trunk/examples/jms/hornetq-jms-examples.iml trunk/hornetq.iml trunk/hornetq.ipr trunk/hornetq.iws Log: intellij project updates Modified: trunk/examples/javaee/hornetq-javaee-examples.iml =================================================================== --- trunk/examples/javaee/hornetq-javaee-examples.iml 2010-01-06 10:03:33 UTC (rev 8728) +++ trunk/examples/javaee/hornetq-javaee-examples.iml 2010-01-06 10:04:55 UTC (rev 8729) @@ -17,8 +17,8 @@ <sourceFolder url="file://$MODULE_DIR$/servlet-ssl-example/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/servlet-transport/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/xarecovery/src" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/servlet-ssl/src" isTestSource="false" /> <excludeFolder url="file://$MODULE_DIR$/mdb-bmt/build" /> - <excludeFolder url="file://$MODULE_DIR$/mdb-bmt/server" /> <excludeFolder url="file://$MODULE_DIR$/mdb-cmt-tx-required/build" /> <excludeFolder url="file://$MODULE_DIR$/output" /> <excludeFolder url="file://$MODULE_DIR$/servlet-ssl-example/build" /> @@ -38,6 +38,7 @@ </orderEntry> <orderEntry type="library" name="jboss 5.1 client libs" level="application" /> <orderEntry type="library" name="messaging-javaee-examples" level="project" /> + <orderEntry type="library" name="javaee" level="application" /> </component> </module> Modified: trunk/examples/jms/hornetq-jms-examples.iml =================================================================== --- trunk/examples/jms/hornetq-jms-examples.iml 2010-01-06 10:03:33 UTC (rev 8728) +++ trunk/examples/jms/hornetq-jms-examples.iml 2010-01-06 10:04:55 UTC (rev 8729) @@ -7,7 +7,6 @@ </content> <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/application-layer-failover/src" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/automatic-failover/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/bridge/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/browser/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/client-kickoff/src" isTestSource="false" /> @@ -15,7 +14,6 @@ <sourceFolder url="file://$MODULE_DIR$/clustered-durable-subscription/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/clustered-queue/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/clustered-topic/src" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/common/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/consumer-rate-limit/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/dead-letter/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/delayed-redelivery/src" isTestSource="false" /> @@ -35,6 +33,7 @@ <sourceFolder url="file://$MODULE_DIR$/message-group2/src" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/message-priority/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/no-consumer-buffering/src" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/non-transaction-failover/src" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/paging/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/pre-acknowledge/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/producer-rate-limit/src" isTestSource="false" /> @@ -59,6 +58,16 @@ <sourceFolder url="file://$MODULE_DIR$/xa-receive/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/xa-send/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/xa-with-jta/src" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/applet/src" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/clustered-grouping/src" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/clustered-standalone/src" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/embedded/src" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/jaas/src" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/jms-bridge/src" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/perf/src" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/send-acknowledgements/src" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/static-selector-jms/src" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/transaction-failover/src" isTestSource="false" /> <excludeFolder url="file://$MODULE_DIR$/browser/build" /> <excludeFolder url="file://$MODULE_DIR$/browser/logs" /> <excludeFolder url="file://$MODULE_DIR$/browser/server0/build" /> @@ -95,6 +104,8 @@ <excludeFolder url="file://$MODULE_DIR$/large-message/logs" /> <excludeFolder url="file://$MODULE_DIR$/large-message/server0/data" /> <excludeFolder url="file://$MODULE_DIR$/large-message/server0/logs" /> + <excludeFolder url="file://$MODULE_DIR$/message-group2/build" /> + <excludeFolder url="file://$MODULE_DIR$/message-group2/server0/data" /> <excludeFolder url="file://$MODULE_DIR$/output" /> <excludeFolder url="file://$MODULE_DIR$/paging/build" /> <excludeFolder url="file://$MODULE_DIR$/paging/logs" /> Modified: trunk/hornetq.iml =================================================================== --- trunk/hornetq.iml 2010-01-06 10:03:33 UTC (rev 8728) +++ trunk/hornetq.iml 2010-01-06 10:04:55 UTC (rev 8729) @@ -45,9 +45,5 @@ <orderEntry type="library" name="messaging_jars" level="project" /> <orderEntry type="library" name="ant 1.7.1" level="project" /> </component> - <component name="VcsManagerConfiguration"> - <option name="ACTIVE_VCS_NAME" value="svn" /> - <option name="USE_PROJECT_VCS" value="false" /> - </component> </module> Modified: trunk/hornetq.ipr =================================================================== --- trunk/hornetq.ipr 2010-01-06 10:03:33 UTC (rev 8728) +++ trunk/hornetq.ipr 2010-01-06 10:04:55 UTC (rev 8729) @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<project relativePaths="true" version="4"> +<project version="4"> <component name="AntConfiguration"> <defaultAnt bundledAnt="true" /> <buildFile url="file://$PROJECT_DIR$/build-hornetq.xml"> @@ -274,6 +274,15 @@ <option name="LABEL_INDENT_SIZE" value="0" /> <option name="LABEL_INDENT_ABSOLUTE" value="false" /> </ADDITIONAL_INDENT_OPTIONS> + <ADDITIONAL_INDENT_OPTIONS fileType="jsp"> + <option name="INDENT_SIZE" value="4" /> + <option name="CONTINUATION_INDENT_SIZE" value="8" /> + <option name="TAB_SIZE" value="4" /> + <option name="USE_TAB_CHARACTER" value="false" /> + <option name="SMART_TABS" value="false" /> + <option name="LABEL_INDENT_SIZE" value="0" /> + <option name="LABEL_INDENT_ABSOLUTE" value="false" /> + </ADDITIONAL_INDENT_OPTIONS> <ADDITIONAL_INDENT_OPTIONS fileType="xml"> <option name="INDENT_SIZE" value="4" /> <option name="CONTINUATION_INDENT_SIZE" value="8" /> @@ -285,11 +294,9 @@ </ADDITIONAL_INDENT_OPTIONS> </value> </option> - <option name="USE_PER_PROJECT_SETTINGS" value="false" /> </component> <component name="CompilerConfiguration"> <option name="DEFAULT_COMPILER" value="Javac" /> - <option name="DEPLOY_AFTER_MAKE" value="0" /> <resourceExtensions> <entry name=".+\.(properties|xml|html|dtd|tld)" /> <entry name=".+\.(gif|png|jpeg|jpg)" /> @@ -305,11 +312,13 @@ <entry name="?*.dtd" /> <entry name="?*.tld" /> </wildcardResourcePatterns> + <annotationProcessing enabled="false" useClasspath="true" /> </component> <component name="CopyrightManager" default=""> <copyright> <option name="notice" value="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." /> <option name="keyword" value="Copyright" /> + <option name="allowReplaceKeyword" value="" /> <option name="myName" value="new" /> <option name="myLocal" value="true" /> </copyright> @@ -378,16 +387,16 @@ </component> <component name="IdProvider" IDEtalkID="6A074DEDEA8BB8F84C6214EB1D2AF8C8" /> <component name="InspectionProjectProfileManager"> - <option name="PROJECT_PROFILE" value="Project Default" /> - <option name="USE_PROJECT_LEVEL_SETTINGS" value="false" /> - <scopes /> <profiles> <profile version="1.0" is_locked="false"> <option name="myName" value="Project Default" /> <option name="myLocal" value="false" /> + <inspection_tool class="JavadocReference" enabled="false" level="ERROR" enabled_by_default="false" /> </profile> </profiles> - <list size="0" /> + <option name="PROJECT_PROFILE" value="Project Default" /> + <option name="USE_PROJECT_PROFILE" value="true" /> + <version value="1.0" /> </component> <component name="IntelliJadProjectConfigComponent"> <config> @@ -446,13 +455,6 @@ <pl type="string">_lcl</pl> </config> </component> - <component name="JavacSettings"> - <option name="DEBUGGING_INFO" value="true" /> - <option name="GENERATE_NO_WARNINGS" value="false" /> - <option name="DEPRECATION" value="true" /> - <option name="ADDITIONAL_OPTIONS_STRING" value="" /> - <option name="MAXIMUM_HEAP_SIZE" value="128" /> - </component> <component name="JavadocGenerationManager"> <option name="OUTPUT_DIRECTORY" /> <option name="OPTION_SCOPE" value="protected" /> @@ -608,7 +610,13 @@ <component name="ProjectDetails"> <option name="projectName" value="messaging" /> </component> - <component name="ProjectFileVersion" converted="true" /> + <component name="ProjectDictionaryState"> + <dictionary name="andy"> + <words> + <w>remoting</w> + </words> + </dictionary> + </component> <component name="ProjectKey"> <option name="state" value="https://svn.jboss.org/repos/hornetq/trunk/hornetq.ipr" /> </component> @@ -633,19 +641,36 @@ </value> </option> </component> - <component name="RmicSettings"> - <option name="IS_EANABLED" value="false" /> - <option name="DEBUGGING_INFO" value="true" /> - <option name="GENERATE_NO_WARNINGS" value="false" /> - <option name="GENERATE_IIOP_STUBS" value="false" /> - <option name="ADDITIONAL_OPTIONS_STRING" value="" /> - </component> <component name="SvnBranchConfigurationManager"> <option name="myConfigurationMap"> <map> <entry key="$PROJECT_DIR$"> <value> <SvnBranchConfiguration> + <option name="branchMap"> + <map> + <entry key="https://svn.jboss.org/repos/messaging/admin"> + <value> + <list /> + </value> + </entry> + <entry key="https://svn.jboss.org/repos/messaging/branches"> + <value> + <list /> + </value> + </entry> + <entry key="https://svn.jboss.org/repos/messaging/projects"> + <value> + <list /> + </value> + </entry> + <entry key="https://svn.jboss.org/repos/messaging/tags"> + <value> + <list /> + </value> + </entry> + </map> + </option> <option name="branchUrls"> <list> <option value="https://svn.jboss.org/repos/messaging/admin" /> @@ -721,6 +746,7 @@ <JAVADOC /> <SOURCES> <root url="file://$PROJECT_DIR$/../JBOSSTS_4_6_1_GA/common/classes" /> + <root url="jar://$PROJECT_DIR$/../../Download/netty-3.1.5.GA-sources.jar!/" /> </SOURCES> </library> <library name="messaging-tests"> Modified: trunk/hornetq.iws =================================================================== --- trunk/hornetq.iws 2010-01-06 10:03:33 UTC (rev 8728) +++ trunk/hornetq.iws 2010-01-06 10:04:55 UTC (rev 8729) @@ -1,62 +1,21 @@ <?xml version="1.0" encoding="UTF-8"?> -<project relativePaths="false" version="4"> - <component name="BookmarkManager"> - <editor_bookmark url="file://$PROJECT_DIR$/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java" line="573" number="8" description="/" /> - </component> - <component name="ChangeListManager"> - <list default="true" readonly="true" name="Default" comment=""> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/org/hornetq/core/client/impl/FailoverManager.java" afterPath="$PROJECT_DIR$/src/main/org/hornetq/core/client/impl/FailoverManager.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/org/hornetq/jms/server/management/impl/JMSServerControlImpl.java" afterPath="$PROJECT_DIR$/src/main/org/hornetq/jms/server/management/impl/JMSServerControlImpl.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/examples/jms/message-group2/build.bat" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/examples/jms/hornetq-jms-examples.iml" afterPath="$PROJECT_DIR$/examples/jms/hornetq-jms-examples.iml" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/examples/jms/message-group2/src/org/hornetq/jms/example" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java" afterPath="$PROJECT_DIR$/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/org/hornetq/jms/server/management/JMSServerControl.java" afterPath="$PROJECT_DIR$/src/main/org/hornetq/jms/server/management/JMSServerControl.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/org/hornetq/core/client/impl/FailoverManagerImpl.java" afterPath="$PROJECT_DIR$/src/main/org/hornetq/core/client/impl/FailoverManagerImpl.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/examples/jms/message-group2/src/org/hornetq/jms" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java" afterPath="$PROJECT_DIR$/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/org/hornetq/core/client/impl/ClientProducerImpl.java" afterPath="$PROJECT_DIR$/src/main/org/hornetq/core/client/impl/ClientProducerImpl.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/examples/jms/message-group2/build.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/org/hornetq/jms/server/JMSServerManager.java" afterPath="$PROJECT_DIR$/src/main/org/hornetq/jms/server/JMSServerManager.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/examples/jms/message-group2/readme.html" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/org/hornetq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java" afterPath="$PROJECT_DIR$/src/main/org/hornetq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tests/src/org/hornetq/tests/integration/jms/client/ReSendLargeMessageTest.java" afterPath="$PROJECT_DIR$/tests/src/org/hornetq/tests/integration/jms/client/ReSendLargeMessageTest.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tests/src/org/hornetq/tests/integration/jms/client/PreACKJMSTest.java" afterPath="$PROJECT_DIR$/tests/src/org/hornetq/tests/integration/jms/client/PreACKJMSTest.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/examples/jms/message-group2/src" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/tests/src/org/hornetq/tests/integration/client/MessageGroupingConnectionFactoryTest.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/examples/jms/message-group2/build.sh" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tests/jms-tests/src/org/hornetq/jms/tests/tools/container/LocalTestServer.java" afterPath="$PROJECT_DIR$/tests/jms-tests/src/org/hornetq/jms/tests/tools/container/LocalTestServer.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tests/src/org/hornetq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java" afterPath="$PROJECT_DIR$/tests/src/org/hornetq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java" afterPath="$PROJECT_DIR$/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java" /> +<project version="4"> + <component name="ChangeListManager" verified="true"> + <list default="true" readonly="true" id="a2aae645-dbcd-4d6e-9c99-efa05d93589a" name="Default" comment="" /> + <list id="e1b486d8-d1b7-4aff-87e2-e20629d1b1d5" name="intellij" comment="intellij project updates"> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/examples/javaee/hornetq-javaee-examples.iml" afterPath="$PROJECT_DIR$/examples/javaee/hornetq-javaee-examples.iml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq.ipr" afterPath="$PROJECT_DIR$/hornetq.ipr" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq.iws" afterPath="$PROJECT_DIR$/hornetq.iws" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/docs/user-manual/en/message-grouping.xml" afterPath="$PROJECT_DIR$/docs/user-manual/en/message-grouping.xml" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/examples/jms/message-group2/src/org/hornetq" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/examples/jms/message-group2/src/org" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/examples/jms/message-group2" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/org/hornetq/core/client/ClientSessionFactory.java" afterPath="$PROJECT_DIR$/src/main/org/hornetq/core/client/ClientSessionFactory.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tests/jms-tests/src/org/hornetq/jms/tests/CTSMiscellaneousTest.java" afterPath="$PROJECT_DIR$/tests/jms-tests/src/org/hornetq/jms/tests/CTSMiscellaneousTest.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tests/jms-tests/src/org/hornetq/jms/tests/JMSTestCase.java" afterPath="$PROJECT_DIR$/tests/jms-tests/src/org/hornetq/jms/tests/JMSTestCase.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/org/hornetq/jms/server/config/ConnectionFactoryConfiguration.java" afterPath="$PROJECT_DIR$/src/main/org/hornetq/jms/server/config/ConnectionFactoryConfiguration.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tests/src/org/hornetq/tests/integration/client/MessageGroupingTest.java" afterPath="$PROJECT_DIR$/tests/src/org/hornetq/tests/integration/client/MessageGroupingTest.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/config/common/schema/hornetq-jms.xsd" afterPath="$PROJECT_DIR$/src/config/common/schema/hornetq-jms.xsd" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tests/src/org/hornetq/tests/util/JMSTestBase.java" afterPath="$PROJECT_DIR$/tests/src/org/hornetq/tests/util/JMSTestBase.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tests/src/org/hornetq/tests/integration/jms/client/TextMessageTest.java" afterPath="$PROJECT_DIR$/tests/src/org/hornetq/tests/integration/jms/client/TextMessageTest.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/examples/jms/message-group2/server0/hornetq-configuration.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tests/src/org/hornetq/tests/integration/jms/FloodServerTest.java" afterPath="$PROJECT_DIR$/tests/src/org/hornetq/tests/integration/jms/FloodServerTest.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/examples/jms/message-group2/server0" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tests/src/org/hornetq/tests/integration/jms/divert/DivertAndACKClientTest.java" afterPath="$PROJECT_DIR$/tests/src/org/hornetq/tests/integration/jms/divert/DivertAndACKClientTest.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/examples/jms/message-group2/server0/hornetq-users.xml" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/examples/jms/message-group2/server0/client-jndi.properties" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlTest.java" afterPath="$PROJECT_DIR$/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlTest.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java" afterPath="$PROJECT_DIR$/src/main/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/examples/jms/message-group2/server0/hornetq-beans.xml" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java" afterPath="$PROJECT_DIR$/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/examples/jms/message-group2/src/org/hornetq/jms/example/MessageGroup2Example.java" /> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/src/main/org/hornetq/jms/client/HornetQConnectionFactory.java" afterPath="$PROJECT_DIR$/src/main/org/hornetq/jms/client/HornetQConnectionFactory.java" /> - <change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/examples/jms/message-group2/server0/hornetq-jms.xml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/hornetq.iml" afterPath="$PROJECT_DIR$/hornetq.iml" /> + <change type="MODIFICATION" beforePath="$PROJECT_DIR$/examples/jms/hornetq-jms-examples.iml" afterPath="$PROJECT_DIR$/examples/jms/hornetq-jms-examples.iml" /> </list> - <ignored path="messaging.iws" /> <ignored path=".idea/workspace.xml" /> + <ignored path="messaging.iws" /> + <option name="TRACKING_ENABLED" value="true" /> + <option name="SHOW_DIALOG" value="false" /> + <option name="HIGHLIGHT_CONFLICTS" value="true" /> + <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" /> + <option name="LAST_RESOLUTION" value="IGNORE" /> </component> <component name="ChangesViewManager" flattened_view="true" show_ignored="false" /> <component name="CreatePatchCommitExecutor"> @@ -68,7 +27,7 @@ </component> <component name="DebuggerManager"> <line_breakpoints> - <breakpoint url="file://$PROJECT_DIR$/examples/javaee/mdb-bmt/src/org/hornetq/javaee/example/server/MDB_BMTExample.java" line="49" class="org.hornetq.javaee.example.server.MDB_BMTExample" package="org.hornetq.javaee.example.server"> + <breakpoint url="file://$PROJECT_DIR$/examples/javaee/mdb-bmt/src/org/hornetq/javaee/example/server/MDB_BMTExample.java" line="45" class="org.hornetq.javaee.example.server.MDB_BMTExample" package="org.hornetq.javaee.example.server"> <option name="ENABLED" value="true" /> <option name="LOG_ENABLED" value="false" /> <option name="LOG_EXPRESSION_ENABLED" value="false" /> @@ -81,7 +40,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java" line="811" class="org.hornetq.core.server.cluster.impl.ClusterConnectionImpl" package="org.hornetq.core.server.cluster.impl"> + <breakpoint url="file://$PROJECT_DIR$/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java" line="847" class="org.hornetq.core.server.cluster.impl.ClusterConnectionImpl" package="org.hornetq.core.server.cluster.impl"> <option name="ENABLED" value="true" /> <option name="LOG_ENABLED" value="false" /> <option name="LOG_EXPRESSION_ENABLED" value="false" /> @@ -94,7 +53,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java" line="580" class="org.hornetq.tests.integration.cluster.distribution.ClusterTestBase" package="org.hornetq.tests.integration.cluster.distribution"> + <breakpoint url="file://$PROJECT_DIR$/src/main/org/hornetq/core/list/impl/PriorityLinkedListImpl.java" line="205" class="org.hornetq.core.list.impl.PriorityLinkedListImpl.PriorityLinkedListIterator" package="org.hornetq.core.list.impl"> <option name="ENABLED" value="true" /> <option name="LOG_ENABLED" value="false" /> <option name="LOG_EXPRESSION_ENABLED" value="false" /> @@ -107,7 +66,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/src/main/org/hornetq/core/server/impl/ServerConsumerImpl.java" line="211" class="org.hornetq.core.server.impl.ServerConsumerImpl" package="org.hornetq.core.server.impl"> + <breakpoint url="file://$PROJECT_DIR$/tests/src/org/hornetq/tests/unit/core/server/impl/QueueImplTest.java" line="1149" class="org.hornetq.tests.unit.core.server.impl.QueueImplTest" package="org.hornetq.tests.unit.core.server.impl"> <option name="ENABLED" value="true" /> <option name="LOG_ENABLED" value="false" /> <option name="LOG_EXPRESSION_ENABLED" value="false" /> @@ -120,7 +79,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/src/main/org/hornetq/core/list/impl/PriorityLinkedListImpl.java" line="205" class="org.hornetq.core.list.impl.PriorityLinkedListImpl.PriorityLinkedListIterator" package="org.hornetq.core.list.impl"> + <breakpoint url="file://$PROJECT_DIR$/tests/src/org/hornetq/tests/unit/core/server/impl/QueueImplTest.java" line="1175" class="org.hornetq.tests.unit.core.server.impl.QueueImplTest" package="org.hornetq.tests.unit.core.server.impl"> <option name="ENABLED" value="true" /> <option name="LOG_ENABLED" value="false" /> <option name="LOG_EXPRESSION_ENABLED" value="false" /> @@ -133,7 +92,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/tests/src/org/hornetq/tests/unit/core/server/impl/QueueImplTest.java" line="957" class="org.hornetq.tests.unit.core.server.impl.QueueImplTest" package="org.hornetq.tests.unit.core.server.impl"> + <breakpoint url="file://$PROJECT_DIR$/tests/src/org/hornetq/tests/unit/core/server/impl/QueueImplTest.java" line="1202" class="org.hornetq.tests.unit.core.server.impl.QueueImplTest" package="org.hornetq.tests.unit.core.server.impl"> <option name="ENABLED" value="true" /> <option name="LOG_ENABLED" value="false" /> <option name="LOG_EXPRESSION_ENABLED" value="false" /> @@ -146,7 +105,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/tests/src/org/hornetq/tests/unit/core/server/impl/QueueImplTest.java" line="983" class="org.hornetq.tests.unit.core.server.impl.QueueImplTest" package="org.hornetq.tests.unit.core.server.impl"> + <breakpoint url="file://$PROJECT_DIR$/tests/src/org/hornetq/tests/unit/core/server/impl/QueueImplTest.java" line="1213" class="org.hornetq.tests.unit.core.server.impl.QueueImplTest" package="org.hornetq.tests.unit.core.server.impl"> <option name="ENABLED" value="true" /> <option name="LOG_ENABLED" value="false" /> <option name="LOG_EXPRESSION_ENABLED" value="false" /> @@ -159,7 +118,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/tests/src/org/hornetq/tests/unit/core/server/impl/QueueImplTest.java" line="1001" class="org.hornetq.tests.unit.core.server.impl.QueueImplTest" package="org.hornetq.tests.unit.core.server.impl"> + <breakpoint url="file://$PROJECT_DIR$/tests/src/org/hornetq/tests/unit/core/server/impl/QueueImplTest.java" line="1224" class="org.hornetq.tests.unit.core.server.impl.QueueImplTest" package="org.hornetq.tests.unit.core.server.impl"> <option name="ENABLED" value="true" /> <option name="LOG_ENABLED" value="false" /> <option name="LOG_EXPRESSION_ENABLED" value="false" /> @@ -172,7 +131,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/tests/src/org/hornetq/tests/unit/core/server/impl/QueueImplTest.java" line="1010" class="org.hornetq.tests.unit.core.server.impl.QueueImplTest" package="org.hornetq.tests.unit.core.server.impl"> + <breakpoint url="file://$PROJECT_DIR$/tests/src/org/hornetq/tests/unit/core/server/impl/QueueImplTest.java" line="1136" class="org.hornetq.tests.unit.core.server.impl.QueueImplTest" package="org.hornetq.tests.unit.core.server.impl"> <option name="ENABLED" value="true" /> <option name="LOG_ENABLED" value="false" /> <option name="LOG_EXPRESSION_ENABLED" value="false" /> @@ -185,7 +144,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/tests/src/org/hornetq/tests/unit/core/server/impl/QueueImplTest.java" line="1023" class="org.hornetq.tests.unit.core.server.impl.QueueImplTest" package="org.hornetq.tests.unit.core.server.impl"> + <breakpoint url="file://$PROJECT_DIR$/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControl2Test.java" line="396" class="org.hornetq.tests.integration.jms.server.management.JMSServerControl2Test" package="org.hornetq.tests.integration.jms.server.management"> <option name="ENABLED" value="true" /> <option name="LOG_ENABLED" value="false" /> <option name="LOG_EXPRESSION_ENABLED" value="false" /> @@ -198,7 +157,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/tests/src/org/hornetq/tests/unit/core/server/impl/QueueImplTest.java" line="942" class="org.hornetq.tests.unit.core.server.impl.QueueImplTest" package="org.hornetq.tests.unit.core.server.impl"> + <breakpoint url="file://$PROJECT_DIR$/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControl2Test.java" line="394" class="org.hornetq.tests.integration.jms.server.management.JMSServerControl2Test" package="org.hornetq.tests.integration.jms.server.management"> <option name="ENABLED" value="true" /> <option name="LOG_ENABLED" value="false" /> <option name="LOG_EXPRESSION_ENABLED" value="false" /> @@ -211,7 +170,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControl2Test.java" line="383" class="org.hornetq.tests.integration.jms.server.management.JMSServerControl2Test" package="org.hornetq.tests.integration.jms.server.management"> + <breakpoint url="file://$PROJECT_DIR$/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java" line="547" class="org.hornetq.core.server.cluster.impl.BridgeImpl" package="org.hornetq.core.server.cluster.impl"> <option name="ENABLED" value="true" /> <option name="LOG_ENABLED" value="false" /> <option name="LOG_EXPRESSION_ENABLED" value="false" /> @@ -224,7 +183,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControl2Test.java" line="382" class="org.hornetq.tests.integration.jms.server.management.JMSServerControl2Test" package="org.hornetq.tests.integration.jms.server.management"> + <breakpoint url="file://$PROJECT_DIR$/src/main/org/hornetq/core/postoffice/impl/BindingsImpl.java" line="445" class="org.hornetq.core.postoffice.impl.BindingsImpl" package="org.hornetq.core.postoffice.impl"> <option name="ENABLED" value="true" /> <option name="LOG_ENABLED" value="false" /> <option name="LOG_EXPRESSION_ENABLED" value="false" /> @@ -237,7 +196,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/tests/src/org/hornetq/tests/integration/remoting/PingTest.java" line="365" class="org.hornetq.tests.integration.remoting.PingTest" package="org.hornetq.tests.integration.remoting"> + <breakpoint url="file://$PROJECT_DIR$/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java" line="290" class="org.hornetq.tests.integration.cluster.distribution.ClusterTestBase" package="org.hornetq.tests.integration.cluster.distribution"> <option name="ENABLED" value="true" /> <option name="LOG_ENABLED" value="false" /> <option name="LOG_EXPRESSION_ENABLED" value="false" /> @@ -250,7 +209,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/tests/src/org/hornetq/tests/integration/remoting/PingTest.java" line="369" class="org.hornetq.tests.integration.remoting.PingTest" package="org.hornetq.tests.integration.remoting"> + <breakpoint url="file://$PROJECT_DIR$/src/main/org/hornetq/core/cluster/impl/DiscoveryGroupImpl.java" line="379" class="org.hornetq.core.cluster.impl.DiscoveryGroupImpl" package="org.hornetq.core.cluster.impl"> <option name="ENABLED" value="true" /> <option name="LOG_ENABLED" value="false" /> <option name="LOG_EXPRESSION_ENABLED" value="false" /> @@ -263,7 +222,7 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> - <breakpoint url="file://$PROJECT_DIR$/src/main/org/hornetq/core/postoffice/impl/PostOfficeImpl.java" line="887" class="org.hornetq.core.postoffice.impl.PostOfficeImpl" package="org.hornetq.core.postoffice.impl"> + <breakpoint url="file://$PROJECT_DIR$/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java" line="777" class="org.hornetq.core.server.cluster.impl.ClusterConnectionImpl.MessageFlowRecordImpl" package="org.hornetq.core.server.cluster.impl"> <option name="ENABLED" value="true" /> <option name="LOG_ENABLED" value="false" /> <option name="LOG_EXPRESSION_ENABLED" value="false" /> @@ -276,6 +235,32 @@ <option name="CONDITION" value="" /> <option name="LOG_MESSAGE" value="" /> </breakpoint> + <breakpoint url="file://$PROJECT_DIR$/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java" line="831" class="org.hornetq.core.server.cluster.impl.ClusterConnectionImpl.MessageFlowRecordImpl" package="org.hornetq.core.server.cluster.impl"> + <option name="ENABLED" value="true" /> + <option name="LOG_ENABLED" value="false" /> + <option name="LOG_EXPRESSION_ENABLED" value="false" /> + <option name="SUSPEND_POLICY" value="SuspendAll" /> + <option name="COUNT_FILTER_ENABLED" value="false" /> + <option name="COUNT_FILTER" value="0" /> + <option name="CONDITION_ENABLED" value="false" /> + <option name="CLASS_FILTERS_ENABLED" value="false" /> + <option name="INSTANCE_FILTERS_ENABLED" value="false" /> + <option name="CONDITION" value="" /> + <option name="LOG_MESSAGE" value="" /> + </breakpoint> + <breakpoint url="file://$PROJECT_DIR$/src/main/org/hornetq/core/remoting/impl/wireformat/SessionSendMessage.java" line="73" class="org.hornetq.core.remoting.impl.wireformat.SessionSendMessage" package="org.hornetq.core.remoting.impl.wireformat"> + <option name="ENABLED" value="true" /> + <option name="LOG_ENABLED" value="false" /> + <option name="LOG_EXPRESSION_ENABLED" value="false" /> + <option name="SUSPEND_POLICY" value="SuspendAll" /> + <option name="COUNT_FILTER_ENABLED" value="false" /> + <option name="COUNT_FILTER" value="0" /> + <option name="CONDITION_ENABLED" value="false" /> + <option name="CLASS_FILTERS_ENABLED" value="false" /> + <option name="INSTANCE_FILTERS_ENABLED" value="false" /> + <option name="CONDITION" value="" /> + <option name="LOG_MESSAGE" value="" /> + </breakpoint> </line_breakpoints> <breakpoint_any> <breakpoint> @@ -315,93 +300,94 @@ <component name="FavoritesManager"> <favorites_list name="messaging" /> </component> + <component name="FileColors" enabled="true" enabledForTabs="true" /> <component name="FileEditorManager"> <leaf> - <file leaf-file-name="ConnectionFactoryConfiguration.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/org/hornetq/jms/server/config/ConnectionFactoryConfiguration.java"> + <file leaf-file-name="ClientSessionFactoryImpl.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/org/hornetq/api/core/client/ClientSessionFactoryImpl.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> + <state line="54" column="37" selection-start="2265" selection-end="2289" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="ConnectionFactoryConfigurationImpl.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/org/hornetq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java"> + <file leaf-file-name="HornetQClient.java" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/main/org/hornetq/api/core/client/HornetQClient.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="104" column="0" selection-start="4217" selection-end="4217" vertical-scroll-proportion="0.0"> + <state line="73" column="77" selection-start="2722" selection-end="2722" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="FailoverManager.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/org/hornetq/core/client/impl/FailoverManager.java"> + <file leaf-file-name="hornetq-version.properties" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/src/config/common/hornetq-version.properties"> <provider selected="true" editor-type-id="text-editor"> - <state line="49" column="0" selection-start="2121" selection-end="2121" vertical-scroll-proportion="0.0"> + <state line="0" column="40" selection-start="40" selection-end="40" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="FailoverManagerImpl.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/org/hornetq/core/client/impl/FailoverManagerImpl.java"> + <file leaf-file-name="JavaUtilities.cpp" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/native/src/JavaUtilities.cpp"> <provider selected="true" editor-type-id="text-editor"> - <state line="426" column="0" selection-start="15882" selection-end="15882" vertical-scroll-proportion="0.0"> + <state line="28" column="58" selection-start="1017" selection-end="1017" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="HornetQConnectionFactory.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/org/hornetq/jms/client/HornetQConnectionFactory.java"> + <file leaf-file-name="README" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/native/README"> <provider selected="true" editor-type-id="text-editor"> - <state line="559" column="32" selection-start="17012" selection-end="17012" vertical-scroll-proportion="0.0"> + <state line="43" column="44" selection-start="1202" selection-end="1221" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="JMSServerControl.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/org/hornetq/jms/server/management/JMSServerControl.java"> + <file leaf-file-name="bootstrap" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/native/bootstrap"> <provider selected="true" editor-type-id="text-editor"> - <state line="159" column="0" selection-start="11108" selection-end="11108" vertical-scroll-proportion="0.0"> + <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="JMSServerControlImpl.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/org/hornetq/jms/server/management/impl/JMSServerControlImpl.java"> + <file leaf-file-name="org_hornetq_core_asyncio_impl_AsynchronousFileImpl.h" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/native/src/org_hornetq_core_asyncio_impl_AsynchronousFileImpl.h"> <provider selected="true" editor-type-id="text-editor"> - <state line="429" column="0" selection-start="23162" selection-end="23162" vertical-scroll-proportion="0.0"> + <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="JMSServerDeployer.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java"> + <file leaf-file-name="pom.xml" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="301" column="0" selection-start="16739" selection-end="16739" vertical-scroll-proportion="0.0"> + <state line="21" column="21" selection-start="1019" selection-end="1019" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="JMSServerManager.java" pinned="false" current="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/src/main/org/hornetq/jms/server/JMSServerManager.java"> + <file leaf-file-name="build-maven.xml" pinned="false" current="true" current-in-tab="true"> + <entry file="file://$PROJECT_DIR$/build-maven.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="202" column="0" selection-start="8852" selection-end="8852" vertical-scroll-proportion="0.0"> + <state line="15" column="52" selection-start="762" selection-end="762" vertical-scroll-proportion="0.3802817"> <folding /> </state> </provider> </entry> </file> - <file leaf-file-name="JMSServerManagerImpl.java" pinned="false" current="true" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java"> + <file leaf-file-name="build.xml" pinned="false" current="false" current-in-tab="false"> + <entry file="file://$PROJECT_DIR$/tests/smoke/build.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="757" column="0" selection-start="28561" selection-end="28561" vertical-scroll-proportion="-1.1101813"> + <state line="149" column="58" selection-start="6069" selection-end="6069" vertical-scroll-proportion="-9.818182"> <folding /> </state> </provider> @@ -414,10 +400,37 @@ <setting name="OPEN_NEW_TAB" value="true" /> </FindUsagesManager> </component> + <component name="IdeDocumentHistory"> + <option name="changedFiles"> + <list> + <option value="$PROJECT_DIR$/src/main/org/hornetq/api/jms/HornetQJMSClient.java" /> + <option value="$PROJECT_DIR$/tests/joram-tests/config/provider.properties" /> + <option value="$PROJECT_DIR$/tests/src/org/hornetq/tests/integration/jms/connection/ExceptionListenerTest.java" /> + <option value="$PROJECT_DIR$/src/main/org/hornetq/ra/HornetQResourceAdapter.java" /> + <option value="$PROJECT_DIR$/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java" /> + <option value="$PROJECT_DIR$/src/main/org/hornetq/core/config/impl/FileConfiguration.java" /> + <option value="$PROJECT_DIR$/src/main/org/hornetq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java" /> + <option value="$PROJECT_DIR$/tests/src/org/hornetq/tests/integration/jms/server/JMSServerStartStopTest.java" /> + <option value="$PROJECT_DIR$/tests/src/org/hornetq/tests/integration/jms/HornetQConnectionFactoryTest.java" /> + <option value="$PROJECT_DIR$/tests/joram-tests/src/org/hornetq/jms/SpawnedJMSServer.java" /> + <option value="$PROJECT_DIR$/tests/joram-tests/src/org/hornetq/jms/HornetQAdmin.java" /> + <option value="$PROJECT_DIR$/src/main/org/hornetq/jms/HornetQConnectionFactory.java" /> + <option value="$PROJECT_DIR$/pom.xml" /> + <option value="$PROJECT_DIR$/build-maven.xml" /> + <option value="$PROJECT_DIR$/src/config/common/hornetq-version.properties" /> + <option value="$PROJECT_DIR$/native/src/JavaUtilities.cpp" /> + </list> + </option> + </component> <component name="ModuleEditorState"> <option name="LAST_EDITED_MODULE_NAME" /> <option name="LAST_EDITED_TAB_NAME" /> </component> + <component name="ProjectInspectionProfilesVisibleTreeState"> + <entry key="Project Default"> + <profile-state /> + </entry> + </component> <component name="ProjectLevelVcsManager"> <OptionsSetting value="true" id="Add" /> <OptionsSetting value="true" id="Remove" /> @@ -493,10 +506,6 @@ <option name="myItemId" value="tests" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="util" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -519,29 +528,7 @@ <option name="myItemId" value="tests" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - </PATH> - <PATH> <PATH_ELEMENT> - <option name="myItemId" value="messaging" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="hornetq-tests" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="tests" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="tests" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> <option name="myItemId" value="integration" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> @@ -572,7 +559,7 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="jms" /> + <option name="myItemId" value="largemessage" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> @@ -602,11 +589,11 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="jms" /> + <option name="myItemId" value="largemessage" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="server" /> + <option name="myItemId" value="mock" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> @@ -636,17 +623,9 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="jms" /> + <option name="myItemId" value="cluster" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="server" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="management" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -674,11 +653,11 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="jms" /> + <option name="myItemId" value="cluster" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="divert" /> + <option name="myItemId" value="distribution" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> @@ -687,34 +666,6 @@ <option name="myItemId" value="messaging" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="hornetq-tests" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="tests" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="tests" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="integration" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="jms" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="client" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -722,57 +673,21 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="hornetq-tests" /> + <option name="myItemId" value="hornetq" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="tests" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="tests" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="integration" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="client" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> <option name="myItemId" value="messaging" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> - </PATH> - <PATH> <PATH_ELEMENT> - <option name="myItemId" value="messaging" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="hornetq-jms-tests" /> + <option name="myItemId" value="hornetq" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> - </PATH> - <PATH> <PATH_ELEMENT> - <option name="myItemId" value="messaging" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="hornetq-jms-tests" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="jms-tests" /> + <option name="myItemId" value="hornetq3" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> @@ -782,21 +697,17 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="hornetq-jms-tests" /> + <option name="myItemId" value="hornetq" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="jms-tests" /> + <option name="myItemId" value="hornetq3" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> <option name="myItemId" value="src" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="tests" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -804,11 +715,11 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="hornetq-jms-tests" /> + <option name="myItemId" value="hornetq" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="jms-tests" /> + <option name="myItemId" value="hornetq3" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> @@ -816,13 +727,9 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="tests" /> + <option name="myItemId" value="main" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="tools" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -830,11 +737,11 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="hornetq-jms-tests" /> + <option name="myItemId" value="hornetq" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="jms-tests" /> + <option name="myItemId" value="hornetq3" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> @@ -842,17 +749,13 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="tests" /> + <option name="myItemId" value="main" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="tools" /> + <option name="myItemId" value="hornetq" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="container" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -860,87 +763,31 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="hornetq-jms-examples" /> + <option name="myItemId" value="hornetq" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> - </PATH> - <PATH> <PATH_ELEMENT> - <option name="myItemId" value="messaging" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="hornetq-jms-examples" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="jms" /> + <option name="myItemId" value="hornetq3" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - </PATH> - <PATH> <PATH_ELEMENT> - <option name="myItemId" value="messaging" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="hornetq-jms-examples" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="jms" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="message-group2" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="messaging" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="hornetq-jms-examples" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="jms" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="message-group2" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> <option name="myItemId" value="src" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="example" /> + <option name="myItemId" value="main" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - </PATH> - <PATH> <PATH_ELEMENT> - <option name="myItemId" value="messaging" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="hornetq-jms-examples" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="jms" /> + <option name="myItemId" value="hornetq" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="message-group2" /> + <option name="myItemId" value="integration" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="server0" /> + <option name="myItemId" value="netty" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> @@ -950,249 +797,29 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="hornetq-javaee-examples" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="messaging" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="hornetq-javaee-examples" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="javaee" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="messaging" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="hornetq-javaee-examples" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="javaee" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="xarecovery" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="messaging" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="hornetq-javaee-examples" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="javaee" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="common" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="messaging" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="hornetq-core-examples" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="messaging" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="hornetq-core-examples" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="core" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="messaging" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="hornetq-core-examples" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="core" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="microcontainer" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="messaging" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="hornetq-core-examples" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="core" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="embedded-remote" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="messaging" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="hornetq-core-examples" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="core" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="embedded" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="messaging" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> <option name="myItemId" value="hornetq" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="Libraries" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.LibraryGroupNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="messaging" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="hornetq" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="Libraries" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.LibraryGroupNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="messaging" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="messaging" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="hornetq" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="Libraries" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.LibraryGroupNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="messaging" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="common" /> + <option name="myItemId" value="hornetq3" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - </PATH> - <PATH> <PATH_ELEMENT> - <option name="myItemId" value="messaging" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="hornetq" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="Libraries" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.LibraryGroupNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="messaging" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.NamedLibraryElementNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="common" /> + <option name="myItemId" value="src" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="schema" /> + <option name="myItemId" value="main" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - </PATH> - <PATH> <PATH_ELEMENT> - <option name="myItemId" value="messaging" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> <option name="myItemId" value="hornetq" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="hornetq3" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - </PATH> - <PATH> <PATH_ELEMENT> - <option name="myItemId" value="messaging" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="hornetq" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="hornetq3" /> + <option name="myItemId" value="integration" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -1215,32 +842,14 @@ <option name="myItemId" value="main" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - </PATH> - <PATH> <PATH_ELEMENT> - <option name="myItemId" value="messaging" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> <option name="myItemId" value="hornetq" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="hornetq3" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="src" /> + <option name="myItemId" value="core" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="main" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="hornetq" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -1268,9 +877,13 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="jms" /> + <option name="myItemId" value="core" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="server" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -1298,13 +911,17 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="jms" /> + <option name="myItemId" value="core" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> <option name="myItemId" value="server" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="impl" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -1332,7 +949,7 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="jms" /> + <option name="myItemId" value="core" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> @@ -1340,7 +957,7 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="management" /> + <option name="myItemId" value="cluster" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> @@ -1370,7 +987,7 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="jms" /> + <option name="myItemId" value="core" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> @@ -1378,7 +995,7 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="management" /> + <option name="myItemId" value="cluster" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> @@ -1412,17 +1029,13 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="jms" /> + <option name="myItemId" value="core" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="server" /> + <option name="myItemId" value="security" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="impl" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -1450,15 +1063,15 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="jms" /> + <option name="myItemId" value="core" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="server" /> + <option name="myItemId" value="security" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="config" /> + <option name="myItemId" value="impl" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> @@ -1488,21 +1101,13 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="jms" /> + <option name="myItemId" value="core" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="server" /> + <option name="myItemId" value="remoting" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="config" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="impl" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -1530,13 +1135,17 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="jms" /> + <option name="myItemId" value="core" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="client" /> + <option name="myItemId" value="remoting" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="impl" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -1567,6 +1176,10 @@ <option name="myItemId" value="core" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="management" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> </PATH> <PATH> <PATH_ELEMENT> @@ -1598,7 +1211,7 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="client" /> + <option name="myItemId" value="cluster" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> @@ -1632,7 +1245,7 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="client" /> + <option name="myItemId" value="cluster" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> @@ -1654,29 +1267,23 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="docs" /> + <option name="myItemId" value="src" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - </PATH> - <PATH> <PATH_ELEMENT> - <option name="myItemId" value="messaging" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + <option name="myItemId" value="main" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> <option name="myItemId" value="hornetq" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="hornetq3" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="docs" /> + <option name="myItemId" value="core" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="user-manual" /> + <option name="myItemId" value="client" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> </PATH> @@ -1694,58 +1301,26 @@ <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="docs" /> + <option name="myItemId" value="src" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="user-manual" /> + <option name="myItemId" value="main" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="en" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - </PATH> - <PATH> - <PATH_ELEMENT> - <option name="myItemId" value="messaging" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> <option name="myItemId" value="hornetq" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="hornetq3" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="build" /> + <option name="myItemId" value="core" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> - </PATH> - <PATH> <PATH_ELEMENT> - <option name="myItemId" value="messaging" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="hornetq" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="hornetq3" /> + <option name="myItemId" value="client" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> <PATH_ELEMENT> - <option name="myItemId" value="build" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> - <option name="myItemId" value="src" /> - <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> - </PATH_ELEMENT> - <PATH_ELEMENT> <option name="myItemId" value="impl" /> <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> </PATH_ELEMENT> @@ -1756,47 +1331,128 @@ <option name="STATE" value="0" /> </component> <component name="ProjectView"> - <navigator currentView="ProjectPane" proportions="0.5" version="1" splitterProportion="0.5"> + <navigator currentView="ProjectPane" proportions="" version="1" splitterProportion="0.5"> <flattenPackages /> <showMembers /> <showModules /> <showLibraryContents /> <hideEmptyPackages /> <abbreviatePackageNames /> - <showStructure ProjectPane="false" /> <autoscrollToSource /> <autoscrollFromSource ProjectPane="true" /> <sortByType /> </navigator> + <panes> + <pane id="Scope" /> + <pane id="ProjectPane"> + <subPane> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="hornetq" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="hornetq" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="hornetq3" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="hornetq" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="hornetq3" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="hornetq" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="hornetq3" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="config" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + <PATH> + <PATH_ELEMENT> + <option name="myItemId" value="hornetq" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="hornetq3" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="src" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="config" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + <PATH_ELEMENT> + <option name="myItemId" value="common" /> + <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" /> + </PATH_ELEMENT> + </PATH> + </subPane> + </pane> + <pane id="PackagesPane" /> + <pane id="Favorites" /> + </panes> </component> <component name="PropertiesComponent"> - <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatWidth1" value="284" /> - <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatWidth0" value="222" /> + <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatWidth1" value="287" /> + <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatWidth0" value="225" /> <property name="project.structure.last.edited" value="Modules" /> <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatWidth3" value="35" /> - <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatWidth2" value="242" /> + <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatWidth2" value="246" /> <property name="project.structure.proportion" value="0.15" /> + <property name="OverrideImplement.combined" value="true" /> <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatOrder1" value="1" /> <property name="options.splitter.main.proportions" value="0.3" /> <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatOrder0" value="0" /> <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatOrder3" value="3" /> <property name="RunManagerConfig.showSettingsBeforeRunnig" value="false" /> <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatOrder2" value="2" /> - <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeWidth2" value="198" /> + <property name="recentsLimit" value="5" /> + <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeWidth2" value="200" /> <property name="MemberChooser.sorted" value="false" /> - <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeWidth1" value="241" /> + <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeWidth1" value="243" /> <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatOrder4" value="4" /> - <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeWidth0" value="193" /> - <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeWidth4" value="993" /> - <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeWidth3" value="194" /> + <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeWidth0" value="195" /> + <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeWidth4" value="989" /> + <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeWidth3" value="198" /> <property name="GoToClass.includeJavaFiles" value="false" /> <property name="GoToClass.toSaveIncludeLibraries" value="false" /> + <property name="WebServerToolWindowFactoryState" value="false" /> <property name="MemberChooser.showClasses" value="true" /> - <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatWidth4" value="1036" /> + <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_flatWidth4" value="1032" /> <property name="GoToClass.includeLibraries" value="false" /> <property name="options.splitter.details.proportions" value="0.2" /> <property name="GoToFile.includeJavaFiles" value="false" /> - <property name="options.lastSelected" value="preferences.sourceCode.Spaces" /> + <property name="options.lastSelected" value="reference.settings.ide.settings.web.browsers" /> <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeOrder3" value="3" /> <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeOrder4" value="4" /> <property name="FileHistory.org.jetbrains.idea.svn.history.SvnHistoryProvider_treeOrder1" value="1" /> @@ -1811,9 +1467,12 @@ <key name="CopyClassDialog.RECENTS_KEY"> <recent name="org.hornetq.jms.example" /> </key> + <key name="MoveMembersDialog.RECENTS_KEY"> + <recent name="org.hornetq.api.core.client.HornetQClient" /> + </key> </component> <component name="RestoreUpdateTree"> - <UpdateInfo date="12/1/09 8:28 AM" ActionInfo="_Update"> + <UpdateInfo date="1/6/10 8:48 AM" ActionInfo="_Update"> <UpdatedFiles> <FILE-GROUP> <option name="myUpdateName" value="Updated from server" /> @@ -1827,18 +1486,6 @@ <option name="mySupportsDeletion" value="false" /> <option name="myCanBeAbsent" value="false" /> <option name="myId" value="UPDATED" /> - <PATH vcs="svn" revision="8473">$PROJECT_DIR$/src/main/org/hornetq/core/remoting/server/impl/RemotingServiceImpl.java</PATH> - <PATH vcs="svn" revision="8473">$PROJECT_DIR$/src/main/org/hornetq/core/server/cluster/impl/RemoteQueueBindingImpl.java</PATH> - <PATH vcs="svn" revision="8473">$PROJECT_DIR$/src/main/org/hornetq/core/journal/impl/NIOSequentialFile.java</PATH> - <PATH vcs="svn" revision="8473">$PROJECT_DIR$/src/main/org/hornetq/integration/transports/netty/HornetQFrameDecoder2.java</PATH> - <PATH vcs="svn" revision="8473">$PROJECT_DIR$/src/main/org/hornetq/integration/transports/netty/NettyAcceptor.java</PATH> - <PATH vcs="svn" revision="8473">$PROJECT_DIR$/src/main/org/hornetq/integration/transports/netty/ChannelPipelineSupport.java</PATH> - <PATH vcs="svn" revision="8473">$PROJECT_DIR$/.classpath</PATH> - <PATH vcs="svn" revision="8473">$PROJECT_DIR$/tests/src/org/hornetq/tests/unit/core/paging/impl/PagingStoreImplTest.java</PATH> - <PATH vcs="svn" revision="8473">$PROJECT_DIR$/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java</PATH> - <PATH vcs="svn" revision="8473">$PROJECT_DIR$/tests/src/org/hornetq/tests/integration/cluster/distribution/SymmetricClusterTest.java</PATH> - <PATH vcs="svn" revision="8473">$PROJECT_DIR$/build-hornetq.properties</PATH> - <PATH vcs="svn" revision="8473">$PROJECT_DIR$/build-hornetq.xml</PATH> </FILE-GROUP> <FILE-GROUP> <option name="myUpdateName" value="Created" /> @@ -1884,18 +1531,12 @@ <option name="myId" value="MERGED_WITH_CONFLICTS" /> </FILE-GROUP> <FILE-GROUP> - <option name="myUpdateName" value="Merged with property conflicts" /> - <option name="myStatusName" value="Will be merged with property conflicts" /> - <option name="mySupportsDeletion" value="false" /> - <option name="myCanBeAbsent" value="false" /> - <option name="myId" value="MERGED_WITH_PROPERTY_CONFLICT" /> - </FILE-GROUP> - <FILE-GROUP> <option name="myUpdateName" value="Merged" /> <option name="myStatusName" value="Will be merged" /> <option name="mySupportsDeletion" value="false" /> <option name="myCanBeAbsent" value="false" /> <option name="myId" value="MERGED" /> + <PATH vcs="svn" revision="8722">$PROJECT_DIR$/tests/joram-tests/config/provider.properties</PATH> </FILE-GROUP> <FILE-GROUP> <option name="myUpdateName" value="Not in repository" /> @@ -1926,6 +1567,13 @@ <option name="myId" value="SWITCHED" /> </FILE-GROUP> <FILE-GROUP> + <option name="myUpdateName" value="Merged with property conflicts" /> + <option name="myStatusName" value="Will be merged with property conflicts" /> + <option name="mySupportsDeletion" value="false" /> + <option name="myCanBeAbsent" value="false" /> + <option name="myId" value="MERGED_WITH_PROPERTY_CONFLICT" /> + </FILE-GROUP> + <FILE-GROUP> <option name="myUpdateName" value="Merged with tree conflicts" /> <option name="myStatusName" value="Will be merged with tree conflicts" /> <option name="mySupportsDeletion" value="false" /> @@ -1935,17 +1583,106 @@ </UpdatedFiles> </UpdateInfo> </component> - <component name="RunManager" selected="JUnit.MessageGroupingConnectionFactoryTest"> - <tempConfiguration default="false" name="MessageGroupingConnectionFactoryTest" type="JUnit" factoryName="JUnit" enabled="false" merge="false" sample_coverage="true" runner="emma"> - <pattern> - <option name="PATTERN" value="org.hornetq.tests.integration.client.*" /> - <option name="ENABLED" value="true" /> - </pattern> + <component name="RunManager" selected="JUnit.AsynchronousFileTest.testInvalidReads"> + <configuration default="false" name="MessageRedistributionTest" type="JUnit" factoryName="JUnit" temporary="true"> + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="emma"> + <pattern> + <option name="PATTERN" value="org.hornetq.tests.integration.cluster.distribution.*" /> + <option name="ENABLED" value="true" /> + </pattern> + </extension> <module name="hornetq-tests" /> <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> <option name="ALTERNATIVE_JRE_PATH" value="" /> + <option name="PACKAGE_NAME" value="org.hornetq.tests.integration.cluster.distribution" /> + <option name="MAIN_CLASS_NAME" value="org.hornetq.tests.integration.cluster.distribution.MessageRedistributionTest" /> + <option name="METHOD_NAME" value="" /> + <option name="TEST_OBJECT" value="class" /> + <option name="VM_PARAMETERS" value="-Djava.util.logging.config.file=./src/config/trunk/clustered/logging.properties -Djava.library.path=native/bin" /> + <option name="PARAMETERS" value="" /> + <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" /> + <option name="ENV_VARIABLES" /> + <option name="PASS_PARENT_ENVS" value="true" /> + <option name="TEST_SEARCH_SCOPE"> + <value defaultName="moduleWithDependencies" /> + </option> + <envs /> + <RunnerSettings RunnerId="Run" /> + <ConfigurationWrapper RunnerId="Run" /> + <method /> + </configuration> + <configuration default="false" name="SessionTest.test" type="JUnit" factoryName="JUnit" temporary="true"> + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="emma"> + <pattern> + <option name="PATTERN" value="org.hornetq.tests.integration.client.*" /> + <option name="ENABLED" value="true" /> + </pattern> + </extension> + <module name="hornetq-tests" /> + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> + <option name="ALTERNATIVE_JRE_PATH" value="" /> <option name="PACKAGE_NAME" value="org.hornetq.tests.integration.client" /> - <option name="MAIN_CLASS_NAME" value="org.hornetq.tests.integration.client.MessageGroupingConnectionFactoryTest" /> + <option name="MAIN_CLASS_NAME" value="org.hornetq.tests.integration.client.SessionTest" /> + <option name="METHOD_NAME" value="test" /> + <option name="TEST_OBJECT" value="method" /> + <option name="VM_PARAMETERS" value="-Djava.util.logging.config.file=./src/config/trunk/clustered/logging.properties -Djava.library.path=native/bin" /> + <option name="PARAMETERS" value="" /> + <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" /> + <option name="ENV_VARIABLES" /> + <option name="PASS_PARENT_ENVS" value="true" /> + <option name="TEST_SEARCH_SCOPE"> + <value defaultName="moduleWithDependencies" /> + </option> + <envs /> + <RunnerSettings RunnerId="Debug"> + <option name="DEBUG_PORT" value="42306" /> + <option name="TRANSPORT" value="0" /> + <option name="LOCAL" value="true" /> + </RunnerSettings> + <RunnerSettings RunnerId="Run" /> + <ConfigurationWrapper RunnerId="Debug" /> + <ConfigurationWrapper RunnerId="Run" /> + <method /> + </configuration> + <configuration default="false" name="AsynchronousFileTest.testInvalidReads" type="JUnit" factoryName="JUnit" temporary="true"> + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="emma"> + <pattern> + <option name="PATTERN" value="org.hornetq.tests.unit.core.asyncio.*" /> + <option name="ENABLED" value="true" /> + </pattern> + </extension> + <module name="hornetq-tests" /> + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> + <option name="ALTERNATIVE_JRE_PATH" value="" /> + <option name="PACKAGE_NAME" value="org.hornetq.tests.unit.core.asyncio" /> + <option name="MAIN_CLASS_NAME" value="org.hornetq.tests.unit.core.asyncio.AsynchronousFileTest" /> + <option name="METHOD_NAME" value="testInvalidReads" /> + <option name="TEST_OBJECT" value="method" /> + <option name="VM_PARAMETERS" value="-Djava.util.logging.config.file=./src/config/trunk/clustered/logging.properties -Djava.library.path=native/bin" /> + <option name="PARAMETERS" value="" /> + <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" /> + <option name="ENV_VARIABLES" /> + <option name="PASS_PARENT_ENVS" value="true" /> + <option name="TEST_SEARCH_SCOPE"> + <value defaultName="moduleWithDependencies" /> + </option> + <envs /> + <RunnerSettings RunnerId="Run" /> + <ConfigurationWrapper RunnerId="Run" /> + <method /> + </configuration> + <configuration default="false" name="LargeMessageFailoverTest" type="JUnit" factoryName="JUnit" temporary="true"> + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="emma"> + <pattern> + <option name="PATTERN" value="org.hornetq.tests.integration.cluster.failover.*" /> + <option name="ENABLED" value="true" /> + </pattern> + </extension> + <module name="hornetq-tests" /> + <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> + <option name="ALTERNATIVE_JRE_PATH" value="" /> + <option name="PACKAGE_NAME" value="org.hornetq.tests.integration.cluster.failover" /> + <option name="MAIN_CLASS_NAME" value="org.hornetq.tests.integration.cluster.failover.LargeMessageFailoverTest" /> <option name="METHOD_NAME" value="" /> <option name="TEST_OBJECT" value="class" /> <option name="VM_PARAMETERS" value="-Djava.util.logging.config.file=./src/config/trunk/clustered/logging.properties -Djava.library.path=native/bin" /> @@ -1953,23 +1690,44 @@ <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" /> <option name="ENV_VARIABLES" /> <option name="PASS_PARENT_ENVS" value="true" /> - <option name="ADDITIONAL_CLASS_PATH" /> <option name="TEST_SEARCH_SCOPE"> <value defaultName="moduleWithDependencies" /> </option> <envs /> <RunnerSettings RunnerId="Run" /> <ConfigurationWrapper RunnerId="Run" /> + <method /> + </configuration> + <configuration default="true" type="PHPUnitRunConfigurationType" factoryName="PHPUnit" break_at_first_line="false" browser="DEFAULT" class_file="" class="" config_file="" directory="" file="" is_config_by_xml="false" is_groups_set="false" method_class="" method_file="" method="" open_page_automatically="false" scope="Class" stop_session_after_first_page="true" web_path=""> + <option name="excludedGroups"> + <set /> + </option> + <option name="includedGroups"> + <set /> + </option> + <option name="mappings"> + <list /> + </option> + <option name="sessionId" value="" /> <method> - <option name="Make" value="true" /> + <option name="AntTarget" enabled="false" /> + <option name="BuildArtifacts" enabled="false" /> + <option name="FtpUpload" enabled="false" /> + <option name="Maven.BeforeRunTask" enabled="false" /> </method> - </tempConfiguration> + </configuration> <configuration default="true" type="Remote" factoryName="Remote"> <option name="USE_SOCKET_TRANSPORT" value="true" /> <option name="SERVER_MODE" value="false" /> <option name="SHMEM_ADDRESS" value="javadebug" /> <option name="HOST" value="localhost" /> <option name="PORT" value="5005" /> + <method> + <option name="AntTarget" enabled="false" /> + <option name="BuildArtifacts" enabled="false" /> + <option name="FtpUpload" enabled="false" /> + <option name="Maven.BeforeRunTask" enabled="false" /> + </method> </configuration> <configuration default="true" type="Applet" factoryName="Applet"> <module name="" /> @@ -1982,8 +1740,16 @@ <option name="VM_PARAMETERS" /> <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> <option name="ALTERNATIVE_JRE_PATH" /> + <method> + <option name="AntTarget" enabled="false" /> + <option name="BuildArtifacts" enabled="false" /> + <option name="FtpUpload" enabled="false" /> + <option name="Make" enabled="true" /> + <option name="Maven.BeforeRunTask" enabled="false" /> + </method> </configuration> - <configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false" runner="emma"> + <configuration default="true" type="Application" factoryName="Application"> + <extension name="coverage" enabled="false" merge="false" runner="emma" /> <option name="MAIN_CLASS_NAME" /> <option name="VM_PARAMETERS" /> <option name="PROGRAM_PARAMETERS" /> @@ -1995,8 +1761,16 @@ <option name="PASS_PARENT_ENVS" value="true" /> <module name="" /> <envs /> + <method> + <option name="AntTarget" enabled="false" /> + <option name="BuildArtifacts" enabled="false" /> + <option name="FtpUpload" enabled="false" /> + <option name="Make" enabled="true" /> + <option name="Maven.BeforeRunTask" enabled="false" /> + </method> </configuration> - <configuration default="true" type="JUnit" factoryName="JUnit" enabled="false" merge="false" sample_coverage="true" runner="emma"> + <configuration default="true" type="JUnit" factoryName="JUnit"> + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="emma" /> <module name="" /> <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> <option name="ALTERNATIVE_JRE_PATH" value="" /> @@ -2009,20 +1783,25 @@ <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" /> <option name="ENV_VARIABLES" /> <option name="PASS_PARENT_ENVS" value="true" /> - <option name="ADDITIONAL_CLASS_PATH" /> <option name="TEST_SEARCH_SCOPE"> <value defaultName="moduleWithDependencies" /> </option> <envs /> <method> - <option name="Make" value="true" /> + <option name="AntTarget" enabled="false" /> + <option name="BuildArtifacts" enabled="false" /> + <option name="FtpUpload" enabled="false" /> + <option name="Make" enabled="true" /> + <option name="Maven.BeforeRunTask" enabled="false" /> </method> </configuration> - <configuration default="false" name="LargeMessageTest" type="JUnit" factoryName="JUnit" enabled="false" merge="false" runner="emma"> - <pattern> - <option name="PATTERN" value="org.hornetq.tests.integration.client.*" /> - <option name="ENABLED" value="true" /> - </pattern> + <configuration default="false" name="LargeMessageTest" type="JUnit" factoryName="JUnit"> + <extension name="coverage" enabled="false" merge="false" runner="emma"> + <pattern> + <option name="PATTERN" value="org.hornetq.tests.integration.client.*" /> + <option name="ENABLED" value="true" /> + </pattern> + </extension> <module name="hornetq-tests" /> <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> <option name="ALTERNATIVE_JRE_PATH" /> @@ -2035,7 +1814,6 @@ <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" /> <option name="ENV_VARIABLES" /> <option name="PASS_PARENT_ENVS" value="true" /> - <option name="ADDITIONAL_CLASS_PATH" /> <option name="TEST_SEARCH_SCOPE"> <value defaultName="moduleWithDependencies" /> </option> @@ -2048,15 +1826,15 @@ <RunnerSettings RunnerId="Run" /> <ConfigurationWrapper RunnerId="Debug" /> <ConfigurationWrapper RunnerId="Run" /> - <method> - <option name="Make" value="true" /> - </method> + <method /> </configuration> - <configuration default="false" name="NettyFailoverTest.test" type="JUnit" factoryName="JUnit" enabled="false" merge="false" sample_coverage="true" runner="emma"> - <pattern> - <option name="PATTERN" value="org.hornetq.tests.integration.cluster.failover.*" /> - <option name="ENABLED" value="true" /> - </pattern> + <configuration default="false" name="NettyFailoverTest.test" type="JUnit" factoryName="JUnit"> + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="emma"> + <pattern> + <option name="PATTERN" value="org.hornetq.tests.integration.cluster.failover.*" /> + <option name="ENABLED" value="true" /> + </pattern> + </extension> <module name="hornetq-tests" /> <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> <option name="ALTERNATIVE_JRE_PATH" value="" /> @@ -2069,22 +1847,21 @@ <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" /> <option name="ENV_VARIABLES" /> <option name="PASS_PARENT_ENVS" value="true" /> - <option name="ADDITIONAL_CLASS_PATH" /> <option name="TEST_SEARCH_SCOPE"> <value defaultName="moduleWithDependencies" /> </option> <envs /> <RunnerSettings RunnerId="Run" /> <ConfigurationWrapper RunnerId="Run" /> - <method> - <option name="Make" value="true" /> - </method> + <method /> </configuration> - <configuration default="false" name="GroupingFailoverReplicationTest.test" type="JUnit" factoryName="JUnit" enabled="false" merge="false" sample_coverage="true" runner="emma"> - <pattern> - <option name="PATTERN" value="org.hornetq.tests.integration.cluster.failover.*" /> - <option name="ENABLED" value="true" /> - </pattern> + <configuration default="false" name="GroupingFailoverReplicationTest.test" type="JUnit" factoryName="JUnit"> + <extension name="coverage" enabled="false" merge="false" sample_coverage="true" runner="emma"> + <pattern> + <option name="PATTERN" value="org.hornetq.tests.integration.cluster.failover.*" /> + <option name="ENABLED" value="true" /> + </pattern> + </extension> <module name="hornetq-tests" /> <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" /> <option name="ALTERNATIVE_JRE_PATH" value="" /> @@ -2097,7 +1874,6 @@ <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$" /> <option name="ENV_VARIABLES" /> <option name="PASS_PARENT_ENVS" value="true" /> - <option name="ADDITIONAL_CLASS_PATH" /> <option name="TEST_SEARCH_SCOPE"> <value defaultName="moduleWithDependencies" /> </option> @@ -2110,9 +1886,7 @@ <RunnerSettings RunnerId="Run" /> <ConfigurationWrapper RunnerId="Debug" /> <ConfigurationWrapper RunnerId="Run" /> - <method> - <option name="Make" value="true" /> - </method> + <method /> </configuration> <configuration default="false" name="server" type="Remote" factoryName="Remote"> <option name="USE_SOCKET_TRANSPORT" value="true" /> @@ -2126,16 +1900,17 @@ <option name="LOCAL" value="false" /> </RunnerSettings> <ConfigurationWrapper RunnerId="Debug" /> - <method> - <option name="Make" value="true" /> - </method> + <method /> </configuration> - <list size="5"> - <item index="0" class="java.lang.String" itemvalue="JUnit.LargeMessageTest" /> - <item index="1" class="java.lang.String" itemvalue="JUnit.NettyFailoverTest.test" /> - <item index="2" class="java.lang.String" itemvalue="JUnit.GroupingFailoverReplicationTest.test" /> - <item index="3" class="java.lang.String" itemvalue="Remote.server" /> - <item index="4" class="java.lang.String" itemvalue="JUnit.MessageGroupingConnectionFactoryTest" /> + <list size="8"> + <item index="0" class="java.lang.String" itemvalue="JUnit.MessageRedistributionTest" /> + <item index="1" class="java.lang.String" itemvalue="JUnit.SessionTest.test" /> + <item index="2" class="java.lang.String" itemvalue="JUnit.LargeMessageTest" /> + <item index="3" class="java.lang.String" itemvalue="JUnit.NettyFailoverTest.test" /> + <item index="4" class="java.lang.String" itemvalue="JUnit.GroupingFailoverReplicationTest.test" /> + <item index="5" class="java.lang.String" itemvalue="Remote.server" /> + <item index="6" class="java.lang.String" itemvalue="JUnit.AsynchronousFileTest.testInvalidReads" /> + <item index="7" class="java.lang.String" itemvalue="JUnit.LargeMessageFailoverTest" /> </list> <configuration name="<template>" type="WebApp" default="true" selected="false"> <Host>localhost</Host> @@ -2143,11 +1918,6 @@ </configuration> </component> <component name="ShelveChangesManager" show_recycled="false" /> - <component name="StructureViewFactory"> - <option name="AUTOSCROLL_MODE" value="true" /> - <option name="AUTOSCROLL_FROM_SOURCE" value="false" /> - <option name="ACTIVE_ACTIONS" value="" /> - </component> <component name="SvnConfiguration"> <option name="USER" value="" /> <option name="PASSWORD" value="" /> @@ -2157,10 +1927,45 @@ <option name="MERGE_DIFF_USE_ANCESTRY" value="true" /> <option name="UPDATE_LOCK_ON_DEMAND" value="false" /> <option name="IGNORE_SPACES_IN_MERGE" value="false" /> + <option name="DETECT_NESTED_COPIES" value="false" /> + <option name="IGNORE_SPACES_IN_ANNOTATE" value="true" /> + <option name="SHOW_MERGE_SOURCES_IN_ANNOTATE" value="true" /> <configuration useDefault="false">$PROJECT_DIR$/../../.subversion</configuration> <myIsUseDefaultProxy>false</myIsUseDefaultProxy> <supportedVersion>125</supportedVersion> </component> + <component name="SvnFileUrlMappingImpl"> + <option name="myMappingRoots"> + <list> + <SvnCopyRootSimple> + <option name="myVcsRoot" value="$PROJECT_DIR$" /> + <option name="myCopyRoot" value="$PROJECT_DIR$" /> + </SvnCopyRootSimple> + </list> + </option> + <option name="myMoreRealMappingRoots"> + <list> + <SvnCopyRootSimple> + <option name="myVcsRoot" value="$PROJECT_DIR$" /> + <option name="myCopyRoot" value="$PROJECT_DIR$" /> + </SvnCopyRootSimple> + </list> + </option> + </component> + <component name="TaskManager"> + <task active="true" id="Default" summary="Default task"> + <changelist id="a2aae645-dbcd-4d6e-9c99-efa05d93589a" name="Default" comment="" /> + <created>1260445407874</created> + <updated>1260445407874</updated> + </task> + <task id="LOCAL-00001" summary="intellij"> + <changelist id="e1b486d8-d1b7-4aff-87e2-e20629d1b1d5" name="intellij" comment="" /> + <created>1260445360382</created> + <updated>1260445360382</updated> + </task> + <option name="localTasksCounter" value="2" /> + <servers /> + </component> <component name="TodoView" selected-index="0"> <todo-panel id="selected-file"> <are-packages-shown value="false" /> @@ -2182,28 +1987,28 @@ </todo-panel> </component> <component name="ToolWindowManager"> - <frame x="0" y="25" width="1920" height="1150" extended-state="0" /> + <frame x="-3" y="25" width="1926" height="1153" extended-state="6" /> <editor active="false" /> <layout> - <window_info id="Changes" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.23558648" sideWeight="0.0" order="7" side_tool="false" /> - <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" /> - <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" /> - <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.21704657" sideWeight="0.5" order="1" side_tool="false" /> - <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.209" sideWeight="0.0" order="3" side_tool="false" /> - <window_info id="Dataflow to this" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" /> - <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.22465208" sideWeight="0.5" order="7" side_tool="false" /> - <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.15208748" sideWeight="0.5" order="7" side_tool="false" /> - <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" /> - <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24959914" sideWeight="0.7006937" order="1" side_tool="false" /> - <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" /> - <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.1769437" sideWeight="0.7574553" order="0" side_tool="false" /> - <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" /> - <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" /> - <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.26540756" sideWeight="0.5" order="2" side_tool="false" /> - <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" /> - <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" /> - <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" /> - <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" /> + <window_info id="Changes" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.34886026" sideWeight="0.0" order="7" side_tool="false" content_ui="tabs" /> + <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> + <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> + <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.26858276" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> + <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.27833003" sideWeight="0.0" order="3" side_tool="false" content_ui="tabs" /> + <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.32903865" sideWeight="0.0" order="7" side_tool="false" content_ui="tabs" /> + <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.16451932" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> + <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" /> + <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.24959914" sideWeight="0.7006937" order="1" side_tool="false" content_ui="tabs" /> + <window_info id="Maven Projects" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" /> + <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.25815073" sideWeight="0.6442022" order="0" side_tool="false" content_ui="tabs" /> + <window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> + <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.29335976" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> + <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" /> + <window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> + <window_info id="Dataflow to this" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" /> + <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> + <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> + <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> </layout> </component> <component name="VcsManagerConfiguration"> @@ -2214,9 +2019,13 @@ <option name="PERFORM_EDIT_IN_BACKGROUND" value="true" /> <option name="PERFORM_CHECKOUT_IN_BACKGROUND" value="true" /> <option name="PERFORM_ADD_REMOVE_IN_BACKGROUND" value="true" /> + <option name="PERFORM_ROLLBACK_IN_BACKGROUND" value="false" /> + <option name="CHECK_LOCALLY_CHANGED_CONFLICTS_IN_BACKGROUND" value="true" /> <option name="FORCE_NON_EMPTY_COMMENT" value="false" /> - <option name="LAST_COMMIT_MESSAGE" value="https://jira.jboss.org/jira/browse/HORNETQ-229 - added the ability to control grouping at the connection factry level" /> + <option name="LAST_COMMIT_MESSAGE" value="intellij project updates" /> + <option name="MAKE_NEW_CHANGELIST_ACTIVE" value="true" /> <option name="OPTIMIZE_IMPORTS_BEFORE_PROJECT_COMMIT" value="false" /> + <option name="CHECK_FILES_UP_TO_DATE_BEFORE_COMMIT" value="false" /> <option name="REFORMAT_BEFORE_PROJECT_COMMIT" value="false" /> <option name="REFORMAT_BEFORE_FILE_COMMIT" value="false" /> <option name="FILE_HISTORY_DIALOG_COMMENTS_SPLITTER_PROPORTION" value="0.8" /> @@ -2226,29 +2035,31 @@ <option name="UPDATE_GROUP_BY_CHANGELIST" value="false" /> <option name="SHOW_FILE_HISTORY_AS_TREE" value="false" /> <option name="FILE_HISTORY_SPLITTER_PROPORTION" value="0.6" /> - <MESSAGE value="https://jira.jboss.org/jira/browse/HORNETQ-159 - changed jms-ra.rar to be called hornetq-ra.rar and added dependencies to support ResourceAdapater tag." /> - <MESSAGE value="https://jira.jboss.org/jira/browse/HORNETQ-46 - support for clustered groupings" /> - <MESSAGE value="https://jira.jboss.org/jira/browse/HORNETQ-146 - added mbean support for jboss 4.x servers" /> - <MESSAGE value="cluster test fix" /> - <MESSAGE value="fixed test
" /> - <MESSAGE value="fixed tests
" /> - <MESSAGE value="https://jira.jboss.org/jira/browse/HORNETQ-190 - each largemessagedeliverer now uses its own file handle" /> - <MESSAGE value="https://jira.jboss.org/jira/browse/HORNETQ-188 - a few tweaks" /> - <MESSAGE value="test tweaks + fix" /> + <MESSAGE value="fixed test" /> + <MESSAGE value="doc updates" /> + <MESSAGE value="tidied exception handling" /> <MESSAGE value="test fix" /> - <MESSAGE value="fix to reset iterators when consumer is busy + some refactoring" /> - <MESSAGE value="added test for iterator when first message handled is busy and that the order is still correct" /> - <MESSAGE value="added latch instead of sleep to fix test" /> - <MESSAGE value="added latch instead to make sure server connection was closed" /> - <MESSAGE value="fixed timing issue on test" /> - <MESSAGE value="added maven debug flag" /> - <MESSAGE value="only add the remote binding to the bindings map if it doesnt already exist" /> - <MESSAGE value="renamed example dir" /> - <MESSAGE value="fixed classpath" /> - <MESSAGE value="fixed classpath on embedded example" /> - <MESSAGE value="message id was not being set in MessageImpl constructor" /> - <MESSAGE value="fixed restart target on xarecovery example" /> - <MESSAGE value="https://jira.jboss.org/jira/browse/HORNETQ-229 - added the ability to control grouping at the connection factry level" /> + <MESSAGE value="uncommented reset to clear bindings" /> + <MESSAGE value="make all tests use file storage" /> + <MESSAGE value="remeoved all boolean isFileStorage() methods" /> + <MESSAGE value="removed cluetered tags from config files" /> + <MESSAGE value="added build scripts and updated docs" /> + <MESSAGE value="upped sleep to allow server to start" /> + <MESSAGE value="config fix" /> + <MESSAGE value="doc fix" /> + <MESSAGE value="example fix" /> + <MESSAGE value="reconnect attemots now -1 by default for the ra. updated docs also" /> + <MESSAGE value="ClientProducer javadocs" /> + <MESSAGE value="SimpleString and Pair javadocs" /> + <MESSAGE value="javadocs and some refactoring of message" /> + <MESSAGE value="remoting javadocs" /> + <MESSAGE value="buffer fix" /> + <MESSAGE value="added maven target for creating repos files" /> + <MESSAGE value="fixed import" /> + <MESSAGE value="refactored client api for CLientSessionFactory, ConnectionFactory, HornetQQueue and HornetQTopic" /> + <MESSAGE value="updated native libs for refactoring" /> + <MESSAGE value="updated versioning" /> + <MESSAGE value="intellij project updates" /> </component> <component name="XDebuggerManager"> <breakpoint-manager /> @@ -2851,178 +2662,151 @@ </buildFile> </component> <component name="editorHistoryManager"> - <entry file="file://$PROJECT_DIR$/tests/src/org/hornetq/tests/integration/client/MessageGroupingTest.java"> + <entry file="file://$PROJECT_DIR$/src/main/org/hornetq/core/asyncio/impl/AsynchronousFileImpl.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="711" column="26" selection-start="24557" selection-end="25406" vertical-scroll-proportion="0.0"> + <state line="377" column="111" selection-start="11072" selection-end="11072" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/tests/src/org/hornetq/tests/integration/client/MessageGroupingConnectionFactoryTest.java"> + <entry file="file://$PROJECT_DIR$/tests/src/org/hornetq/tests/integration/cluster/failover/LargeMessageFailoverTest.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="119" column="63" selection-start="4462" selection-end="4462" vertical-scroll-proportion="0.0"> - <folding> - <element signature="imports" expanded="true" /> - </folding> + <state line="30" column="24" selection-start="1071" selection-end="1071" vertical-scroll-proportion="-7.8"> + <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/org/hornetq/core/client/impl/ClientProducerImpl.java"> + <entry file="file://$PROJECT_DIR$/tests/src/org/hornetq/tests/unit/core/asyncio/AsynchronousFileTest.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="107" column="0" selection-start="3880" selection-end="3880" vertical-scroll-proportion="0.0"> + <state line="306" column="100" selection-start="9093" selection-end="9093" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/org/hornetq/core/client/ClientSessionFactory.java"> + <entry file="file://$PROJECT_DIR$/src/main/org/hornetq/api/jms/HornetQJMSClient.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="183" column="0" selection-start="5214" selection-end="5214" vertical-scroll-proportion="0.0"> + <state line="41" column="29" selection-start="1445" selection-end="1445" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/org/hornetq/core/client/impl/ClientSessionFactoryImpl.java"> + <entry file="file://$PROJECT_DIR$/src/main/org/hornetq/jms/HornetQConnectionFactory.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="987" column="32" selection-start="28940" selection-end="28940" vertical-scroll-proportion="0.0"> + <state line="102" column="9" selection-start="4003" selection-end="4003" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/org/hornetq/core/client/impl/ClientSessionImpl.java"> + <entry file="file://$PROJECT_DIR$/examples/jms/client-side-load-balancing/src/org/hornetq/jms/example/ClientSideLoadBalancingExample.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="1397" column="0" selection-start="45205" selection-end="45205" vertical-scroll-proportion="0.0"> + <state line="51" column="100" selection-start="1787" selection-end="1787" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/org/hornetq/jms/server/config/ConnectionFactoryConfiguration.java"> + <entry file="file://$PROJECT_DIR$/src/main/org/hornetq/api/core/client/HornetQClient.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> + <state line="73" column="77" selection-start="2722" selection-end="2722" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/org/hornetq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java"> + <entry file="file://$PROJECT_DIR$/tests/smoke/build.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="104" column="0" selection-start="4217" selection-end="4217" vertical-scroll-proportion="0.0"> + <state line="149" column="58" selection-start="6069" selection-end="6069" vertical-scroll-proportion="-9.818182"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/org/hornetq/core/client/impl/FailoverManager.java"> + <entry file="file://$PROJECT_DIR$/src/main/org/hornetq/api/core/client/ClientSessionFactoryImpl.java"> <provider selected="true" editor-type-id="text-editor"> - <state line="49" column="0" selection-start="2121" selection-end="2121" vertical-scroll-proportion="0.0"> + <state line="54" column="37" selection-start="2265" selection-end="2289" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/org/hornetq/core/client/impl/FailoverManagerImpl.java"> + <entry file="file://$PROJECT_DIR$/native/src/JavaUtilities.cpp"> <provider selected="true" editor-type-id="text-editor"> - <state line="426" column="0" selection-start="15882" selection-end="15882" vertical-scroll-proportion="0.0"> + <state line="28" column="58" selection-start="1017" selection-end="1017" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/org/hornetq/jms/client/HornetQConnectionFactory.java"> + <entry file="file://$PROJECT_DIR$/native/bootstrap"> <provider selected="true" editor-type-id="text-editor"> - <state line="559" column="32" selection-start="17012" selection-end="17012" vertical-scroll-proportion="0.0"> + <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/org/hornetq/jms/server/management/JMSServerControl.java"> + <entry file="file://$PROJECT_DIR$/native/src/org_hornetq_core_asyncio_impl_AsynchronousFileImpl.h"> <provider selected="true" editor-type-id="text-editor"> - <state line="159" column="0" selection-start="11108" selection-end="11108" vertical-scroll-proportion="0.0"> + <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/org/hornetq/jms/server/management/impl/JMSServerControlImpl.java"> + <entry file="file://$PROJECT_DIR$/native/README"> <provider selected="true" editor-type-id="text-editor"> - <state line="429" column="0" selection-start="23162" selection-end="23162" vertical-scroll-proportion="0.0"> + <state line="43" column="44" selection-start="1202" selection-end="1221" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java"> + <entry file="file://$PROJECT_DIR$/pom.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="301" column="0" selection-start="16739" selection-end="16739" vertical-scroll-proportion="0.0"> + <state line="21" column="21" selection-start="1019" selection-end="1019" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/org/hornetq/jms/server/JMSServerManager.java"> + <entry file="file://$PROJECT_DIR$/src/config/common/hornetq-version.properties"> <provider selected="true" editor-type-id="text-editor"> - <state line="202" column="0" selection-start="8852" selection-end="8852" vertical-scroll-proportion="0.0"> + <state line="0" column="40" selection-start="40" selection-end="40" vertical-scroll-proportion="0.0"> <folding /> </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java"> + <entry file="file://$PROJECT_DIR$/build-maven.xml"> <provider selected="true" editor-type-id="text-editor"> - <state line="757" column="0" selection-start="28561" selection-end="28561" vertical-scroll-proportion="-1.1101813"> + <state line="15" column="52" selection-start="762" selection-end="762" vertical-scroll-proportion="0.3802817"> <folding /> </state> </provider> </entry> </component> <component name="masterDetails"> - <option name="states"> - <map> - <entry key="Errors.UI"> - <value> - <UIState> + <states> + <state key="ArtifactsStructureConfigurable.UI"> + <UIState> + <splitter-proportions> + <SplitterProportionsDataImpl> <option name="proportions"> - <SplitterProportionsDataImpl /> + <list> + <option value="0.2" /> + </list> </option> - </UIState> - </value> - </entry> - <entry key="ScopeChooserConfigurable.UI"> - <value> - <UIState> - <option name="proportions"> - <SplitterProportionsDataImpl> - <option name="proportions"> - <list> - <option value="0.2" /> - </list> - </option> - </SplitterProportionsDataImpl> - </option> - </UIState> - </value> - </entry> - </map> - </option> - <option name="myStates"> - <map> - <entry key="Errors.UI"> - <value> - <UIState> - <option name="proportions"> - <SplitterProportionsDataImpl /> - </option> - </UIState> - </value> - </entry> - <entry key="ScopeChooserConfigurable.UI"> - <value> - <UIState> - <option name="proportions"> - <SplitterProportionsDataImpl> - <option name="proportions"> - <list> - <option value="0.2" /> - </list> - </option> - </SplitterProportionsDataImpl> - </option> - </UIState> - </value> - </entry> - </map> - </option> + </SplitterProportionsDataImpl> + </splitter-proportions> + <settings /> + </UIState> + </state> + <state key="Copyright.UI"> + <UIState> + <splitter-proportions> + <SplitterProportionsDataImpl /> + </splitter-proportions> + </UIState> + </state> + <state key="ScopeChooserConfigurable.UI"> + <UIState> + <splitter-proportions> + <SplitterProportionsDataImpl /> + </splitter-proportions> + <settings /> + </UIState> + </state> + </states> </component> </project>

14 years, 11 months

1
0
0 / 0

JBoss hornetq SVN: r8728 - in trunk: src/config/common and 1 other directory.

by do-not-reply＠jboss.org

Author: ataylor Date: 2010-01-06 05:03:33 -0500 (Wed, 06 Jan 2010) New Revision: 8728 Modified: trunk/build-maven.xml trunk/pom.xml trunk/src/config/common/hornetq-version.properties Log: updated versioning Modified: trunk/build-maven.xml =================================================================== --- trunk/build-maven.xml 2010-01-06 10:02:30 UTC (rev 8727) +++ trunk/build-maven.xml 2010-01-06 10:03:33 UTC (rev 8728) @@ -13,7 +13,7 @@ --> <project default="upload" name="HornetQ"> - <property name="hornetq.version" value="2.0.0.GA"/> + <property name="hornetq.version" value="2.0.0.CR3"/> <property name="build.dir" value="build"/> <property name="jars.dir" value="${build.dir}/jars"/> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2010-01-06 10:02:30 UTC (rev 8727) +++ trunk/pom.xml 2010-01-06 10:03:33 UTC (rev 8728) @@ -19,7 +19,7 @@ <groupId>org.hornetq</groupId> <artifactId>messaging</artifactId> <packaging>pom</packaging> - <version>2.0.0.CR2</version> + <version>2.0.0.CR3</version> <name>HornetQ</name> <url>http://hornetq.org</url> Modified: trunk/src/config/common/hornetq-version.properties =================================================================== --- trunk/src/config/common/hornetq-version.properties 2010-01-06 10:02:30 UTC (rev 8727) +++ trunk/src/config/common/hornetq-version.properties 2010-01-06 10:03:33 UTC (rev 8728) @@ -1,8 +1,8 @@ -hornetq.version.versionName=vespa +hornetq.version.versionName=yellowjacket hornetq.version.majorVersion=2 hornetq.version.minorVersion=0 hornetq.version.microVersion=0 -hornetq.version.incrementingVersion=110 -hornetq.version.versionSuffix=CR2 -hornetq.version.versionTag=CR2 +hornetq.version.incrementingVersion=111 +hornetq.version.versionSuffix=CR3 +hornetq.version.versionTag=CR3 hornetq.netty.version=(a)NETTY.VERSION@

14 years, 11 months

1
0
0 / 0

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

by do-not-reply＠jboss.org

Author: ataylor Date: 2010-01-06 05:02:30 -0500 (Wed, 06 Jan 2010) New Revision: 8727 Modified: trunk/native/src/JavaUtilities.cpp Log: updated native libs for refactoring Modified: trunk/native/src/JavaUtilities.cpp =================================================================== --- trunk/native/src/JavaUtilities.cpp 2010-01-06 09:49:50 UTC (rev 8726) +++ trunk/native/src/JavaUtilities.cpp 2010-01-06 10:02:30 UTC (rev 8727) @@ -26,7 +26,7 @@ void throwException(JNIEnv * env, const int code, const char * message) { - jclass exceptionClass = env->FindClass("org/hornetq/core/exception/HornetQException"); + jclass exceptionClass = env->FindClass("org/hornetq/api/core/exception/HornetQException"); if (exceptionClass==NULL) { std::cerr << "Couldn't throw exception message:= " << message << "\n";

14 years, 11 months

1
0
0 / 0

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

by do-not-reply＠jboss.org

Author: jmesnil Date: 2010-01-06 04:49:50 -0500 (Wed, 06 Jan 2010) New Revision: 8726 Modified: trunk/src/main/org/hornetq/api/core/client/ClientSessionFactory.java Log: Javadoc fixes * used @link instead of @value now that the default constants are in the API in the HornetQClient class Modified: trunk/src/main/org/hornetq/api/core/client/ClientSessionFactory.java =================================================================== --- trunk/src/main/org/hornetq/api/core/client/ClientSessionFactory.java 2010-01-06 09:29:49 UTC (rev 8725) +++ trunk/src/main/org/hornetq/api/core/client/ClientSessionFactory.java 2010-01-06 09:49:50 UTC (rev 8726) @@ -163,7 +163,7 @@ /** * Returns the period used to check if a client has failed to receive pings from the server. * - * Period is in milliseconds, default value is {@value HornetQClient#DEFAULT_CLIENT_FAILURE_CHECK_PERIOD}. + * Period is in milliseconds, default value is {@link HornetQClient#DEFAULT_CLIENT_FAILURE_CHECK_PERIOD}. * * @return the period used to check if a client has failed to receive pings from the server */ @@ -183,7 +183,7 @@ * * There is 1 temporary file created for each large message. * - * Default value is {@value HornetQClient#DEFAULT_CACHE_LARGE_MESSAGE_CLIENT}. + * Default value is {@link HornetQClient#DEFAULT_CACHE_LARGE_MESSAGE_CLIENT}. * * @return <code>true</code> if consumers created through this factory will cache large messages in temporary files, <code>false</code> else */ @@ -200,7 +200,7 @@ * Returns the connection time-to-live. * This TTL determines how long the server will keep a connection alive in the absence of any data arriving from the client. * - * Value is in milliseconds, default value is {@value HornetQClient#DEFAULT_CONNECTION_TTL}. + * Value is in milliseconds, default value is {@link HornetQClient#DEFAULT_CONNECTION_TTL}. * * @return the connection time-to-live in milliseconds */ @@ -219,7 +219,7 @@ * Returns the blocking calls timeout. * * If client's blocking calls to the server take more than this timeout, the call will throw a {@link HornetQException} with the code {@link HornetQException#CONNECTION_TIMEDOUT}. - * Value is in milliseconds, default value is {@value HornetQClient#DEFAULT_CALL_TIMEOUT}. + * Value is in milliseconds, default value is {@link HornetQClient#DEFAULT_CALL_TIMEOUT}. * * @return the blocking calls timeout */ @@ -239,7 +239,7 @@ * * Messages whose size is if greater than this value will be handled as large messages. * - * Value is in bytes, default value is {@value HornetQClient#DEFAULT_MIN_LARGE_MESSAGE_SIZE}. + * Value is in bytes, default value is {@link HornetQClient#DEFAULT_MIN_LARGE_MESSAGE_SIZE}. * * @return the message size threshold to treat messages as large messages. */ @@ -257,7 +257,7 @@ /** * Returns the window size for flow control of the consumers created through this factory. * - * Value is in bytes, default value is {@value HornetQClient#DEFAULT_CONSUMER_WINDOW_SIZE}. + * Value is in bytes, default value is {@link HornetQClient#DEFAULT_CONSUMER_WINDOW_SIZE}. * * @return the window size used for consumer flow control */ @@ -278,7 +278,7 @@ * This value controls the rate at which a consumer can consume messages. A consumer will never consume messages at a rate faster than the rate specified. * * Value is -1 (to disable) or a positive integer corresponding to the maximum desired message consumption rate specified in units of messages per second. - * Default value is {@value HornetQClient#DEFAULT_CONSUMER_MAX_RATE}. + * Default value is {@link HornetQClient#DEFAULT_CONSUMER_MAX_RATE}. * * @return the consumer max rate */ @@ -296,7 +296,7 @@ /** * Returns the size for the confirmation window of clients using this factory. * - * Value is in bytes or -1 (to disable the window). Default value is {@value HornetQClient#DEFAULT_CONFIRMATION_WINDOW_SIZE}. + * Value is in bytes or -1 (to disable the window). Default value is {@link HornetQClient#DEFAULT_CONFIRMATION_WINDOW_SIZE}. * * @return the size for the confirmation window of clients using this factory */ @@ -315,7 +315,7 @@ * Returns the window size for flow control of the producers created through this factory. * * Value must be -1 (to disable flow control) or greater than 0 to determine the maximum amount of bytes at any give time (to prevent overloading the connection). - * Default value is {@value HornetQClient#DEFAULT_PRODUCER_WINDOW_SIZE}. + * Default value is {@link HornetQClient#DEFAULT_PRODUCER_WINDOW_SIZE}. * * @return the window size for flow control of the producers created through this factory. */ @@ -336,7 +336,7 @@ * This value controls the rate at which a producer can produce messages. A producer will never produce messages at a rate faster than the rate specified. * * Value is -1 (to disable) or a positive integer corresponding to the maximum desired message production rate specified in units of messages per second. - * Default value is {@value HornetQClient#DEFAULT_PRODUCER_MAX_RATE}. + * Default value is {@link HornetQClient#DEFAULT_PRODUCER_MAX_RATE}. * * @return maximum rate of message production (in messages per seconds) */ @@ -354,7 +354,7 @@ /** * Returns whether consumers created through this factory will block while sending message acknowledgements or do it asynchronously. * - * Default value is {@value HornetQClient#DEFAULT_BLOCK_ON_ACKNOWLEDGE}. + * Default value is {@link HornetQClient#DEFAULT_BLOCK_ON_ACKNOWLEDGE}. * * @return whether consumers will block while sending message acknowledgements or do it asynchronously */ @@ -373,7 +373,7 @@ * If the session is configured to send durable message asynchronously, the client can set a SendAcknowledgementHandler on the ClientSession * to be notified once the message has been handled by the server. * - * Default value is {@value HornetQClient#DEFAULT_BLOCK_ON_DURABLE_SEND}. + * Default value is {@link HornetQClient#DEFAULT_BLOCK_ON_DURABLE_SEND}. * * @return whether producers will block while sending persistent messages or do it asynchronously */ @@ -392,7 +392,7 @@ * If the session is configured to send non-durable message asynchronously, the client can set a SendAcknowledgementHandler on the ClientSession * to be notified once the message has been handled by the server. * - * Default value is {@value HornetQClient#DEFAULT_BLOCK_ON_NON_DURABLE_SEND}. + * Default value is {@link HornetQClient#DEFAULT_BLOCK_ON_NON_DURABLE_SEND}. * * @return whether producers will block while sending non-durable messages or do it asynchronously */ @@ -411,7 +411,7 @@ * * 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}. - * Default value is {@value HornetQClient#DEFAULT_AUTO_GROUP}. + * Default value is {@link HornetQClient#DEFAULT_AUTO_GROUP}. * * @return whether producers will automatically assign a group ID to their messages */ @@ -444,7 +444,7 @@ /** * Returns whether messages will pre-acknowledged on the server before they are sent to the consumers or not. * - * Default value is {@value HornetQClient#DEFAULT_PRE_ACKNOWLEDGE} + * Default value is {@link HornetQClient#DEFAULT_PRE_ACKNOWLEDGE} */ boolean isPreAcknowledge(); @@ -459,7 +459,7 @@ /** * Returns the acknowledgements batch size. * - * Default value is {@value HornetQClient#DEFAULT_ACK_BATCH_SIZE}. + * Default value is {@link HornetQClient#DEFAULT_ACK_BATCH_SIZE}. * * @return the acknowledgements batch size */ @@ -511,7 +511,7 @@ * If this factory uses discovery to find HornetQ servers, the list of discovered servers * will be refreshed according to this timeout. * - * Value is in milliseconds, default value is {@value HornetQClient#DEFAULT_DISCOVERY_REFRESH_TIMEOUT}. + * Value is in milliseconds, default value is {@link HornetQClient#DEFAULT_DISCOVERY_REFRESH_TIMEOUT}. * * @return the refresh timeout for discovered HornetQ servers */ @@ -529,7 +529,7 @@ /** * Returns the initial wait timeout if this factory is configured to use discovery. * - * Value is in milliseconds, default value is {@value HornetQClient#DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT}. + * Value is in milliseconds, default value is {@link HornetQClient#DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT}. * * @return the initial wait timeout if this factory is configured to use discovery */ @@ -548,7 +548,7 @@ * Returns whether this factory will use global thread pools (shared among all the factories in the same JVM) * or its own pools. * - * Default value is {@value HornetQClient#DEFAULT_USE_GLOBAL_POOLS}. + * Default value is {@link HornetQClient#DEFAULT_USE_GLOBAL_POOLS}. * * @return <code>true</code> if this factory uses global thread pools, <code>false</code> else */ @@ -565,7 +565,7 @@ /** * Returns the maximum size of the scheduled thread pool. * - * Default value is {@value HornetQClient#DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE}. + * Default value is {@link HornetQClient#DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE}. * * @return the maximum size of the scheduled thread pool. */ @@ -584,7 +584,7 @@ /** * Returns the maximum size of the thread pool. * - * Default value is {@value HornetQClient#DEFAULT_THREAD_POOL_MAX_SIZE}. + * Default value is {@link HornetQClient#DEFAULT_THREAD_POOL_MAX_SIZE}. * * @return the maximum size of the thread pool. */ @@ -603,7 +603,7 @@ /** * Returns the time to retry connections created by this factory after failure. * - * Value is in milliseconds, default is {@value HornetQClient#DEFAULT_RETRY_INTERVAL}. + * Value is in milliseconds, default is {@link HornetQClient#DEFAULT_RETRY_INTERVAL}. * * @return the time to retry connections created by this factory after failure */ @@ -621,7 +621,7 @@ /** * Returns the multiplier to apply to successive retry intervals. * - * Default value is {@value HornetQClient#DEFAULT_RETRY_INTERVAL_MULTIPLIER}. + * Default value is {@link HornetQClient#DEFAULT_RETRY_INTERVAL_MULTIPLIER}. * * @return the multiplier to apply to successive retry intervals */ @@ -639,7 +639,7 @@ /** * Returns the maximum retry interval (in the case a retry interval multiplier has been specified). * - * Value is in milliseconds, default value is {@value HornetQClient#DEFAULT_MAX_RETRY_INTERVAL}. + * Value is in milliseconds, default value is {@link HornetQClient#DEFAULT_MAX_RETRY_INTERVAL}. * * @return the maximum retry interval */ @@ -657,7 +657,7 @@ /** * Returns the maximum number of attempts to retry connection in case of failure. * - * Default value is {@value HornetQClient#DEFAULT_RECONNECT_ATTEMPTS}. + * Default value is {@link HornetQClient#DEFAULT_RECONNECT_ATTEMPTS}. * * @return the maximum number of attempts to retry connection in case of failure. */ @@ -676,7 +676,7 @@ * Returns whether connections created by this factory must failover in case the server they are * connected to has normally shut down. * - * Default value is {@value HornetQClient#DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN}. + * Default value is {@link HornetQClient#DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN}. * * @return <code>true</code> if connections must failover if the server has normally shut down, else <code>false</code> */ @@ -711,7 +711,7 @@ /** * Returns the initial size of messages created through this factory. * - * Value is in bytes, default value is {@value HornetQClient#DEFAULT_INITIAL_MESSAGE_PACKET_SIZE}. + * Value is in bytes, default value is {@link HornetQClient#DEFAULT_INITIAL_MESSAGE_PACKET_SIZE}. * * @return the initial size of messages created through this factory */

14 years, 11 months

1
0
0 / 0

JBoss hornetq SVN: r8725 - in trunk/src/main/org/hornetq: api/jms/management and 2 other directories.

by do-not-reply＠jboss.org

Author: jmesnil Date: 2010-01-06 04:29:49 -0500 (Wed, 06 Jan 2010) New Revision: 8725 Added: trunk/src/main/org/hornetq/api/core/management/Operation.java trunk/src/main/org/hornetq/api/core/management/Parameter.java Removed: trunk/src/main/org/hornetq/core/server/management/Operation.java trunk/src/main/org/hornetq/core/server/management/Parameter.java Modified: trunk/src/main/org/hornetq/api/core/management/AddressControl.java trunk/src/main/org/hornetq/api/core/management/HornetQServerControl.java trunk/src/main/org/hornetq/api/core/management/QueueControl.java trunk/src/main/org/hornetq/api/jms/management/DestinationControl.java trunk/src/main/org/hornetq/api/jms/management/JMSQueueControl.java trunk/src/main/org/hornetq/api/jms/management/JMSServerControl.java trunk/src/main/org/hornetq/api/jms/management/TopicControl.java trunk/src/main/org/hornetq/core/management/impl/MBeanInfoHelper.java Log: HORNETQ-258: Public vs. Private API * moved Operation and Parameter annotations to api.core.management package Modified: trunk/src/main/org/hornetq/api/core/management/AddressControl.java =================================================================== --- trunk/src/main/org/hornetq/api/core/management/AddressControl.java 2010-01-06 09:14:32 UTC (rev 8724) +++ trunk/src/main/org/hornetq/api/core/management/AddressControl.java 2010-01-06 09:29:49 UTC (rev 8725) @@ -13,8 +13,6 @@ package org.hornetq.api.core.management; -import org.hornetq.core.server.management.Operation; -import org.hornetq.core.server.management.Parameter; /** * An AddressControl is used to manage an address. Modified: trunk/src/main/org/hornetq/api/core/management/HornetQServerControl.java =================================================================== --- trunk/src/main/org/hornetq/api/core/management/HornetQServerControl.java 2010-01-06 09:14:32 UTC (rev 8724) +++ trunk/src/main/org/hornetq/api/core/management/HornetQServerControl.java 2010-01-06 09:29:49 UTC (rev 8725) @@ -17,8 +17,6 @@ import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.config.Configuration; -import org.hornetq.core.server.management.Operation; -import org.hornetq.core.server.management.Parameter; /** * A HornetQServerControl is used to manage HornetQ servers. Copied: trunk/src/main/org/hornetq/api/core/management/Operation.java (from rev 8724, trunk/src/main/org/hornetq/core/server/management/Operation.java) =================================================================== --- trunk/src/main/org/hornetq/api/core/management/Operation.java (rev 0) +++ trunk/src/main/org/hornetq/api/core/management/Operation.java 2010-01-06 09:29:49 UTC (rev 8725) @@ -0,0 +1,43 @@ +/* + * 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.management; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Inherited; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +import javax.management.MBeanOperationInfo; + +/** + * Info for a MBean Operation. + * + * This annotation is used only for methods which can be invoked + * through a GUI. + * + * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> + * + * @version <tt>$Revision$</tt> + * + */ +(a)Retention(RetentionPolicy.RUNTIME) +(a)Target(ElementType.METHOD) +@Inherited +public @interface Operation +{ + String desc(); + + int impact() default MBeanOperationInfo.INFO; +} Copied: trunk/src/main/org/hornetq/api/core/management/Parameter.java (from rev 8724, trunk/src/main/org/hornetq/core/server/management/Parameter.java) =================================================================== --- trunk/src/main/org/hornetq/api/core/management/Parameter.java (rev 0) +++ trunk/src/main/org/hornetq/api/core/management/Parameter.java 2010-01-06 09:29:49 UTC (rev 8725) @@ -0,0 +1,36 @@ +/* + * 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.management; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * Info for a MBean Operation Parameter. + * + * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> + * + * @version <tt>$Revision$</tt> + * + */ +(a)Retention(RetentionPolicy.RUNTIME) +(a)Target(ElementType.PARAMETER) +public @interface Parameter +{ + String name(); + + String desc() default "N/A"; +} Modified: trunk/src/main/org/hornetq/api/core/management/QueueControl.java =================================================================== --- trunk/src/main/org/hornetq/api/core/management/QueueControl.java 2010-01-06 09:14:32 UTC (rev 8724) +++ trunk/src/main/org/hornetq/api/core/management/QueueControl.java 2010-01-06 09:29:49 UTC (rev 8725) @@ -17,8 +17,6 @@ import javax.management.MBeanOperationInfo; -import org.hornetq.core.server.management.Operation; -import org.hornetq.core.server.management.Parameter; /** * A QueueControl is used to manage a queue. Modified: trunk/src/main/org/hornetq/api/jms/management/DestinationControl.java =================================================================== --- trunk/src/main/org/hornetq/api/jms/management/DestinationControl.java 2010-01-06 09:14:32 UTC (rev 8724) +++ trunk/src/main/org/hornetq/api/jms/management/DestinationControl.java 2010-01-06 09:29:49 UTC (rev 8725) @@ -15,8 +15,8 @@ import javax.management.MBeanOperationInfo; -import org.hornetq.core.server.management.Operation; -import org.hornetq.core.server.management.Parameter; +import org.hornetq.api.core.management.Operation; +import org.hornetq.api.core.management.Parameter; /** * A DestinationControl is used to manage a JMS Destination. Modified: trunk/src/main/org/hornetq/api/jms/management/JMSQueueControl.java =================================================================== --- trunk/src/main/org/hornetq/api/jms/management/JMSQueueControl.java 2010-01-06 09:14:32 UTC (rev 8724) +++ trunk/src/main/org/hornetq/api/jms/management/JMSQueueControl.java 2010-01-06 09:29:49 UTC (rev 8725) @@ -17,8 +17,8 @@ import javax.management.MBeanOperationInfo; -import org.hornetq.core.server.management.Operation; -import org.hornetq.core.server.management.Parameter; +import org.hornetq.api.core.management.Operation; +import org.hornetq.api.core.management.Parameter; /** * A JMSQueueControl is used to manage a JMS queue. Modified: trunk/src/main/org/hornetq/api/jms/management/JMSServerControl.java =================================================================== --- trunk/src/main/org/hornetq/api/jms/management/JMSServerControl.java 2010-01-06 09:14:32 UTC (rev 8724) +++ trunk/src/main/org/hornetq/api/jms/management/JMSServerControl.java 2010-01-06 09:29:49 UTC (rev 8725) @@ -19,8 +19,8 @@ import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.core.server.management.Operation; -import org.hornetq.core.server.management.Parameter; +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/api/jms/management/TopicControl.java =================================================================== --- trunk/src/main/org/hornetq/api/jms/management/TopicControl.java 2010-01-06 09:14:32 UTC (rev 8724) +++ trunk/src/main/org/hornetq/api/jms/management/TopicControl.java 2010-01-06 09:29:49 UTC (rev 8725) @@ -17,8 +17,8 @@ import javax.management.MBeanOperationInfo; -import org.hornetq.core.server.management.Operation; -import org.hornetq.core.server.management.Parameter; +import org.hornetq.api.core.management.Operation; +import org.hornetq.api.core.management.Parameter; /** * A TopicControl is used to manage a JMS Topic. Modified: trunk/src/main/org/hornetq/core/management/impl/MBeanInfoHelper.java =================================================================== --- trunk/src/main/org/hornetq/core/management/impl/MBeanInfoHelper.java 2010-01-06 09:14:32 UTC (rev 8724) +++ trunk/src/main/org/hornetq/core/management/impl/MBeanInfoHelper.java 2010-01-06 09:29:49 UTC (rev 8725) @@ -21,8 +21,8 @@ import javax.management.MBeanOperationInfo; import javax.management.MBeanParameterInfo; -import org.hornetq.core.server.management.Operation; -import org.hornetq.core.server.management.Parameter; +import org.hornetq.api.core.management.Operation; +import org.hornetq.api.core.management.Parameter; /** * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> Deleted: trunk/src/main/org/hornetq/core/server/management/Operation.java =================================================================== --- trunk/src/main/org/hornetq/core/server/management/Operation.java 2010-01-06 09:14:32 UTC (rev 8724) +++ trunk/src/main/org/hornetq/core/server/management/Operation.java 2010-01-06 09:29:49 UTC (rev 8725) @@ -1,43 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat licenses this file to you under the Apache License, version - * 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied. See the License for the specific language governing - * permissions and limitations under the License. - */ - -package org.hornetq.core.server.management; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Inherited; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -import javax.management.MBeanOperationInfo; - -/** - * Info for a MBean Operation. - * - * This annotation is used only for methods which can be invoked - * through a GUI. - * - * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> - * - * @version <tt>$Revision$</tt> - * - */ -(a)Retention(RetentionPolicy.RUNTIME) -(a)Target(ElementType.METHOD) -@Inherited -public @interface Operation -{ - String desc(); - - int impact() default MBeanOperationInfo.INFO; -} Deleted: trunk/src/main/org/hornetq/core/server/management/Parameter.java =================================================================== --- trunk/src/main/org/hornetq/core/server/management/Parameter.java 2010-01-06 09:14:32 UTC (rev 8724) +++ trunk/src/main/org/hornetq/core/server/management/Parameter.java 2010-01-06 09:29:49 UTC (rev 8725) @@ -1,36 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat licenses this file to you under the Apache License, version - * 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied. See the License for the specific language governing - * permissions and limitations under the License. - */ - -package org.hornetq.core.server.management; - -import java.lang.annotation.ElementType; -import java.lang.annotation.Retention; -import java.lang.annotation.RetentionPolicy; -import java.lang.annotation.Target; - -/** - * Info for a MBean Operation Parameter. - * - * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> - * - * @version <tt>$Revision$</tt> - * - */ -(a)Retention(RetentionPolicy.RUNTIME) -(a)Target(ElementType.PARAMETER) -public @interface Parameter -{ - String name(); - - String desc() default "N/A"; -}

14 years, 11 months

1
0
0 / 0

JBoss hornetq SVN: r8724 - in trunk/src/main/org/hornetq: core/client and 1 other directory.

by do-not-reply＠jboss.org

Author: timfox Date: 2010-01-06 04:14:32 -0500 (Wed, 06 Jan 2010) New Revision: 8724 Removed: trunk/src/main/org/hornetq/api/jms/bridge/ trunk/src/main/org/hornetq/core/client/management/ Log: removed empty dirs

14 years, 11 months

1
0
0 / 0

JBoss hornetq SVN: r8723 - in trunk: examples/core and 73 other directories.

by do-not-reply＠jboss.org

Author: ataylor Date: 2010-01-06 03:57:20 -0500 (Wed, 06 Jan 2010) New Revision: 8723 Added: trunk/src/main/org/hornetq/api/core/client/HornetQClient.java trunk/src/main/org/hornetq/api/jms/HornetQJMSClient.java trunk/src/main/org/hornetq/jms/HornetQConnectionFactory.java trunk/src/main/org/hornetq/jms/HornetQDestination.java trunk/src/main/org/hornetq/jms/HornetQQueue.java trunk/src/main/org/hornetq/jms/HornetQTemporaryQueue.java trunk/src/main/org/hornetq/jms/HornetQTemporaryTopic.java trunk/src/main/org/hornetq/jms/HornetQTopic.java Removed: trunk/src/main/org/hornetq/api/jms/HornetQConnectionFactory.java trunk/src/main/org/hornetq/api/jms/HornetQDestination.java trunk/src/main/org/hornetq/api/jms/HornetQQueue.java trunk/src/main/org/hornetq/api/jms/HornetQTemporaryQueue.java trunk/src/main/org/hornetq/api/jms/HornetQTemporaryTopic.java trunk/src/main/org/hornetq/api/jms/HornetQTopic.java Modified: trunk/docs/user-manual/en/clusters.xml trunk/docs/user-manual/en/configuring-transports.xml trunk/docs/user-manual/en/connection-ttl.xml trunk/docs/user-manual/en/embedding-hornetq.xml trunk/docs/user-manual/en/large-messages.xml trunk/docs/user-manual/en/management.xml trunk/docs/user-manual/en/thread-pooling.xml trunk/docs/user-manual/en/using-core.xml trunk/docs/user-manual/en/using-jms.xml trunk/examples/core/embedded-remote/readme.html trunk/examples/core/embedded-remote/src/org/hornetq/core/example/EmbeddedRemoteExample.java trunk/examples/core/embedded/readme.html trunk/examples/core/embedded/src/org/hornetq/core/example/EmbeddedExample.java trunk/examples/core/hornetq-core-examples.iml trunk/examples/core/microcontainer/readme.html trunk/examples/core/microcontainer/src/org/hornetq/core/example/EmbeddedMicroContainerExample.java trunk/examples/core/perf/src/org/hornetq/core/example/PerfBase.java trunk/examples/javaee/jca-config/src/org/hornetq/javaee/example/server2/StatelessSender.java trunk/examples/jms/applet/src/org/hornetq/jms/example/AppletExample.java trunk/examples/jms/clustered-grouping/src/org/hornetq/jms/example/ClusteredGroupingExample.java trunk/examples/jms/instantiate-connection-factory/readme.html trunk/examples/jms/instantiate-connection-factory/src/org/hornetq/jms/example/InstantiateConnectionFactoryExample.java trunk/examples/jms/management/src/org/hornetq/jms/example/ManagementExample.java trunk/examples/jms/pre-acknowledge/src/org/hornetq/jms/example/PreacknowledgeExample.java trunk/examples/jms/reattach-node/src/org/hornetq/jms/example/ReattachExample.java trunk/examples/jms/symmetric-cluster/readme.html trunk/examples/jms/symmetric-cluster/src/org/hornetq/jms/example/SymmetricClusterExample.java trunk/examples/jms/topic-hierarchies/readme.html trunk/examples/jms/topic-hierarchies/src/org/hornetq/jms/example/TopicHierarchyExample.java trunk/src/main/org/hornetq/api/core/client/ClientSessionFactory.java trunk/src/main/org/hornetq/api/core/client/ClientSessionFactoryImpl.java trunk/src/main/org/hornetq/core/config/impl/FileConfiguration.java trunk/src/main/org/hornetq/core/remoting/server/impl/RemotingServiceImpl.java trunk/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.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/package-info.java trunk/src/main/org/hornetq/jms/management/impl/JMSConnectionFactoryControlImpl.java trunk/src/main/org/hornetq/jms/management/impl/JMSQueueControlImpl.java trunk/src/main/org/hornetq/jms/management/impl/JMSTopicControlImpl.java trunk/src/main/org/hornetq/jms/server/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/management/JMSManagementService.java trunk/src/main/org/hornetq/jms/server/management/impl/JMSManagementServiceImpl.java trunk/src/main/org/hornetq/jms/server/recovery/HornetQXAResourceWrapper.java trunk/src/main/org/hornetq/ra/HornetQRAManagedConnectionFactory.java trunk/src/main/org/hornetq/ra/HornetQResourceAdapter.java trunk/src/main/org/hornetq/ra/inflow/HornetQActivation.java trunk/src/main/org/hornetq/ra/inflow/HornetQMessageHandler.java trunk/tests/jms-tests/src/org/hornetq/jms/tests/CTSMiscellaneousTest.java trunk/tests/jms-tests/src/org/hornetq/jms/tests/JMSTestCase.java trunk/tests/jms-tests/src/org/hornetq/jms/tests/MessageProducerTest.java trunk/tests/jms-tests/src/org/hornetq/jms/tests/ReferenceableTest.java trunk/tests/jms-tests/src/org/hornetq/jms/tests/message/MessageHeaderTestBase.java trunk/tests/jms-tests/src/org/hornetq/jms/tests/tools/container/LocalTestServer.java trunk/tests/joram-tests/config/provider.properties 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/String64KLimitTest.java trunk/tests/src/org/hornetq/tests/integration/client/ConsumerCloseTest.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/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/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/ProducerCloseTest.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/RequestorTest.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/SessionFactoryTest.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/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/BridgeWithDiscoveryGroupStartTest.java trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.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/LargeMessageFailoverTest.java trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/MultiThreadRandomReattachTestBase.java trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/NettyMultiThreadRandomReattachTest.java trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/RandomReattachTest.java trunk/tests/src/org/hornetq/tests/integration/divert/DivertTest.java trunk/tests/src/org/hornetq/tests/integration/divert/PersistentDivertTest.java trunk/tests/src/org/hornetq/tests/integration/http/CoreClientOverHttpTest.java trunk/tests/src/org/hornetq/tests/integration/jms/FloodServerTest.java trunk/tests/src/org/hornetq/tests/integration/jms/HornetQConnectionFactoryTest.java trunk/tests/src/org/hornetq/tests/integration/jms/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/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/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/ServerLargeMessageTest.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/BroadcastGroupControlUsingCoreTest.java trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControl2Test.java trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControlUsingCoreTest.java trunk/tests/src/org/hornetq/tests/integration/management/DiscoveryGroupControlUsingCoreTest.java trunk/tests/src/org/hornetq/tests/integration/management/DivertControlUsingCoreTest.java trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlUsingCoreTest.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/SecurityNotificationTest.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/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/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/XaTimeoutTest.java trunk/tests/src/org/hornetq/tests/opt/SendTest.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/unit/jms/HornetQDestinationTest.java trunk/tests/src/org/hornetq/tests/unit/jms/HornetQQueueTest.java trunk/tests/src/org/hornetq/tests/unit/jms/HornetQTopicTest.java trunk/tests/src/org/hornetq/tests/unit/jms/referenceable/DestinationObjectFactoryTest.java trunk/tests/src/org/hornetq/tests/unit/ra/ResourceAdapterTest.java trunk/tests/src/org/hornetq/tests/util/JMSTestBase.java trunk/tests/src/org/hornetq/tests/util/ServiceTestBase.java Log: refactored client api for CLientSessionFactory, ConnectionFactory, HornetQQueue and HornetQTopic Modified: trunk/docs/user-manual/en/clusters.xml =================================================================== --- trunk/docs/user-manual/en/clusters.xml 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/docs/user-manual/en/clusters.xml 2010-01-06 08:57:20 UTC (rev 8723) @@ -242,7 +242,7 @@ final int groupPort = 9876; ConnectionFactory jmsConnectionFactory = - new HornetQConnectionFactory(groupAddress, groupPort); + HornetQJMSClient.createConnectionFactory(groupAddress, groupPort); Connection jmsConnection1 = jmsConnectionFactory.createConnection(); @@ -264,7 +264,7 @@ >ClientSessionFactory</literal> instances, then you can specify the discovery group parameters directly when creating the session factory. Here's an example:final String groupAddress = "231.7.7.7"; final int groupPort = 9876; - SessionFactory factory = new ClientSessionFactoryImpl(groupAddress, groupPort); + SessionFactory factory = HornetQClient.createClientSessionFactory(groupAddress, groupPort); ClientSession session1 = factory.createClientSession(...); ClientSession session2 = factory.createClientSession(...); </para> <para>The <literal>refresh-timeout</literal> can be set directly on the session @@ -464,13 +464,13 @@ client side then you can set the load balancing policy using the setter on the <literal >HornetQConnectionFactory</literal> before using it: <programlisting> -ConnectionFactory jmsConnectionFactory = new HornetQConnectionFactory(...); +ConnectionFactory jmsConnectionFactory = HornetQJMSClient.createConnectionFactory(...); jmsConnectionFactory.setLoadBalancingPolicyClassName("com.acme.MyLoadBalancingPolicy"); </programlisting></para> <para>If you're using the core API, you can set the load balancing policy directly on the <literal>ClientSessionFactory</literal> instance you are using: <programlisting> -ClientSessionFactory factory = new ClientSessionFactoryImpl(...); +ClientSessionFactory factory = HornetQClient.createClientSessionFactory(...); factory.setLoadBalancingPolicyClassName("com.acme.MyLoadBalancingPolicy"); </programlisting></para> <para>The set of servers over which the factory load balances can be determined in one of @@ -539,7 +539,7 @@ serverList.add(new Pair<TransportConfiguration, TransportConfiguration>(liveTC2, backupTC2)); -ConnectionFactory jmsConnectionFactory = new HornetQConnectionFactory(serverList); +ConnectionFactory jmsConnectionFactory = HornetQJMSClient.createConnectionFactory(serverList); Connection jmsConnection1 = jmsConnectionFactory.createConnection(); @@ -568,7 +568,7 @@ serverList.add(new Pair<TransportConfiguration, TransportConfiguration>(liveTC2, backupTC2)); -ClientSessionFactory factory = new ClientSessionFactoryImpl(serverList); +ClientSessionFactory factory = HornetQClient.createClientSessionFactory(serverList); ClientSession sesison1 = factory.createClientSession(...); Modified: trunk/docs/user-manual/en/configuring-transports.xml =================================================================== --- trunk/docs/user-manual/en/configuring-transports.xml 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/docs/user-manual/en/configuring-transports.xml 2010-01-06 08:57:20 UTC (rev 8723) @@ -138,7 +138,7 @@ "org.hornetq.integration.transports.netty.NettyConnectorFactory", connectionParams); -ClientSessionFactory sessionFactory = new ClientSessionFactoryImpl(transportConfiguration); +ClientSessionFactory sessionFactory = HornetQClient.createClientSessionFactory(transportConfiguration); ClientSession session = sessionFactory.createSession(...); @@ -157,7 +157,7 @@ "org.hornetq.integration.transports.netty.NettyConnectorFactory", connectionParams); -ConnectionFactory connectionFactory = new HornetQConnectionFactory(transportConfiguration); +ConnectionFactory connectionFactory = HornetQJMSClient.createConnectionFactory(transportConfiguration); Connection jmsConnection = connectionFactory.createConnection(); Modified: trunk/docs/user-manual/en/connection-ttl.xml =================================================================== --- trunk/docs/user-manual/en/connection-ttl.xml 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/docs/user-manual/en/connection-ttl.xml 2010-01-06 08:57:20 UTC (rev 8723) @@ -34,7 +34,7 @@ try { - sf = new ClientSessionFactoryImpl(...); + sf = HornetQClient.createClientSessionFactory(...); session = sf.createSession(...); @@ -59,7 +59,7 @@ try { - ConnectionFactory jmsConnectionFactory = new HornetQConnectionFactory(...); + ConnectionFactory jmsConnectionFactory = HornetQJMSClient.createConnectionFactory(...); jmsConnection = jmsConnectionFactory.createConnection(); Modified: trunk/docs/user-manual/en/embedding-hornetq.xml =================================================================== --- trunk/docs/user-manual/en/embedding-hornetq.xml 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/docs/user-manual/en/embedding-hornetq.xml 2010-01-06 08:57:20 UTC (rev 8723) @@ -125,7 +125,7 @@ <title>Core API</title> <para>If using the core API, just create the <literal>ClientSessionFactory</literal> and use the regular core API.</para> - <programlisting>ClientSessionFactory nettyFactory = new ClientSessionFactoryImpl( + <programlisting>ClientSessionFactory nettyFactory = HornetQClient.createClientSessionFactory( new TransportConfiguration( InVMConnectorFactory.class.getName())); @@ -154,10 +154,10 @@ <section> <title>JMS API</title> <para>Connection on an Embedded HornetQ through JMS is also simple. Just instantiate - <literal>HornetQConnectionFactory</literal> directly. The following example + <literal>ConnectionFactory</literal> directly. The following example illustrates that.</para> - <programlisting>HornetQConnectionFactory cf = - new HornetQConnectionFactory( + <programlisting>ConnectionFactory cf = + HornetQJMSClient.createConnectionFactory( new TransportConfiguration(InVMConnectorFactory.class.getName())); Connection conn = cf.createConnection(); Modified: trunk/docs/user-manual/en/large-messages.xml =================================================================== --- trunk/docs/user-manual/en/large-messages.xml 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/docs/user-manual/en/large-messages.xml 2010-01-06 08:57:20 UTC (rev 8723) @@ -66,7 +66,7 @@ <para>If the HornetQ Core API is used, the minimal large message size is specified by <literal>ClientSessionFactory.setMinLargeMessageSize</literal>.</para> <programlisting>ClientSessionFactory factory = - new ClientSessionFactoryImpl(new + HornetQClient.createClientSessionFactory(new TransportConfiguration(NettyConnectorFactory.class.getName()), null); factory.setMinLargeMessageSize(25 * 1024);</programlisting> <para><xref linkend="configuring-transports.client.side"/> will provide more information Modified: trunk/docs/user-manual/en/management.xml =================================================================== --- trunk/docs/user-manual/en/management.xml 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/docs/user-manual/en/management.xml 2010-01-06 08:57:20 UTC (rev 8723) @@ -660,7 +660,7 @@ <para>The <emphasis>management queue</emphasis> is a special queue and needs to be instantiated directly by the client:</para> <programlisting> - Queue managementQueue = new HornetQQueue("hornetq.management", "hornetq.management"); + Queue managementQueue = HornetQJMSClient.createHornetQQueue("hornetq.management", "hornetq.management"); </programlisting> <para>All the other steps are the same than for the Core API but they use JMS API instead:</para> @@ -689,7 +689,7 @@ <para>For example, to know the number of messages in the JMS queue <literal >exampleQueue</literal>:</para> <programlisting> - Queue managementQueue = new HornetQQueue("hornetq.management", "hornetq.management"); + Queue managementQueue = HornetQJMSClient.createHornetQQueue("hornetq.management", "hornetq.management"); QueueSession session = ... QueueRequestor requestor = new QueueRequestor(session, managementQueue); @@ -800,12 +800,12 @@ is that JMS requires a JMS Destination to receive the messages (preferably a Topic):</para> <programlisting> - Topic notificationsTopic = new HornetQTopic("hornetq.notifications", "hornetq.notifications"); + Topic notificationsTopic = HornetQJMSClient.createHornetQTopic("hornetq.notifications", "hornetq.notifications"); </programlisting> <para>Once the notification topic is created, you can receive messages from it or set a <literal>MessageListener</literal>:</para> <programlisting> - Topic notificationsTopic = new HornetQTopic("hornetq.notifications", "hornetq.notifications"); + Topic notificationsTopic = HornetQJMSClient.createHornetQTopic("hornetq.notifications", "hornetq.notifications"); Session session = ... MessageConsumer notificationConsumer = session.createConsumer(notificationsTopic); Modified: trunk/docs/user-manual/en/thread-pooling.xml =================================================================== --- trunk/docs/user-manual/en/thread-pooling.xml 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/docs/user-manual/en/thread-pooling.xml 2010-01-06 08:57:20 UTC (rev 8723) @@ -99,16 +99,13 @@ <para>To configure a <literal>ClientSessionFactory</literal> instance to use its own pools, simply use the appropriate setter methods immediately after creation, for example:</para> - <programlisting>ClientSessionFactory myFactory = new ClientSessionFactory(...); + <programlisting>ClientSessionFactory myFactory = HornetQClient.createClientSessionFactory(...); myFactory.setUseGlobalPools(false); myFactory.setScheduledThreadPoolMaxSize(10); myFactory.setThreadPoolMaxSize(-1); </programlisting> - <para>If you're using the JMS API, you can set the same parameters directly on the <literal - >HornetQConnectionFactory</literal> instance, for example:</para> - <programlisting>HornetQConnectionFactory myFactory = new HornetQConnectionFactory(...); -myFactory.setUseGlobalPools(false); -myFactory.setScheduledThreadPoolMaxSize(10); -myFactory.setThreadPoolMaxSize(-1); </programlisting> + <para>If you're using the JMS API, you can set the same parameters on the ClientSessionFactory and use it to create the <literal + >ConnectionFactory</literal> instance, for example:</para> + <programlisting>ConnectionFactory myConnectionFactory = HornetQJMSClient.createConnectionFactory(myFactory); </programlisting> <para>If you're using JNDI to instantiate <literal>HornetQConnectionFactory</literal> instances, you can also set these parameters in the <literal>hornetq-jms.xml</literal> file where you describe your connection factory, for example:</para> Modified: trunk/docs/user-manual/en/using-core.xml =================================================================== --- trunk/docs/user-manual/en/using-core.xml 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/docs/user-manual/en/using-core.xml 2010-01-06 08:57:20 UTC (rev 8723) @@ -125,7 +125,7 @@ <para>Here's a very simple program using the core messaging API to send and receive a message:</para> <programlisting> -ClientSessionFactory factory = new ClientSessionFactoryImpl( +ClientSessionFactory factory = HornetQClient.createClientSessionFactory( new TransportConfiguration( InVMConnectorFactory.class.getName())); Modified: trunk/docs/user-manual/en/using-jms.xml =================================================================== --- trunk/docs/user-manual/en/using-jms.xml 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/docs/user-manual/en/using-jms.xml 2010-01-06 08:57:20 UTC (rev 8723) @@ -179,10 +179,10 @@ <programlisting> TransportConfiguration transportConfiguration = new TransportConfiguration(NettyConnectorFactory.class.getName()); -ConnectionFactory cf = new HornetQConnectionFactory(transportConfiguration); +ConnectionFactory cf = HornetQJMSClient.createConnectionFactory(transportConfiguration); </programlisting> <para>We create the JMS Queue Object directly:</para> - <programlisting>Queue orderQueue = new HornetQQueue("OrderQueue");</programlisting> + <programlisting>Queue orderQueue = HornetQJMSClient.createHornetQQueue("OrderQueue");</programlisting> <para>Next we create a JMS connection using the connection factory:</para> <programlisting>Connection connection = cf.createConnection();</programlisting> <para>And we create a non transacted JMS Session, with AUTO_ACKNOWLEDGE acknowledge Modified: trunk/examples/core/embedded/readme.html =================================================================== --- trunk/examples/core/embedded/readme.html 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/examples/core/embedded/readme.html 2010-01-06 08:57:20 UTC (rev 8723) @@ -35,7 +35,7 @@ <li>As we are not using a JNDI environment we instantiate the objects directly</li> <pre class="prettyprint"> - ClientSessionFactory sf = new ClientSessionFactoryImpl (new TransportConfiguration(InVMConnectorFactory.class.getName())); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); </pre> <li>Create a Core Queue</li> 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 08:44:23 UTC (rev 8722) +++ trunk/examples/core/embedded/src/org/hornetq/core/example/EmbeddedExample.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -15,12 +15,7 @@ import java.util.Date; import java.util.HashMap; -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.ClientSessionFactoryImpl; +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; @@ -56,7 +51,7 @@ server.start(); // Step 3. As we are not using a JNDI environment we instantiate the objects directly - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); // Step 4. Create a core queue ClientSession coreSession = sf.createSession(false, false, false); @@ -120,7 +115,7 @@ map.put("host", "localhost"); map.put("port", 5445); TransportConfiguration config = new TransportConfiguration(InVMConnectorFactory.class.getName(), map); - ClientSessionFactory sf = new ClientSessionFactoryImpl(config); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(config); } } Modified: trunk/examples/core/embedded-remote/readme.html =================================================================== --- trunk/examples/core/embedded-remote/readme.html 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/examples/core/embedded-remote/readme.html 2010-01-06 08:57:20 UTC (rev 8723) @@ -54,7 +54,7 @@ <li>As we are not using a JNDI environment we instantiate the objects directly</li> <pre class="prettyprint"> - ClientSessionFactory sf = new ClientSessionFactoryImpl (new TransportConfiguration(NettyConnectorFactory.class.getName())); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(NettyConnectorFactory.class.getName())); </pre> <li>Create a Core Queue</li> 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 08:44:23 UTC (rev 8722) +++ trunk/examples/core/embedded-remote/src/org/hornetq/core/example/EmbeddedRemoteExample.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -14,12 +14,7 @@ import java.util.Date; -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.ClientSessionFactoryImpl; +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; @@ -47,7 +42,7 @@ process = EmbeddedRemoteExample.startRemoteEmbedded(); // Step 4. As we are not using a JNDI environment we instantiate the objects directly - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(NettyConnectorFactory.class.getName())); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(NettyConnectorFactory.class.getName())); // Step 5. Create a core queue ClientSession coreSession = sf.createSession(false, false, false); Modified: trunk/examples/core/hornetq-core-examples.iml =================================================================== --- trunk/examples/core/hornetq-core-examples.iml 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/examples/core/hornetq-core-examples.iml 2010-01-06 08:57:20 UTC (rev 8723) @@ -5,11 +5,14 @@ <content url="file://$MODULE_DIR$"> <sourceFolder url="file://$MODULE_DIR$/embedded/src" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/perf/src" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/embedded-remote/src" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/microcontainer/src" isTestSource="false" /> </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="hornetq" /> <orderEntry type="library" name="messaging_jars" level="project" /> + <orderEntry type="module" module-name="hornetq-jms-examples" /> </component> </module> Modified: trunk/examples/core/microcontainer/readme.html =================================================================== --- trunk/examples/core/microcontainer/readme.html 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/examples/core/microcontainer/readme.html 2010-01-06 08:57:20 UTC (rev 8723) @@ -24,7 +24,7 @@ <li>As we are not using a JNDI environment we instantiate the objects directly</li> <pre class="prettyprint"> - ClientSessionFactory sf = new ClientSessionFactoryImpl (new TransportConfiguration(NettyConnectorFactory.class.getName())); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory (new TransportConfiguration(NettyConnectorFactory.class.getName())); </pre> <li>Create a Core Queue</li> 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 08:44:23 UTC (rev 8722) +++ trunk/examples/core/microcontainer/src/org/hornetq/core/example/EmbeddedMicroContainerExample.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -14,12 +14,7 @@ import java.util.Date; -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.ClientSessionFactoryImpl; +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; @@ -47,7 +42,7 @@ hornetQ.run(); // Step 2. As we are not using a JNDI environment we instantiate the objects directly - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(NettyConnectorFactory.class.getName())); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(NettyConnectorFactory.class.getName())); // Step 3. Create a core queue ClientSession coreSession = sf.createSession(false, false, false); 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 08:44:23 UTC (rev 8722) +++ trunk/examples/core/perf/src/org/hornetq/core/example/PerfBase.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -22,14 +22,7 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.logging.Logger; -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.ClientSessionFactoryImpl; -import org.hornetq.api.core.client.MessageHandler; -import org.hornetq.api.core.client.SendAcknowledgementHandler; +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; @@ -202,7 +195,7 @@ params.put(TransportConstants.HOST_PROP_NAME, perfParams.getHost()); params.put(TransportConstants.PORT_PROP_NAME, perfParams.getPort()); - factory = new ClientSessionFactoryImpl(new TransportConfiguration(NettyConnectorFactory.class.getName(), params)); + factory = HornetQClient.createClientSessionFactory(new TransportConfiguration(NettyConnectorFactory.class.getName(), params)); factory.setPreAcknowledge(perfParams.isPreAck()); factory.setConfirmationWindowSize(perfParams.getConfirmationWindow()); factory.setProducerWindowSize(perfParams.getProducerWindow()); Modified: trunk/examples/javaee/jca-config/src/org/hornetq/javaee/example/server2/StatelessSender.java =================================================================== --- trunk/examples/javaee/jca-config/src/org/hornetq/javaee/example/server2/StatelessSender.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/examples/javaee/jca-config/src/org/hornetq/javaee/example/server2/StatelessSender.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -16,15 +16,12 @@ -import org.hornetq.api.jms.HornetQQueue; +import org.hornetq.api.jms.HornetQJMSClient; import javax.annotation.Resource; import javax.ejb.Remote; import javax.ejb.Stateless; -import javax.jms.Connection; -import javax.jms.ConnectionFactory; -import javax.jms.MessageProducer; -import javax.jms.Session; +import javax.jms.*; /** * A Stateless Bean that will connect to a remote JBM. @@ -51,8 +48,8 @@ public void sendHello(String message) throws Exception { // Step 4. Define the destinations that will receive the message (instead of using JNDI to the remote server) - HornetQQueue destQueueA = new HornetQQueue("A"); - HornetQQueue destQueueB = new HornetQQueue("B"); + Queue destQueueA = HornetQJMSClient.createHornetQQueue("A"); + Queue destQueueB = HornetQJMSClient.createHornetQQueue("B"); // Step 5. Create a connection to a remote server using a connection-factory (look at the deployed file jms-remote-ds.xml) Connection conn = connectionFactory.createConnection("guest", "guest"); Modified: trunk/examples/jms/applet/src/org/hornetq/jms/example/AppletExample.java =================================================================== --- trunk/examples/jms/applet/src/org/hornetq/jms/example/AppletExample.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/examples/jms/applet/src/org/hornetq/jms/example/AppletExample.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -43,10 +43,10 @@ import javax.swing.SwingConstants; import javax.swing.SwingUtilities; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +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.HornetQConnectionFactory; -import org.hornetq.api.jms.HornetQTopic; +import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.integration.transports.netty.NettyConnectorFactory; /** @@ -108,9 +108,9 @@ Map<String, Object> params = new HashMap<String, Object>(); TransportConfiguration connector = new TransportConfiguration(NettyConnectorFactory.class.getName(), params); - ClientSessionFactoryImpl sf = new ClientSessionFactoryImpl(connector); - ConnectionFactory cf = new HornetQConnectionFactory(sf); - destination = new HornetQTopic("exampleTopic"); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(connector); + ConnectionFactory cf = HornetQJMSClient.createConnectionFactory(sf); + destination = HornetQJMSClient.createHornetQTopic("exampleTopic"); try { Modified: trunk/examples/jms/clustered-grouping/src/org/hornetq/jms/example/ClusteredGroupingExample.java =================================================================== --- trunk/examples/jms/clustered-grouping/src/org/hornetq/jms/example/ClusteredGroupingExample.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/examples/jms/clustered-grouping/src/org/hornetq/jms/example/ClusteredGroupingExample.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -118,7 +118,7 @@ { TextMessage message = session0.createTextMessage("This is text message " + i); - message.setStringProperty(HornetQMessage.JMSXGROUPID, "Group-0"); + message.setStringProperty("JMSXGroupID", "Group-0"); producer0.send(message); @@ -129,7 +129,7 @@ { TextMessage message = session1.createTextMessage("This is text message " + (i + 10)); - message.setStringProperty(HornetQMessage.JMSXGROUPID, "Group-0"); + message.setStringProperty("JMSXGroupID", "Group-0"); producer1.send(message); @@ -141,7 +141,7 @@ { TextMessage message = session2.createTextMessage("This is text message " + (i + 20)); - message.setStringProperty(HornetQMessage.JMSXGROUPID, "Group-0"); + message.setStringProperty("JMSXGroupID", "Group-0"); producer2.send(message); Modified: trunk/examples/jms/instantiate-connection-factory/readme.html =================================================================== --- trunk/examples/jms/instantiate-connection-factory/readme.html 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/examples/jms/instantiate-connection-factory/readme.html 2010-01-06 08:57:20 UTC (rev 8723) @@ -56,7 +56,7 @@ <li>Directly instantiate the JMS ConnectionFactory object using that TransportConfiguration.</li> <pre class="prettyprint"> <code> - ConnectionFactory cf = new HornetQConnectionFactory(transportConfiguration); + ConnectionFactory cf = HornetQJMSClient.createConnectionFactory(transportConfiguration); </code> </pre> 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 08:44:23 UTC (rev 8722) +++ trunk/examples/jms/instantiate-connection-factory/src/org/hornetq/jms/example/InstantiateConnectionFactoryExample.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -24,8 +24,7 @@ import javax.jms.TextMessage; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.jms.HornetQConnectionFactory; -import org.hornetq.api.jms.HornetQQueue; +import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.common.example.HornetQExample; import org.hornetq.integration.transports.netty.NettyConnectorFactory; import org.hornetq.integration.transports.netty.TransportConstants; @@ -54,7 +53,7 @@ try { // Step 1. Directly instantiate the JMS Queue object. - Queue queue = new HornetQQueue("exampleQueue"); + Queue queue = HornetQJMSClient.createHornetQQueue("exampleQueue"); // Step 2. Instantiate the TransportConfiguration object which contains the knowledge of what transport to use, // The server port etc. @@ -66,7 +65,7 @@ connectionParams); // Step 3 Directly instantiate the JMS ConnectionFactory object using that TransportConfiguration - ConnectionFactory cf = new HornetQConnectionFactory(transportConfiguration); + ConnectionFactory cf = HornetQJMSClient.createConnectionFactory(transportConfiguration); // Step 4.Create a JMS Connection connection = cf.createConnection(); Modified: trunk/examples/jms/management/src/org/hornetq/jms/example/ManagementExample.java =================================================================== --- trunk/examples/jms/management/src/org/hornetq/jms/example/ManagementExample.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/examples/jms/management/src/org/hornetq/jms/example/ManagementExample.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -24,7 +24,7 @@ import javax.jms.TextMessage; import javax.naming.InitialContext; -import org.hornetq.api.jms.HornetQQueue; +import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.api.jms.management.JMSManagementHelper; import org.hornetq.common.example.HornetQExample; @@ -74,7 +74,7 @@ // Step 9. create the JMS management queue. // It is a "special" queue and it is not looked up from JNDI but constructed directly - Queue managementQueue = new HornetQQueue("hornetq.management", "hornetq.management"); + Queue managementQueue = HornetQJMSClient.createHornetQQueue("hornetq.management", "hornetq.management"); // Step 10. Create a QueueRequestor for the management queue (see queue-requestor example) QueueRequestor requestor = new QueueRequestor(session, managementQueue); Modified: trunk/examples/jms/pre-acknowledge/src/org/hornetq/jms/example/PreacknowledgeExample.java =================================================================== --- trunk/examples/jms/pre-acknowledge/src/org/hornetq/jms/example/PreacknowledgeExample.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/examples/jms/pre-acknowledge/src/org/hornetq/jms/example/PreacknowledgeExample.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -25,7 +25,7 @@ import javax.jms.TextMessage; import javax.naming.InitialContext; -import org.hornetq.api.jms.HornetQQueue; +import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.api.jms.management.JMSManagementHelper; import org.hornetq.common.example.HornetQExample; import org.hornetq.jms.client.HornetQSession; @@ -128,7 +128,7 @@ { QueueSession session = ((QueueConnection)connection).createQueueSession(false, Session.AUTO_ACKNOWLEDGE); - Queue managementQueue = new HornetQQueue("hornetq.management", "hornetq.management"); + Queue managementQueue = HornetQJMSClient.createHornetQQueue("hornetq.management", "hornetq.management"); QueueRequestor requestor = new QueueRequestor(session, managementQueue); Modified: trunk/examples/jms/reattach-node/src/org/hornetq/jms/example/ReattachExample.java =================================================================== --- trunk/examples/jms/reattach-node/src/org/hornetq/jms/example/ReattachExample.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/examples/jms/reattach-node/src/org/hornetq/jms/example/ReattachExample.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -22,7 +22,7 @@ import javax.jms.TextMessage; import javax.naming.InitialContext; -import org.hornetq.api.jms.HornetQQueue; +import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.api.jms.management.JMSManagementHelper; import org.hornetq.common.example.HornetQExample; @@ -141,7 +141,7 @@ Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); - Queue managementQueue = new HornetQQueue("hornetq.management", "hornetq.management"); + Queue managementQueue = HornetQJMSClient.createHornetQQueue("hornetq.management", "hornetq.management"); MessageProducer producer = session.createProducer(managementQueue); Modified: trunk/examples/jms/symmetric-cluster/readme.html =================================================================== --- trunk/examples/jms/symmetric-cluster/readme.html 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/examples/jms/symmetric-cluster/readme.html 2010-01-06 08:57:20 UTC (rev 8723) @@ -62,7 +62,7 @@ <pre class="prettyprint"> <code> - ConnectionFactory cf = new HornetQConnectionFactory("231.7.7.7", 9876); + ConnectionFactory cf = HornetQJMSClient.createConnectionFactory("231.7.7.7", 9876); </code> </pre> @@ -71,7 +71,7 @@ <code> Queue queue = new HornetQQueue("exampleQueue"); - Topic topic = new HornetQTopic("exampleTopic"); + Topic topic = HornetQJMSClient.createHornetQTopic("exampleTopic"); </code> </pre> Modified: trunk/examples/jms/symmetric-cluster/src/org/hornetq/jms/example/SymmetricClusterExample.java =================================================================== --- trunk/examples/jms/symmetric-cluster/src/org/hornetq/jms/example/SymmetricClusterExample.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/examples/jms/symmetric-cluster/src/org/hornetq/jms/example/SymmetricClusterExample.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -21,9 +21,7 @@ import javax.jms.TextMessage; import javax.jms.Topic; -import org.hornetq.api.jms.HornetQConnectionFactory; -import org.hornetq.api.jms.HornetQQueue; -import org.hornetq.api.jms.HornetQTopic; +import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.common.example.HornetQExample; /** @@ -81,15 +79,15 @@ // connection factory directly we avoid having to worry about a JNDI look-up. // In an app server environment you could use HA-JNDI to lookup from the clustered JNDI servers without // having to know about a specific one. - ConnectionFactory cf = new HornetQConnectionFactory("231.7.7.7", 9876); + ConnectionFactory cf = HornetQJMSClient.createConnectionFactory("231.7.7.7", 9876); // We give a little while for each server to broadcast its whereabouts to the client Thread.sleep(2000); // Step 2. Directly instantiate JMS Queue and Topic objects - Queue queue = new HornetQQueue("exampleQueue"); + Queue queue = HornetQJMSClient.createHornetQQueue("exampleQueue"); - Topic topic = new HornetQTopic("exampleTopic"); + Topic topic = HornetQJMSClient.createHornetQTopic("exampleTopic"); // Step 3. We create six connections, they should be to different nodes of the cluster in a round-robin fashion // and start them Modified: trunk/examples/jms/topic-hierarchies/readme.html =================================================================== --- trunk/examples/jms/topic-hierarchies/readme.html 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/examples/jms/topic-hierarchies/readme.html 2010-01-06 08:57:20 UTC (rev 8723) @@ -75,7 +75,7 @@ <li>Instantiate a topic representing the wildcard we're going to subscribe to.</li> <pre class="prettyprint"> - <code>Topic topicSubscribe = new HornetQTopic("news.europe.#");</code> + <code>Topic topicSubscribe = HornetQJMSClient.createHornetQTopic("news.europe.#");</code> </pre> <li>Create a consumer (topic subscriber) that will consume using that wildcard. @@ -93,11 +93,11 @@ we're going to send messages to. You could look these up from JNDI if you wanted to.</li> <pre class="prettyprint"> <code> - Topic topicNewsUsaWrestling = new HornetQTopic("news.usa.wrestling"); + Topic topicNewsUsaWrestling = HornetQJMSClient.createHornetQTopic("news.usa.wrestling"); - Topic topicNewsEuropeSport = new HornetQTopic("news.europe.sport"); + Topic topicNewsEuropeSport = HornetQJMSClient.createHornetQTopic("news.europe.sport"); - Topic topicNewsEuropeEntertainment = new HornetQTopic("news.europe.entertainment");</code> + Topic topicNewsEuropeEntertainment = HornetQJMSClient.createHornetQTopic("news.europe.entertainment");</code> </pre> <li>Send a message destined for the usa wrestling topic.</li> Modified: trunk/examples/jms/topic-hierarchies/src/org/hornetq/jms/example/TopicHierarchyExample.java =================================================================== --- trunk/examples/jms/topic-hierarchies/src/org/hornetq/jms/example/TopicHierarchyExample.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/examples/jms/topic-hierarchies/src/org/hornetq/jms/example/TopicHierarchyExample.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -22,7 +22,7 @@ import javax.jms.Topic; import javax.naming.InitialContext; -import org.hornetq.api.jms.HornetQTopic; +import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.common.example.HornetQExample; /** @@ -59,7 +59,7 @@ Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); // Step 6. Instantiate a topic representing the wildcard we're going to subscribe to - Topic topicSubscribe = new HornetQTopic("news.europe.#"); + Topic topicSubscribe = HornetQJMSClient.createHornetQTopic("news.europe.#"); // Step 7. Create a consumer (topic subscriber) that will consume using that wildcard // The consumer will receive any messages sent to any topic that starts with news.europe @@ -70,11 +70,11 @@ // Step 9. Instantiate some more topic objects corresponding to the individual topics // we're going to send messages to - Topic topicNewsUsaWrestling = new HornetQTopic("news.usa.wrestling"); + Topic topicNewsUsaWrestling = HornetQJMSClient.createHornetQTopic("news.usa.wrestling"); - Topic topicNewsEuropeSport = new HornetQTopic("news.europe.sport"); + Topic topicNewsEuropeSport = HornetQJMSClient.createHornetQTopic("news.europe.sport"); - Topic topicNewsEuropeEntertainment = new HornetQTopic("news.europe.entertainment"); + Topic topicNewsEuropeEntertainment = HornetQJMSClient.createHornetQTopic("news.europe.entertainment"); // Step 10. Send a message destined for the usa wrestling topic TextMessage messageWrestlingNews = session.createTextMessage("Hulk Hogan starts ballet classes"); Modified: trunk/src/main/org/hornetq/api/core/client/ClientSessionFactory.java =================================================================== --- trunk/src/main/org/hornetq/api/core/client/ClientSessionFactory.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/src/main/org/hornetq/api/core/client/ClientSessionFactory.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -163,7 +163,7 @@ /** * Returns the period used to check if a client has failed to receive pings from the server. * - * Period is in milliseconds, default value is {@value org.hornetq.api.core.client.ClientSessionFactoryImpl#DEFAULT_CLIENT_FAILURE_CHECK_PERIOD}. + * Period is in milliseconds, default value is {@value HornetQClient#DEFAULT_CLIENT_FAILURE_CHECK_PERIOD}. * * @return the period used to check if a client has failed to receive pings from the server */ @@ -183,7 +183,7 @@ * * There is 1 temporary file created for each large message. * - * Default value is {@value org.hornetq.api.core.client.ClientSessionFactoryImpl#DEFAULT_CACHE_LARGE_MESSAGE_CLIENT}. + * Default value is {@value HornetQClient#DEFAULT_CACHE_LARGE_MESSAGE_CLIENT}. * * @return <code>true</code> if consumers created through this factory will cache large messages in temporary files, <code>false</code> else */ @@ -200,7 +200,7 @@ * Returns the connection time-to-live. * This TTL determines how long the server will keep a connection alive in the absence of any data arriving from the client. * - * Value is in milliseconds, default value is {@value org.hornetq.api.core.client.ClientSessionFactoryImpl#DEFAULT_CONNECTION_TTL}. + * Value is in milliseconds, default value is {@value HornetQClient#DEFAULT_CONNECTION_TTL}. * * @return the connection time-to-live in milliseconds */ @@ -219,7 +219,7 @@ * Returns the blocking calls timeout. * * If client's blocking calls to the server take more than this timeout, the call will throw a {@link HornetQException} with the code {@link HornetQException#CONNECTION_TIMEDOUT}. - * Value is in milliseconds, default value is {@value org.hornetq.api.core.client.ClientSessionFactoryImpl#DEFAULT_CALL_TIMEOUT}. + * Value is in milliseconds, default value is {@value HornetQClient#DEFAULT_CALL_TIMEOUT}. * * @return the blocking calls timeout */ @@ -239,7 +239,7 @@ * * Messages whose size is if greater than this value will be handled as large messages. * - * Value is in bytes, default value is {@value org.hornetq.api.core.client.ClientSessionFactoryImpl#DEFAULT_MIN_LARGE_MESSAGE_SIZE}. + * Value is in bytes, default value is {@value HornetQClient#DEFAULT_MIN_LARGE_MESSAGE_SIZE}. * * @return the message size threshold to treat messages as large messages. */ @@ -257,7 +257,7 @@ /** * Returns the window size for flow control of the consumers created through this factory. * - * Value is in bytes, default value is {@value org.hornetq.api.core.client.ClientSessionFactoryImpl#DEFAULT_CONSUMER_WINDOW_SIZE}. + * Value is in bytes, default value is {@value HornetQClient#DEFAULT_CONSUMER_WINDOW_SIZE}. * * @return the window size used for consumer flow control */ @@ -278,7 +278,7 @@ * This value controls the rate at which a consumer can consume messages. A consumer will never consume messages at a rate faster than the rate specified. * * Value is -1 (to disable) or a positive integer corresponding to the maximum desired message consumption rate specified in units of messages per second. - * Default value is {@value org.hornetq.api.core.client.ClientSessionFactoryImpl#DEFAULT_CONSUMER_MAX_RATE}. + * Default value is {@value HornetQClient#DEFAULT_CONSUMER_MAX_RATE}. * * @return the consumer max rate */ @@ -296,7 +296,7 @@ /** * Returns the size for the confirmation window of clients using this factory. * - * Value is in bytes or -1 (to disable the window). Default value is {@value org.hornetq.api.core.client.ClientSessionFactoryImpl#DEFAULT_CONFIRMATION_WINDOW_SIZE}. + * Value is in bytes or -1 (to disable the window). Default value is {@value HornetQClient#DEFAULT_CONFIRMATION_WINDOW_SIZE}. * * @return the size for the confirmation window of clients using this factory */ @@ -315,7 +315,7 @@ * Returns the window size for flow control of the producers created through this factory. * * Value must be -1 (to disable flow control) or greater than 0 to determine the maximum amount of bytes at any give time (to prevent overloading the connection). - * Default value is {@value org.hornetq.api.core.client.ClientSessionFactoryImpl#DEFAULT_PRODUCER_WINDOW_SIZE}. + * Default value is {@value HornetQClient#DEFAULT_PRODUCER_WINDOW_SIZE}. * * @return the window size for flow control of the producers created through this factory. */ @@ -336,7 +336,7 @@ * This value controls the rate at which a producer can produce messages. A producer will never produce messages at a rate faster than the rate specified. * * Value is -1 (to disable) or a positive integer corresponding to the maximum desired message production rate specified in units of messages per second. - * Default value is {@value org.hornetq.api.core.client.ClientSessionFactoryImpl#DEFAULT_PRODUCER_MAX_RATE}. + * Default value is {@value HornetQClient#DEFAULT_PRODUCER_MAX_RATE}. * * @return maximum rate of message production (in messages per seconds) */ @@ -354,7 +354,7 @@ /** * Returns whether consumers created through this factory will block while sending message acknowledgements or do it asynchronously. * - * Default value is {@value org.hornetq.api.core.client.ClientSessionFactoryImpl#DEFAULT_BLOCK_ON_ACKNOWLEDGE}. + * Default value is {@value HornetQClient#DEFAULT_BLOCK_ON_ACKNOWLEDGE}. * * @return whether consumers will block while sending message acknowledgements or do it asynchronously */ @@ -373,7 +373,7 @@ * If the session is configured to send durable message asynchronously, the client can set a SendAcknowledgementHandler on the ClientSession * to be notified once the message has been handled by the server. * - * Default value is {@value org.hornetq.api.core.client.ClientSessionFactoryImpl#DEFAULT_BLOCK_ON_DURABLE_SEND}. + * Default value is {@value HornetQClient#DEFAULT_BLOCK_ON_DURABLE_SEND}. * * @return whether producers will block while sending persistent messages or do it asynchronously */ @@ -392,7 +392,7 @@ * If the session is configured to send non-durable message asynchronously, the client can set a SendAcknowledgementHandler on the ClientSession * to be notified once the message has been handled by the server. * - * Default value is {@value org.hornetq.api.core.client.ClientSessionFactoryImpl#DEFAULT_BLOCK_ON_NON_DURABLE_SEND}. + * Default value is {@value HornetQClient#DEFAULT_BLOCK_ON_NON_DURABLE_SEND}. * * @return whether producers will block while sending non-durable messages or do it asynchronously */ @@ -411,7 +411,7 @@ * * 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}. - * Default value is {@value org.hornetq.api.core.client.ClientSessionFactoryImpl#DEFAULT_AUTO_GROUP}. + * Default value is {@value HornetQClient#DEFAULT_AUTO_GROUP}. * * @return whether producers will automatically assign a group ID to their messages */ @@ -444,7 +444,7 @@ /** * Returns whether messages will pre-acknowledged on the server before they are sent to the consumers or not. * - * Default value is {@value org.hornetq.api.core.client.ClientSessionFactoryImpl#DEFAULT_PRE_ACKNOWLEDGE} + * Default value is {@value HornetQClient#DEFAULT_PRE_ACKNOWLEDGE} */ boolean isPreAcknowledge(); @@ -459,7 +459,7 @@ /** * Returns the acknowledgements batch size. * - * Default value is {@value org.hornetq.api.core.client.ClientSessionFactoryImpl#DEFAULT_ACK_BATCH_SIZE}. + * Default value is {@value HornetQClient#DEFAULT_ACK_BATCH_SIZE}. * * @return the acknowledgements batch size */ @@ -511,7 +511,7 @@ * If this factory uses discovery to find HornetQ servers, the list of discovered servers * will be refreshed according to this timeout. * - * Value is in milliseconds, default value is {@value org.hornetq.api.core.client.ClientSessionFactoryImpl#DEFAULT_DISCOVERY_REFRESH_TIMEOUT}. + * Value is in milliseconds, default value is {@value HornetQClient#DEFAULT_DISCOVERY_REFRESH_TIMEOUT}. * * @return the refresh timeout for discovered HornetQ servers */ @@ -529,7 +529,7 @@ /** * Returns the initial wait timeout if this factory is configured to use discovery. * - * Value is in milliseconds, default value is {@value org.hornetq.api.core.client.ClientSessionFactoryImpl#DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT}. + * Value is in milliseconds, default value is {@value HornetQClient#DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT}. * * @return the initial wait timeout if this factory is configured to use discovery */ @@ -548,7 +548,7 @@ * Returns whether this factory will use global thread pools (shared among all the factories in the same JVM) * or its own pools. * - * Default value is {@value org.hornetq.api.core.client.ClientSessionFactoryImpl#DEFAULT_USE_GLOBAL_POOLS}. + * Default value is {@value HornetQClient#DEFAULT_USE_GLOBAL_POOLS}. * * @return <code>true</code> if this factory uses global thread pools, <code>false</code> else */ @@ -565,7 +565,7 @@ /** * Returns the maximum size of the scheduled thread pool. * - * Default value is {@value org.hornetq.api.core.client.ClientSessionFactoryImpl#DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE}. + * Default value is {@value HornetQClient#DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE}. * * @return the maximum size of the scheduled thread pool. */ @@ -584,7 +584,7 @@ /** * Returns the maximum size of the thread pool. * - * Default value is {@value org.hornetq.api.core.client.ClientSessionFactoryImpl#DEFAULT_THREAD_POOL_MAX_SIZE}. + * Default value is {@value HornetQClient#DEFAULT_THREAD_POOL_MAX_SIZE}. * * @return the maximum size of the thread pool. */ @@ -603,7 +603,7 @@ /** * Returns the time to retry connections created by this factory after failure. * - * Value is in milliseconds, default is {@value org.hornetq.api.core.client.ClientSessionFactoryImpl#DEFAULT_RETRY_INTERVAL}. + * Value is in milliseconds, default is {@value HornetQClient#DEFAULT_RETRY_INTERVAL}. * * @return the time to retry connections created by this factory after failure */ @@ -621,7 +621,7 @@ /** * Returns the multiplier to apply to successive retry intervals. * - * Default value is {@value org.hornetq.api.core.client.ClientSessionFactoryImpl#DEFAULT_RETRY_INTERVAL_MULTIPLIER}. + * Default value is {@value HornetQClient#DEFAULT_RETRY_INTERVAL_MULTIPLIER}. * * @return the multiplier to apply to successive retry intervals */ @@ -639,7 +639,7 @@ /** * Returns the maximum retry interval (in the case a retry interval multiplier has been specified). * - * Value is in milliseconds, default value is {@value org.hornetq.api.core.client.ClientSessionFactoryImpl#DEFAULT_MAX_RETRY_INTERVAL}. + * Value is in milliseconds, default value is {@value HornetQClient#DEFAULT_MAX_RETRY_INTERVAL}. * * @return the maximum retry interval */ @@ -657,7 +657,7 @@ /** * Returns the maximum number of attempts to retry connection in case of failure. * - * Default value is {@value org.hornetq.api.core.client.ClientSessionFactoryImpl#DEFAULT_RECONNECT_ATTEMPTS}. + * Default value is {@value HornetQClient#DEFAULT_RECONNECT_ATTEMPTS}. * * @return the maximum number of attempts to retry connection in case of failure. */ @@ -676,7 +676,7 @@ * Returns whether connections created by this factory must failover in case the server they are * connected to has normally shut down. * - * Default value is {@value org.hornetq.api.core.client.ClientSessionFactoryImpl#DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN}. + * Default value is {@value HornetQClient#DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN}. * * @return <code>true</code> if connections must failover if the server has normally shut down, else <code>false</code> */ @@ -711,7 +711,7 @@ /** * Returns the initial size of messages created through this factory. * - * Value is in bytes, default value is {@value org.hornetq.api.core.client.ClientSessionFactoryImpl#DEFAULT_INITIAL_MESSAGE_PACKET_SIZE}. + * Value is in bytes, default value is {@value HornetQClient#DEFAULT_INITIAL_MESSAGE_PACKET_SIZE}. * * @return the initial size of messages created through this factory */ Modified: trunk/src/main/org/hornetq/api/core/client/ClientSessionFactoryImpl.java =================================================================== --- trunk/src/main/org/hornetq/api/core/client/ClientSessionFactoryImpl.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/src/main/org/hornetq/api/core/client/ClientSessionFactoryImpl.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -30,7 +30,6 @@ import org.hornetq.api.Pair; import org.hornetq.api.core.client.loadbalance.ConnectionLoadBalancingPolicy; -import org.hornetq.api.core.client.loadbalance.RoundRobinConnectionLoadBalancingPolicy; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; import org.hornetq.api.core.interceptor.Interceptor; @@ -62,64 +61,6 @@ private static final Logger log = Logger.getLogger(ClientSessionFactoryImpl.class); - public static final String DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME = RoundRobinConnectionLoadBalancingPolicy.class.getCanonicalName(); - - public static final long DEFAULT_CLIENT_FAILURE_CHECK_PERIOD = 30000; - - // 1 minute - this should be higher than ping period - public static final long DEFAULT_CONNECTION_TTL = 1 * 60 * 1000; - - // Any message beyond this size is considered a large message (to be sent in chunks) - public static final int DEFAULT_MIN_LARGE_MESSAGE_SIZE = 100 * 1024; - - public static final int DEFAULT_CONSUMER_WINDOW_SIZE = 1024 * 1024; - - public static final int DEFAULT_CONSUMER_MAX_RATE = -1; - - public static final int DEFAULT_CONFIRMATION_WINDOW_SIZE = -1; - - public static final int DEFAULT_PRODUCER_WINDOW_SIZE = 1024 * 1024; - - public static final int DEFAULT_PRODUCER_MAX_RATE = -1; - - public static final boolean DEFAULT_BLOCK_ON_ACKNOWLEDGE = false; - - public static final boolean DEFAULT_BLOCK_ON_DURABLE_SEND = true; - - public static final boolean DEFAULT_BLOCK_ON_NON_DURABLE_SEND = false; - - public static final boolean DEFAULT_AUTO_GROUP = false; - - public static final long DEFAULT_CALL_TIMEOUT = 30000; - - public static final int DEFAULT_ACK_BATCH_SIZE = 1024 * 1024; - - public static final boolean DEFAULT_PRE_ACKNOWLEDGE = false; - - public static final long DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT = 2000; - - public static final long DEFAULT_DISCOVERY_REFRESH_TIMEOUT = 10000; - - public static final long DEFAULT_RETRY_INTERVAL = 2000; - - public static final double DEFAULT_RETRY_INTERVAL_MULTIPLIER = 1d; - - public static final long DEFAULT_MAX_RETRY_INTERVAL = 2000; - - public static final int DEFAULT_RECONNECT_ATTEMPTS = 0; - - public static final boolean DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN = false; - - public static final boolean DEFAULT_USE_GLOBAL_POOLS = true; - - public static final int DEFAULT_THREAD_POOL_MAX_SIZE = -1; - - public static final int DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE = 5; - - public static final boolean DEFAULT_CACHE_LARGE_MESSAGE_CLIENT = false; - - public static final int DEFAULT_INITIAL_MESSAGE_PACKET_SIZE = 1500; - // Attributes // ----------------------------------------------------------------------------------- @@ -141,7 +82,7 @@ // Settable attributes: - private boolean cacheLargeMessagesClient = ClientSessionFactoryImpl.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT; + private boolean cacheLargeMessagesClient = HornetQClient.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT; private List<Pair<TransportConfiguration, TransportConfiguration>> staticConnectors; @@ -231,7 +172,7 @@ { ThreadFactory factory = new HornetQThreadFactory("HornetQ-client-global-scheduled-threads", true); - ClientSessionFactoryImpl.globalScheduledThreadPool = Executors.newScheduledThreadPool(ClientSessionFactoryImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, + ClientSessionFactoryImpl.globalScheduledThreadPool = Executors.newScheduledThreadPool(HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, factory); } @@ -396,61 +337,61 @@ public ClientSessionFactoryImpl() { - discoveryRefreshTimeout = ClientSessionFactoryImpl.DEFAULT_DISCOVERY_REFRESH_TIMEOUT; + discoveryRefreshTimeout = HornetQClient.DEFAULT_DISCOVERY_REFRESH_TIMEOUT; - clientFailureCheckPeriod = ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD; + clientFailureCheckPeriod = HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD; - connectionTTL = ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL; + connectionTTL = HornetQClient.DEFAULT_CONNECTION_TTL; - callTimeout = ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT; + callTimeout = HornetQClient.DEFAULT_CALL_TIMEOUT; - minLargeMessageSize = ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE; + minLargeMessageSize = HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE; - consumerWindowSize = ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE; + consumerWindowSize = HornetQClient.DEFAULT_CONSUMER_WINDOW_SIZE; - consumerMaxRate = ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE; + consumerMaxRate = HornetQClient.DEFAULT_CONSUMER_MAX_RATE; - confirmationWindowSize = ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE; + confirmationWindowSize = HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE; - producerWindowSize = ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE; + producerWindowSize = HornetQClient.DEFAULT_PRODUCER_WINDOW_SIZE; - producerMaxRate = ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE; + producerMaxRate = HornetQClient.DEFAULT_PRODUCER_MAX_RATE; - blockOnAcknowledge = ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE; + blockOnAcknowledge = HornetQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE; - blockOnDurableSend = ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND; + blockOnDurableSend = HornetQClient.DEFAULT_BLOCK_ON_DURABLE_SEND; - blockOnNonDurableSend = ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND; + blockOnNonDurableSend = HornetQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND; - autoGroup = ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP; + autoGroup = HornetQClient.DEFAULT_AUTO_GROUP; - preAcknowledge = ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE; + preAcknowledge = HornetQClient.DEFAULT_PRE_ACKNOWLEDGE; - ackBatchSize = ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE; + ackBatchSize = HornetQClient.DEFAULT_ACK_BATCH_SIZE; - connectionLoadBalancingPolicyClassName = ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME; + connectionLoadBalancingPolicyClassName = HornetQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME; - discoveryInitialWaitTimeout = ClientSessionFactoryImpl.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT; + discoveryInitialWaitTimeout = HornetQClient.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT; - useGlobalPools = ClientSessionFactoryImpl.DEFAULT_USE_GLOBAL_POOLS; + useGlobalPools = HornetQClient.DEFAULT_USE_GLOBAL_POOLS; - scheduledThreadPoolMaxSize = ClientSessionFactoryImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE; + scheduledThreadPoolMaxSize = HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE; - threadPoolMaxSize = ClientSessionFactoryImpl.DEFAULT_THREAD_POOL_MAX_SIZE; + threadPoolMaxSize = HornetQClient.DEFAULT_THREAD_POOL_MAX_SIZE; - retryInterval = ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL; + retryInterval = HornetQClient.DEFAULT_RETRY_INTERVAL; - retryIntervalMultiplier = ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER; + retryIntervalMultiplier = HornetQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER; - maxRetryInterval = ClientSessionFactoryImpl.DEFAULT_MAX_RETRY_INTERVAL; + maxRetryInterval = HornetQClient.DEFAULT_MAX_RETRY_INTERVAL; - reconnectAttempts = ClientSessionFactoryImpl.DEFAULT_RECONNECT_ATTEMPTS; + reconnectAttempts = HornetQClient.DEFAULT_RECONNECT_ATTEMPTS; - failoverOnServerShutdown = ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN; + failoverOnServerShutdown = HornetQClient.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN; - cacheLargeMessagesClient = ClientSessionFactoryImpl.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT; + cacheLargeMessagesClient = HornetQClient.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT; - initialMessagePacketSize = ClientSessionFactoryImpl.DEFAULT_INITIAL_MESSAGE_PACKET_SIZE; + initialMessagePacketSize = HornetQClient.DEFAULT_INITIAL_MESSAGE_PACKET_SIZE; } public ClientSessionFactoryImpl(final String discoveryAddress, final int discoveryPort) Added: trunk/src/main/org/hornetq/api/core/client/HornetQClient.java =================================================================== --- trunk/src/main/org/hornetq/api/core/client/HornetQClient.java (rev 0) +++ trunk/src/main/org/hornetq/api/core/client/HornetQClient.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -0,0 +1,158 @@ +/* + * 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 org.hornetq.api.Pair; +import org.hornetq.api.core.client.loadbalance.RoundRobinConnectionLoadBalancingPolicy; +import org.hornetq.api.core.config.TransportConfiguration; + +import java.util.List; + +/** + * A utility class for creating core HornetQ ClientSessionFactory's. + * + * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a> + * Created Jan 5, 2010 + */ +public class HornetQClient +{ + public static final String DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME = RoundRobinConnectionLoadBalancingPolicy.class.getCanonicalName(); + + public static final long DEFAULT_CLIENT_FAILURE_CHECK_PERIOD = 30000; + + // 1 minute - this should be higher than ping period + + public static final long DEFAULT_CONNECTION_TTL = 1 * 60 * 1000; + + // Any message beyond this size is considered a large message (to be sent in chunks) + + public static final int DEFAULT_MIN_LARGE_MESSAGE_SIZE = 100 * 1024; + + public static final int DEFAULT_CONSUMER_WINDOW_SIZE = 1024 * 1024; + + public static final int DEFAULT_CONSUMER_MAX_RATE = -1; + + public static final int DEFAULT_CONFIRMATION_WINDOW_SIZE = -1; + + public static final int DEFAULT_PRODUCER_WINDOW_SIZE = 1024 * 1024; + + public static final int DEFAULT_PRODUCER_MAX_RATE = -1; + + public static final boolean DEFAULT_BLOCK_ON_ACKNOWLEDGE = false; + + public static final boolean DEFAULT_BLOCK_ON_DURABLE_SEND = true; + + public static final boolean DEFAULT_BLOCK_ON_NON_DURABLE_SEND = false; + + public static final boolean DEFAULT_AUTO_GROUP = false; + + public static final long DEFAULT_CALL_TIMEOUT = 30000; + + public static final int DEFAULT_ACK_BATCH_SIZE = 1024 * 1024; + + public static final boolean DEFAULT_PRE_ACKNOWLEDGE = false; + + public static final long DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT = 2000; + + public static final long DEFAULT_DISCOVERY_REFRESH_TIMEOUT = 10000; + + public static final long DEFAULT_RETRY_INTERVAL = 2000; + + public static final double DEFAULT_RETRY_INTERVAL_MULTIPLIER = 1d; + + public static final long DEFAULT_MAX_RETRY_INTERVAL = 2000; + + public static final int DEFAULT_RECONNECT_ATTEMPTS = 0; + + public static final boolean DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN = false; + + public static final boolean DEFAULT_USE_GLOBAL_POOLS = true; + + public static final int DEFAULT_THREAD_POOL_MAX_SIZE = -1; + + public static final int DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE = 5; + + public static final boolean DEFAULT_CACHE_LARGE_MESSAGE_CLIENT = false; + + public static final int DEFAULT_INITIAL_MESSAGE_PACKET_SIZE = 1500; + + /** + * Creates a ClientSessionFactory using all the defaults. + * + * @return the ClientSessionFactory. + */ + public static ClientSessionFactory createClientSessionFactory() + { + return new ClientSessionFactoryImpl(); + } + + /** + * Creates a new CLientSessionFactory using the same settings as the one passed in. + * + * @param other The ClientSessionFactory to copy + * @return The new ClientSessionFactory + */ + public static ClientSessionFactory createClientSessionFactory(final ClientSessionFactory other) + { + return new ClientSessionFactoryImpl(other); + } + + /** + * Create a ClientSessionFactory that uses discovery to connect to the server. + * + * @param discoveryAddress The address to use for discovery + * @param discoveryPort The port to use for discovery. + * @return The ClientSessionFactory. + */ + public static ClientSessionFactory createClientSessionFactory(final String discoveryAddress, final int discoveryPort) + { + return new ClientSessionFactoryImpl(discoveryAddress, discoveryPort); + } + + /** + * Creates a ClientSessionFactory using a List of TransportConfigurations and backups. + * + * @param staticConnectors The list of TransportConfiguration's to use. + * @return The ClientSessionFactory. + */ + public static ClientSessionFactory createClientSessionFactory(final List<Pair<TransportConfiguration, TransportConfiguration>> staticConnectors) + { + return new ClientSessionFactoryImpl(staticConnectors); + } + + /** + * Create a ClientConnectionFactory using a TransportConfiguration of the server and a backup if needed. + * + * @param connectorConfig The TransportConfiguration of the server to connect to. + * @param backupConnectorConfig The TransportConfiguration of the backup server to connect to. can be null. + * @return The ClientSessionFactory. + */ + public static ClientSessionFactory createClientSessionFactory(final TransportConfiguration connectorConfig, + final TransportConfiguration backupConnectorConfig) + { + return new ClientSessionFactoryImpl(connectorConfig, backupConnectorConfig); + } + + /** + * Create a ClientSessionFactory using the TransportConfiguration of the server to connect to. + * + * @param connectorConfig The TransportConfiguration of the server. + * @return The ClientSessionFactory. + */ + public static ClientSessionFactory createClientSessionFactory(final TransportConfiguration connectorConfig) + { + return new ClientSessionFactoryImpl(connectorConfig); + } + + +} Deleted: trunk/src/main/org/hornetq/api/jms/HornetQConnectionFactory.java =================================================================== --- trunk/src/main/org/hornetq/api/jms/HornetQConnectionFactory.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/src/main/org/hornetq/api/jms/HornetQConnectionFactory.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -1,632 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat licenses this file to you under the Apache License, version - * 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied. See the License for the specific language governing - * permissions and limitations under the License. - */ - -package org.hornetq.api.jms; - -import java.io.Serializable; -import java.util.List; - -import javax.jms.Connection; -import javax.jms.ConnectionFactory; -import javax.jms.JMSException; -import javax.jms.QueueConnection; -import javax.jms.QueueConnectionFactory; -import javax.jms.TopicConnection; -import javax.jms.TopicConnectionFactory; -import javax.jms.XAConnection; -import javax.jms.XAConnectionFactory; -import javax.jms.XAQueueConnection; -import javax.jms.XAQueueConnectionFactory; -import javax.jms.XATopicConnection; -import javax.jms.XATopicConnectionFactory; -import javax.naming.NamingException; -import javax.naming.Reference; -import javax.naming.Referenceable; - -import org.hornetq.api.Pair; -import org.hornetq.api.core.client.ClientSessionFactory; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; -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; -import org.hornetq.jms.referenceable.SerializableObjectRefAddr; - -/** - * HornetQ implementation of a JMS ConnectionFactory. - * - * @author <a href="mailto:ovidiu@feodorov.com">Ovidiu Feodorov</a> - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * @version <tt>$Revision$</tt> $Id$ - */ -public class HornetQConnectionFactory implements ConnectionFactory, QueueConnectionFactory, TopicConnectionFactory, - XAConnectionFactory, XAQueueConnectionFactory, XATopicConnectionFactory, Serializable, Referenceable -{ - // Constants ------------------------------------------------------------------------------------ - - private final static long serialVersionUID = -2810634789345348326L; - - private static final Logger log = Logger.getLogger(HornetQConnectionFactory.class); - - // Static --------------------------------------------------------------------------------------- - - // Attributes ----------------------------------------------------------------------------------- - - private final ClientSessionFactory sessionFactory; - - private String clientID; - - private int dupsOKBatchSize = ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE; - - private int transactionBatchSize = ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE; - - private boolean readOnly; - - // Constructors --------------------------------------------------------------------------------- - - public HornetQConnectionFactory() - { - sessionFactory = new ClientSessionFactoryImpl(); - } - - public HornetQConnectionFactory(final ClientSessionFactory sessionFactory) - { - this.sessionFactory = sessionFactory; - } - - public HornetQConnectionFactory(final String discoveryAddress, final int discoveryPort) - { - sessionFactory = new ClientSessionFactoryImpl(discoveryAddress, discoveryPort); - } - - public HornetQConnectionFactory(final List<Pair<TransportConfiguration, TransportConfiguration>> staticConnectors) - { - sessionFactory = new ClientSessionFactoryImpl(staticConnectors); - } - - public HornetQConnectionFactory(final TransportConfiguration connectorConfig, - final TransportConfiguration backupConnectorConfig) - { - sessionFactory = new ClientSessionFactoryImpl(connectorConfig, backupConnectorConfig); - } - - public HornetQConnectionFactory(final TransportConfiguration connectorConfig) - { - this(connectorConfig, null); - } - - // ConnectionFactory implementation ------------------------------------------------------------- - - public Connection createConnection() throws JMSException - { - return createConnection(null, null); - } - - public Connection createConnection(final String username, final String password) throws JMSException - { - return createConnectionInternal(username, password, false, HornetQConnection.TYPE_GENERIC_CONNECTION); - } - - // QueueConnectionFactory implementation -------------------------------------------------------- - - public QueueConnection createQueueConnection() throws JMSException - { - return createQueueConnection(null, null); - } - - public QueueConnection createQueueConnection(final String username, final String password) throws JMSException - { - return createConnectionInternal(username, password, false, HornetQConnection.TYPE_QUEUE_CONNECTION); - } - - // TopicConnectionFactory implementation -------------------------------------------------------- - - public TopicConnection createTopicConnection() throws JMSException - { - return createTopicConnection(null, null); - } - - public TopicConnection createTopicConnection(final String username, final String password) throws JMSException - { - return createConnectionInternal(username, password, false, HornetQConnection.TYPE_TOPIC_CONNECTION); - } - - // XAConnectionFactory implementation ----------------------------------------------------------- - - public XAConnection createXAConnection() throws JMSException - { - return createXAConnection(null, null); - } - - public XAConnection createXAConnection(final String username, final String password) throws JMSException - { - return createConnectionInternal(username, password, true, HornetQConnection.TYPE_GENERIC_CONNECTION); - } - - // XAQueueConnectionFactory implementation ------------------------------------------------------ - - public XAQueueConnection createXAQueueConnection() throws JMSException - { - return createXAQueueConnection(null, null); - } - - public XAQueueConnection createXAQueueConnection(final String username, final String password) throws JMSException - { - return createConnectionInternal(username, password, true, HornetQConnection.TYPE_QUEUE_CONNECTION); - } - - // XATopicConnectionFactory implementation ------------------------------------------------------ - - public XATopicConnection createXATopicConnection() throws JMSException - { - return createXATopicConnection(null, null); - } - - public XATopicConnection createXATopicConnection(final String username, final String password) throws JMSException - { - return createConnectionInternal(username, password, true, HornetQConnection.TYPE_TOPIC_CONNECTION); - } - - // Referenceable implementation ----------------------------------------------------------------- - - public Reference getReference() throws NamingException - { - return new Reference(this.getClass().getCanonicalName(), - new SerializableObjectRefAddr("HornetQ-CF", this), - ConnectionFactoryObjectFactory.class.getCanonicalName(), - null); - } - - // Public --------------------------------------------------------------------------------------- - - public synchronized String getConnectionLoadBalancingPolicyClassName() - { - return sessionFactory.getConnectionLoadBalancingPolicyClassName(); - } - - public synchronized void setConnectionLoadBalancingPolicyClassName(final String connectionLoadBalancingPolicyClassName) - { - checkWrite(); - sessionFactory.setConnectionLoadBalancingPolicyClassName(connectionLoadBalancingPolicyClassName); - } - - public synchronized List<Pair<TransportConfiguration, TransportConfiguration>> getStaticConnectors() - { - return sessionFactory.getStaticConnectors(); - } - - public synchronized void setStaticConnectors(final List<Pair<TransportConfiguration, TransportConfiguration>> staticConnectors) - { - checkWrite(); - sessionFactory.setStaticConnectors(staticConnectors); - } - - public synchronized String getDiscoveryAddress() - { - return sessionFactory.getDiscoveryAddress(); - } - - public synchronized void setDiscoveryAddress(final String discoveryAddress) - { - checkWrite(); - sessionFactory.setDiscoveryAddress(discoveryAddress); - } - - public synchronized int getDiscoveryPort() - { - return sessionFactory.getDiscoveryPort(); - } - - public synchronized void setDiscoveryPort(final int discoveryPort) - { - checkWrite(); - sessionFactory.setDiscoveryPort(discoveryPort); - } - - public synchronized long getDiscoveryRefreshTimeout() - { - return sessionFactory.getDiscoveryRefreshTimeout(); - } - - public synchronized void setDiscoveryRefreshTimeout(final long discoveryRefreshTimeout) - { - checkWrite(); - sessionFactory.setDiscoveryRefreshTimeout(discoveryRefreshTimeout); - } - - public synchronized long getDiscoveryInitialWaitTimeout() - { - return sessionFactory.getDiscoveryInitialWaitTimeout(); - } - - public synchronized void setDiscoveryInitialWaitTimeout(final long discoveryInitialWaitTimeout) - { - checkWrite(); - sessionFactory.setDiscoveryInitialWaitTimeout(discoveryInitialWaitTimeout); - } - - public synchronized String getClientID() - { - return clientID; - } - - public synchronized void setClientID(final String clientID) - { - checkWrite(); - this.clientID = clientID; - } - - public synchronized int getDupsOKBatchSize() - { - return dupsOKBatchSize; - } - - public synchronized void setDupsOKBatchSize(final int dupsOKBatchSize) - { - checkWrite(); - this.dupsOKBatchSize = dupsOKBatchSize; - } - - public synchronized int getTransactionBatchSize() - { - return transactionBatchSize; - } - - public synchronized void setTransactionBatchSize(final int transactionBatchSize) - { - checkWrite(); - this.transactionBatchSize = transactionBatchSize; - } - - public synchronized long getClientFailureCheckPeriod() - { - return sessionFactory.getClientFailureCheckPeriod(); - } - - public synchronized void setClientFailureCheckPeriod(final long clientFailureCheckPeriod) - { - checkWrite(); - sessionFactory.setClientFailureCheckPeriod(clientFailureCheckPeriod); - } - - public synchronized long getConnectionTTL() - { - return sessionFactory.getConnectionTTL(); - } - - public synchronized void setConnectionTTL(final long connectionTTL) - { - checkWrite(); - sessionFactory.setConnectionTTL(connectionTTL); - } - - public synchronized long getCallTimeout() - { - return sessionFactory.getCallTimeout(); - } - - public synchronized void setCallTimeout(final long callTimeout) - { - checkWrite(); - sessionFactory.setCallTimeout(callTimeout); - } - - public synchronized int getConsumerWindowSize() - { - return sessionFactory.getConsumerWindowSize(); - } - - public synchronized void setConsumerWindowSize(final int consumerWindowSize) - { - checkWrite(); - sessionFactory.setConsumerWindowSize(consumerWindowSize); - } - - public synchronized int getConsumerMaxRate() - { - return sessionFactory.getConsumerMaxRate(); - } - - public synchronized void setConsumerMaxRate(final int consumerMaxRate) - { - checkWrite(); - sessionFactory.setConsumerMaxRate(consumerMaxRate); - } - - public synchronized int getConfirmationWindowSize() - { - return sessionFactory.getConfirmationWindowSize(); - } - - public synchronized void setConfirmationWindowSize(final int confirmationWindowSize) - { - checkWrite(); - sessionFactory.setConfirmationWindowSize(confirmationWindowSize); - } - - public synchronized int getProducerMaxRate() - { - return sessionFactory.getProducerMaxRate(); - } - - public synchronized void setProducerMaxRate(final int producerMaxRate) - { - checkWrite(); - sessionFactory.setProducerMaxRate(producerMaxRate); - } - - public synchronized int getProducerWindowSize() - { - return sessionFactory.getProducerWindowSize(); - } - - public synchronized void setProducerWindowSize(final int producerWindowSize) - { - checkWrite(); - sessionFactory.setProducerWindowSize(producerWindowSize); - } - - /** - * @param cacheLargeMessagesClient - */ - public synchronized void setCacheLargeMessagesClient(final boolean cacheLargeMessagesClient) - { - checkWrite(); - sessionFactory.setCacheLargeMessagesClient(cacheLargeMessagesClient); - } - - public synchronized boolean isCacheLargeMessagesClient() - { - return sessionFactory.isCacheLargeMessagesClient(); - } - - public synchronized int getMinLargeMessageSize() - { - return sessionFactory.getMinLargeMessageSize(); - } - - public synchronized void setMinLargeMessageSize(final int minLargeMessageSize) - { - checkWrite(); - sessionFactory.setMinLargeMessageSize(minLargeMessageSize); - } - - public synchronized boolean isBlockOnAcknowledge() - { - return sessionFactory.isBlockOnAcknowledge(); - } - - public synchronized void setBlockOnAcknowledge(final boolean blockOnAcknowledge) - { - checkWrite(); - sessionFactory.setBlockOnAcknowledge(blockOnAcknowledge); - } - - public synchronized boolean isBlockOnNonDurableSend() - { - return sessionFactory.isBlockOnNonDurableSend(); - } - - public synchronized void setBlockOnNonDurableSend(final boolean blockOnNonDurableSend) - { - checkWrite(); - sessionFactory.setBlockOnNonDurableSend(blockOnNonDurableSend); - } - - public synchronized boolean isBlockOnDurableSend() - { - return sessionFactory.isBlockOnDurableSend(); - } - - public synchronized void setBlockOnDurableSend(final boolean blockOnDurableSend) - { - checkWrite(); - sessionFactory.setBlockOnDurableSend(blockOnDurableSend); - } - - public synchronized boolean isAutoGroup() - { - return sessionFactory.isAutoGroup(); - } - - public synchronized void setAutoGroup(final boolean autoGroup) - { - checkWrite(); - sessionFactory.setAutoGroup(autoGroup); - } - - public synchronized boolean isPreAcknowledge() - { - return sessionFactory.isPreAcknowledge(); - } - - public synchronized void setPreAcknowledge(final boolean preAcknowledge) - { - checkWrite(); - sessionFactory.setPreAcknowledge(preAcknowledge); - } - - public synchronized long getRetryInterval() - { - return sessionFactory.getRetryInterval(); - } - - public synchronized void setRetryInterval(final long retryInterval) - { - checkWrite(); - sessionFactory.setRetryInterval(retryInterval); - } - - public synchronized long getMaxRetryInterval() - { - return sessionFactory.getMaxRetryInterval(); - } - - public synchronized void setMaxRetryInterval(final long retryInterval) - { - checkWrite(); - sessionFactory.setMaxRetryInterval(retryInterval); - } - - public synchronized double getRetryIntervalMultiplier() - { - return sessionFactory.getRetryIntervalMultiplier(); - } - - public synchronized void setRetryIntervalMultiplier(final double retryIntervalMultiplier) - { - checkWrite(); - sessionFactory.setRetryIntervalMultiplier(retryIntervalMultiplier); - } - - public synchronized int getReconnectAttempts() - { - return sessionFactory.getReconnectAttempts(); - } - - public synchronized void setReconnectAttempts(final int reconnectAttempts) - { - checkWrite(); - sessionFactory.setReconnectAttempts(reconnectAttempts); - } - - public synchronized boolean isFailoverOnServerShutdown() - { - return sessionFactory.isFailoverOnServerShutdown(); - } - - public synchronized void setFailoverOnServerShutdown(final boolean failoverOnServerShutdown) - { - checkWrite(); - sessionFactory.setFailoverOnServerShutdown(failoverOnServerShutdown); - } - - public synchronized boolean isUseGlobalPools() - { - return sessionFactory.isUseGlobalPools(); - } - - public synchronized void setUseGlobalPools(final boolean useGlobalPools) - { - checkWrite(); - sessionFactory.setUseGlobalPools(useGlobalPools); - } - - public synchronized int getScheduledThreadPoolMaxSize() - { - return sessionFactory.getScheduledThreadPoolMaxSize(); - } - - public synchronized void setScheduledThreadPoolMaxSize(final int scheduledThreadPoolMaxSize) - { - checkWrite(); - sessionFactory.setScheduledThreadPoolMaxSize(scheduledThreadPoolMaxSize); - } - - public synchronized int getThreadPoolMaxSize() - { - return sessionFactory.getThreadPoolMaxSize(); - } - - public synchronized void setThreadPoolMaxSize(final int threadPoolMaxSize) - { - checkWrite(); - sessionFactory.setThreadPoolMaxSize(threadPoolMaxSize); - } - - public synchronized int getInitialMessagePacketSize() - { - return sessionFactory.getInitialMessagePacketSize(); - } - - public synchronized void setInitialMessagePacketSize(final int size) - { - checkWrite(); - sessionFactory.setInitialMessagePacketSize(size); - } - - public ClientSessionFactory getCoreFactory() - { - return sessionFactory; - } - - public void setGroupID(final String groupID) - { - sessionFactory.setGroupID(groupID); - } - - public String getGroupID() - { - return sessionFactory.getGroupID(); - } - - public void close() - { - sessionFactory.close(); - } - - // Package protected ---------------------------------------------------------------------------- - - // Protected ------------------------------------------------------------------------------------ - - protected synchronized HornetQConnection createConnectionInternal(final String username, - final String password, - final boolean isXA, - final int type) throws JMSException - { - readOnly = true; - - // Note that each JMS connection gets it's own copy of the connection factory - // This means there is one underlying remoting connection per jms connection (if not load balanced) - ClientSessionFactory factory = sessionFactory.copy(); - - HornetQConnection connection = new HornetQConnection(username, - password, - type, - clientID, - dupsOKBatchSize, - transactionBatchSize, - factory); - - try - { - connection.authorize(); - } - catch (JMSException e) - { - try - { - connection.close(); - } - catch (JMSException me) - { - } - throw e; - } - - return connection; - } - - // Private -------------------------------------------------------------------------------------- - - private void checkWrite() - { - if (readOnly) - { - throw new IllegalStateException("Cannot set attribute on HornetQConnectionFactory after it has been used"); - } - } - - // Inner classes -------------------------------------------------------------------------------- - -} Deleted: trunk/src/main/org/hornetq/api/jms/HornetQDestination.java =================================================================== --- trunk/src/main/org/hornetq/api/jms/HornetQDestination.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/src/main/org/hornetq/api/jms/HornetQDestination.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -1,167 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat licenses this file to you under the Apache License, version - * 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied. See the License for the specific language governing - * permissions and limitations under the License. - */ - -package org.hornetq.api.jms; - -import java.io.Serializable; - -import javax.jms.Destination; -import javax.naming.NamingException; -import javax.naming.Reference; -import javax.naming.Referenceable; - -import org.hornetq.api.SimpleString; -import org.hornetq.jms.referenceable.DestinationObjectFactory; -import org.hornetq.jms.referenceable.SerializableObjectRefAddr; - -/** - * HornetQ implementation of a JMS Destination. - * - * @author <a href="mailto:ovidiu@feodorov.com">Ovidiu Feodorov</a> - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * @version <tt>$Revision$</tt> - * - * $Id$ - */ -public abstract class HornetQDestination implements Destination, Serializable, Referenceable -{ - // Constants ----------------------------------------------------- - - // Static -------------------------------------------------------- - - /** - * - */ - private static final long serialVersionUID = 5027962425462382883L; - - protected static String escape(final String input) - { - if (input == null) - { - return ""; - } - return input.replace("\\", "\\\\").replace(".", "\\."); - } - - public static HornetQDestination fromAddress(final String address) - { - if (address.startsWith(HornetQQueue.JMS_QUEUE_ADDRESS_PREFIX)) - { - String name = address.substring(HornetQQueue.JMS_QUEUE_ADDRESS_PREFIX.length()); - - return new HornetQQueue(address, name); - } - else if (address.startsWith(HornetQTopic.JMS_TOPIC_ADDRESS_PREFIX)) - { - String name = address.substring(HornetQTopic.JMS_TOPIC_ADDRESS_PREFIX.length()); - - return new HornetQTopic(address, name); - } - else if (address.startsWith(HornetQTemporaryQueue.JMS_TEMP_QUEUE_ADDRESS_PREFIX)) - { - String name = address.substring(HornetQTemporaryQueue.JMS_TEMP_QUEUE_ADDRESS_PREFIX.length()); - - return new HornetQTemporaryQueue(null, name); - } - else if (address.startsWith(HornetQTemporaryTopic.JMS_TEMP_TOPIC_ADDRESS_PREFIX)) - { - String name = address.substring(HornetQTemporaryTopic.JMS_TEMP_TOPIC_ADDRESS_PREFIX.length()); - - return new HornetQTemporaryTopic(null, name); - } - else - { - throw new IllegalArgumentException("Invalid address " + address); - } - } - - // Attributes ---------------------------------------------------- - - protected final String name; - - private final String address; - - private final SimpleString simpleAddress; - - // Constructors -------------------------------------------------- - - public HornetQDestination(final String address, final String name) - { - this.address = address; - - this.name = name; - - simpleAddress = new SimpleString(address); - } - - // Referenceable implementation --------------------------------------- - - public Reference getReference() throws NamingException - { - return new Reference(this.getClass().getCanonicalName(), - new SerializableObjectRefAddr("HornetQ-DEST", this), - DestinationObjectFactory.class.getCanonicalName(), - null); - } - - // Public -------------------------------------------------------- - - public String getAddress() - { - return address; - } - - public SimpleString getSimpleAddress() - { - return simpleAddress; - } - - public String getName() - { - return name; - } - - public abstract boolean isTemporary(); - - @Override - public boolean equals(final Object o) - { - if (this == o) - { - return true; - } - - if (!(o instanceof HornetQDestination)) - { - return false; - } - - HornetQDestination that = (HornetQDestination)o; - - return address.equals(that.address); - } - - @Override - public int hashCode() - { - return address.hashCode(); - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Added: trunk/src/main/org/hornetq/api/jms/HornetQJMSClient.java =================================================================== --- trunk/src/main/org/hornetq/api/jms/HornetQJMSClient.java (rev 0) +++ trunk/src/main/org/hornetq/api/jms/HornetQJMSClient.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -0,0 +1,148 @@ +/* + * 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.jms; + +import org.hornetq.api.Pair; +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; + +import javax.jms.ConnectionFactory; +import javax.jms.Queue; +import javax.jms.Topic; +import java.util.List; + +/** + * A utility class for creating HornetQ Client Side JMS Objects. + * + * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a> + * Created Jan 5, 2010 + */ +public class HornetQJMSClient +{ + /** + * Creates a ConnectionFactory using all the defaults. + * + * @return The ConnectionFactory. + */ + public static ConnectionFactory createConnectionFactory() + { + return new HornetQConnectionFactory(); + } + + /** + * Creates a ConnectionFactory using the ClientSessionFactory for its underlying connection. + * + * @param sessionFactory The underlying ClientSessionFactory to use. + * @return The ConnectionFactory. + */ + public static ConnectionFactory createConnectionFactory(final ClientSessionFactory sessionFactory) + { + return new HornetQConnectionFactory(sessionFactory); + } + + /** + * Creates a ConnectionFactory that will use discovery to connect to the server. + * + * @param discoveryAddress The address to use for discovery. + * @param discoveryPort The port to use for discovery. + * @return The ConnectionFactory. + */ + public static ConnectionFactory createConnectionFactory(final String discoveryAddress, final int discoveryPort) + { + return new HornetQConnectionFactory(discoveryAddress, discoveryPort); + } + + /** + * Creates a ClientSessionFactory using a List of TransportConfigurations and backups. + * + * @param staticConnectors The list of TransportConfiguration's to use. + * @return The ConnectionFactory. + */ + public static ConnectionFactory createConnectionFactory(final List<Pair<TransportConfiguration, TransportConfiguration>> staticConnectors) + { + return new HornetQConnectionFactory(staticConnectors); + } + + /** + * Creates a ConnectionFactory using a List of TransportConfigurations and backups. + * + * @param connectorConfig The TransportConfiguration of the server to connect to. + * @param backupConnectorConfig The TransportConfiguration of the backup server to connect to. can be null. + * @return The ConnectionFactory. + */ + public static ConnectionFactory createConnectionFactory(final TransportConfiguration connectorConfig, + final TransportConfiguration backupConnectorConfig) + { + return new HornetQConnectionFactory(connectorConfig, backupConnectorConfig); + } + + /** + * Create a ConnectionFactory using the TransportConfiguration of the server to connect to. + * + * @param connectorConfig The TransportConfiguration of the server. + * @return The ConnectionFactory. + */ + public static ConnectionFactory createConnectionFactory(final TransportConfiguration connectorConfig) + { + return new HornetQConnectionFactory(connectorConfig); + } + + /** + * Create a client side representation of a JMS Topic. + * + * @param name the name of the topic + * @return The Topic + */ + public static Topic createHornetQTopic(final String name) + { + return new HornetQTopic(name); + } + + /** + * Create a client side representation of a JMS Topic. + * + * @param address the address of the topic. + * @param name the name of the topic. + * @return The Topic. + */ + public static Topic createHornetQTopic(final String address, final String name) + { + return new HornetQTopic(address, name); + } + + /** + * Create a client side representation of a JMS Queue. + * + * @param name the name of the queue + * @return The Queue + */ + public static Queue createHornetQQueue(final String name) + { + return new HornetQQueue(name); + } + + /** + * Create a client side representation of a JMS Queue. + * + * @param address the address of the queue. + * @param name the name of the queue. + * @return The Queue. + */ + public static Queue createHornetQQueue(final String address, final String name) + { + return new HornetQQueue(address, name); + } +} Deleted: trunk/src/main/org/hornetq/api/jms/HornetQQueue.java =================================================================== --- trunk/src/main/org/hornetq/api/jms/HornetQQueue.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/src/main/org/hornetq/api/jms/HornetQQueue.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -1,92 +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.jms; - -import javax.jms.JMSException; -import javax.jms.Queue; - -import org.hornetq.api.SimpleString; -import org.hornetq.core.logging.Logger; - -/** - * HornetQ implementation of a JMS Queue. - * - * This class can be instantiated directly. - * - * @author <a href="mailto:ovidiu@feodorov.com">Ovidiu Feodorov</a> - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * @version <tt>$Revision$</tt> - * - * $Id$ - */ -public class HornetQQueue extends HornetQDestination implements Queue -{ - // Constants ----------------------------------------------------- - - private static final Logger log = Logger.getLogger(HornetQQueue.class); - - private static final long serialVersionUID = -1106092883162295462L; - - public static final String JMS_QUEUE_ADDRESS_PREFIX = "jms.queue."; - - // Static -------------------------------------------------------- - - public static SimpleString createAddressFromName(final String name) - { - return new SimpleString(HornetQQueue.JMS_QUEUE_ADDRESS_PREFIX + name); - } - - // Attributes ---------------------------------------------------- - - // Constructors -------------------------------------------------- - - public HornetQQueue(final String name) - { - super(HornetQQueue.JMS_QUEUE_ADDRESS_PREFIX + name, name); - } - - public HornetQQueue(final String address, final String name) - { - super(address, name); - } - - // Queue implementation ------------------------------------------ - - public String getQueueName() throws JMSException - { - return name; - } - - // Public -------------------------------------------------------- - - @Override - public boolean isTemporary() - { - return false; - } - - @Override - public String toString() - { - return "HornetQQueue[" + name + "]"; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: trunk/src/main/org/hornetq/api/jms/HornetQTemporaryQueue.java =================================================================== --- trunk/src/main/org/hornetq/api/jms/HornetQTemporaryQueue.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/src/main/org/hornetq/api/jms/HornetQTemporaryQueue.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -1,82 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat licenses this file to you under the Apache License, version - * 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied. See the License for the specific language governing - * permissions and limitations under the License. - */ - -package org.hornetq.api.jms; - -import javax.jms.JMSException; -import javax.jms.TemporaryQueue; - -import org.hornetq.jms.client.HornetQSession; - -/** - * HornetQ implementation of a JMS TemporaryQueue. - * - * This class can be instantiated directly. - * - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * @version <tt>$Revision: 3569 $</tt> - * - * $Id: HornetQQueue.java 3569 2008-01-15 21:14:04Z timfox $ - */ -public class HornetQTemporaryQueue extends HornetQQueue implements TemporaryQueue -{ - // Constants ----------------------------------------------------- - - private static final long serialVersionUID = -4624930377557954624L; - - public static final String JMS_TEMP_QUEUE_ADDRESS_PREFIX = "jms.tempqueue."; - - // Static -------------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private final transient HornetQSession session; - - // Constructors -------------------------------------------------- - - public HornetQTemporaryQueue(final HornetQSession session, final String name) - { - super(HornetQTemporaryQueue.JMS_TEMP_QUEUE_ADDRESS_PREFIX + name, name); - - this.session = session; - } - - // TemporaryQueue implementation ------------------------------------------ - - public void delete() throws JMSException - { - session.deleteTemporaryQueue(this); - } - - // Public -------------------------------------------------------- - - @Override - public boolean isTemporary() - { - return true; - } - - @Override - public String toString() - { - return "HornetQTemporaryQueue[" + name + "]"; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: trunk/src/main/org/hornetq/api/jms/HornetQTemporaryTopic.java =================================================================== --- trunk/src/main/org/hornetq/api/jms/HornetQTemporaryTopic.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/src/main/org/hornetq/api/jms/HornetQTemporaryTopic.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -1,82 +0,0 @@ -/* - * Copyright 2009 Red Hat, Inc. - * Red Hat licenses this file to you under the Apache License, version - * 2.0 (the "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0 - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied. See the License for the specific language governing - * permissions and limitations under the License. - */ - -package org.hornetq.api.jms; - -import javax.jms.JMSException; -import javax.jms.TemporaryTopic; - -import org.hornetq.jms.client.HornetQSession; - -/** - * HornetQ implementation of a JMS TemporaryTopic. - * - * This class can be instantiated directly. - * - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * @version <tt>$Revision: 3569 $</tt> - * - * $Id: HornetQQueue.java 3569 2008-01-15 21:14:04Z timfox $ - */ -public class HornetQTemporaryTopic extends HornetQTopic implements TemporaryTopic -{ - // Constants ----------------------------------------------------- - - private static final long serialVersionUID = 845450764835635266L; - - public static final String JMS_TEMP_TOPIC_ADDRESS_PREFIX = "jms.temptopic."; - - // Static -------------------------------------------------------- - - // Attributes ---------------------------------------------------- - - private final transient HornetQSession session; - - // Constructors -------------------------------------------------- - - public HornetQTemporaryTopic(final HornetQSession session, final String name) - { - super(HornetQTemporaryTopic.JMS_TEMP_TOPIC_ADDRESS_PREFIX + name, name); - - this.session = session; - } - - // TemporaryTopic implementation ------------------------------------------ - - public void delete() throws JMSException - { - session.deleteTemporaryTopic(this); - } - - // Public -------------------------------------------------------- - - @Override - public boolean isTemporary() - { - return true; - } - - @Override - public String toString() - { - return "HornetQTemporaryTopic[" + name + "]"; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Deleted: trunk/src/main/org/hornetq/api/jms/HornetQTopic.java =================================================================== --- trunk/src/main/org/hornetq/api/jms/HornetQTopic.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/src/main/org/hornetq/api/jms/HornetQTopic.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -1,145 +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.jms; - -import javax.jms.JMSException; -import javax.jms.Topic; - -import org.hornetq.api.Pair; -import org.hornetq.api.SimpleString; - -/** - * HornetQ implementation of a JMS Topic. - * - * This class can be instantiated directly. - * - * @author <a href="mailto:ovidiu@feodorov.com">Ovidiu Feodorov</a> - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * @version <tt>$Revision$</tt> - * - * $Id$ - */ -public class HornetQTopic extends HornetQDestination implements Topic -{ - // Constants ----------------------------------------------------- - - private static final long serialVersionUID = 7873614001276404156L; - - public static final String JMS_TOPIC_ADDRESS_PREFIX = "jms.topic."; - - private static final char SEPARATOR = '.'; - - // Static -------------------------------------------------------- - - public static String createQueueNameForDurableSubscription(final String clientID, final String subscriptionName) - { - return HornetQDestination.escape(clientID) + HornetQTopic.SEPARATOR + HornetQDestination.escape(subscriptionName); - } - - public static Pair<String, String> decomposeQueueNameForDurableSubscription(final String queueName) - { - StringBuffer[] parts = new StringBuffer[2]; - int currentPart = 0; - - parts[0] = new StringBuffer(); - parts[1] = new StringBuffer(); - - int pos = 0; - while (pos < queueName.length()) - { - char ch = queueName.charAt(pos); - pos++; - - if (ch == HornetQTopic.SEPARATOR) - { - currentPart++; - if (currentPart >= parts.length) - { - throw new IllegalArgumentException("Invalid message queue name: " + queueName); - } - - continue; - } - - if (ch == '\\') - { - if (pos >= queueName.length()) - { - throw new IllegalArgumentException("Invalid message queue name: " + queueName); - } - ch = queueName.charAt(pos); - pos++; - } - - parts[currentPart].append(ch); - } - - if (currentPart != 1) - { - throw new IllegalArgumentException("Invalid message queue name: " + queueName); - } - - Pair<String, String> pair = new Pair<String, String>(parts[0].toString(), parts[1].toString()); - - return pair; - } - - public static SimpleString createAddressFromName(final String name) - { - return new SimpleString(HornetQTopic.JMS_TOPIC_ADDRESS_PREFIX + name); - } - - // Attributes ---------------------------------------------------- - - // Constructors -------------------------------------------------- - - public HornetQTopic(final String name) - { - super(HornetQTopic.JMS_TOPIC_ADDRESS_PREFIX + name, name); - } - - public HornetQTopic(final String address, final String name) - { - super(address, name); - } - - // Topic implementation ------------------------------------------ - - public String getTopicName() throws JMSException - { - return name; - } - - // Public -------------------------------------------------------- - - @Override - public boolean isTemporary() - { - return false; - } - - @Override - public String toString() - { - return "HornetQTopic[" + name + "]"; - } - - // Package protected --------------------------------------------- - - // Protected ----------------------------------------------------- - - // Private ------------------------------------------------------- - - // Inner classes ------------------------------------------------- -} Modified: trunk/src/main/org/hornetq/core/config/impl/FileConfiguration.java =================================================================== --- trunk/src/main/org/hornetq/core/config/impl/FileConfiguration.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/src/main/org/hornetq/core/config/impl/FileConfiguration.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -1,14 +1,14 @@ /* * 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. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. */ package org.hornetq.core.config.impl; @@ -24,6 +24,7 @@ import org.hornetq.api.Pair; import org.hornetq.api.SimpleString; 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; @@ -698,7 +699,7 @@ long retryInterval = XMLConfigurationUtil.getLong(brNode, "retry-interval", - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL, + HornetQClient.DEFAULT_RETRY_INTERVAL, Validators.GT_ZERO); // Default bridge conf @@ -709,7 +710,7 @@ double retryIntervalMultiplier = XMLConfigurationUtil.getDouble(brNode, "retry-interval-multiplier", - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER, + HornetQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER, Validators.GT_ZERO); int reconnectAttempts = XMLConfigurationUtil.getInteger(brNode, @@ -719,7 +720,7 @@ boolean failoverOnServerShutdown = XMLConfigurationUtil.getBoolean(brNode, "failover-on-server-shutdown", - ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); + HornetQClient.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); boolean useDuplicateDetection = XMLConfigurationUtil.getBoolean(brNode, "use-duplicate-detection", @@ -777,7 +778,7 @@ failoverOnServerShutdown, useDuplicateDetection, confirmationWindowSize, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, connectorPair); } else @@ -793,7 +794,7 @@ failoverOnServerShutdown, useDuplicateDetection, confirmationWindowSize, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, discoveryGroupName); } 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 08:44:23 UTC (rev 8722) +++ trunk/src/main/org/hornetq/core/remoting/server/impl/RemotingServiceImpl.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -23,7 +23,7 @@ import java.util.concurrent.ScheduledExecutorService; import org.hornetq.api.core.buffers.HornetQBuffer; -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; @@ -323,7 +323,7 @@ channel1.setHandler(handler); - long ttl = ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL; + long ttl = HornetQClient.DEFAULT_CONNECTION_TTL; if (config.getConnectionTTLOverride() != -1) { 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 08:44:23 UTC (rev 8722) +++ trunk/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -22,13 +22,7 @@ import org.hornetq.api.Pair; import org.hornetq.api.SimpleString; -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.ClientSessionFactory; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; -import org.hornetq.api.core.client.SendAcknowledgementHandler; -import org.hornetq.api.core.client.SessionFailureListener; +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; @@ -651,11 +645,11 @@ { if (discoveryAddress != null) { - csf = new ClientSessionFactoryImpl(discoveryAddress, discoveryPort); + csf = HornetQClient.createClientSessionFactory(discoveryAddress, discoveryPort); } else { - csf = new ClientSessionFactoryImpl(connectorPair.a, connectorPair.b); + csf = HornetQClient.createClientSessionFactory(connectorPair.a, connectorPair.b); } csf.setFailoverOnServerShutdown(failoverOnServerShutdown); Modified: trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -35,7 +35,7 @@ import org.hornetq.api.Pair; import org.hornetq.api.SimpleString; 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.client.impl.FailoverManager; @@ -870,9 +870,9 @@ backupConnector, null, false, - ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL, + HornetQClient.DEFAULT_CALL_TIMEOUT, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CONNECTION_TTL, 0, 1.0d, 0, Copied: trunk/src/main/org/hornetq/jms/HornetQConnectionFactory.java (from rev 8721, trunk/src/main/org/hornetq/api/jms/HornetQConnectionFactory.java) =================================================================== --- trunk/src/main/org/hornetq/jms/HornetQConnectionFactory.java (rev 0) +++ trunk/src/main/org/hornetq/jms/HornetQConnectionFactory.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -0,0 +1,632 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package org.hornetq.jms; + +import java.io.Serializable; +import java.util.List; + +import javax.jms.Connection; +import javax.jms.ConnectionFactory; +import javax.jms.JMSException; +import javax.jms.QueueConnection; +import javax.jms.QueueConnectionFactory; +import javax.jms.TopicConnection; +import javax.jms.TopicConnectionFactory; +import javax.jms.XAConnection; +import javax.jms.XAConnectionFactory; +import javax.jms.XAQueueConnection; +import javax.jms.XAQueueConnectionFactory; +import javax.jms.XATopicConnection; +import javax.jms.XATopicConnectionFactory; +import javax.naming.NamingException; +import javax.naming.Reference; +import javax.naming.Referenceable; + +import org.hornetq.api.Pair; +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; +import org.hornetq.jms.referenceable.SerializableObjectRefAddr; + +/** + * HornetQ implementation of a JMS ConnectionFactory. + * + * @author <a href="mailto:ovidiu@feodorov.com">Ovidiu Feodorov</a> + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * @version <tt>$Revision$</tt> $Id$ + */ +public class HornetQConnectionFactory implements ConnectionFactory, QueueConnectionFactory, TopicConnectionFactory, + XAConnectionFactory, XAQueueConnectionFactory, XATopicConnectionFactory, Serializable, Referenceable +{ + // Constants ------------------------------------------------------------------------------------ + + private final static long serialVersionUID = -2810634789345348326L; + + private static final Logger log = Logger.getLogger(HornetQConnectionFactory.class); + + // Static --------------------------------------------------------------------------------------- + + // Attributes ----------------------------------------------------------------------------------- + + private final ClientSessionFactory sessionFactory; + + private String clientID; + + private int dupsOKBatchSize = HornetQClient.DEFAULT_ACK_BATCH_SIZE; + + private int transactionBatchSize = HornetQClient.DEFAULT_ACK_BATCH_SIZE; + + private boolean readOnly; + + // Constructors --------------------------------------------------------------------------------- + + public HornetQConnectionFactory() + { + sessionFactory = HornetQClient.createClientSessionFactory(); + } + + public HornetQConnectionFactory(final ClientSessionFactory sessionFactory) + { + this.sessionFactory = sessionFactory; + } + + public HornetQConnectionFactory(final String discoveryAddress, final int discoveryPort) + { + sessionFactory = HornetQClient.createClientSessionFactory(discoveryAddress, discoveryPort); + } + + public HornetQConnectionFactory(final List<Pair<TransportConfiguration, TransportConfiguration>> staticConnectors) + { + sessionFactory = HornetQClient.createClientSessionFactory(staticConnectors); + } + + public HornetQConnectionFactory(final TransportConfiguration connectorConfig, + final TransportConfiguration backupConnectorConfig) + { + sessionFactory = HornetQClient.createClientSessionFactory(connectorConfig, backupConnectorConfig); + } + + public HornetQConnectionFactory(final TransportConfiguration connectorConfig) + { + this(connectorConfig, null); + } + + // ConnectionFactory implementation ------------------------------------------------------------- + + public Connection createConnection() throws JMSException + { + return createConnection(null, null); + } + + public Connection createConnection(final String username, final String password) throws JMSException + { + return createConnectionInternal(username, password, false, HornetQConnection.TYPE_GENERIC_CONNECTION); + } + + // QueueConnectionFactory implementation -------------------------------------------------------- + + public QueueConnection createQueueConnection() throws JMSException + { + return createQueueConnection(null, null); + } + + public QueueConnection createQueueConnection(final String username, final String password) throws JMSException + { + return createConnectionInternal(username, password, false, HornetQConnection.TYPE_QUEUE_CONNECTION); + } + + // TopicConnectionFactory implementation -------------------------------------------------------- + + public TopicConnection createTopicConnection() throws JMSException + { + return createTopicConnection(null, null); + } + + public TopicConnection createTopicConnection(final String username, final String password) throws JMSException + { + return createConnectionInternal(username, password, false, HornetQConnection.TYPE_TOPIC_CONNECTION); + } + + // XAConnectionFactory implementation ----------------------------------------------------------- + + public XAConnection createXAConnection() throws JMSException + { + return createXAConnection(null, null); + } + + public XAConnection createXAConnection(final String username, final String password) throws JMSException + { + return createConnectionInternal(username, password, true, HornetQConnection.TYPE_GENERIC_CONNECTION); + } + + // XAQueueConnectionFactory implementation ------------------------------------------------------ + + public XAQueueConnection createXAQueueConnection() throws JMSException + { + return createXAQueueConnection(null, null); + } + + public XAQueueConnection createXAQueueConnection(final String username, final String password) throws JMSException + { + return createConnectionInternal(username, password, true, HornetQConnection.TYPE_QUEUE_CONNECTION); + } + + // XATopicConnectionFactory implementation ------------------------------------------------------ + + public XATopicConnection createXATopicConnection() throws JMSException + { + return createXATopicConnection(null, null); + } + + public XATopicConnection createXATopicConnection(final String username, final String password) throws JMSException + { + return createConnectionInternal(username, password, true, HornetQConnection.TYPE_TOPIC_CONNECTION); + } + + // Referenceable implementation ----------------------------------------------------------------- + + public Reference getReference() throws NamingException + { + return new Reference(this.getClass().getCanonicalName(), + new SerializableObjectRefAddr("HornetQ-CF", this), + ConnectionFactoryObjectFactory.class.getCanonicalName(), + null); + } + + // Public --------------------------------------------------------------------------------------- + + public synchronized String getConnectionLoadBalancingPolicyClassName() + { + return sessionFactory.getConnectionLoadBalancingPolicyClassName(); + } + + public synchronized void setConnectionLoadBalancingPolicyClassName(final String connectionLoadBalancingPolicyClassName) + { + checkWrite(); + sessionFactory.setConnectionLoadBalancingPolicyClassName(connectionLoadBalancingPolicyClassName); + } + + public synchronized List<Pair<TransportConfiguration, TransportConfiguration>> getStaticConnectors() + { + return sessionFactory.getStaticConnectors(); + } + + public synchronized void setStaticConnectors(final List<Pair<TransportConfiguration, TransportConfiguration>> staticConnectors) + { + checkWrite(); + sessionFactory.setStaticConnectors(staticConnectors); + } + + public synchronized String getDiscoveryAddress() + { + return sessionFactory.getDiscoveryAddress(); + } + + public synchronized void setDiscoveryAddress(final String discoveryAddress) + { + checkWrite(); + sessionFactory.setDiscoveryAddress(discoveryAddress); + } + + public synchronized int getDiscoveryPort() + { + return sessionFactory.getDiscoveryPort(); + } + + public synchronized void setDiscoveryPort(final int discoveryPort) + { + checkWrite(); + sessionFactory.setDiscoveryPort(discoveryPort); + } + + public synchronized long getDiscoveryRefreshTimeout() + { + return sessionFactory.getDiscoveryRefreshTimeout(); + } + + public synchronized void setDiscoveryRefreshTimeout(final long discoveryRefreshTimeout) + { + checkWrite(); + sessionFactory.setDiscoveryRefreshTimeout(discoveryRefreshTimeout); + } + + public synchronized long getDiscoveryInitialWaitTimeout() + { + return sessionFactory.getDiscoveryInitialWaitTimeout(); + } + + public synchronized void setDiscoveryInitialWaitTimeout(final long discoveryInitialWaitTimeout) + { + checkWrite(); + sessionFactory.setDiscoveryInitialWaitTimeout(discoveryInitialWaitTimeout); + } + + public synchronized String getClientID() + { + return clientID; + } + + public synchronized void setClientID(final String clientID) + { + checkWrite(); + this.clientID = clientID; + } + + public synchronized int getDupsOKBatchSize() + { + return dupsOKBatchSize; + } + + public synchronized void setDupsOKBatchSize(final int dupsOKBatchSize) + { + checkWrite(); + this.dupsOKBatchSize = dupsOKBatchSize; + } + + public synchronized int getTransactionBatchSize() + { + return transactionBatchSize; + } + + public synchronized void setTransactionBatchSize(final int transactionBatchSize) + { + checkWrite(); + this.transactionBatchSize = transactionBatchSize; + } + + public synchronized long getClientFailureCheckPeriod() + { + return sessionFactory.getClientFailureCheckPeriod(); + } + + public synchronized void setClientFailureCheckPeriod(final long clientFailureCheckPeriod) + { + checkWrite(); + sessionFactory.setClientFailureCheckPeriod(clientFailureCheckPeriod); + } + + public synchronized long getConnectionTTL() + { + return sessionFactory.getConnectionTTL(); + } + + public synchronized void setConnectionTTL(final long connectionTTL) + { + checkWrite(); + sessionFactory.setConnectionTTL(connectionTTL); + } + + public synchronized long getCallTimeout() + { + return sessionFactory.getCallTimeout(); + } + + public synchronized void setCallTimeout(final long callTimeout) + { + checkWrite(); + sessionFactory.setCallTimeout(callTimeout); + } + + public synchronized int getConsumerWindowSize() + { + return sessionFactory.getConsumerWindowSize(); + } + + public synchronized void setConsumerWindowSize(final int consumerWindowSize) + { + checkWrite(); + sessionFactory.setConsumerWindowSize(consumerWindowSize); + } + + public synchronized int getConsumerMaxRate() + { + return sessionFactory.getConsumerMaxRate(); + } + + public synchronized void setConsumerMaxRate(final int consumerMaxRate) + { + checkWrite(); + sessionFactory.setConsumerMaxRate(consumerMaxRate); + } + + public synchronized int getConfirmationWindowSize() + { + return sessionFactory.getConfirmationWindowSize(); + } + + public synchronized void setConfirmationWindowSize(final int confirmationWindowSize) + { + checkWrite(); + sessionFactory.setConfirmationWindowSize(confirmationWindowSize); + } + + public synchronized int getProducerMaxRate() + { + return sessionFactory.getProducerMaxRate(); + } + + public synchronized void setProducerMaxRate(final int producerMaxRate) + { + checkWrite(); + sessionFactory.setProducerMaxRate(producerMaxRate); + } + + public synchronized int getProducerWindowSize() + { + return sessionFactory.getProducerWindowSize(); + } + + public synchronized void setProducerWindowSize(final int producerWindowSize) + { + checkWrite(); + sessionFactory.setProducerWindowSize(producerWindowSize); + } + + /** + * @param cacheLargeMessagesClient + */ + public synchronized void setCacheLargeMessagesClient(final boolean cacheLargeMessagesClient) + { + checkWrite(); + sessionFactory.setCacheLargeMessagesClient(cacheLargeMessagesClient); + } + + public synchronized boolean isCacheLargeMessagesClient() + { + return sessionFactory.isCacheLargeMessagesClient(); + } + + public synchronized int getMinLargeMessageSize() + { + return sessionFactory.getMinLargeMessageSize(); + } + + public synchronized void setMinLargeMessageSize(final int minLargeMessageSize) + { + checkWrite(); + sessionFactory.setMinLargeMessageSize(minLargeMessageSize); + } + + public synchronized boolean isBlockOnAcknowledge() + { + return sessionFactory.isBlockOnAcknowledge(); + } + + public synchronized void setBlockOnAcknowledge(final boolean blockOnAcknowledge) + { + checkWrite(); + sessionFactory.setBlockOnAcknowledge(blockOnAcknowledge); + } + + public synchronized boolean isBlockOnNonDurableSend() + { + return sessionFactory.isBlockOnNonDurableSend(); + } + + public synchronized void setBlockOnNonDurableSend(final boolean blockOnNonDurableSend) + { + checkWrite(); + sessionFactory.setBlockOnNonDurableSend(blockOnNonDurableSend); + } + + public synchronized boolean isBlockOnDurableSend() + { + return sessionFactory.isBlockOnDurableSend(); + } + + public synchronized void setBlockOnDurableSend(final boolean blockOnDurableSend) + { + checkWrite(); + sessionFactory.setBlockOnDurableSend(blockOnDurableSend); + } + + public synchronized boolean isAutoGroup() + { + return sessionFactory.isAutoGroup(); + } + + public synchronized void setAutoGroup(final boolean autoGroup) + { + checkWrite(); + sessionFactory.setAutoGroup(autoGroup); + } + + public synchronized boolean isPreAcknowledge() + { + return sessionFactory.isPreAcknowledge(); + } + + public synchronized void setPreAcknowledge(final boolean preAcknowledge) + { + checkWrite(); + sessionFactory.setPreAcknowledge(preAcknowledge); + } + + public synchronized long getRetryInterval() + { + return sessionFactory.getRetryInterval(); + } + + public synchronized void setRetryInterval(final long retryInterval) + { + checkWrite(); + sessionFactory.setRetryInterval(retryInterval); + } + + public synchronized long getMaxRetryInterval() + { + return sessionFactory.getMaxRetryInterval(); + } + + public synchronized void setMaxRetryInterval(final long retryInterval) + { + checkWrite(); + sessionFactory.setMaxRetryInterval(retryInterval); + } + + public synchronized double getRetryIntervalMultiplier() + { + return sessionFactory.getRetryIntervalMultiplier(); + } + + public synchronized void setRetryIntervalMultiplier(final double retryIntervalMultiplier) + { + checkWrite(); + sessionFactory.setRetryIntervalMultiplier(retryIntervalMultiplier); + } + + public synchronized int getReconnectAttempts() + { + return sessionFactory.getReconnectAttempts(); + } + + public synchronized void setReconnectAttempts(final int reconnectAttempts) + { + checkWrite(); + sessionFactory.setReconnectAttempts(reconnectAttempts); + } + + public synchronized boolean isFailoverOnServerShutdown() + { + return sessionFactory.isFailoverOnServerShutdown(); + } + + public synchronized void setFailoverOnServerShutdown(final boolean failoverOnServerShutdown) + { + checkWrite(); + sessionFactory.setFailoverOnServerShutdown(failoverOnServerShutdown); + } + + public synchronized boolean isUseGlobalPools() + { + return sessionFactory.isUseGlobalPools(); + } + + public synchronized void setUseGlobalPools(final boolean useGlobalPools) + { + checkWrite(); + sessionFactory.setUseGlobalPools(useGlobalPools); + } + + public synchronized int getScheduledThreadPoolMaxSize() + { + return sessionFactory.getScheduledThreadPoolMaxSize(); + } + + public synchronized void setScheduledThreadPoolMaxSize(final int scheduledThreadPoolMaxSize) + { + checkWrite(); + sessionFactory.setScheduledThreadPoolMaxSize(scheduledThreadPoolMaxSize); + } + + public synchronized int getThreadPoolMaxSize() + { + return sessionFactory.getThreadPoolMaxSize(); + } + + public synchronized void setThreadPoolMaxSize(final int threadPoolMaxSize) + { + checkWrite(); + sessionFactory.setThreadPoolMaxSize(threadPoolMaxSize); + } + + public synchronized int getInitialMessagePacketSize() + { + return sessionFactory.getInitialMessagePacketSize(); + } + + public synchronized void setInitialMessagePacketSize(final int size) + { + checkWrite(); + sessionFactory.setInitialMessagePacketSize(size); + } + + public ClientSessionFactory getCoreFactory() + { + return sessionFactory; + } + + public void setGroupID(final String groupID) + { + sessionFactory.setGroupID(groupID); + } + + public String getGroupID() + { + return sessionFactory.getGroupID(); + } + + public void close() + { + sessionFactory.close(); + } + + // Package protected ---------------------------------------------------------------------------- + + // Protected ------------------------------------------------------------------------------------ + + protected synchronized HornetQConnection createConnectionInternal(final String username, + final String password, + final boolean isXA, + final int type) throws JMSException + { + readOnly = true; + + // Note that each JMS connection gets it's own copy of the connection factory + // This means there is one underlying remoting connection per jms connection (if not load balanced) + ClientSessionFactory factory = sessionFactory.copy(); + + HornetQConnection connection = new HornetQConnection(username, + password, + type, + clientID, + dupsOKBatchSize, + transactionBatchSize, + factory); + + try + { + connection.authorize(); + } + catch (JMSException e) + { + try + { + connection.close(); + } + catch (JMSException me) + { + } + throw e; + } + + return connection; + } + + // Private -------------------------------------------------------------------------------------- + + private void checkWrite() + { + if (readOnly) + { + throw new IllegalStateException("Cannot set attribute on HornetQConnectionFactory after it has been used"); + } + } + + // Inner classes -------------------------------------------------------------------------------- + +} Property changes on: trunk/src/main/org/hornetq/jms/HornetQConnectionFactory.java ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: trunk/src/main/org/hornetq/jms/HornetQDestination.java (from rev 8720, trunk/src/main/org/hornetq/api/jms/HornetQDestination.java) =================================================================== --- trunk/src/main/org/hornetq/jms/HornetQDestination.java (rev 0) +++ trunk/src/main/org/hornetq/jms/HornetQDestination.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -0,0 +1,172 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package org.hornetq.jms; + +import java.io.Serializable; + +import javax.jms.Destination; +import javax.naming.NamingException; +import javax.naming.Reference; +import javax.naming.Referenceable; + +import org.hornetq.api.SimpleString; +import org.hornetq.api.jms.HornetQJMSClient; +import org.hornetq.jms.HornetQQueue; +import org.hornetq.jms.HornetQTemporaryQueue; +import org.hornetq.jms.HornetQTemporaryTopic; +import org.hornetq.jms.HornetQTopic; +import org.hornetq.jms.referenceable.DestinationObjectFactory; +import org.hornetq.jms.referenceable.SerializableObjectRefAddr; + +/** + * HornetQ implementation of a JMS Destination. + * + * @author <a href="mailto:ovidiu@feodorov.com">Ovidiu Feodorov</a> + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * @version <tt>$Revision$</tt> + * + * $Id$ + */ +public abstract class HornetQDestination implements Destination, Serializable, Referenceable +{ + // Constants ----------------------------------------------------- + + // Static -------------------------------------------------------- + + /** + * + */ + private static final long serialVersionUID = 5027962425462382883L; + + protected static String escape(final String input) + { + if (input == null) + { + return ""; + } + return input.replace("\\", "\\\\").replace(".", "\\."); + } + + public static Destination fromAddress(final String address) + { + if (address.startsWith(HornetQQueue.JMS_QUEUE_ADDRESS_PREFIX)) + { + String name = address.substring(HornetQQueue.JMS_QUEUE_ADDRESS_PREFIX.length()); + + return new HornetQQueue(address, name); + } + else if (address.startsWith(HornetQTopic.JMS_TOPIC_ADDRESS_PREFIX)) + { + String name = address.substring(HornetQTopic.JMS_TOPIC_ADDRESS_PREFIX.length()); + + return HornetQJMSClient.createHornetQTopic(address, name); + } + else if (address.startsWith(HornetQTemporaryQueue.JMS_TEMP_QUEUE_ADDRESS_PREFIX)) + { + String name = address.substring(HornetQTemporaryQueue.JMS_TEMP_QUEUE_ADDRESS_PREFIX.length()); + + return new HornetQTemporaryQueue(null, name); + } + else if (address.startsWith(HornetQTemporaryTopic.JMS_TEMP_TOPIC_ADDRESS_PREFIX)) + { + String name = address.substring(HornetQTemporaryTopic.JMS_TEMP_TOPIC_ADDRESS_PREFIX.length()); + + return new HornetQTemporaryTopic(null, name); + } + else + { + throw new IllegalArgumentException("Invalid address " + address); + } + } + + // Attributes ---------------------------------------------------- + + protected final String name; + + private final String address; + + private final SimpleString simpleAddress; + + // Constructors -------------------------------------------------- + + public HornetQDestination(final String address, final String name) + { + this.address = address; + + this.name = name; + + simpleAddress = new SimpleString(address); + } + + // Referenceable implementation --------------------------------------- + + public Reference getReference() throws NamingException + { + return new Reference(this.getClass().getCanonicalName(), + new SerializableObjectRefAddr("HornetQ-DEST", this), + DestinationObjectFactory.class.getCanonicalName(), + null); + } + + // Public -------------------------------------------------------- + + public String getAddress() + { + return address; + } + + public SimpleString getSimpleAddress() + { + return simpleAddress; + } + + public String getName() + { + return name; + } + + public abstract boolean isTemporary(); + + @Override + public boolean equals(final Object o) + { + if (this == o) + { + return true; + } + + if (!(o instanceof HornetQDestination)) + { + return false; + } + + HornetQDestination that = (HornetQDestination)o; + + return address.equals(that.address); + } + + @Override + public int hashCode() + { + return address.hashCode(); + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Property changes on: trunk/src/main/org/hornetq/jms/HornetQDestination.java ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: trunk/src/main/org/hornetq/jms/HornetQQueue.java (from rev 8720, trunk/src/main/org/hornetq/api/jms/HornetQQueue.java) =================================================================== --- trunk/src/main/org/hornetq/jms/HornetQQueue.java (rev 0) +++ trunk/src/main/org/hornetq/jms/HornetQQueue.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -0,0 +1,93 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package org.hornetq.jms; + +import javax.jms.JMSException; +import javax.jms.Queue; + +import org.hornetq.api.SimpleString; +import org.hornetq.jms.HornetQDestination; +import org.hornetq.core.logging.Logger; + +/** + * HornetQ implementation of a JMS Queue. + * + * This class can be instantiated directly. + * + * @author <a href="mailto:ovidiu@feodorov.com">Ovidiu Feodorov</a> + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * @version <tt>$Revision$</tt> + * + * $Id$ + */ +public class HornetQQueue extends HornetQDestination implements Queue +{ + // Constants ----------------------------------------------------- + + private static final Logger log = Logger.getLogger(HornetQQueue.class); + + private static final long serialVersionUID = -1106092883162295462L; + + public static final String JMS_QUEUE_ADDRESS_PREFIX = "jms.queue."; + + // Static -------------------------------------------------------- + + public static SimpleString createAddressFromName(final String name) + { + return new SimpleString(HornetQQueue.JMS_QUEUE_ADDRESS_PREFIX + name); + } + + // Attributes ---------------------------------------------------- + + // Constructors -------------------------------------------------- + + public HornetQQueue(final String name) + { + super(HornetQQueue.JMS_QUEUE_ADDRESS_PREFIX + name, name); + } + + public HornetQQueue(final String address, final String name) + { + super(address, name); + } + + // Queue implementation ------------------------------------------ + + public String getQueueName() throws JMSException + { + return name; + } + + // Public -------------------------------------------------------- + + @Override + public boolean isTemporary() + { + return false; + } + + @Override + public String toString() + { + return "HornetQQueue[" + name + "]"; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Property changes on: trunk/src/main/org/hornetq/jms/HornetQQueue.java ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Copied: trunk/src/main/org/hornetq/jms/HornetQTemporaryQueue.java (from rev 8720, trunk/src/main/org/hornetq/api/jms/HornetQTemporaryQueue.java) =================================================================== --- trunk/src/main/org/hornetq/jms/HornetQTemporaryQueue.java (rev 0) +++ trunk/src/main/org/hornetq/jms/HornetQTemporaryQueue.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -0,0 +1,82 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package org.hornetq.jms; + +import javax.jms.JMSException; +import javax.jms.TemporaryQueue; + +import org.hornetq.jms.client.HornetQSession; + +/** + * HornetQ implementation of a JMS TemporaryQueue. + * + * This class can be instantiated directly. + * + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * @version <tt>$Revision: 3569 $</tt> + * + * $Id: HornetQQueue.java 3569 2008-01-15 21:14:04Z timfox $ + */ +public class HornetQTemporaryQueue extends HornetQQueue implements TemporaryQueue +{ + // Constants ----------------------------------------------------- + + private static final long serialVersionUID = -4624930377557954624L; + + public static final String JMS_TEMP_QUEUE_ADDRESS_PREFIX = "jms.tempqueue."; + + // Static -------------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private final transient HornetQSession session; + + // Constructors -------------------------------------------------- + + public HornetQTemporaryQueue(final HornetQSession session, final String name) + { + super(HornetQTemporaryQueue.JMS_TEMP_QUEUE_ADDRESS_PREFIX + name, name); + + this.session = session; + } + + // TemporaryQueue implementation ------------------------------------------ + + public void delete() throws JMSException + { + session.deleteTemporaryQueue(this); + } + + // Public -------------------------------------------------------- + + @Override + public boolean isTemporary() + { + return true; + } + + @Override + public String toString() + { + return "HornetQTemporaryQueue[" + name + "]"; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Copied: trunk/src/main/org/hornetq/jms/HornetQTemporaryTopic.java (from rev 8720, trunk/src/main/org/hornetq/api/jms/HornetQTemporaryTopic.java) =================================================================== --- trunk/src/main/org/hornetq/jms/HornetQTemporaryTopic.java (rev 0) +++ trunk/src/main/org/hornetq/jms/HornetQTemporaryTopic.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -0,0 +1,82 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package org.hornetq.jms; + +import javax.jms.JMSException; +import javax.jms.TemporaryTopic; + +import org.hornetq.jms.client.HornetQSession; + +/** + * HornetQ implementation of a JMS TemporaryTopic. + * + * This class can be instantiated directly. + * + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * @version <tt>$Revision: 3569 $</tt> + * + * $Id: HornetQQueue.java 3569 2008-01-15 21:14:04Z timfox $ + */ +public class HornetQTemporaryTopic extends HornetQTopic implements TemporaryTopic +{ + // Constants ----------------------------------------------------- + + private static final long serialVersionUID = 845450764835635266L; + + public static final String JMS_TEMP_TOPIC_ADDRESS_PREFIX = "jms.temptopic."; + + // Static -------------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private final transient HornetQSession session; + + // Constructors -------------------------------------------------- + + public HornetQTemporaryTopic(final HornetQSession session, final String name) + { + super(HornetQTemporaryTopic.JMS_TEMP_TOPIC_ADDRESS_PREFIX + name, name); + + this.session = session; + } + + // TemporaryTopic implementation ------------------------------------------ + + public void delete() throws JMSException + { + session.deleteTemporaryTopic(this); + } + + // Public -------------------------------------------------------- + + @Override + public boolean isTemporary() + { + return true; + } + + @Override + public String toString() + { + return "HornetQTemporaryTopic[" + name + "]"; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Copied: trunk/src/main/org/hornetq/jms/HornetQTopic.java (from rev 8720, trunk/src/main/org/hornetq/api/jms/HornetQTopic.java) =================================================================== --- trunk/src/main/org/hornetq/jms/HornetQTopic.java (rev 0) +++ trunk/src/main/org/hornetq/jms/HornetQTopic.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -0,0 +1,146 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package org.hornetq.jms; + +import javax.jms.JMSException; +import javax.jms.Topic; + +import org.hornetq.api.Pair; +import org.hornetq.api.SimpleString; +import org.hornetq.jms.HornetQDestination; + +/** + * HornetQ implementation of a JMS Topic. + * + * This class can be instantiated directly. + * + * @author <a href="mailto:ovidiu@feodorov.com">Ovidiu Feodorov</a> + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * @version <tt>$Revision$</tt> + * + * $Id$ + */ +public class HornetQTopic extends HornetQDestination implements Topic +{ + // Constants ----------------------------------------------------- + + private static final long serialVersionUID = 7873614001276404156L; + + public static final String JMS_TOPIC_ADDRESS_PREFIX = "jms.topic."; + + private static final char SEPARATOR = '.'; + + // Static -------------------------------------------------------- + + public static String createQueueNameForDurableSubscription(final String clientID, final String subscriptionName) + { + return HornetQDestination.escape(clientID) + HornetQTopic.SEPARATOR + HornetQDestination.escape(subscriptionName); + } + + public static Pair<String, String> decomposeQueueNameForDurableSubscription(final String queueName) + { + StringBuffer[] parts = new StringBuffer[2]; + int currentPart = 0; + + parts[0] = new StringBuffer(); + parts[1] = new StringBuffer(); + + int pos = 0; + while (pos < queueName.length()) + { + char ch = queueName.charAt(pos); + pos++; + + if (ch == HornetQTopic.SEPARATOR) + { + currentPart++; + if (currentPart >= parts.length) + { + throw new IllegalArgumentException("Invalid message queue name: " + queueName); + } + + continue; + } + + if (ch == '\\') + { + if (pos >= queueName.length()) + { + throw new IllegalArgumentException("Invalid message queue name: " + queueName); + } + ch = queueName.charAt(pos); + pos++; + } + + parts[currentPart].append(ch); + } + + if (currentPart != 1) + { + throw new IllegalArgumentException("Invalid message queue name: " + queueName); + } + + Pair<String, String> pair = new Pair<String, String>(parts[0].toString(), parts[1].toString()); + + return pair; + } + + public static SimpleString createAddressFromName(final String name) + { + return new SimpleString(HornetQTopic.JMS_TOPIC_ADDRESS_PREFIX + name); + } + + // Attributes ---------------------------------------------------- + + // Constructors -------------------------------------------------- + + public HornetQTopic(final String name) + { + super(HornetQTopic.JMS_TOPIC_ADDRESS_PREFIX + name, name); + } + + public HornetQTopic(final String address, final String name) + { + super(address, name); + } + + // Topic implementation ------------------------------------------ + + public String getTopicName() throws JMSException + { + return name; + } + + // Public -------------------------------------------------------- + + @Override + public boolean isTemporary() + { + return false; + } + + @Override + public String toString() + { + return "HornetQTopic[" + name + "]"; + } + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Property changes on: trunk/src/main/org/hornetq/jms/HornetQTopic.java ___________________________________________________________________ Name: svn:keywords + Author Date Id Revision Name: svn:eol-style + native Modified: trunk/src/main/org/hornetq/jms/client/HornetQMessage.java =================================================================== --- trunk/src/main/org/hornetq/jms/client/HornetQMessage.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/src/main/org/hornetq/jms/client/HornetQMessage.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -39,7 +39,7 @@ import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.exception.HornetQException; import org.hornetq.api.core.message.PropertyConversionException; -import org.hornetq.api.jms.HornetQDestination; +import org.hornetq.jms.HornetQDestination; import org.hornetq.api.jms.HornetQMessageConstants; import org.hornetq.core.client.impl.ClientMessageImpl; import org.hornetq.core.logging.Logger; Modified: trunk/src/main/org/hornetq/jms/client/HornetQMessageConsumer.java =================================================================== --- trunk/src/main/org/hornetq/jms/client/HornetQMessageConsumer.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/src/main/org/hornetq/jms/client/HornetQMessageConsumer.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -29,7 +29,7 @@ import org.hornetq.api.core.client.ClientMessage; import org.hornetq.api.core.client.MessageHandler; import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.jms.HornetQDestination; +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 08:44:23 UTC (rev 8722) +++ trunk/src/main/org/hornetq/jms/client/HornetQMessageProducer.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -35,7 +35,7 @@ import org.hornetq.api.core.client.ClientProducer; import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.jms.HornetQDestination; +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 08:44:23 UTC (rev 8722) +++ trunk/src/main/org/hornetq/jms/client/HornetQQueueBrowser.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -25,7 +25,7 @@ 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.jms.HornetQQueue; +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 08:44:23 UTC (rev 8722) +++ trunk/src/main/org/hornetq/jms/client/HornetQSession.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -57,13 +57,10 @@ 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.HornetQDestination; -import org.hornetq.api.jms.HornetQQueue; -import org.hornetq.api.jms.HornetQTemporaryQueue; -import org.hornetq.api.jms.HornetQTemporaryTopic; -import org.hornetq.api.jms.HornetQTopic; +import org.hornetq.api.jms.*; import org.hornetq.core.filter.impl.FilterImpl; import org.hornetq.core.logging.Logger; +import org.hornetq.jms.*; /** * HornetQ implementation of a JMS Session. @@ -404,7 +401,7 @@ throw new IllegalStateException("Cannot create a queue using a TopicSession"); } - HornetQQueue queue = new HornetQQueue(queueName); + HornetQQueue queue = (HornetQQueue) HornetQJMSClient.createHornetQQueue(queueName); try { @@ -433,7 +430,7 @@ throw new IllegalStateException("Cannot create a topic on a QueueSession"); } - HornetQTopic topic = new HornetQTopic(topicName); + HornetQTopic topic = (HornetQTopic) HornetQJMSClient.createHornetQTopic(topicName); try { Modified: trunk/src/main/org/hornetq/jms/client/package-info.java =================================================================== --- trunk/src/main/org/hornetq/jms/client/package-info.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/src/main/org/hornetq/jms/client/package-info.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -15,7 +15,7 @@ * Implementation of the JMS API. * * Classes in this package are not meant to be used directly - * except {@link org.hornetq.api.jms.HornetQConnectionFactory} which can be instantiated directly + * except {@link org.hornetq.jms.HornetQConnectionFactory} which can be instantiated directly * if JMS resources are not looked up in JNDI. * */ Modified: trunk/src/main/org/hornetq/jms/management/impl/JMSConnectionFactoryControlImpl.java =================================================================== --- trunk/src/main/org/hornetq/jms/management/impl/JMSConnectionFactoryControlImpl.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/src/main/org/hornetq/jms/management/impl/JMSConnectionFactoryControlImpl.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -19,9 +19,8 @@ import javax.management.NotCompliantMBeanException; import javax.management.StandardMBean; -import org.hornetq.api.jms.HornetQConnectionFactory; +import org.hornetq.jms.HornetQConnectionFactory; import org.hornetq.api.jms.management.ConnectionFactoryControl; -import org.hornetq.api.jms.management.JMSQueueControl; import org.hornetq.core.management.impl.MBeanInfoHelper; /** Modified: trunk/src/main/org/hornetq/jms/management/impl/JMSQueueControlImpl.java =================================================================== --- trunk/src/main/org/hornetq/jms/management/impl/JMSQueueControlImpl.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/src/main/org/hornetq/jms/management/impl/JMSQueueControlImpl.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -21,7 +21,8 @@ import org.hornetq.api.core.exception.HornetQException; import org.hornetq.api.core.management.MessageCounterInfo; import org.hornetq.api.core.management.QueueControl; -import org.hornetq.api.jms.HornetQQueue; +import org.hornetq.api.jms.HornetQJMSClient; +import org.hornetq.jms.HornetQQueue; import org.hornetq.api.jms.management.JMSQueueControl; import org.hornetq.core.logging.Logger; import org.hornetq.core.management.impl.MBeanInfoHelper; @@ -274,7 +275,7 @@ public boolean moveMessage(final String messageID, final String otherQueueName) throws Exception { String filter = JMSQueueControlImpl.createFilterForJMSMessageID(messageID); - HornetQQueue otherQueue = new HornetQQueue(otherQueueName); + HornetQQueue otherQueue = (HornetQQueue) HornetQJMSClient.createHornetQQueue(otherQueueName); int moved = coreQueueControl.moveMessages(filter, otherQueue.getAddress()); if (moved != 1) { @@ -287,7 +288,7 @@ public int moveMessages(final String filterStr, final String otherQueueName) throws Exception { String filter = JMSQueueControlImpl.createFilterFromJMSSelector(filterStr); - HornetQQueue otherQueue = new HornetQQueue(otherQueueName); + HornetQQueue otherQueue = (HornetQQueue) HornetQJMSClient.createHornetQQueue(otherQueueName); return coreQueueControl.moveMessages(filter, otherQueue.getAddress()); } Modified: trunk/src/main/org/hornetq/jms/management/impl/JMSTopicControlImpl.java =================================================================== --- trunk/src/main/org/hornetq/jms/management/impl/JMSTopicControlImpl.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/src/main/org/hornetq/jms/management/impl/JMSTopicControlImpl.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -27,8 +27,7 @@ import org.hornetq.api.core.management.HornetQServerControl; import org.hornetq.api.core.management.QueueControl; import org.hornetq.api.core.management.ResourceNames; -import org.hornetq.api.jms.HornetQTopic; -import org.hornetq.api.jms.management.JMSQueueControl; +import org.hornetq.jms.HornetQTopic; import org.hornetq.api.jms.management.TopicControl; import org.hornetq.core.logging.Logger; import org.hornetq.core.management.impl.MBeanInfoHelper; 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 08:44:23 UTC (rev 8722) +++ trunk/src/main/org/hornetq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -1,14 +1,14 @@ /* * 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. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. */ package org.hornetq.jms.server.config.impl; @@ -18,6 +18,7 @@ import org.hornetq.api.Pair; 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; @@ -46,61 +47,61 @@ private String clientID = null; - private long discoveryRefreshTimeout = ClientSessionFactoryImpl.DEFAULT_DISCOVERY_REFRESH_TIMEOUT; + private long discoveryRefreshTimeout = HornetQClient.DEFAULT_DISCOVERY_REFRESH_TIMEOUT; - private long clientFailureCheckPeriod = ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD; + private long clientFailureCheckPeriod = HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD; - private long connectionTTL = ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL; + private long connectionTTL = HornetQClient.DEFAULT_CONNECTION_TTL; - private long callTimeout = ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT; + private long callTimeout = HornetQClient.DEFAULT_CALL_TIMEOUT; - private boolean cacheLargeMessagesClient = ClientSessionFactoryImpl.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT; + private boolean cacheLargeMessagesClient = HornetQClient.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT; - private int minLargeMessageSize = ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE; + private int minLargeMessageSize = HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE; - private int consumerWindowSize = ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE; + private int consumerWindowSize = HornetQClient.DEFAULT_CONSUMER_WINDOW_SIZE; - private int consumerMaxRate = ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE; + private int consumerMaxRate = HornetQClient.DEFAULT_CONSUMER_MAX_RATE; - private int confirmationWindowSize = ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE; + private int confirmationWindowSize = HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE; - private int producerWindowSize = ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE; + private int producerWindowSize = HornetQClient.DEFAULT_PRODUCER_WINDOW_SIZE; - private int producerMaxRate = ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE; + private int producerMaxRate = HornetQClient.DEFAULT_PRODUCER_MAX_RATE; - private boolean blockOnAcknowledge = ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE; + private boolean blockOnAcknowledge = HornetQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE; - private boolean blockOnDurableSend = ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND; + private boolean blockOnDurableSend = HornetQClient.DEFAULT_BLOCK_ON_DURABLE_SEND; - private boolean blockOnNonDurableSend = ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND; + private boolean blockOnNonDurableSend = HornetQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND; - private boolean autoGroup = ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP; + private boolean autoGroup = HornetQClient.DEFAULT_AUTO_GROUP; - private boolean preAcknowledge = ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE; + private boolean preAcknowledge = HornetQClient.DEFAULT_PRE_ACKNOWLEDGE; - private String loadBalancingPolicyClassName = ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME; + private String loadBalancingPolicyClassName = HornetQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME; - private int transactionBatchSize = ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE; + private int transactionBatchSize = HornetQClient.DEFAULT_ACK_BATCH_SIZE; - private int dupsOKBatchSize = ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE; + private int dupsOKBatchSize = HornetQClient.DEFAULT_ACK_BATCH_SIZE; - private long initialWaitTimeout = ClientSessionFactoryImpl.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT; + private long initialWaitTimeout = HornetQClient.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT; - private boolean useGlobalPools = ClientSessionFactoryImpl.DEFAULT_USE_GLOBAL_POOLS; + private boolean useGlobalPools = HornetQClient.DEFAULT_USE_GLOBAL_POOLS; - private int scheduledThreadPoolMaxSize = ClientSessionFactoryImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE; + private int scheduledThreadPoolMaxSize = HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE; - private int threadPoolMaxSize = ClientSessionFactoryImpl.DEFAULT_THREAD_POOL_MAX_SIZE; + private int threadPoolMaxSize = HornetQClient.DEFAULT_THREAD_POOL_MAX_SIZE; - private long retryInterval = ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL; + private long retryInterval = HornetQClient.DEFAULT_RETRY_INTERVAL; - private double retryIntervalMultiplier = ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER; + private double retryIntervalMultiplier = HornetQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER; - private long maxRetryInterval = ClientSessionFactoryImpl.DEFAULT_MAX_RETRY_INTERVAL; + private long maxRetryInterval = HornetQClient.DEFAULT_MAX_RETRY_INTERVAL; - private int reconnectAttempts = ClientSessionFactoryImpl.DEFAULT_RECONNECT_ATTEMPTS; + private int reconnectAttempts = HornetQClient.DEFAULT_RECONNECT_ATTEMPTS; - private boolean failoverOnServerShutdown = ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN; + private boolean failoverOnServerShutdown = HornetQClient.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN; private String groupID = null; Modified: trunk/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -17,7 +17,7 @@ import java.util.List; import org.hornetq.api.Pair; -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.Validators; @@ -121,104 +121,104 @@ long clientFailureCheckPeriod = XMLConfigurationUtil.getLong(e, "client-failure-check-period", - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, Validators.MINUS_ONE_OR_GT_ZERO); long connectionTTL = XMLConfigurationUtil.getLong(e, "connection-ttl", - ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL, + HornetQClient.DEFAULT_CONNECTION_TTL, Validators.MINUS_ONE_OR_GE_ZERO); long callTimeout = XMLConfigurationUtil.getLong(e, "call-timeout", - ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT, + HornetQClient.DEFAULT_CALL_TIMEOUT, Validators.GE_ZERO); String clientID = XMLConfigurationUtil.getString(e, "client-id", null, Validators.NO_CHECK); int dupsOKBatchSize = XMLConfigurationUtil.getInteger(e, "dups-ok-batch-size", - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, Validators.GT_ZERO); int transactionBatchSize = XMLConfigurationUtil.getInteger(e, "transaction-batch-size", - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, Validators.GT_ZERO); int consumerWindowSize = XMLConfigurationUtil.getInteger(e, "consumer-window-size", - ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE, + HornetQClient.DEFAULT_CONSUMER_WINDOW_SIZE, Validators.MINUS_ONE_OR_GE_ZERO); int producerWindowSize = XMLConfigurationUtil.getInteger(e, "producer-window-size", - ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_WINDOW_SIZE, Validators.MINUS_ONE_OR_GT_ZERO); int consumerMaxRate = XMLConfigurationUtil.getInteger(e, "consumer-max-rate", - ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE, + HornetQClient.DEFAULT_CONSUMER_MAX_RATE, Validators.MINUS_ONE_OR_GT_ZERO); int confirmationWindowSize = XMLConfigurationUtil.getInteger(e, "confirmation-window-size", - ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE, + HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE, Validators.MINUS_ONE_OR_GT_ZERO); int producerMaxRate = XMLConfigurationUtil.getInteger(e, "producer-max-rate", - ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE, + HornetQClient.DEFAULT_PRODUCER_MAX_RATE, Validators.MINUS_ONE_OR_GT_ZERO); boolean cacheLargeMessagesClient = XMLConfigurationUtil.getBoolean(e, "cache-large-message-client", - ClientSessionFactoryImpl.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT); + HornetQClient.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT); int minLargeMessageSize = XMLConfigurationUtil.getInteger(e, "min-large-message-size", - ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, Validators.GT_ZERO); boolean blockOnAcknowledge = XMLConfigurationUtil.getBoolean(e, "block-on-acknowledge", - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE); + HornetQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE); boolean blockOnNonDurableSend = XMLConfigurationUtil.getBoolean(e, "block-on-non-durable-send", - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND); + HornetQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND); boolean blockOnDurableSend = XMLConfigurationUtil.getBoolean(e, "block-on-durable-send", - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND); + HornetQClient.DEFAULT_BLOCK_ON_DURABLE_SEND); boolean autoGroup = XMLConfigurationUtil.getBoolean(e, "auto-group", - ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP); + HornetQClient.DEFAULT_AUTO_GROUP); boolean preAcknowledge = XMLConfigurationUtil.getBoolean(e, "pre-acknowledge", - ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE); + HornetQClient.DEFAULT_PRE_ACKNOWLEDGE); long retryInterval = XMLConfigurationUtil.getLong(e, "retry-interval", - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL, + HornetQClient.DEFAULT_RETRY_INTERVAL, Validators.GT_ZERO); double retryIntervalMultiplier = XMLConfigurationUtil.getDouble(e, "retry-interval-multiplier", - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER, + HornetQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER, Validators.GT_ZERO); long maxRetryInterval = XMLConfigurationUtil.getLong(e, "max-retry-interval", - ClientSessionFactoryImpl.DEFAULT_MAX_RETRY_INTERVAL, + HornetQClient.DEFAULT_MAX_RETRY_INTERVAL, Validators.GT_ZERO); int reconnectAttempts = XMLConfigurationUtil.getInteger(e, "reconnect-attempts", - ClientSessionFactoryImpl.DEFAULT_RECONNECT_ATTEMPTS, + HornetQClient.DEFAULT_RECONNECT_ATTEMPTS, Validators.MINUS_ONE_OR_GE_ZERO); boolean failoverOnServerShutdown = XMLConfigurationUtil.getBoolean(e, "failover-on-server-shutdown", - ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); + HornetQClient.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); boolean useGlobalPools = XMLConfigurationUtil.getBoolean(e, "use-global-pools", - ClientSessionFactoryImpl.DEFAULT_USE_GLOBAL_POOLS); + HornetQClient.DEFAULT_USE_GLOBAL_POOLS); int scheduledThreadPoolMaxSize = XMLConfigurationUtil.getInteger(e, "scheduled-thread-pool-max-size", - ClientSessionFactoryImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, Validators.MINUS_ONE_OR_GT_ZERO); int threadPoolMaxSize = XMLConfigurationUtil.getInteger(e, "thread-pool-max-size", - ClientSessionFactoryImpl.DEFAULT_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_THREAD_POOL_MAX_SIZE, Validators.MINUS_ONE_OR_GT_ZERO); String connectionLoadBalancingPolicyClassName = XMLConfigurationUtil.getString(e, "connection-load-balancing-policy-class-name", - ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, + HornetQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, Validators.NOT_NULL_OR_EMPTY); long discoveryInitialWaitTimeout = XMLConfigurationUtil.getLong(e, "discovery-initial-wait-timeout", - ClientSessionFactoryImpl.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT, + HornetQClient.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT, Validators.GT_ZERO); String groupid = XMLConfigurationUtil.getString(e, "group-id", null, Validators.NO_CHECK); List<String> jndiBindings = new ArrayList<String>(); Modified: trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -1,14 +1,14 @@ /* * 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. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. */ package org.hornetq.jms.server.impl; @@ -28,9 +28,10 @@ import org.hornetq.api.Pair; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.jms.HornetQConnectionFactory; -import org.hornetq.api.jms.HornetQQueue; -import org.hornetq.api.jms.HornetQTopic; +import org.hornetq.jms.HornetQConnectionFactory; +import org.hornetq.api.jms.HornetQJMSClient; +import org.hornetq.jms.HornetQQueue; +import org.hornetq.jms.HornetQTopic; import org.hornetq.core.deployers.DeploymentManager; import org.hornetq.core.deployers.impl.FileDeploymentManager; import org.hornetq.core.deployers.impl.XmlDeployer; @@ -357,7 +358,7 @@ HornetQConnectionFactory cf = connectionFactories.get(name); if (cf == null) { - cf = new HornetQConnectionFactory(connectorConfigs); + cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(connectorConfigs); } bindConnectionFactory(cf, name, jndiBindings); @@ -372,7 +373,7 @@ HornetQConnectionFactory cf = connectionFactories.get(name); if (cf == null) { - cf = new HornetQConnectionFactory(connectorConfigs); + cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(connectorConfigs); cf.setClientID(clientID); } @@ -415,7 +416,7 @@ HornetQConnectionFactory cf = connectionFactories.get(name); if (cf == null) { - cf = new HornetQConnectionFactory(connectorConfigs); + cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(connectorConfigs); cf.setClientID(clientID); cf.setClientFailureCheckPeriod(clientFailureCheckPeriod); cf.setConnectionTTL(connectionTTL); @@ -488,7 +489,7 @@ HornetQConnectionFactory cf = connectionFactories.get(name); if (cf == null) { - cf = new HornetQConnectionFactory(discoveryAddress, discoveryPort); + cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(discoveryAddress, discoveryPort); cf.setClientID(clientID); cf.setDiscoveryRefreshTimeout(discoveryRefreshTimeout); cf.setClientFailureCheckPeriod(clientFailureCheckPeriod); @@ -532,7 +533,7 @@ HornetQConnectionFactory cf = connectionFactories.get(name); if (cf == null) { - cf = new HornetQConnectionFactory(discoveryAddress, discoveryPort); + cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(discoveryAddress, discoveryPort); } bindConnectionFactory(cf, name, jndiBindings); @@ -548,7 +549,7 @@ HornetQConnectionFactory cf = connectionFactories.get(name); if (cf == null) { - cf = new HornetQConnectionFactory(discoveryAddress, discoveryPort); + cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(discoveryAddress, discoveryPort); cf.setClientID(clientID); } @@ -563,7 +564,7 @@ HornetQConnectionFactory cf = connectionFactories.get(name); if (cf == null) { - cf = new HornetQConnectionFactory(liveTC); + cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(liveTC); } bindConnectionFactory(cf, name, jndiBindings); @@ -578,7 +579,7 @@ HornetQConnectionFactory cf = connectionFactories.get(name); if (cf == null) { - cf = new HornetQConnectionFactory(liveTC); + cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(liveTC); cf.setClientID(clientID); } @@ -594,7 +595,7 @@ HornetQConnectionFactory cf = connectionFactories.get(name); if (cf == null) { - cf = new HornetQConnectionFactory(liveTC, backupTC); + cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(liveTC, backupTC); } bindConnectionFactory(cf, name, jndiBindings); @@ -610,7 +611,7 @@ HornetQConnectionFactory cf = connectionFactories.get(name); if (cf == null) { - cf = new HornetQConnectionFactory(liveTC, backupTC); + cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(liveTC, backupTC); cf.setClientID(clientID); } Modified: trunk/src/main/org/hornetq/jms/server/management/JMSManagementService.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/management/JMSManagementService.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/src/main/org/hornetq/jms/server/management/JMSManagementService.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -15,9 +15,9 @@ import java.util.List; -import org.hornetq.api.jms.HornetQConnectionFactory; -import org.hornetq.api.jms.HornetQQueue; -import org.hornetq.api.jms.HornetQTopic; +import org.hornetq.jms.HornetQConnectionFactory; +import org.hornetq.jms.HornetQQueue; +import org.hornetq.jms.HornetQTopic; import org.hornetq.api.jms.management.JMSServerControl; import org.hornetq.jms.server.JMSServerManager; Modified: trunk/src/main/org/hornetq/jms/server/management/impl/JMSManagementServiceImpl.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/management/impl/JMSManagementServiceImpl.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/src/main/org/hornetq/jms/server/management/impl/JMSManagementServiceImpl.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -20,9 +20,9 @@ import org.hornetq.api.core.management.AddressControl; import org.hornetq.api.core.management.QueueControl; import org.hornetq.api.core.management.ResourceNames; -import org.hornetq.api.jms.HornetQConnectionFactory; -import org.hornetq.api.jms.HornetQQueue; -import org.hornetq.api.jms.HornetQTopic; +import org.hornetq.jms.HornetQConnectionFactory; +import org.hornetq.jms.HornetQQueue; +import org.hornetq.jms.HornetQTopic; import org.hornetq.api.jms.management.ConnectionFactoryControl; import org.hornetq.api.jms.management.JMSQueueControl; import org.hornetq.api.jms.management.JMSServerControl; Modified: trunk/src/main/org/hornetq/jms/server/recovery/HornetQXAResourceWrapper.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/recovery/HornetQXAResourceWrapper.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/src/main/org/hornetq/jms/server/recovery/HornetQXAResourceWrapper.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -19,10 +19,7 @@ import javax.transaction.xa.XAResource; import javax.transaction.xa.Xid; -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.SessionFailureListener; +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; @@ -277,7 +274,7 @@ } TransportConfiguration config = new TransportConfiguration(connectorFactoryClassName, connectorConfig); - csf = new ClientSessionFactoryImpl(config); + csf = HornetQClient.createClientSessionFactory(config); ClientSession cs = null; if (username == null) Modified: trunk/src/main/org/hornetq/ra/HornetQRAManagedConnectionFactory.java =================================================================== --- trunk/src/main/org/hornetq/ra/HornetQRAManagedConnectionFactory.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/src/main/org/hornetq/ra/HornetQRAManagedConnectionFactory.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -28,6 +28,7 @@ import javax.security.auth.Subject; import org.hornetq.core.logging.Logger; +import org.hornetq.jms.HornetQConnectionFactory; /** * HornetQ ManagedConectionFactory @@ -72,7 +73,7 @@ /** * Connection Factory used if properties are set */ - private org.hornetq.api.jms.HornetQConnectionFactory connectionFactory; + private HornetQConnectionFactory connectionFactory; /** * Constructor @@ -758,7 +759,7 @@ * * @return The factory */ - protected synchronized org.hornetq.api.jms.HornetQConnectionFactory getHornetQConnectionFactory() throws ResourceException + protected synchronized HornetQConnectionFactory getHornetQConnectionFactory() throws ResourceException { if (connectionFactory == null) Modified: trunk/src/main/org/hornetq/ra/HornetQResourceAdapter.java =================================================================== --- trunk/src/main/org/hornetq/ra/HornetQResourceAdapter.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/src/main/org/hornetq/ra/HornetQResourceAdapter.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -29,9 +29,11 @@ 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.jms.HornetQConnectionFactory; +import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.core.logging.Logger; import org.hornetq.ra.inflow.HornetQActivation; import org.hornetq.ra.inflow.HornetQActivationSpec; @@ -86,7 +88,7 @@ */ private final Map<ActivationSpec, HornetQActivation> activations; - private org.hornetq.api.jms.HornetQConnectionFactory defaultHornetQConnectionFactory; + private HornetQConnectionFactory defaultHornetQConnectionFactory; /** * Constructor @@ -1288,7 +1290,7 @@ if (deliveryTransacted || useLocalTx) { int actTxBatchSize = transactionBatchSize != null ? transactionBatchSize - : ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE; + : HornetQClient.DEFAULT_ACK_BATCH_SIZE; if (useLocalTx) { result = parameterFactory.createSession(user, pass, false, false, false, false, actTxBatchSize); @@ -1314,7 +1316,7 @@ break; case Session.DUPS_OK_ACKNOWLEDGE: int actDupsOkBatchSize = dupsOkBatchSize != null ? dupsOkBatchSize - : ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE; + : HornetQClient.DEFAULT_ACK_BATCH_SIZE; result = parameterFactory.createSession(user, pass, false, true, true, false, actDupsOkBatchSize); break; default: @@ -1353,7 +1355,7 @@ sessionFactory = defaultHornetQConnectionFactory.getCoreFactory(); } - public org.hornetq.api.jms.HornetQConnectionFactory getDefaultHornetQConnectionFactory() throws ResourceException + public HornetQConnectionFactory getDefaultHornetQConnectionFactory() throws ResourceException { if (!configured.getAndSet(true)) { @@ -1369,9 +1371,9 @@ return defaultHornetQConnectionFactory; } - public org.hornetq.api.jms.HornetQConnectionFactory createHornetQConnectionFactory(final ConnectionFactoryProperties overrideProperties) + public HornetQConnectionFactory createHornetQConnectionFactory(final ConnectionFactoryProperties overrideProperties) { - org.hornetq.api.jms.HornetQConnectionFactory cf; + HornetQConnectionFactory cf; String connectorClassName = overrideProperties.getConnectorClassName() != null ? overrideProperties.getConnectorClassName() : getConnectorClassName(); String discoveryAddress = overrideProperties.getDiscoveryAddress() != null ? overrideProperties.getDiscoveryAddress() @@ -1390,13 +1392,13 @@ : new TransportConfiguration(backUpCOnnectorClassname, backupConnectionParams); - cf = new org.hornetq.api.jms.HornetQConnectionFactory(transportConf, backup); + cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(transportConf, backup); } else if (discoveryAddress != null) { Integer discoveryPort = overrideProperties.getDiscoveryPort() != null ? overrideProperties.getDiscoveryPort() : getDiscoveryPort(); - cf = new org.hornetq.api.jms.HornetQConnectionFactory(discoveryAddress, discoveryPort); + cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(discoveryAddress, discoveryPort); } else { @@ -1406,7 +1408,7 @@ return cf; } - private void setParams(final org.hornetq.api.jms.HornetQConnectionFactory cf, + private void setParams(final HornetQConnectionFactory cf, final ConnectionFactoryProperties overrideProperties) { Boolean val = overrideProperties.isAutoGroup() != null ? overrideProperties.isAutoGroup() Modified: trunk/src/main/org/hornetq/ra/inflow/HornetQActivation.java =================================================================== --- trunk/src/main/org/hornetq/ra/inflow/HornetQActivation.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/src/main/org/hornetq/ra/inflow/HornetQActivation.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -31,9 +31,9 @@ import org.hornetq.api.SimpleString; import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.jms.HornetQDestination; -import org.hornetq.api.jms.HornetQQueue; -import org.hornetq.api.jms.HornetQTopic; +import org.hornetq.jms.HornetQConnectionFactory; +import org.hornetq.jms.HornetQDestination; +import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.core.logging.Logger; import org.hornetq.ra.HornetQResourceAdapter; import org.hornetq.ra.Util; @@ -97,7 +97,7 @@ private final List<HornetQMessageHandler> handlers = new ArrayList<HornetQMessageHandler>(); - private org.hornetq.api.jms.HornetQConnectionFactory factory; + private HornetQConnectionFactory factory; static { @@ -398,11 +398,11 @@ // If there is no binding on naming, we will just create a new instance if (isTopic) { - destination = new HornetQTopic(destinationName.substring(destinationName.lastIndexOf('/') + 1)); + destination = (HornetQDestination) HornetQJMSClient.createHornetQTopic(destinationName.substring(destinationName.lastIndexOf('/') + 1)); } else { - destination = new HornetQQueue(destinationName.substring(destinationName.lastIndexOf('/') + 1)); + destination = (HornetQDestination) HornetQJMSClient.createHornetQQueue(destinationName.substring(destinationName.lastIndexOf('/') + 1)); } } } @@ -424,11 +424,11 @@ { if (Topic.class.getName().equals(spec.getDestinationType())) { - destination = new HornetQTopic(spec.getDestination()); + destination = (HornetQDestination) HornetQJMSClient.createHornetQTopic(spec.getDestination()); } else { - destination = new HornetQQueue(spec.getDestination()); + destination = (HornetQDestination) HornetQJMSClient.createHornetQQueue(spec.getDestination()); } } Modified: trunk/src/main/org/hornetq/ra/inflow/HornetQMessageHandler.java =================================================================== --- trunk/src/main/org/hornetq/ra/inflow/HornetQMessageHandler.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/src/main/org/hornetq/ra/inflow/HornetQMessageHandler.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -27,7 +27,7 @@ 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.api.jms.HornetQTopic; +import org.hornetq.jms.HornetQTopic; import org.hornetq.core.logging.Logger; import org.hornetq.jms.client.HornetQMessage; 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 08:44:23 UTC (rev 8722) +++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/CTSMiscellaneousTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -22,9 +22,9 @@ import javax.jms.Session; import org.hornetq.api.Pair; -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.jms.HornetQConnectionFactory; +import org.hornetq.jms.HornetQConnectionFactory; /** * Safeguards for previously detected TCK failures. @@ -69,32 +69,32 @@ getJmsServerManager().createConnectionFactory("StrictTCKConnectionFactory", connectorConfigs, null, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL, - ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT, - ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CONNECTION_TTL, + HornetQClient.DEFAULT_CALL_TIMEOUT, + HornetQClient.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, + HornetQClient.DEFAULT_CONSUMER_WINDOW_SIZE, + HornetQClient.DEFAULT_CONSUMER_MAX_RATE, + HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_MAX_RATE, true, true, true, - ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP, - ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_USE_GLOBAL_POOLS, - ClientSessionFactoryImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL, - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER, - ClientSessionFactoryImpl.DEFAULT_MAX_RETRY_INTERVAL, - ClientSessionFactoryImpl.DEFAULT_RECONNECT_ATTEMPTS, - ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN, + HornetQClient.DEFAULT_AUTO_GROUP, + HornetQClient.DEFAULT_PRE_ACKNOWLEDGE, + HornetQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_USE_GLOBAL_POOLS, + HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_RETRY_INTERVAL, + HornetQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER, + HornetQClient.DEFAULT_MAX_RETRY_INTERVAL, + HornetQClient.DEFAULT_RECONNECT_ATTEMPTS, + HornetQClient.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN, null, jndiBindings); 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 08:44:23 UTC (rev 8722) +++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/JMSTestCase.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -19,9 +19,9 @@ import javax.naming.InitialContext; import org.hornetq.api.Pair; -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.jms.HornetQConnectionFactory; +import org.hornetq.jms.HornetQConnectionFactory; /** * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> @@ -65,32 +65,32 @@ getJmsServerManager().createConnectionFactory("testsuitecf", connectorConfigs, null, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL, - ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT, - ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CONNECTION_TTL, + HornetQClient.DEFAULT_CALL_TIMEOUT, + HornetQClient.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, + HornetQClient.DEFAULT_CONSUMER_WINDOW_SIZE, + HornetQClient.DEFAULT_CONSUMER_MAX_RATE, + HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_MAX_RATE, true, true, true, - ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP, - ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_USE_GLOBAL_POOLS, - ClientSessionFactoryImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL, - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER, - ClientSessionFactoryImpl.DEFAULT_MAX_RETRY_INTERVAL, - ClientSessionFactoryImpl.DEFAULT_RECONNECT_ATTEMPTS, - ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN, + HornetQClient.DEFAULT_AUTO_GROUP, + HornetQClient.DEFAULT_PRE_ACKNOWLEDGE, + HornetQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_USE_GLOBAL_POOLS, + HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_RETRY_INTERVAL, + HornetQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER, + HornetQClient.DEFAULT_MAX_RETRY_INTERVAL, + HornetQClient.DEFAULT_RECONNECT_ATTEMPTS, + HornetQClient.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN, null, jndiBindings); Modified: trunk/tests/jms-tests/src/org/hornetq/jms/tests/MessageProducerTest.java =================================================================== --- trunk/tests/jms-tests/src/org/hornetq/jms/tests/MessageProducerTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/MessageProducerTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -25,7 +25,7 @@ import javax.jms.Session; import javax.jms.TextMessage; -import org.hornetq.api.jms.HornetQTopic; +import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.jms.tests.message.SimpleJMSMessage; import org.hornetq.jms.tests.message.SimpleJMSTextMessage; import org.hornetq.jms.tests.util.ProxyAssertSupport; @@ -403,7 +403,7 @@ Session ps = pconn.createSession(false, Session.AUTO_ACKNOWLEDGE); try { - ps.createProducer(new HornetQTopic("NoSuchTopic")); + ps.createProducer(HornetQJMSClient.createHornetQTopic("NoSuchTopic")); ProxyAssertSupport.fail("should throw exception"); } catch (InvalidDestinationException e) Modified: trunk/tests/jms-tests/src/org/hornetq/jms/tests/ReferenceableTest.java =================================================================== --- trunk/tests/jms-tests/src/org/hornetq/jms/tests/ReferenceableTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/ReferenceableTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -25,9 +25,9 @@ import javax.naming.Reference; import javax.naming.Referenceable; -import org.hornetq.api.jms.HornetQConnectionFactory; -import org.hornetq.api.jms.HornetQQueue; -import org.hornetq.api.jms.HornetQTopic; +import org.hornetq.jms.HornetQConnectionFactory; +import org.hornetq.jms.HornetQQueue; +import org.hornetq.jms.HornetQTopic; import org.hornetq.jms.referenceable.ConnectionFactoryObjectFactory; import org.hornetq.jms.referenceable.DestinationObjectFactory; import org.hornetq.jms.tests.util.ProxyAssertSupport; Modified: trunk/tests/jms-tests/src/org/hornetq/jms/tests/message/MessageHeaderTestBase.java =================================================================== --- trunk/tests/jms-tests/src/org/hornetq/jms/tests/message/MessageHeaderTestBase.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/message/MessageHeaderTestBase.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -30,7 +30,7 @@ import javax.jms.StreamMessage; import javax.jms.TextMessage; -import org.hornetq.api.jms.HornetQQueue; +import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.jms.client.HornetQBytesMessage; import org.hornetq.jms.client.HornetQMapMessage; import org.hornetq.jms.client.HornetQMessage; @@ -62,8 +62,8 @@ m.setJMSMessageID("ID:messageID777"); m.setJMSTimestamp(123456789l); m.setJMSCorrelationID("correlationID777"); - m.setJMSReplyTo(new HornetQQueue("ReplyToQueue")); - m.setJMSDestination(new HornetQQueue("DestinationQueue")); + m.setJMSReplyTo(HornetQJMSClient.createHornetQQueue("ReplyToQueue")); + m.setJMSDestination(HornetQJMSClient.createHornetQQueue("DestinationQueue")); m.setJMSDeliveryMode(DeliveryMode.PERSISTENT); m.setJMSExpiration(987654321l); m.setJMSPriority(9); 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 08:44:23 UTC (rev 8722) +++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/tools/container/LocalTestServer.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -27,7 +27,7 @@ import javax.naming.InitialContext; import org.hornetq.api.Pair; -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.ObjectNameBuilder; import org.hornetq.api.core.management.ResourceNames; @@ -293,32 +293,32 @@ getJMSServerManager().createConnectionFactory(objectName, connectorConfigs, clientId, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL, - ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT, - ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CONNECTION_TTL, + HornetQClient.DEFAULT_CALL_TIMEOUT, + HornetQClient.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, prefetchSize, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE, + HornetQClient.DEFAULT_CONSUMER_MAX_RATE, + HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_MAX_RATE, blockOnAcknowledge, true, true, - ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP, - ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_AUTO_GROUP, + HornetQClient.DEFAULT_PRE_ACKNOWLEDGE, + HornetQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, dupsOkBatchSize, - ClientSessionFactoryImpl.DEFAULT_USE_GLOBAL_POOLS, - ClientSessionFactoryImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL, - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER, - ClientSessionFactoryImpl.DEFAULT_MAX_RETRY_INTERVAL, - ClientSessionFactoryImpl.DEFAULT_RECONNECT_ATTEMPTS, - ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN, + HornetQClient.DEFAULT_USE_GLOBAL_POOLS, + HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_RETRY_INTERVAL, + HornetQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER, + HornetQClient.DEFAULT_MAX_RETRY_INTERVAL, + HornetQClient.DEFAULT_RECONNECT_ATTEMPTS, + HornetQClient.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN, null, jndiBindings); } Modified: trunk/tests/joram-tests/config/provider.properties =================================================================== --- trunk/tests/joram-tests/config/provider.properties 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/joram-tests/config/provider.properties 2010-01-06 08:57:20 UTC (rev 8723) @@ -27,7 +27,7 @@ # Uncomment the chosen provider and comment the other ones ## -jms.provider.admin.class=org.hornetq.HornetQAdmin +jms.provider.admin.class=org.hornetq.jms.HornetQAdmin #jms.provider.admin.class = org.hornetq.api.jms.GenericAdmin #jms.provider.admin.class = org.objectweb.jtests.providers.admin.JoramAdmin #jms.provider.admin.class = org.objectweb.jtests.providers.admin.AshnaMQAdmin Modified: trunk/tests/joram-tests/src/org/hornetq/jms/HornetQAdmin.java =================================================================== --- trunk/tests/joram-tests/src/org/hornetq/jms/HornetQAdmin.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/joram-tests/src/org/hornetq/jms/HornetQAdmin.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -29,6 +29,7 @@ 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; @@ -72,7 +73,7 @@ public void start() throws Exception { - ClientSessionFactoryImpl sf = new ClientSessionFactoryImpl(new TransportConfiguration(NettyConnectorFactory.class.getName())); + ClientSessionFactoryImpl sf = (ClientSessionFactoryImpl) HornetQClient.createClientSessionFactory(new TransportConfiguration(NettyConnectorFactory.class.getName())); clientSession = sf.createSession(ConfigurationImpl.DEFAULT_MANAGEMENT_CLUSTER_USER, ConfigurationImpl.DEFAULT_MANAGEMENT_CLUSTER_PASSWORD, false, @@ -207,7 +208,7 @@ public void startServer() throws Exception { - String[] vmArgs = new String[] { "-Dorg.hornetq.logger-delegate-factory-class-name=org.hornetq.api.jms.SysoutLoggerDelegateFactory" }; + String[] vmArgs = new String[] { "-Dorg.hornetq.logger-delegate-factory-class-name=org.hornetq.jms.SysoutLoggerDelegateFactory" }; serverProcess = SpawnedVMSupport.spawnVM(SpawnedJMSServer.class.getName(), vmArgs, false); InputStreamReader isr = new InputStreamReader(serverProcess.getInputStream()); Modified: trunk/tests/joram-tests/src/org/hornetq/jms/SpawnedJMSServer.java =================================================================== --- trunk/tests/joram-tests/src/org/hornetq/jms/SpawnedJMSServer.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/joram-tests/src/org/hornetq/jms/SpawnedJMSServer.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -107,8 +107,9 @@ } catch (Throwable t) { - String allStack = t.getMessage() + "|"; - StackTraceElement[] stackTrace = t.getStackTrace(); + t.printStackTrace(); + String allStack = t.getCause().getMessage() + "|"; + StackTraceElement[] stackTrace = t.getCause().getStackTrace(); for (StackTraceElement stackTraceElement : stackTrace) { allStack += stackTraceElement.toString() + "|"; Modified: trunk/tests/src/org/hornetq/tests/integration/DuplicateDetectionTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/DuplicateDetectionTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/DuplicateDetectionTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -19,12 +19,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -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.ClientSessionFactoryImpl; +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; @@ -56,7 +51,7 @@ public void testSimpleDuplicateDetecion() throws Exception { - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(false, true, true); @@ -122,7 +117,7 @@ public void testSimpleDuplicateDetectionWithString() throws Exception { - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(false, true, true); @@ -188,7 +183,7 @@ public void testCacheSize() throws Exception { - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(false, true, true); @@ -343,7 +338,7 @@ public void testTransactedDuplicateDetection1() throws Exception { - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(false, false, false); @@ -391,7 +386,7 @@ public void testTransactedDuplicateDetection2() throws Exception { - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(false, false, false); @@ -433,7 +428,7 @@ public void testTransactedDuplicateDetection3() throws Exception { - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(false, false, false); @@ -491,7 +486,7 @@ */ public void testEntireTransactionRejected() throws Exception { - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(false, false, false); @@ -548,7 +543,7 @@ public void testXADuplicateDetection1() throws Exception { - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(true, false, false); @@ -623,7 +618,7 @@ public void testXADuplicateDetection2() throws Exception { - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(true, false, false); @@ -700,7 +695,7 @@ public void testXADuplicateDetection3() throws Exception { - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(true, false, false); @@ -776,7 +771,7 @@ public void testXADuplicateDetection4() throws Exception { - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(true, false, false); @@ -873,7 +868,7 @@ messagingService2.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(false, true, true); @@ -911,7 +906,7 @@ messagingService2.start(); - sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); session = sf.createSession(false, true, true); @@ -956,7 +951,7 @@ messagingService2.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(false, true, true); @@ -990,7 +985,7 @@ messagingService2.start(); - sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); session = sf.createSession(false, true, true); @@ -1034,7 +1029,7 @@ messagingService2.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(false, true, true); @@ -1070,7 +1065,7 @@ messagingService2.start(); - sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); session = sf.createSession(false, true, true); @@ -1123,7 +1118,7 @@ messagingService2.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(false, true, true); @@ -1169,7 +1164,7 @@ messagingService2.start(); - sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); session = sf.createSession(false, true, true); @@ -1221,7 +1216,7 @@ messagingService2.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(false, true, true); @@ -1259,7 +1254,7 @@ messagingService2.start(); - sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); session = sf.createSession(false, true, true); @@ -1304,7 +1299,7 @@ messagingService2.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(false, false, false); @@ -1344,7 +1339,7 @@ messagingService2.start(); - sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); session = sf.createSession(false, false, false); @@ -1389,7 +1384,7 @@ messagingService2.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(false, false, false); @@ -1433,7 +1428,7 @@ messagingService2.start(); - sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); session = sf.createSession(false, false, false); @@ -1480,7 +1475,7 @@ messagingService2.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(true, false, false); @@ -1522,7 +1517,7 @@ messagingService2.start(); - sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); session = sf.createSession(true, false, false); @@ -1579,7 +1574,7 @@ messagingService2.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(true, false, false); @@ -1619,7 +1614,7 @@ messagingService2.start(); - sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); session = sf.createSession(true, false, false); @@ -1676,7 +1671,7 @@ messagingService2.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(true, false, false); @@ -1718,7 +1713,7 @@ messagingService2.start(); - sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); session = sf.createSession(true, false, false); @@ -1775,7 +1770,7 @@ messagingService2.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(true, false, false); @@ -1816,7 +1811,7 @@ messagingService2.start(); - sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); session = sf.createSession(true, false, false); Modified: trunk/tests/src/org/hornetq/tests/integration/String64KLimitTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/String64KLimitTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/String64KLimitTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -16,12 +16,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -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.ClientSessionFactoryImpl; +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; @@ -211,7 +206,7 @@ server = HornetQServers.newHornetQServer(config, false); server.start(); - sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); session = sf.createSession(); } Modified: trunk/tests/src/org/hornetq/tests/integration/client/ConsumerCloseTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/ConsumerCloseTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/client/ConsumerCloseTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -15,13 +15,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -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.ClientSessionFactoryImpl; -import org.hornetq.api.core.client.MessageHandler; +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; @@ -162,7 +156,7 @@ address = RandomUtil.randomSimpleString(); queue = RandomUtil.randomSimpleString(); - sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); session = sf.createSession(false, true, true); session.createQueue(address, queue, false); Modified: trunk/tests/src/org/hornetq/tests/integration/client/CoreClientTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/CoreClientTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/client/CoreClientTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -17,12 +17,7 @@ import org.hornetq.api.SimpleString; import org.hornetq.api.core.buffers.HornetQBuffer; -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.ClientSessionFactoryImpl; +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; @@ -72,7 +67,7 @@ server.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(connectorFactoryClassName)); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(connectorFactoryClassName)); // sf.setConsumerWindowSize(0); ClientSession session = sf.createSession(false, true, true); Modified: trunk/tests/src/org/hornetq/tests/integration/client/DeadLetterAddressTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/DeadLetterAddressTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/client/DeadLetterAddressTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -18,12 +18,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -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.ClientSessionFactoryImpl; +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; @@ -152,7 +147,7 @@ SimpleString dlq = new SimpleString("DLQ1"); clientSession.createQueue(dla, dlq, null, false); clientSession.createQueue(qName, qName, null, false); - ClientSessionFactory sessionFactory = new ClientSessionFactoryImpl(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY)); + ClientSessionFactory sessionFactory = HornetQClient.createClientSessionFactory(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY)); ClientSession sendSession = sessionFactory.createSession(false, true, true); ClientProducer producer = sendSession.createProducer(qName); Map<String, Long> origIds = new HashMap<String, Long>(); @@ -375,7 +370,7 @@ // start the server server.start(); // then we create a client as normal - ClientSessionFactory sessionFactory = new ClientSessionFactoryImpl(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY)); + ClientSessionFactory sessionFactory = HornetQClient.createClientSessionFactory(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY)); clientSession = sessionFactory.createSession(false, true, false); } Modified: trunk/tests/src/org/hornetq/tests/integration/client/DurableQueueTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/DurableQueueTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/client/DurableQueueTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -16,12 +16,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -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.ClientSessionFactoryImpl; +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; @@ -89,7 +84,7 @@ server.stop(); server.start(); - sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); session = sf.createSession(false, true, true); session.start(); @@ -116,7 +111,7 @@ server.stop(); server.start(); - sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); session = sf.createSession(false, true, true); ClientProducer producer = session.createProducer(address); Modified: trunk/tests/src/org/hornetq/tests/integration/client/ExpiryAddressTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/ExpiryAddressTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/client/ExpiryAddressTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -15,12 +15,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -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.ClientSessionFactoryImpl; +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; @@ -174,7 +169,7 @@ SimpleString eq = new SimpleString("EA1"); clientSession.createQueue(ea, eq, null, false); clientSession.createQueue(qName, qName, null, false); - ClientSessionFactory sessionFactory = new ClientSessionFactoryImpl(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY)); + ClientSessionFactory sessionFactory = HornetQClient.createClientSessionFactory(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY)); ClientSession sendSession = sessionFactory.createSession(false, true, true); ClientProducer producer = sendSession.createProducer(qName); @@ -326,7 +321,7 @@ // start the server server.start(); // then we create a client as normal - ClientSessionFactory sessionFactory = new ClientSessionFactoryImpl(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY)); + ClientSessionFactory sessionFactory = HornetQClient.createClientSessionFactory(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY)); sessionFactory.setBlockOnAcknowledge(true); // There are assertions over sizes that needs to be done after the ACK // was received on server clientSession = sessionFactory.createSession(null, null, false, true, true, false, 0); Modified: trunk/tests/src/org/hornetq/tests/integration/client/FailureDeadlockTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/FailureDeadlockTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/client/FailureDeadlockTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -19,7 +19,8 @@ import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.jms.HornetQConnectionFactory; +import org.hornetq.jms.HornetQConnectionFactory; +import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.core.client.impl.ClientSessionInternal; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; @@ -65,9 +66,9 @@ jmsServer = new JMSServerManagerImpl(server); jmsServer.setContext(new NullInitialContext()); jmsServer.start(); - cf1 = new HornetQConnectionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + cf1 = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); - cf2 = new HornetQConnectionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + cf2 = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); } @Override Modified: trunk/tests/src/org/hornetq/tests/integration/client/HornetQCrashTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/HornetQCrashTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/client/HornetQCrashTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -3,12 +3,7 @@ import junit.framework.Assert; import junit.framework.TestCase; -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.ClientSessionFactoryImpl; -import org.hornetq.api.core.client.SendAcknowledgementHandler; +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; @@ -50,7 +45,7 @@ server.getRemotingService().addInterceptor(new AckInterceptor(server)); - ClientSessionFactory clientSessionFactory = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + ClientSessionFactory clientSessionFactory = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); // Force an ack at once - this means the send call will block clientSessionFactory.setConfirmationWindowSize(1); Modified: trunk/tests/src/org/hornetq/tests/integration/client/IncompatibleVersionTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/IncompatibleVersionTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/client/IncompatibleVersionTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -20,7 +20,7 @@ import java.util.concurrent.ScheduledExecutorService; 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.client.impl.FailoverManagerImpl; @@ -67,20 +67,20 @@ server.start(); TransportConfiguration config = new TransportConfiguration(InVMConnectorFactory.class.getName()); - ClientSessionFactory csf = new ClientSessionFactoryImpl(config); + ClientSessionFactory csf = HornetQClient.createClientSessionFactory(config); ExecutorService executorService = Executors.newFixedThreadPool(1); ScheduledExecutorService scheduledexecutorService = Executors.newScheduledThreadPool(1); FailoverManagerImpl failoverManager = new FailoverManagerImpl(csf, config, null, - ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN, - ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN, + HornetQClient.DEFAULT_CALL_TIMEOUT, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, 500, - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL, - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER, - ClientSessionFactoryImpl.DEFAULT_MAX_RETRY_INTERVAL, - ClientSessionFactoryImpl.DEFAULT_RECONNECT_ATTEMPTS, + HornetQClient.DEFAULT_RETRY_INTERVAL, + HornetQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER, + HornetQClient.DEFAULT_MAX_RETRY_INTERVAL, + HornetQClient.DEFAULT_RECONNECT_ATTEMPTS, executorService, scheduledexecutorService, null); @@ -119,12 +119,12 @@ version, null, null, - ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, false, true, true, false, - ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE); + HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE); if (compatible) { Modified: trunk/tests/src/org/hornetq/tests/integration/client/LargeMessageTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/LargeMessageTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/client/LargeMessageTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -21,12 +21,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -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.ClientSessionFactoryImpl; +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; @@ -75,7 +70,7 @@ public void testCloseConsumer() throws Exception { - final int messageSize = (int)(3.5 * ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE); + final int messageSize = (int)(3.5 * HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE); ClientSession session = null; @@ -144,7 +139,7 @@ public void testDLALargeMessage() throws Exception { - final int messageSize = (int)(3.5 * ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE); + final int messageSize = (int)(3.5 * HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE); ClientSession session = null; @@ -271,7 +266,7 @@ public void testDeliveryCount() throws Exception { - final int messageSize = (int)(3.5 * ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE); + final int messageSize = (int)(3.5 * HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE); ClientSession session = null; @@ -354,7 +349,7 @@ public void testDLAOnExpiryNonDurableMessage() throws Exception { - final int messageSize = (int)(3.5 * ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE); + final int messageSize = (int)(3.5 * HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE); ClientSession session = null; @@ -489,7 +484,7 @@ public void testDLAOnExpiry() throws Exception { - final int messageSize = (int)(3.5 * ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE); + final int messageSize = (int)(3.5 * HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE); ClientSession session = null; @@ -624,7 +619,7 @@ public void testExpiryLargeMessage() throws Exception { - final int messageSize = 3 * ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE; + final int messageSize = 3 * HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE; ClientSession session = null; Modified: trunk/tests/src/org/hornetq/tests/integration/client/MessageGroupingConnectionFactoryTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/MessageGroupingConnectionFactoryTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/client/MessageGroupingConnectionFactoryTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -19,13 +19,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -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.ClientSessionFactoryImpl; -import org.hornetq.api.core.client.MessageHandler; +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; @@ -179,7 +173,7 @@ server.start(); // then we create a client as normal - ClientSessionFactory sessionFactory = new ClientSessionFactoryImpl(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY)); + ClientSessionFactory sessionFactory = HornetQClient.createClientSessionFactory(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY)); sessionFactory.setGroupID("grp1"); clientSession = sessionFactory.createSession(false, true, true); clientSession.createQueue(qName, qName, null, false); Modified: trunk/tests/src/org/hornetq/tests/integration/client/MessageGroupingTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/MessageGroupingTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/client/MessageGroupingTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -22,13 +22,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -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.ClientSessionFactoryImpl; -import org.hornetq.api.core.client.MessageHandler; +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; @@ -259,7 +253,7 @@ private void doTestMultipleGroupingTXCommit(final boolean directDelivery) throws Exception { - ClientSessionFactory sessionFactory = new ClientSessionFactoryImpl(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY)); + ClientSessionFactory sessionFactory = HornetQClient.createClientSessionFactory(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY)); ClientSession clientSession = sessionFactory.createSession(false, false, false); ClientProducer clientProducer = this.clientSession.createProducer(qName); if (directDelivery) @@ -319,7 +313,7 @@ private void doTestMultipleGroupingTXRollback(final boolean directDelivery) throws Exception { - ClientSessionFactory sessionFactory = new ClientSessionFactoryImpl(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY)); + ClientSessionFactory sessionFactory = HornetQClient.createClientSessionFactory(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY)); sessionFactory.setBlockOnAcknowledge(true); ClientSession clientSession = sessionFactory.createSession(false, false, false); ClientProducer clientProducer = this.clientSession.createProducer(qName); @@ -395,7 +389,7 @@ private void dotestMultipleGroupingXACommit(final boolean directDelivery) throws Exception { - ClientSessionFactory sessionFactory = new ClientSessionFactoryImpl(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY)); + ClientSessionFactory sessionFactory = HornetQClient.createClientSessionFactory(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY)); ClientSession clientSession = sessionFactory.createSession(true, false, false); ClientProducer clientProducer = this.clientSession.createProducer(qName); ClientConsumer consumer = clientSession.createConsumer(qName); @@ -459,7 +453,7 @@ private void doTestMultipleGroupingXARollback(final boolean directDelivery) throws Exception { - ClientSessionFactory sessionFactory = new ClientSessionFactoryImpl(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY)); + ClientSessionFactory sessionFactory = HornetQClient.createClientSessionFactory(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY)); sessionFactory.setBlockOnAcknowledge(true); ClientSession clientSession = sessionFactory.createSession(true, false, false); ClientProducer clientProducer = this.clientSession.createProducer(qName); @@ -639,7 +633,7 @@ server.start(); // then we create a client as normal - ClientSessionFactory sessionFactory = new ClientSessionFactoryImpl(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY)); + ClientSessionFactory sessionFactory = HornetQClient.createClientSessionFactory(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY)); clientSession = sessionFactory.createSession(false, true, true); clientSession.createQueue(qName, qName, null, false); } Modified: trunk/tests/src/org/hornetq/tests/integration/client/MessagePriorityTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/MessagePriorityTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/client/MessagePriorityTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -16,12 +16,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -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.ClientSessionFactoryImpl; +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; @@ -207,7 +202,7 @@ server = HornetQServers.newHornetQServer(config, false); server.start(); - sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); sf.setBlockOnNonDurableSend(true); sf.setBlockOnDurableSend(true); session = sf.createSession(false, true, true); Modified: trunk/tests/src/org/hornetq/tests/integration/client/NewDeadLetterAddressTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/NewDeadLetterAddressTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/client/NewDeadLetterAddressTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -15,12 +15,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -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.ClientSessionFactoryImpl; +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; @@ -76,7 +71,7 @@ // start the server server.start(); // then we create a client as normal - ClientSessionFactory sessionFactory = new ClientSessionFactoryImpl(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY)); + ClientSessionFactory sessionFactory = HornetQClient.createClientSessionFactory(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY)); clientSession = sessionFactory.createSession(false, true, false); } Modified: trunk/tests/src/org/hornetq/tests/integration/client/ProducerCloseTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/ProducerCloseTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/client/ProducerCloseTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -14,10 +14,7 @@ import junit.framework.Assert; -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.ClientSessionFactoryImpl; +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; @@ -84,7 +81,7 @@ server = HornetQServers.newHornetQServer(config, false); server.start(); - sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); session = sf.createSession(false, true, true); } Modified: trunk/tests/src/org/hornetq/tests/integration/client/QueueBrowserTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/QueueBrowserTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/client/QueueBrowserTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -15,12 +15,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -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.ClientSessionFactoryImpl; +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; @@ -63,7 +58,7 @@ public void testSimpleConsumerBrowser() throws Exception { - sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); sf.setBlockOnNonDurableSend(true); Modified: trunk/tests/src/org/hornetq/tests/integration/client/ReceiveImmediateTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/ReceiveImmediateTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/client/ReceiveImmediateTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -15,12 +15,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -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.ClientSessionFactoryImpl; +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; @@ -88,7 +83,7 @@ public void testConsumerReceiveImmediateWithSessionStop() throws Exception { - sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); sf.setBlockOnNonDurableSend(true); sf.setBlockOnAcknowledge(true); sf.setAckBatchSize(0); @@ -121,7 +116,7 @@ private void doConsumerReceiveImmediateWithNoMessages(final boolean browser) throws Exception { - sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); sf.setBlockOnNonDurableSend(true); sf.setBlockOnAcknowledge(true); sf.setAckBatchSize(0); @@ -143,7 +138,7 @@ private void doConsumerReceiveImmediate(final boolean browser) throws Exception { - sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); sf.setBlockOnNonDurableSend(true); sf.setBlockOnAcknowledge(true); sf.setAckBatchSize(0); Modified: trunk/tests/src/org/hornetq/tests/integration/client/RequestorTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/RequestorTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/client/RequestorTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -16,14 +16,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -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.ClientRequestor; -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.MessageHandler; +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; @@ -92,7 +85,7 @@ SimpleString requestAddress = RandomUtil.randomSimpleString(); SimpleString requestQueue = RandomUtil.randomSimpleString(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); final ClientSession session = sf.createSession(false, true, true); session.start(); @@ -125,7 +118,7 @@ SimpleString requestAddress = RandomUtil.randomSimpleString(); SimpleString requestQueue = RandomUtil.randomSimpleString(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); final ClientSession session = sf.createSession(false, true, true); session.start(); @@ -155,7 +148,7 @@ { final SimpleString requestAddress = RandomUtil.randomSimpleString(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); final ClientSession session = sf.createSession(false, true, true); session.close(); @@ -178,7 +171,7 @@ SimpleString requestAddress = RandomUtil.randomSimpleString(); SimpleString requestQueue = RandomUtil.randomSimpleString(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); final ClientSession session = sf.createSession(false, true, true); session.start(); @@ -228,7 +221,7 @@ service = HornetQServers.newHornetQServer(conf, false); service.start(); - sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); } @Override Modified: trunk/tests/src/org/hornetq/tests/integration/client/SessionCloseTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/SessionCloseTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/client/SessionCloseTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -19,11 +19,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -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.client.ClientSessionFactoryImpl; +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; @@ -256,7 +252,7 @@ server.start(); - sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); } Modified: trunk/tests/src/org/hornetq/tests/integration/client/SessionClosedOnRemotingConnectionFailureTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/SessionClosedOnRemotingConnectionFailureTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/client/SessionClosedOnRemotingConnectionFailureTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -15,11 +15,7 @@ import junit.framework.Assert; -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.client.ClientSessionFactoryImpl; +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; @@ -123,7 +119,7 @@ server.start(); - sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); } @Override Modified: trunk/tests/src/org/hornetq/tests/integration/client/SessionFactoryTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/SessionFactoryTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/client/SessionFactoryTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -27,6 +27,7 @@ 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; @@ -85,7 +86,7 @@ public void testSerializable() throws Exception { - ClientSessionFactory cf = new ClientSessionFactoryImpl(); + ClientSessionFactory cf = HornetQClient.createClientSessionFactory(); ByteArrayOutputStream baos = new ByteArrayOutputStream(); @@ -108,7 +109,7 @@ public void testCloseUnusedClientSessionFactoryWithoutGlobalPools() throws Exception { - ClientSessionFactoryImpl csf = new ClientSessionFactoryImpl(); + ClientSessionFactoryImpl csf = (ClientSessionFactoryImpl) HornetQClient.createClientSessionFactory(); csf.setUseGlobalPools(false); csf.close(); } @@ -118,35 +119,35 @@ try { startLiveAndBackup(); - ClientSessionFactory cf = new ClientSessionFactoryImpl(); + ClientSessionFactory cf = HornetQClient.createClientSessionFactory(); assertFactoryParams(cf, null, null, 0, - ClientSessionFactoryImpl.DEFAULT_DISCOVERY_REFRESH_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL, - ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP, - ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_USE_GLOBAL_POOLS, - ClientSessionFactoryImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL, - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER, - ClientSessionFactoryImpl.DEFAULT_RECONNECT_ATTEMPTS, - ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); + HornetQClient.DEFAULT_DISCOVERY_REFRESH_TIMEOUT, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CONNECTION_TTL, + HornetQClient.DEFAULT_CALL_TIMEOUT, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, + HornetQClient.DEFAULT_CONSUMER_WINDOW_SIZE, + HornetQClient.DEFAULT_CONSUMER_MAX_RATE, + HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_MAX_RATE, + HornetQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE, + HornetQClient.DEFAULT_BLOCK_ON_DURABLE_SEND, + HornetQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, + HornetQClient.DEFAULT_AUTO_GROUP, + HornetQClient.DEFAULT_PRE_ACKNOWLEDGE, + HornetQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT, + HornetQClient.DEFAULT_USE_GLOBAL_POOLS, + HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_RETRY_INTERVAL, + HornetQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER, + HornetQClient.DEFAULT_RECONNECT_ATTEMPTS, + HornetQClient.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); try { ClientSession session = cf.createSession(false, true, true); @@ -178,35 +179,35 @@ try { startLiveAndBackup(); - ClientSessionFactory cf = new ClientSessionFactoryImpl(groupAddress, groupPort); + ClientSessionFactory cf = HornetQClient.createClientSessionFactory(groupAddress, groupPort); assertFactoryParams(cf, null, groupAddress, groupPort, - ClientSessionFactoryImpl.DEFAULT_DISCOVERY_REFRESH_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL, - ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP, - ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_USE_GLOBAL_POOLS, - ClientSessionFactoryImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL, - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER, - ClientSessionFactoryImpl.DEFAULT_RECONNECT_ATTEMPTS, - ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); + HornetQClient.DEFAULT_DISCOVERY_REFRESH_TIMEOUT, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CONNECTION_TTL, + HornetQClient.DEFAULT_CALL_TIMEOUT, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, + HornetQClient.DEFAULT_CONSUMER_WINDOW_SIZE, + HornetQClient.DEFAULT_CONSUMER_MAX_RATE, + HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_MAX_RATE, + HornetQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE, + HornetQClient.DEFAULT_BLOCK_ON_DURABLE_SEND, + HornetQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, + HornetQClient.DEFAULT_AUTO_GROUP, + HornetQClient.DEFAULT_PRE_ACKNOWLEDGE, + HornetQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT, + HornetQClient.DEFAULT_USE_GLOBAL_POOLS, + HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_RETRY_INTERVAL, + HornetQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER, + HornetQClient.DEFAULT_RECONNECT_ATTEMPTS, + HornetQClient.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); ClientSession session = cf.createSession(false, true, true); Assert.assertNotNull(session); session.close(); @@ -228,35 +229,35 @@ backupTC); staticConnectors.add(pair0); - ClientSessionFactory cf = new ClientSessionFactoryImpl(staticConnectors); + ClientSessionFactory cf = HornetQClient.createClientSessionFactory(staticConnectors); assertFactoryParams(cf, staticConnectors, null, 0, - ClientSessionFactoryImpl.DEFAULT_DISCOVERY_REFRESH_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL, - ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP, - ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_USE_GLOBAL_POOLS, - ClientSessionFactoryImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL, - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER, - ClientSessionFactoryImpl.DEFAULT_RECONNECT_ATTEMPTS, - ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); + HornetQClient.DEFAULT_DISCOVERY_REFRESH_TIMEOUT, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CONNECTION_TTL, + HornetQClient.DEFAULT_CALL_TIMEOUT, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, + HornetQClient.DEFAULT_CONSUMER_WINDOW_SIZE, + HornetQClient.DEFAULT_CONSUMER_MAX_RATE, + HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_MAX_RATE, + HornetQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE, + HornetQClient.DEFAULT_BLOCK_ON_DURABLE_SEND, + HornetQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, + HornetQClient.DEFAULT_AUTO_GROUP, + HornetQClient.DEFAULT_PRE_ACKNOWLEDGE, + HornetQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT, + HornetQClient.DEFAULT_USE_GLOBAL_POOLS, + HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_RETRY_INTERVAL, + HornetQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER, + HornetQClient.DEFAULT_RECONNECT_ATTEMPTS, + HornetQClient.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); ClientSession session = cf.createSession(false, true, true); Assert.assertNotNull(session); session.close(); @@ -278,35 +279,35 @@ backupTC); staticConnectors.add(pair0); - ClientSessionFactory cf = new ClientSessionFactoryImpl(liveTC, backupTC); + ClientSessionFactory cf = HornetQClient.createClientSessionFactory(liveTC, backupTC); assertFactoryParams(cf, staticConnectors, null, 0, - ClientSessionFactoryImpl.DEFAULT_DISCOVERY_REFRESH_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL, - ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP, - ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_USE_GLOBAL_POOLS, - ClientSessionFactoryImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL, - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER, - ClientSessionFactoryImpl.DEFAULT_RECONNECT_ATTEMPTS, - ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); + HornetQClient.DEFAULT_DISCOVERY_REFRESH_TIMEOUT, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CONNECTION_TTL, + HornetQClient.DEFAULT_CALL_TIMEOUT, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, + HornetQClient.DEFAULT_CONSUMER_WINDOW_SIZE, + HornetQClient.DEFAULT_CONSUMER_MAX_RATE, + HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_MAX_RATE, + HornetQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE, + HornetQClient.DEFAULT_BLOCK_ON_DURABLE_SEND, + HornetQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, + HornetQClient.DEFAULT_AUTO_GROUP, + HornetQClient.DEFAULT_PRE_ACKNOWLEDGE, + HornetQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT, + HornetQClient.DEFAULT_USE_GLOBAL_POOLS, + HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_RETRY_INTERVAL, + HornetQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER, + HornetQClient.DEFAULT_RECONNECT_ATTEMPTS, + HornetQClient.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); ClientSession session = cf.createSession(false, true, true); Assert.assertNotNull(session); session.close(); @@ -328,35 +329,35 @@ null); staticConnectors.add(pair0); - ClientSessionFactory cf = new ClientSessionFactoryImpl(liveTC); + ClientSessionFactory cf = HornetQClient.createClientSessionFactory(liveTC); assertFactoryParams(cf, staticConnectors, null, 0, - ClientSessionFactoryImpl.DEFAULT_DISCOVERY_REFRESH_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL, - ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP, - ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_USE_GLOBAL_POOLS, - ClientSessionFactoryImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL, - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER, - ClientSessionFactoryImpl.DEFAULT_RECONNECT_ATTEMPTS, - ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); + HornetQClient.DEFAULT_DISCOVERY_REFRESH_TIMEOUT, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CONNECTION_TTL, + HornetQClient.DEFAULT_CALL_TIMEOUT, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, + HornetQClient.DEFAULT_CONSUMER_WINDOW_SIZE, + HornetQClient.DEFAULT_CONSUMER_MAX_RATE, + HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_MAX_RATE, + HornetQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE, + HornetQClient.DEFAULT_BLOCK_ON_DURABLE_SEND, + HornetQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, + HornetQClient.DEFAULT_AUTO_GROUP, + HornetQClient.DEFAULT_PRE_ACKNOWLEDGE, + HornetQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT, + HornetQClient.DEFAULT_USE_GLOBAL_POOLS, + HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_RETRY_INTERVAL, + HornetQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER, + HornetQClient.DEFAULT_RECONNECT_ATTEMPTS, + HornetQClient.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); ClientSession session = cf.createSession(false, true, true); Assert.assertNotNull(session); session.close(); @@ -370,7 +371,7 @@ public void testGettersAndSetters() { - ClientSessionFactory cf = new ClientSessionFactoryImpl(); + ClientSessionFactory cf = HornetQClient.createClientSessionFactory(); List<Pair<TransportConfiguration, TransportConfiguration>> staticConnectors = new ArrayList<Pair<TransportConfiguration, TransportConfiguration>>(); Pair<TransportConfiguration, TransportConfiguration> pair0 = new Pair<TransportConfiguration, TransportConfiguration>(liveTC, Modified: trunk/tests/src/org/hornetq/tests/integration/client/TemporaryQueueTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/TemporaryQueueTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/client/TemporaryQueueTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -20,12 +20,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -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.ClientSessionFactoryImpl; +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; @@ -235,7 +230,7 @@ } }); - sf = new ClientSessionFactoryImpl(new TransportConfiguration(ServiceTestBase.INVM_CONNECTOR_FACTORY)); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(ServiceTestBase.INVM_CONNECTOR_FACTORY)); sf.setConnectionTTL(TemporaryQueueTest.CONNECTION_TTL); session = sf.createSession(false, true, true); @@ -268,7 +263,7 @@ session.close(); sf.close(); - sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); session = sf.createSession(false, true, true); session.start(); @@ -299,7 +294,7 @@ server = createServer(false, configuration); server.start(); - sf = new ClientSessionFactoryImpl(new TransportConfiguration(ServiceTestBase.INVM_CONNECTOR_FACTORY)); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(ServiceTestBase.INVM_CONNECTOR_FACTORY)); sf.setConnectionTTL(TemporaryQueueTest.CONNECTION_TTL); session = sf.createSession(false, true, true); } Modified: trunk/tests/src/org/hornetq/tests/integration/client/TransactionDurabilityTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/TransactionDurabilityTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/client/TransactionDurabilityTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -15,12 +15,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -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.ClientSessionFactoryImpl; +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; @@ -70,7 +65,7 @@ server.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session1 = sf.createSession(false, true, true); @@ -118,7 +113,7 @@ server.start(); - sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); session1 = sf.createSession(false, true, true); @@ -150,7 +145,7 @@ server.start(); - sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); session1 = sf.createSession(false, true, true); Modified: trunk/tests/src/org/hornetq/tests/integration/client/WildCardRoutingTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/WildCardRoutingTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/client/WildCardRoutingTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -15,12 +15,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -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.ClientSessionFactoryImpl; +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; @@ -768,7 +763,7 @@ server.start(); server.getManagementService().enableNotifications(false); // then we create a client as normal - ClientSessionFactory sessionFactory = new ClientSessionFactoryImpl(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY)); + ClientSessionFactory sessionFactory = HornetQClient.createClientSessionFactory(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY)); clientSession = sessionFactory.createSession(false, true, true); } Modified: trunk/tests/src/org/hornetq/tests/integration/clientcrash/ClientCrashTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/clientcrash/ClientCrashTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/clientcrash/ClientCrashTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -16,12 +16,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -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.ClientSessionFactoryImpl; +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; @@ -123,7 +118,7 @@ { super.setUp(); - sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.integration.transports.netty.NettyConnectorFactory")); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.integration.transports.netty.NettyConnectorFactory")); sf.setClientFailureCheckPeriod(ClientCrashTest.PING_PERIOD); sf.setConnectionTTL(ClientCrashTest.CONNECTION_TTL); Modified: trunk/tests/src/org/hornetq/tests/integration/clientcrash/ClientExitTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/clientcrash/ClientExitTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/clientcrash/ClientExitTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -16,10 +16,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.client.ClientConsumer; -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.*; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.message.Message; import org.hornetq.core.logging.Logger; @@ -104,7 +101,7 @@ { super.setUp(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(NettyConnectorFactory.class.getName())); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(NettyConnectorFactory.class.getName())); session = sf.createSession(false, true, true); session.createQueue(ClientExitTest.QUEUE, ClientExitTest.QUEUE, null, false); consumer = session.createConsumer(ClientExitTest.QUEUE); Modified: trunk/tests/src/org/hornetq/tests/integration/clientcrash/CrashClient.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/clientcrash/CrashClient.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/clientcrash/CrashClient.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -15,11 +15,7 @@ import java.util.Arrays; -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.ClientSessionFactoryImpl; +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; @@ -48,7 +44,7 @@ { CrashClient.log.debug("args = " + Arrays.asList(args)); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.integration.transports.netty.NettyConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.integration.transports.netty.NettyConnectorFactory")); sf.setClientFailureCheckPeriod(ClientCrashTest.PING_PERIOD); sf.setConnectionTTL(ClientCrashTest.CONNECTION_TTL); Modified: trunk/tests/src/org/hornetq/tests/integration/clientcrash/GracefulClient.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/clientcrash/GracefulClient.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/clientcrash/GracefulClient.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -13,12 +13,7 @@ package org.hornetq.tests.integration.clientcrash; -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.ClientSessionFactoryImpl; +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; @@ -53,7 +48,7 @@ try { - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(NettyConnectorFactory.class.getName())); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(NettyConnectorFactory.class.getName())); ClientSession session = sf.createSession(false, true, true); ClientProducer producer = session.createProducer(queueName); ClientConsumer consumer = session.createConsumer(queueName); 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 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeReconnectTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -22,12 +22,7 @@ import org.hornetq.api.Pair; import org.hornetq.api.SimpleString; -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.ClientSessionFactoryImpl; +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; @@ -126,7 +121,7 @@ true, false, confirmationWindowSize, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, connectorPair); List<BridgeConfiguration> bridgeConfigs = new ArrayList<BridgeConfiguration>(); @@ -148,10 +143,10 @@ server1.start(); server0.start(); - ClientSessionFactory csf0 = new ClientSessionFactoryImpl(server0tc); + ClientSessionFactory csf0 = HornetQClient.createClientSessionFactory(server0tc); ClientSession session0 = csf0.createSession(false, true, true); - ClientSessionFactory csf2 = new ClientSessionFactoryImpl(server2tc); + ClientSessionFactory csf2 = HornetQClient.createClientSessionFactory(server2tc); ClientSession session2 = csf2.createSession(false, true, true); ClientProducer prod0 = session0.createProducer(testAddress); @@ -249,7 +244,7 @@ true, false, confirmationWindowSize, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, connectorPair); List<BridgeConfiguration> bridgeConfigs = new ArrayList<BridgeConfiguration>(); @@ -271,10 +266,10 @@ server1.start(); server0.start(); - ClientSessionFactory csf0 = new ClientSessionFactoryImpl(server0tc); + ClientSessionFactory csf0 = HornetQClient.createClientSessionFactory(server0tc); ClientSession session0 = csf0.createSession(false, true, true); - ClientSessionFactory csf2 = new ClientSessionFactoryImpl(server2tc); + ClientSessionFactory csf2 = HornetQClient.createClientSessionFactory(server2tc); ClientSession session2 = csf2.createSession(false, true, true); ClientProducer prod0 = session0.createProducer(testAddress); @@ -367,7 +362,7 @@ true, false, confirmationWindowSize, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, connectorPair); List<BridgeConfiguration> bridgeConfigs = new ArrayList<BridgeConfiguration>(); @@ -387,10 +382,10 @@ server1.start(); server0.start(); - ClientSessionFactory csf0 = new ClientSessionFactoryImpl(server0tc); + ClientSessionFactory csf0 = HornetQClient.createClientSessionFactory(server0tc); ClientSession session0 = csf0.createSession(false, true, true); - ClientSessionFactory csf1 = new ClientSessionFactoryImpl(server1tc); + ClientSessionFactory csf1 = HornetQClient.createClientSessionFactory(server1tc); ClientSession session1 = csf1.createSession(false, true, true); ClientProducer prod0 = session0.createProducer(testAddress); @@ -513,7 +508,7 @@ server1.start(); server0.start(); - ClientSessionFactory csf0 = new ClientSessionFactoryImpl(server0tc); + ClientSessionFactory csf0 = HornetQClient.createClientSessionFactory(server0tc); ClientSession session0 = csf0.createSession(false, true, true); ClientProducer prod0 = session0.createProducer(testAddress); @@ -530,7 +525,7 @@ server1.start(); BridgeReconnectTest.log.info("server 1 restarted"); - ClientSessionFactory csf1 = new ClientSessionFactoryImpl(server1tc); + ClientSessionFactory csf1 = HornetQClient.createClientSessionFactory(server1tc); ClientSession session1 = csf1.createSession(false, true, true); ClientConsumer cons1 = session1.createConsumer(queueName0); @@ -612,7 +607,7 @@ true, false, confirmationWindowSize, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, connectorPair); List<BridgeConfiguration> bridgeConfigs = new ArrayList<BridgeConfiguration>(); @@ -632,10 +627,10 @@ server1.start(); server0.start(); - ClientSessionFactory csf0 = new ClientSessionFactoryImpl(server0tc); + ClientSessionFactory csf0 = HornetQClient.createClientSessionFactory(server0tc); ClientSession session0 = csf0.createSession(false, true, true); - ClientSessionFactory csf1 = new ClientSessionFactoryImpl(server1tc); + ClientSessionFactory csf1 = HornetQClient.createClientSessionFactory(server1tc); ClientSession session1 = csf1.createSession(false, true, true); ClientProducer prod0 = session0.createProducer(testAddress); 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 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeStartTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -22,12 +22,7 @@ import org.hornetq.api.Pair; import org.hornetq.api.SimpleString; -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.ClientSessionFactoryImpl; +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; @@ -111,7 +106,7 @@ true, true, 1024, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, connectorPair); List<BridgeConfiguration> bridgeConfigs = new ArrayList<BridgeConfiguration>(); @@ -131,9 +126,9 @@ server1.start(); server0.start(); - ClientSessionFactory sf0 = new ClientSessionFactoryImpl(server0tc); + ClientSessionFactory sf0 = HornetQClient.createClientSessionFactory(server0tc); - ClientSessionFactory sf1 = new ClientSessionFactoryImpl(server1tc); + ClientSessionFactory sf1 = HornetQClient.createClientSessionFactory(server1tc); ClientSession session0 = sf0.createSession(false, true, true); @@ -261,7 +256,7 @@ true, true, 1024, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, connectorPair); List<BridgeConfiguration> bridgeConfigs = new ArrayList<BridgeConfiguration>(); @@ -284,7 +279,7 @@ server0.start(); - ClientSessionFactory sf0 = new ClientSessionFactoryImpl(server0tc); + ClientSessionFactory sf0 = HornetQClient.createClientSessionFactory(server0tc); ClientSession session0 = sf0.createSession(false, true, true); @@ -308,7 +303,7 @@ server1.start(); - ClientSessionFactory sf1 = new ClientSessionFactoryImpl(server1tc); + ClientSessionFactory sf1 = HornetQClient.createClientSessionFactory(server1tc); ClientSession session1 = sf1.createSession(false, true, true); @@ -376,7 +371,7 @@ BridgeStartTest.log.info("started server1"); - sf1 = new ClientSessionFactoryImpl(server1tc); + sf1 = HornetQClient.createClientSessionFactory(server1tc); session1 = sf1.createSession(false, true, true); @@ -458,7 +453,7 @@ false, false, 1024, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, connectorPair); List<BridgeConfiguration> bridgeConfigs = new ArrayList<BridgeConfiguration>(); @@ -479,7 +474,7 @@ server0.start(); - ClientSessionFactory sf0 = new ClientSessionFactoryImpl(server0tc); + ClientSessionFactory sf0 = HornetQClient.createClientSessionFactory(server0tc); ClientSession session0 = sf0.createSession(false, true, true); @@ -505,7 +500,7 @@ server1.start(); - ClientSessionFactory sf1 = new ClientSessionFactoryImpl(server1tc); + ClientSessionFactory sf1 = HornetQClient.createClientSessionFactory(server1tc); ClientSession session1 = sf1.createSession(false, true, true); @@ -593,7 +588,7 @@ false, true, 1024, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, connectorPair); List<BridgeConfiguration> bridgeConfigs = new ArrayList<BridgeConfiguration>(); @@ -614,7 +609,7 @@ server0.start(); - ClientSessionFactory sf0 = new ClientSessionFactoryImpl(server0tc); + ClientSessionFactory sf0 = HornetQClient.createClientSessionFactory(server0tc); ClientSession session0 = sf0.createSession(false, true, true); @@ -633,7 +628,7 @@ producer0.send(message); } - ClientSessionFactory sf1 = new ClientSessionFactoryImpl(server1tc); + ClientSessionFactory sf1 = HornetQClient.createClientSessionFactory(server1tc); ClientSession session1 = sf1.createSession(false, true, true); 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 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -22,12 +22,7 @@ import org.hornetq.api.Pair; import org.hornetq.api.SimpleString; -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.ClientSessionFactoryImpl; +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; @@ -134,7 +129,7 @@ // Choose confirmation size to make sure acks // are sent numMessages * messageSize / 2, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, connectorPair); List<BridgeConfiguration> bridgeConfigs = new ArrayList<BridgeConfiguration>(); @@ -154,9 +149,9 @@ server1.start(); server0.start(); - ClientSessionFactory sf0 = new ClientSessionFactoryImpl(server0tc); + ClientSessionFactory sf0 = HornetQClient.createClientSessionFactory(server0tc); - ClientSessionFactory sf1 = new ClientSessionFactoryImpl(server1tc); + ClientSessionFactory sf1 = HornetQClient.createClientSessionFactory(server1tc); ClientSession session0 = sf0.createSession(false, true, true); @@ -326,7 +321,7 @@ true, false, 1024, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, connectorPair); List<BridgeConfiguration> bridgeConfigs = new ArrayList<BridgeConfiguration>(); @@ -346,9 +341,9 @@ server1.start(); server0.start(); - ClientSessionFactory sf0 = new ClientSessionFactoryImpl(server0tc); + ClientSessionFactory sf0 = HornetQClient.createClientSessionFactory(server0tc); - ClientSessionFactory sf1 = new ClientSessionFactoryImpl(server1tc); + ClientSessionFactory sf1 = HornetQClient.createClientSessionFactory(server1tc); ClientSession session0 = sf0.createSession(false, true, true); @@ -493,7 +488,7 @@ true, false, 1024, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, connectorPair); List<BridgeConfiguration> bridgeConfigs = new ArrayList<BridgeConfiguration>(); @@ -513,9 +508,9 @@ server1.start(); server0.start(); - ClientSessionFactory sf0 = new ClientSessionFactoryImpl(server0tc); + ClientSessionFactory sf0 = HornetQClient.createClientSessionFactory(server0tc); - ClientSessionFactory sf1 = new ClientSessionFactoryImpl(server1tc); + ClientSessionFactory sf1 = HornetQClient.createClientSessionFactory(server1tc); ClientSession session0 = sf0.createSession(false, true, true); @@ -620,7 +615,7 @@ true, false, 1024, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, connectorPair); List<BridgeConfiguration> bridgeConfigs = new ArrayList<BridgeConfiguration>(); @@ -640,9 +635,9 @@ server1.start(); server0.start(); - ClientSessionFactory sf0 = new ClientSessionFactoryImpl(server0tc); + ClientSessionFactory sf0 = HornetQClient.createClientSessionFactory(server0tc); - ClientSessionFactory sf1 = new ClientSessionFactoryImpl(server1tc); + ClientSessionFactory sf1 = HornetQClient.createClientSessionFactory(server1tc); ClientSession session0 = sf0.createSession(false, true, true); 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 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -22,12 +22,7 @@ import org.hornetq.api.Pair; import org.hornetq.api.SimpleString; -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.ClientSessionFactoryImpl; +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; @@ -117,7 +112,7 @@ true, true, 1024, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, "dg1"); List<BridgeConfiguration> bridgeConfigs = new ArrayList<BridgeConfiguration>(); @@ -137,9 +132,9 @@ server1.start(); server0.start(); - ClientSessionFactory sf0 = new ClientSessionFactoryImpl(server0tc); + ClientSessionFactory sf0 = HornetQClient.createClientSessionFactory(server0tc); - ClientSessionFactory sf1 = new ClientSessionFactoryImpl(server1tc); + ClientSessionFactory sf1 = HornetQClient.createClientSessionFactory(server1tc); ClientSession session0 = sf0.createSession(false, true, true); 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 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -26,12 +26,7 @@ import org.hornetq.api.Pair; import org.hornetq.api.SimpleString; -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.ClientSessionFactoryImpl; +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; @@ -1102,7 +1097,7 @@ serverTotc = new TransportConfiguration(ServiceTestBase.INVM_CONNECTOR_FACTORY, params); } - ClientSessionFactory sf = new ClientSessionFactoryImpl(serverTotc); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(serverTotc); sf.setBlockOnNonDurableSend(true); sf.setBlockOnDurableSend(true); @@ -1146,7 +1141,7 @@ } } - ClientSessionFactory sf = new ClientSessionFactoryImpl(serverTotc, serverBackuptc); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(serverTotc, serverBackuptc); sf.setFailoverOnServerShutdown(false); sf.setRetryInterval(100); 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 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -27,13 +27,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -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.ClientSessionFactoryImpl; -import org.hornetq.api.core.client.SessionFailureListener; +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; @@ -1377,7 +1371,7 @@ session.close(); - sf = new ClientSessionFactoryImpl(getConnectorTransportConfiguration(false)); + sf = (ClientSessionFactoryInternal) HornetQClient.createClientSessionFactory(getConnectorTransportConfiguration(false)); session = sendAndConsume(sf, false); 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 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -20,6 +20,7 @@ import org.hornetq.api.SimpleString; 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; @@ -227,8 +228,7 @@ protected ClientSessionFactoryInternal getSessionFactory() { - return new ClientSessionFactoryImpl(getConnectorTransportConfiguration(true), - getConnectorTransportConfiguration(false)); + return (ClientSessionFactoryInternal) HornetQClient.createClientSessionFactory(getConnectorTransportConfiguration(true), getConnectorTransportConfiguration(false)); } // Private ------------------------------------------------------- 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 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/LargeMessageFailoverTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -18,7 +18,7 @@ import org.hornetq.api.core.buffers.HornetQBuffer; import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.HornetQClient; import org.hornetq.tests.util.UnitTestCase; /** @@ -100,7 +100,7 @@ { HornetQBuffer buffer = message.getBodyBuffer(); - for (int j = 0; j < ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE * 3; j++) + for (int j = 0; j < HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE * 3; j++) { Assert.assertEquals(buffer.readByte(), UnitTestCase.getSamplebyte(j)); } @@ -113,7 +113,7 @@ @Override protected void setBody(final int i, final ClientMessage message) throws Exception { - message.setBodyInputStream(UnitTestCase.createFakeLargeStream(ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE * 3)); + message.setBodyInputStream(UnitTestCase.createFakeLargeStream(HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE * 3)); } // Private ------------------------------------------------------- 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 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/MultiThreadRandomReattachTestBase.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -23,13 +23,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -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.ClientSessionFactoryImpl; -import org.hornetq.api.core.client.MessageHandler; +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; @@ -1221,7 +1215,7 @@ @Override protected ClientSessionFactoryInternal createSessionFactory() { - final ClientSessionFactoryInternal sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + final ClientSessionFactoryInternal sf = (ClientSessionFactoryInternal) HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); sf.setReconnectAttempts(-1); sf.setConfirmationWindowSize(1024 * 1024); 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 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/NettyMultiThreadRandomReattachTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -14,6 +14,7 @@ package org.hornetq.tests.integration.cluster.reattach; 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; @@ -47,7 +48,7 @@ @Override protected ClientSessionFactoryInternal createSessionFactory() { - final ClientSessionFactoryInternal sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.integration.transports.netty.NettyConnectorFactory")); + final ClientSessionFactoryInternal sf = (ClientSessionFactoryInternal) HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.integration.transports.netty.NettyConnectorFactory")); sf.setReconnectAttempts(-1); sf.setConfirmationWindowSize(1024 * 1024); return sf; 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 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/RandomReattachTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -23,13 +23,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -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.ClientSessionFactoryImpl; -import org.hornetq.api.core.client.MessageHandler; +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; @@ -234,7 +228,7 @@ RandomReattachTest.log.info("####" + getName() + " iteration #" + its); start(); - ClientSessionFactoryImpl sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactoryImpl sf = (ClientSessionFactoryImpl) HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); sf.setReconnectAttempts(-1); sf.setConfirmationWindowSize(1024 * 1024); Modified: trunk/tests/src/org/hornetq/tests/integration/divert/DivertTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/divert/DivertTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/divert/DivertTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -19,12 +19,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -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.ClientSessionFactoryImpl; +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; @@ -76,7 +71,7 @@ messagingService.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(false, true, true); @@ -170,7 +165,7 @@ messagingService.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(false, true, true); @@ -302,7 +297,7 @@ messagingService.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(false, true, true); @@ -377,7 +372,7 @@ messagingService.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(false, true, true); @@ -494,7 +489,7 @@ messagingService.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(false, true, true); @@ -646,7 +641,7 @@ messagingService.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(false, true, true); @@ -787,7 +782,7 @@ messagingService.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(false, true, true); @@ -920,7 +915,7 @@ messagingService.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(false, true, true); @@ -1104,7 +1099,7 @@ messagingService.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(false, true, true); @@ -1266,7 +1261,7 @@ // Only the first and third should be deployed - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(false, true, true); Modified: trunk/tests/src/org/hornetq/tests/integration/divert/PersistentDivertTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/divert/PersistentDivertTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/divert/PersistentDivertTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -19,12 +19,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -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.ClientSessionFactoryImpl; +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; @@ -47,7 +42,7 @@ { private static final Logger log = Logger.getLogger(DivertTest.class); - final int minLargeMessageSize = ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE * 2; + final int minLargeMessageSize = HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE * 2; public void testPersistentDivert() throws Exception { @@ -109,7 +104,7 @@ messagingService.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); sf.setBlockOnAcknowledge(true); sf.setBlockOnNonDurableSend(true); @@ -312,7 +307,7 @@ messagingService.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); sf.setBlockOnAcknowledge(true); sf.setBlockOnNonDurableSend(true); @@ -364,7 +359,7 @@ messagingService.start(); - sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); sf.setBlockOnDurableSend(true); @@ -460,7 +455,7 @@ messagingService.start(); - sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); sf.setBlockOnDurableSend(true); Modified: trunk/tests/src/org/hornetq/tests/integration/http/CoreClientOverHttpTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/http/CoreClientOverHttpTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/http/CoreClientOverHttpTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -17,12 +17,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -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.ClientSessionFactoryImpl; +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; @@ -53,7 +48,7 @@ server.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(UnitTestCase.NETTY_CONNECTOR_FACTORY, + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(UnitTestCase.NETTY_CONNECTOR_FACTORY, params)); ClientSession session = sf.createSession(false, true, true); @@ -109,7 +104,7 @@ server.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(UnitTestCase.NETTY_CONNECTOR_FACTORY, + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(UnitTestCase.NETTY_CONNECTOR_FACTORY, params)); sf.setConnectionTTL(500); Modified: trunk/tests/src/org/hornetq/tests/integration/jms/FloodServerTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/FloodServerTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/jms/FloodServerTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -25,9 +25,9 @@ import javax.jms.Session; import org.hornetq.api.Pair; -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.jms.HornetQTopic; +import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; @@ -135,26 +135,26 @@ connectorConfigs, null, 1000, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL, + HornetQClient.DEFAULT_CONNECTION_TTL, callTimeout, - ClientSessionFactoryImpl.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT, - ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE, + HornetQClient.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, + HornetQClient.DEFAULT_CONSUMER_WINDOW_SIZE, + HornetQClient.DEFAULT_CONSUMER_MAX_RATE, + HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_MAX_RATE, false, false, false, - ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP, + HornetQClient.DEFAULT_AUTO_GROUP, false, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_USE_GLOBAL_POOLS, - ClientSessionFactoryImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_USE_GLOBAL_POOLS, + HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_THREAD_POOL_MAX_SIZE, retryInterval, retryIntervalMultiplier, 1000, @@ -230,7 +230,7 @@ session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); - producer = session.createProducer(new HornetQTopic("my-topic")); + producer = session.createProducer(HornetQJMSClient.createHornetQTopic("my-topic")); producer.setDeliveryMode(DeliveryMode.NON_PERSISTENT); @@ -285,7 +285,7 @@ session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); - consumer = session.createConsumer(new HornetQTopic("my-topic")); + consumer = session.createConsumer(HornetQJMSClient.createHornetQTopic("my-topic")); this.numMessages = numMessages; } Modified: trunk/tests/src/org/hornetq/tests/integration/jms/HornetQConnectionFactoryTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/HornetQConnectionFactoryTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/jms/HornetQConnectionFactoryTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -25,9 +25,10 @@ import org.hornetq.api.Pair; 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.jms.HornetQConnectionFactory; +import org.hornetq.jms.HornetQConnectionFactory; +import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; @@ -64,37 +65,37 @@ public void testDefaultConstructor() throws Exception { - HornetQConnectionFactory cf = new HornetQConnectionFactory(); + HornetQConnectionFactory cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(); assertFactoryParams(cf, null, null, 0, - ClientSessionFactoryImpl.DEFAULT_DISCOVERY_REFRESH_TIMEOUT, + HornetQClient.DEFAULT_DISCOVERY_REFRESH_TIMEOUT, null, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL, - ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP, - ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_USE_GLOBAL_POOLS, - ClientSessionFactoryImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL, - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER, - ClientSessionFactoryImpl.DEFAULT_RECONNECT_ATTEMPTS, - ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CONNECTION_TTL, + HornetQClient.DEFAULT_CALL_TIMEOUT, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, + HornetQClient.DEFAULT_CONSUMER_WINDOW_SIZE, + HornetQClient.DEFAULT_CONSUMER_MAX_RATE, + HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_MAX_RATE, + HornetQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE, + HornetQClient.DEFAULT_BLOCK_ON_DURABLE_SEND, + HornetQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, + HornetQClient.DEFAULT_AUTO_GROUP, + HornetQClient.DEFAULT_PRE_ACKNOWLEDGE, + HornetQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT, + HornetQClient.DEFAULT_USE_GLOBAL_POOLS, + HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_RETRY_INTERVAL, + HornetQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER, + HornetQClient.DEFAULT_RECONNECT_ATTEMPTS, + HornetQClient.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); Connection conn = null; try @@ -122,7 +123,7 @@ public void testDefaultConstructorAndSetConnectorPairs() throws Exception { - HornetQConnectionFactory cf = new HornetQConnectionFactory(); + HornetQConnectionFactory cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(); final List<Pair<TransportConfiguration, TransportConfiguration>> staticConnectors = new ArrayList<Pair<TransportConfiguration, TransportConfiguration>>(); Pair<TransportConfiguration, TransportConfiguration> pair0 = new Pair<TransportConfiguration, TransportConfiguration>(liveTC, backupTC); @@ -133,32 +134,32 @@ staticConnectors, null, 0, - ClientSessionFactoryImpl.DEFAULT_DISCOVERY_REFRESH_TIMEOUT, + HornetQClient.DEFAULT_DISCOVERY_REFRESH_TIMEOUT, null, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL, - ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP, - ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_USE_GLOBAL_POOLS, - ClientSessionFactoryImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL, - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER, - ClientSessionFactoryImpl.DEFAULT_RECONNECT_ATTEMPTS, - ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CONNECTION_TTL, + HornetQClient.DEFAULT_CALL_TIMEOUT, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, + HornetQClient.DEFAULT_CONSUMER_WINDOW_SIZE, + HornetQClient.DEFAULT_CONSUMER_MAX_RATE, + HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_MAX_RATE, + HornetQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE, + HornetQClient.DEFAULT_BLOCK_ON_DURABLE_SEND, + HornetQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, + HornetQClient.DEFAULT_AUTO_GROUP, + HornetQClient.DEFAULT_PRE_ACKNOWLEDGE, + HornetQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT, + HornetQClient.DEFAULT_USE_GLOBAL_POOLS, + HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_RETRY_INTERVAL, + HornetQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER, + HornetQClient.DEFAULT_RECONNECT_ATTEMPTS, + HornetQClient.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); Connection conn = cf.createConnection(); @@ -171,37 +172,37 @@ public void testDiscoveryConstructor() throws Exception { - HornetQConnectionFactory cf = new HornetQConnectionFactory(groupAddress, groupPort); + HornetQConnectionFactory cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(groupAddress, groupPort); assertFactoryParams(cf, null, groupAddress, groupPort, - ClientSessionFactoryImpl.DEFAULT_DISCOVERY_REFRESH_TIMEOUT, + HornetQClient.DEFAULT_DISCOVERY_REFRESH_TIMEOUT, null, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL, - ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP, - ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_USE_GLOBAL_POOLS, - ClientSessionFactoryImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL, - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER, - ClientSessionFactoryImpl.DEFAULT_RECONNECT_ATTEMPTS, - ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CONNECTION_TTL, + HornetQClient.DEFAULT_CALL_TIMEOUT, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, + HornetQClient.DEFAULT_CONSUMER_WINDOW_SIZE, + HornetQClient.DEFAULT_CONSUMER_MAX_RATE, + HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_MAX_RATE, + HornetQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE, + HornetQClient.DEFAULT_BLOCK_ON_DURABLE_SEND, + HornetQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, + HornetQClient.DEFAULT_AUTO_GROUP, + HornetQClient.DEFAULT_PRE_ACKNOWLEDGE, + HornetQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT, + HornetQClient.DEFAULT_USE_GLOBAL_POOLS, + HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_RETRY_INTERVAL, + HornetQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER, + HornetQClient.DEFAULT_RECONNECT_ATTEMPTS, + HornetQClient.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); Connection conn = cf.createConnection(); Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); @@ -218,37 +219,37 @@ backupTC); staticConnectors.add(pair0); - HornetQConnectionFactory cf = new HornetQConnectionFactory(staticConnectors); + HornetQConnectionFactory cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(staticConnectors); assertFactoryParams(cf, staticConnectors, null, 0, - ClientSessionFactoryImpl.DEFAULT_DISCOVERY_REFRESH_TIMEOUT, + HornetQClient.DEFAULT_DISCOVERY_REFRESH_TIMEOUT, null, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL, - ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP, - ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_USE_GLOBAL_POOLS, - ClientSessionFactoryImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL, - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER, - ClientSessionFactoryImpl.DEFAULT_RECONNECT_ATTEMPTS, - ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CONNECTION_TTL, + HornetQClient.DEFAULT_CALL_TIMEOUT, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, + HornetQClient.DEFAULT_CONSUMER_WINDOW_SIZE, + HornetQClient.DEFAULT_CONSUMER_MAX_RATE, + HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_MAX_RATE, + HornetQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE, + HornetQClient.DEFAULT_BLOCK_ON_DURABLE_SEND, + HornetQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, + HornetQClient.DEFAULT_AUTO_GROUP, + HornetQClient.DEFAULT_PRE_ACKNOWLEDGE, + HornetQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT, + HornetQClient.DEFAULT_USE_GLOBAL_POOLS, + HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_RETRY_INTERVAL, + HornetQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER, + HornetQClient.DEFAULT_RECONNECT_ATTEMPTS, + HornetQClient.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); Connection conn = cf.createConnection(); Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); @@ -266,37 +267,37 @@ backupTC); staticConnectors.add(pair0); - HornetQConnectionFactory cf = new HornetQConnectionFactory(liveTC, backupTC); + HornetQConnectionFactory cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(liveTC, backupTC); assertFactoryParams(cf, staticConnectors, null, 0, - ClientSessionFactoryImpl.DEFAULT_DISCOVERY_REFRESH_TIMEOUT, + HornetQClient.DEFAULT_DISCOVERY_REFRESH_TIMEOUT, null, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL, - ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP, - ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_USE_GLOBAL_POOLS, - ClientSessionFactoryImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL, - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER, - ClientSessionFactoryImpl.DEFAULT_RECONNECT_ATTEMPTS, - ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CONNECTION_TTL, + HornetQClient.DEFAULT_CALL_TIMEOUT, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, + HornetQClient.DEFAULT_CONSUMER_WINDOW_SIZE, + HornetQClient.DEFAULT_CONSUMER_MAX_RATE, + HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_MAX_RATE, + HornetQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE, + HornetQClient.DEFAULT_BLOCK_ON_DURABLE_SEND, + HornetQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, + HornetQClient.DEFAULT_AUTO_GROUP, + HornetQClient.DEFAULT_PRE_ACKNOWLEDGE, + HornetQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT, + HornetQClient.DEFAULT_USE_GLOBAL_POOLS, + HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_RETRY_INTERVAL, + HornetQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER, + HornetQClient.DEFAULT_RECONNECT_ATTEMPTS, + HornetQClient.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); Connection conn = cf.createConnection(); Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); @@ -314,37 +315,37 @@ null); staticConnectors.add(pair0); - HornetQConnectionFactory cf = new HornetQConnectionFactory(liveTC); + HornetQConnectionFactory cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(liveTC); assertFactoryParams(cf, staticConnectors, null, 0, - ClientSessionFactoryImpl.DEFAULT_DISCOVERY_REFRESH_TIMEOUT, + HornetQClient.DEFAULT_DISCOVERY_REFRESH_TIMEOUT, null, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL, - ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP, - ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_USE_GLOBAL_POOLS, - ClientSessionFactoryImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL, - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER, - ClientSessionFactoryImpl.DEFAULT_RECONNECT_ATTEMPTS, - ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CONNECTION_TTL, + HornetQClient.DEFAULT_CALL_TIMEOUT, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, + HornetQClient.DEFAULT_CONSUMER_WINDOW_SIZE, + HornetQClient.DEFAULT_CONSUMER_MAX_RATE, + HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_MAX_RATE, + HornetQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE, + HornetQClient.DEFAULT_BLOCK_ON_DURABLE_SEND, + HornetQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, + HornetQClient.DEFAULT_AUTO_GROUP, + HornetQClient.DEFAULT_PRE_ACKNOWLEDGE, + HornetQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT, + HornetQClient.DEFAULT_USE_GLOBAL_POOLS, + HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_RETRY_INTERVAL, + HornetQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER, + HornetQClient.DEFAULT_RECONNECT_ATTEMPTS, + HornetQClient.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); Connection conn = cf.createConnection(); Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); @@ -356,13 +357,13 @@ public void testGettersAndSetters() { - ClientSessionFactory csf = new ClientSessionFactoryImpl(); + ClientSessionFactory csf = HornetQClient.createClientSessionFactory(); List<Pair<TransportConfiguration, TransportConfiguration>> staticConnectors = new ArrayList<Pair<TransportConfiguration, TransportConfiguration>>(); Pair<TransportConfiguration, TransportConfiguration> pair0 = new Pair<TransportConfiguration, TransportConfiguration>(liveTC, backupTC); staticConnectors.add(pair0); - HornetQConnectionFactory cf = new HornetQConnectionFactory(csf); + HornetQConnectionFactory cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(csf); String discoveryAddress = RandomUtil.randomString(); int discoveryPort = RandomUtil.randomPositiveInt(); 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 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/jms/bridge/BridgeTestBase.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -36,7 +36,8 @@ import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.management.ResourceNames; -import org.hornetq.api.jms.HornetQConnectionFactory; +import org.hornetq.jms.HornetQConnectionFactory; +import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.api.jms.management.JMSQueueControl; import org.hornetq.api.jms.management.TopicControl; import org.hornetq.core.config.Configuration; @@ -202,7 +203,7 @@ { public ConnectionFactory createConnectionFactory() throws Exception { - HornetQConnectionFactory cf = new HornetQConnectionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); + HornetQConnectionFactory cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); // Note! We disable automatic reconnection on the session factory. The bridge needs to do the reconnection cf.setReconnectAttempts(0); @@ -222,7 +223,7 @@ public ConnectionFactory createConnectionFactory() throws Exception { - HornetQConnectionFactory cf = new HornetQConnectionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName(), + HornetQConnectionFactory cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName(), params1)); // Note! We disable automatic reconnection on the session factory. The bridge needs to do the reconnection 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 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/jms/client/PreACKJMSTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -25,7 +25,7 @@ import junit.framework.Assert; import org.hornetq.api.Pair; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.HornetQClient; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.tests.util.JMSTestBase; @@ -201,30 +201,30 @@ jmsServer.createConnectionFactory("ManualReconnectionToSingleServerTest", connectorConfigs, null, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CONNECTION_TTL, callTimeout, - ClientSessionFactoryImpl.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT, - ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP, + HornetQClient.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, + HornetQClient.DEFAULT_CONSUMER_WINDOW_SIZE, + HornetQClient.DEFAULT_CONSUMER_MAX_RATE, + HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_MAX_RATE, + HornetQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE, + HornetQClient.DEFAULT_BLOCK_ON_DURABLE_SEND, + HornetQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, + HornetQClient.DEFAULT_AUTO_GROUP, true, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_USE_GLOBAL_POOLS, - ClientSessionFactoryImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_USE_GLOBAL_POOLS, + HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_THREAD_POOL_MAX_SIZE, retryInterval, retryIntervalMultiplier, - ClientSessionFactoryImpl.DEFAULT_MAX_RETRY_INTERVAL, + HornetQClient.DEFAULT_MAX_RETRY_INTERVAL, reconnectAttempts, failoverOnServerShutdown, null, 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 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/jms/client/ReSendLargeMessageTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -31,7 +31,7 @@ import junit.framework.Assert; import org.hornetq.api.Pair; -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.jms.HornetQMessageConstants; import org.hornetq.tests.util.JMSTestBase; @@ -73,7 +73,7 @@ { BytesMessage bm = sess.createBytesMessage(); bm.setObjectProperty(HornetQMessageConstants.JMS_HORNETQ_INPUT_STREAM, - UnitTestCase.createFakeLargeStream(2 * ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE)); + UnitTestCase.createFakeLargeStream(2 * HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE)); msgs.add(bm); MapMessage mm = sess.createMapMessage(); @@ -247,30 +247,30 @@ jmsServer.createConnectionFactory("ManualReconnectionToSingleServerTest", connectorConfigs, null, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CONNECTION_TTL, callTimeout, true, - ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP, - ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_USE_GLOBAL_POOLS, - ClientSessionFactoryImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, + HornetQClient.DEFAULT_CONSUMER_WINDOW_SIZE, + HornetQClient.DEFAULT_CONSUMER_MAX_RATE, + HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_MAX_RATE, + HornetQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE, + HornetQClient.DEFAULT_BLOCK_ON_DURABLE_SEND, + HornetQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, + HornetQClient.DEFAULT_AUTO_GROUP, + HornetQClient.DEFAULT_PRE_ACKNOWLEDGE, + HornetQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_USE_GLOBAL_POOLS, + HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_THREAD_POOL_MAX_SIZE, retryInterval, retryIntervalMultiplier, - ClientSessionFactoryImpl.DEFAULT_MAX_RETRY_INTERVAL, + HornetQClient.DEFAULT_MAX_RETRY_INTERVAL, reconnectAttempts, failoverOnServerShutdown, null, 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 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/jms/client/SessionClosedOnRemotingConnectionFailureTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -27,7 +27,7 @@ import junit.framework.Assert; import org.hornetq.api.Pair; -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.client.impl.ClientSessionInternal; @@ -71,30 +71,30 @@ jmsServer.createConnectionFactory("cffoo", connectorConfigs, null, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL, - ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT, - ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP, - ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_USE_GLOBAL_POOLS, - ClientSessionFactoryImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL, - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER, - ClientSessionFactoryImpl.DEFAULT_MAX_RETRY_INTERVAL, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CONNECTION_TTL, + HornetQClient.DEFAULT_CALL_TIMEOUT, + HornetQClient.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, + HornetQClient.DEFAULT_CONSUMER_WINDOW_SIZE, + HornetQClient.DEFAULT_CONSUMER_MAX_RATE, + HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_MAX_RATE, + HornetQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE, + HornetQClient.DEFAULT_BLOCK_ON_DURABLE_SEND, + HornetQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, + HornetQClient.DEFAULT_AUTO_GROUP, + HornetQClient.DEFAULT_PRE_ACKNOWLEDGE, + HornetQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_USE_GLOBAL_POOLS, + HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_RETRY_INTERVAL, + HornetQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER, + HornetQClient.DEFAULT_MAX_RETRY_INTERVAL, 0, false, null, 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 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/jms/client/TextMessageTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -25,7 +25,7 @@ import junit.framework.Assert; import org.hornetq.api.Pair; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +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; @@ -230,30 +230,30 @@ jmsServer.createConnectionFactory("ManualReconnectionToSingleServerTest", connectorConfigs, null, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CONNECTION_TTL, callTimeout, - ClientSessionFactoryImpl.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT, - ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP, - ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_USE_GLOBAL_POOLS, - ClientSessionFactoryImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, + HornetQClient.DEFAULT_CONSUMER_WINDOW_SIZE, + HornetQClient.DEFAULT_CONSUMER_MAX_RATE, + HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_MAX_RATE, + HornetQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE, + HornetQClient.DEFAULT_BLOCK_ON_DURABLE_SEND, + HornetQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, + HornetQClient.DEFAULT_AUTO_GROUP, + HornetQClient.DEFAULT_PRE_ACKNOWLEDGE, + HornetQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_USE_GLOBAL_POOLS, + HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_THREAD_POOL_MAX_SIZE, retryInterval, retryIntervalMultiplier, - ClientSessionFactoryImpl.DEFAULT_MAX_RETRY_INTERVAL, + HornetQClient.DEFAULT_MAX_RETRY_INTERVAL, reconnectAttempts, failoverOnServerShutdown, null, 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 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSFailoverTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -33,8 +33,9 @@ import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.jms.HornetQConnectionFactory; -import org.hornetq.api.jms.HornetQQueue; +import org.hornetq.jms.HornetQConnectionFactory; +import org.hornetq.api.jms.HornetQJMSClient; +import org.hornetq.jms.HornetQQueue; import org.hornetq.core.client.impl.ClientSessionInternal; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; @@ -83,7 +84,7 @@ public void testAutomaticFailover() throws Exception { - HornetQConnectionFactory jbcf = new HornetQConnectionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory"), + HornetQConnectionFactory jbcf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory"), new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory", backupParams)); @@ -169,12 +170,12 @@ public void testManualFailover() throws Exception { - HornetQConnectionFactory jbcfLive = new HornetQConnectionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + HornetQConnectionFactory jbcfLive = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); jbcfLive.setBlockOnNonDurableSend(true); jbcfLive.setBlockOnDurableSend(true); - HornetQConnectionFactory jbcfBackup = new HornetQConnectionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory", + HornetQConnectionFactory jbcfBackup = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory", backupParams)); jbcfBackup.setBlockOnNonDurableSend(true); jbcfBackup.setBlockOnDurableSend(true); 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 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSReconnectTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -32,9 +32,10 @@ import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.jms.HornetQConnectionFactory; -import org.hornetq.api.jms.HornetQQueue; -import org.hornetq.api.jms.HornetQTopic; +import org.hornetq.jms.HornetQConnectionFactory; +import org.hornetq.api.jms.HornetQJMSClient; +import org.hornetq.jms.HornetQQueue; +import org.hornetq.jms.HornetQTopic; import org.hornetq.core.client.impl.ClientSessionInternal; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; @@ -85,7 +86,7 @@ private void testReconnectOrReattachSameNode(boolean reattach) throws Exception { - HornetQConnectionFactory jbcf = new HornetQConnectionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + HornetQConnectionFactory jbcf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); jbcf.setBlockOnDurableSend(true); jbcf.setBlockOnNonDurableSend(true); @@ -189,7 +190,7 @@ //Test that non durable JMS sub gets recreated in auto reconnect private void testReconnectSameNodeServerRestartedWithNonDurableSubOrTempQueue(final boolean durableSub) throws Exception { - HornetQConnectionFactory jbcf = new HornetQConnectionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + HornetQConnectionFactory jbcf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); jbcf.setReconnectAttempts(-1); @@ -209,7 +210,7 @@ { coreSession.createQueue(HornetQTopic.JMS_TOPIC_ADDRESS_PREFIX + "mytopic", "blahblah", null, false); - dest = new HornetQTopic("mytopic"); + dest = HornetQJMSClient.createHornetQTopic("mytopic"); } else { @@ -266,7 +267,7 @@ //If the server is shutdown after a non durable sub is created, then close on the connection should proceed normally public void testNoReconnectCloseAfterFailToReconnectWithTopicConsumer() throws Exception { - HornetQConnectionFactory jbcf = new HornetQConnectionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + HornetQConnectionFactory jbcf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); jbcf.setReconnectAttempts(0); @@ -278,7 +279,7 @@ coreSession.createQueue(HornetQTopic.JMS_TOPIC_ADDRESS_PREFIX + "mytopic", "blahblah", null, false); - Topic topic = new HornetQTopic("mytopic"); + Topic topic = HornetQJMSClient.createHornetQTopic("mytopic"); //Create a non durable subscriber MessageConsumer consumer = sess.createConsumer(topic); @@ -297,7 +298,7 @@ //If server is shutdown, and then connection is closed, after a temp queue has been created, the close should complete normally public void testNoReconnectCloseAfterFailToReconnectWithTempQueue() throws Exception { - HornetQConnectionFactory jbcf = new HornetQConnectionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + HornetQConnectionFactory jbcf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); jbcf.setReconnectAttempts(0); 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 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/jms/connection/CloseConnectionOnGCTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -23,7 +23,8 @@ import junit.framework.Assert; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.jms.HornetQConnectionFactory; +import org.hornetq.jms.HornetQConnectionFactory; +import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.CloseListener; import org.hornetq.core.remoting.RemotingConnection; @@ -49,7 +50,7 @@ { super.setUp(); - cf = new HornetQConnectionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); cf.setBlockOnDurableSend(true); cf.setPreAcknowledge(true); } 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 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/jms/connection/CloseDestroyedConnectionTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -23,8 +23,8 @@ import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.jms.HornetQConnectionFactory; -import org.hornetq.api.jms.HornetQQueue; +import org.hornetq.jms.HornetQConnectionFactory; +import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.core.client.impl.ClientSessionInternal; import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.RemotingConnection; @@ -50,7 +50,7 @@ { super.setUp(); - cf = new HornetQConnectionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); cf.setBlockOnDurableSend(true); cf.setPreAcknowledge(true); } @@ -84,7 +84,7 @@ String queueName = "myqueue"; - Queue queue = new HornetQQueue(queueName); + Queue queue = HornetQJMSClient.createHornetQQueue(queueName); super.createQueue(queueName); 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 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/jms/connection/ExceptionListenerTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -24,7 +24,8 @@ import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.jms.HornetQConnectionFactory; +import org.hornetq.jms.HornetQConnectionFactory; +import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.core.client.impl.ClientSessionInternal; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; @@ -69,7 +70,7 @@ jmsServer.setContext(new NullInitialContext()); jmsServer.start(); jmsServer.createQueue(ExceptionListenerTest.Q_NAME, ExceptionListenerTest.Q_NAME, null, true); - cf = new HornetQConnectionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); cf.setBlockOnDurableSend(true); cf.setPreAcknowledge(true); } 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 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/jms/consumer/ConsumerTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -25,8 +25,9 @@ import org.hornetq.api.SimpleString; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.jms.HornetQConnectionFactory; -import org.hornetq.api.jms.HornetQQueue; +import org.hornetq.jms.HornetQConnectionFactory; +import org.hornetq.api.jms.HornetQJMSClient; +import org.hornetq.jms.HornetQQueue; import org.hornetq.core.logging.Logger; import org.hornetq.core.server.Queue; import org.hornetq.jms.client.HornetQSession; @@ -49,7 +50,7 @@ super.setUp(); jmsServer.createQueue(ConsumerTest.Q_NAME, ConsumerTest.Q_NAME, null, true); - cf = new HornetQConnectionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + cf = HornetQJMSClient.createConnectionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); } @Override @@ -64,7 +65,7 @@ { Connection conn = cf.createConnection(); Session session = conn.createSession(false, HornetQSession.PRE_ACKNOWLEDGE); - jBossQueue = new HornetQQueue(ConsumerTest.Q_NAME); + jBossQueue = (HornetQQueue) HornetQJMSClient.createHornetQQueue(ConsumerTest.Q_NAME); MessageProducer producer = session.createProducer(jBossQueue); MessageConsumer consumer = session.createConsumer(jBossQueue); int noOfMessages = 100; @@ -92,7 +93,7 @@ Connection conn = cf.createConnection(); Session session = conn.createSession(false, Session.CLIENT_ACKNOWLEDGE); - jBossQueue = new HornetQQueue(ConsumerTest.Q_NAME); + jBossQueue = (HornetQQueue) HornetQJMSClient.createHornetQQueue(ConsumerTest.Q_NAME); MessageProducer producer = session.createProducer(jBossQueue); MessageConsumer consumer = session.createConsumer(jBossQueue); int noOfMessages = 100; @@ -121,7 +122,7 @@ Connection conn = cf.createConnection(); Session session = conn.createSession(false, HornetQSession.PRE_ACKNOWLEDGE); - jBossQueue = new HornetQQueue(ConsumerTest.Q_NAME); + jBossQueue = (HornetQQueue) HornetQJMSClient.createHornetQQueue(ConsumerTest.Q_NAME); MessageProducer producer = session.createProducer(jBossQueue); MessageConsumer consumer = session.createConsumer(jBossQueue); int noOfMessages = 1000; @@ -151,7 +152,7 @@ ((HornetQConnectionFactory)cf).setPreAcknowledge(true); Connection conn = cf.createConnection(); Session session = conn.createSession(false, Session.CLIENT_ACKNOWLEDGE); - jBossQueue = new HornetQQueue(ConsumerTest.Q_NAME); + jBossQueue = (HornetQQueue) HornetQJMSClient.createHornetQQueue(ConsumerTest.Q_NAME); MessageProducer producer = session.createProducer(jBossQueue); MessageConsumer consumer = session.createConsumer(jBossQueue); int noOfMessages = 1000; @@ -179,7 +180,7 @@ { Connection conn = cf.createConnection(); Session session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); - jBossQueue = new HornetQQueue(ConsumerTest.Q_NAME); + jBossQueue = (HornetQQueue) HornetQJMSClient.createHornetQQueue(ConsumerTest.Q_NAME); MessageConsumer consumer = session.createConsumer(jBossQueue); consumer.setMessageListener(new MessageListener() { @@ -198,7 +199,7 @@ { Connection conn = cf.createConnection(); Session session = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); - jBossQueue = new HornetQQueue(ConsumerTest.Q_NAME); + jBossQueue = (HornetQQueue) HornetQJMSClient.createHornetQQueue(ConsumerTest.Q_NAME); MessageConsumer consumer = session.createConsumer(jBossQueue); consumer.setMessageListener(new MessageListener() { 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 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/jms/divert/DivertAndACKClientTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -25,9 +25,9 @@ import junit.framework.Assert; import org.hornetq.api.Pair; -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.jms.HornetQQueue; +import org.hornetq.jms.HornetQQueue; import org.hornetq.core.config.Configuration; import org.hornetq.core.server.cluster.DivertConfiguration; import org.hornetq.tests.util.JMSTestBase; @@ -147,30 +147,30 @@ jmsServer.createConnectionFactory("ManualReconnectionToSingleServerTest", connectorConfigs, null, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CONNECTION_TTL, callTimeout, - ClientSessionFactoryImpl.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT, - ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE, + HornetQClient.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, + HornetQClient.DEFAULT_CONSUMER_WINDOW_SIZE, + HornetQClient.DEFAULT_CONSUMER_MAX_RATE, + HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_MAX_RATE, true, // this test needs to block on ACK - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP, - ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_USE_GLOBAL_POOLS, - ClientSessionFactoryImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_BLOCK_ON_DURABLE_SEND, + HornetQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, + HornetQClient.DEFAULT_AUTO_GROUP, + HornetQClient.DEFAULT_PRE_ACKNOWLEDGE, + HornetQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_USE_GLOBAL_POOLS, + HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_THREAD_POOL_MAX_SIZE, retryInterval, retryIntervalMultiplier, - ClientSessionFactoryImpl.DEFAULT_MAX_RETRY_INTERVAL, + HornetQClient.DEFAULT_MAX_RETRY_INTERVAL, reconnectAttempts, failoverOnServerShutdown, null, 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 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerDeployerTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -22,7 +22,7 @@ import junit.framework.Assert; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.jms.HornetQConnectionFactory; +import org.hornetq.jms.HornetQConnectionFactory; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.deployers.DeploymentManager; 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 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerStartStopTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -23,7 +23,8 @@ import junit.framework.Assert; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.jms.HornetQConnectionFactory; +import org.hornetq.jms.HornetQConnectionFactory; +import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.core.config.impl.FileConfiguration; import org.hornetq.core.logging.Logger; import org.hornetq.core.server.HornetQServer; @@ -69,7 +70,7 @@ start(); - HornetQConnectionFactory jbcf = new HornetQConnectionFactory(new TransportConfiguration(NettyConnectorFactory.class.getCanonicalName())); + HornetQConnectionFactory jbcf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(new TransportConfiguration(NettyConnectorFactory.class.getCanonicalName())); jbcf.setBlockOnDurableSend(true); jbcf.setBlockOnNonDurableSend(true); @@ -96,7 +97,7 @@ start(); - HornetQConnectionFactory jbcf = new HornetQConnectionFactory(new TransportConfiguration(NettyConnectorFactory.class.getCanonicalName())); + HornetQConnectionFactory jbcf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(new TransportConfiguration(NettyConnectorFactory.class.getCanonicalName())); jbcf.setBlockOnDurableSend(true); jbcf.setBlockOnNonDurableSend(true); 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 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSQueueControlTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -29,8 +29,9 @@ import org.hornetq.api.SimpleString; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.jms.HornetQConnectionFactory; -import org.hornetq.api.jms.HornetQQueue; +import org.hornetq.jms.HornetQConnectionFactory; +import org.hornetq.api.jms.HornetQJMSClient; +import org.hornetq.jms.HornetQQueue; import org.hornetq.api.jms.management.JMSQueueControl; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; @@ -415,7 +416,7 @@ { JMSQueueControl queueControl = createManagementControl(); String expiryQueueName = RandomUtil.randomString(); - HornetQQueue expiryQueue = new HornetQQueue(expiryQueueName); + HornetQQueue expiryQueue = (HornetQQueue) HornetQJMSClient.createHornetQQueue(expiryQueueName); serverManager.createQueue(expiryQueueName, expiryQueueName, null, true); queueControl.setExpiryAddress(expiryQueue.getAddress()); @@ -544,7 +545,7 @@ { String deadLetterQueue = RandomUtil.randomString(); serverManager.createQueue(deadLetterQueue, deadLetterQueue, null, true); - HornetQQueue dlq = new HornetQQueue(deadLetterQueue); + HornetQQueue dlq = (HornetQQueue) HornetQJMSClient.createHornetQQueue(deadLetterQueue); Connection conn = createConnection(); Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); @@ -605,7 +606,7 @@ String deadLetterQueue = RandomUtil.randomString(); serverManager.createQueue(deadLetterQueue, deadLetterQueue, null, true); - HornetQQueue dlq = new HornetQQueue(deadLetterQueue); + HornetQQueue dlq = (HornetQQueue) HornetQJMSClient.createHornetQQueue(deadLetterQueue); Connection conn = createConnection(); Session sess = conn.createSession(false, Session.AUTO_ACKNOWLEDGE); @@ -647,7 +648,7 @@ String otherQueueName = RandomUtil.randomString(); serverManager.createQueue(otherQueueName, otherQueueName, null, true); - HornetQQueue otherQueue = new HornetQQueue(otherQueueName); + HornetQQueue otherQueue = (HornetQQueue) HornetQJMSClient.createHornetQQueue(otherQueueName); // send on queue JMSUtil.sendMessages(queue, 2); @@ -694,7 +695,7 @@ String otherQueueName = RandomUtil.randomString(); serverManager.createQueue(otherQueueName, otherQueueName, null, true); - HornetQQueue otherQueue = new HornetQQueue(otherQueueName); + HornetQQueue otherQueue = (HornetQQueue) HornetQJMSClient.createHornetQQueue(otherQueueName); Connection connection = JMSUtil.createConnection(InVMConnectorFactory.class.getName()); Session session = connection.createSession(false, Session.AUTO_ACKNOWLEDGE); @@ -729,7 +730,7 @@ String otherQueueName = RandomUtil.randomString(); serverManager.createQueue(otherQueueName, otherQueueName, null, true); - HornetQQueue otherQueue = new HornetQQueue(otherQueueName); + HornetQQueue otherQueue = (HornetQQueue) HornetQJMSClient.createHornetQQueue(otherQueueName); String[] messageIDs = JMSUtil.sendMessages(queue, 1); @@ -833,7 +834,7 @@ String queueName = RandomUtil.randomString(); serverManager.createQueue(queueName, queueName, null, true); - queue = new HornetQQueue(queueName); + queue = (HornetQQueue) HornetQJMSClient.createHornetQQueue(queueName); } @Override @@ -865,7 +866,7 @@ private Connection createConnection() throws JMSException { - HornetQConnectionFactory cf = new HornetQConnectionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); + HornetQConnectionFactory cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); cf.setBlockOnDurableSend(true); 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 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -21,8 +21,9 @@ import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.management.ResourceNames; -import org.hornetq.api.jms.HornetQConnectionFactory; -import org.hornetq.api.jms.HornetQQueue; +import org.hornetq.jms.HornetQConnectionFactory; +import org.hornetq.api.jms.HornetQJMSClient; +import org.hornetq.jms.HornetQQueue; import org.hornetq.api.jms.management.JMSQueueControl; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; @@ -56,7 +57,7 @@ { super.setUp(); - HornetQConnectionFactory cf = new HornetQConnectionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); + HornetQConnectionFactory cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); connection = cf.createQueueConnection(); session = connection.createQueueSession(false, Session.AUTO_ACKNOWLEDGE); connection.start(); @@ -77,7 +78,7 @@ @Override protected JMSQueueControl createManagementControl() throws Exception { - HornetQQueue managementQueue = new HornetQQueue(ConfigurationImpl.DEFAULT_MANAGEMENT_ADDRESS.toString(), + HornetQQueue managementQueue = (HornetQQueue) HornetQJMSClient.createHornetQQueue(ConfigurationImpl.DEFAULT_MANAGEMENT_ADDRESS.toString(), ConfigurationImpl.DEFAULT_MANAGEMENT_ADDRESS.toString()); final JMSMessagingProxy proxy = new JMSMessagingProxy(session, managementQueue, 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 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -22,7 +22,7 @@ import junit.framework.Assert; -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.ObjectNameBuilder; import org.hornetq.api.jms.management.JMSServerControl; @@ -452,32 +452,32 @@ new Object[] { tcBackup.getFactoryClassName() }, new Object[] { tcBackup.getParams() }, clientID, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL, - ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT, - ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP, - ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_USE_GLOBAL_POOLS, - ClientSessionFactoryImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL, - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER, - ClientSessionFactoryImpl.DEFAULT_MAX_RETRY_INTERVAL, - ClientSessionFactoryImpl.DEFAULT_RECONNECT_ATTEMPTS, - ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CONNECTION_TTL, + HornetQClient.DEFAULT_CALL_TIMEOUT, + HornetQClient.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, + HornetQClient.DEFAULT_CONSUMER_WINDOW_SIZE, + HornetQClient.DEFAULT_CONSUMER_MAX_RATE, + HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_MAX_RATE, + HornetQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE, + HornetQClient.DEFAULT_BLOCK_ON_DURABLE_SEND, + HornetQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, + HornetQClient.DEFAULT_AUTO_GROUP, + HornetQClient.DEFAULT_PRE_ACKNOWLEDGE, + HornetQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_USE_GLOBAL_POOLS, + HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_RETRY_INTERVAL, + HornetQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER, + HornetQClient.DEFAULT_MAX_RETRY_INTERVAL, + HornetQClient.DEFAULT_RECONNECT_ATTEMPTS, + HornetQClient.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN, null, bindings); } @@ -501,32 +501,32 @@ InVMConnectorFactory.class.getName(), TransportConstants.SERVER_ID_PROP_NAME + "=1", clientID, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL, - ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT, - ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP, - ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_USE_GLOBAL_POOLS, - ClientSessionFactoryImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL, - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER, - ClientSessionFactoryImpl.DEFAULT_MAX_RETRY_INTERVAL, - ClientSessionFactoryImpl.DEFAULT_RECONNECT_ATTEMPTS, - ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CONNECTION_TTL, + HornetQClient.DEFAULT_CALL_TIMEOUT, + HornetQClient.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, + HornetQClient.DEFAULT_CONSUMER_WINDOW_SIZE, + HornetQClient.DEFAULT_CONSUMER_MAX_RATE, + HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_MAX_RATE, + HornetQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE, + HornetQClient.DEFAULT_BLOCK_ON_DURABLE_SEND, + HornetQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, + HornetQClient.DEFAULT_AUTO_GROUP, + HornetQClient.DEFAULT_PRE_ACKNOWLEDGE, + HornetQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_USE_GLOBAL_POOLS, + HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_RETRY_INTERVAL, + HornetQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER, + HornetQClient.DEFAULT_MAX_RETRY_INTERVAL, + HornetQClient.DEFAULT_RECONNECT_ATTEMPTS, + HornetQClient.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN, null, jndiBindings); } 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 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -21,8 +21,9 @@ import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.management.ResourceNames; -import org.hornetq.api.jms.HornetQConnectionFactory; -import org.hornetq.api.jms.HornetQQueue; +import org.hornetq.jms.HornetQConnectionFactory; +import org.hornetq.api.jms.HornetQJMSClient; +import org.hornetq.jms.HornetQQueue; import org.hornetq.api.jms.management.JMSServerControl; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; @@ -64,7 +65,7 @@ { super.setUp(); - HornetQConnectionFactory cf = new HornetQConnectionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); + HornetQConnectionFactory cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); connection = cf.createQueueConnection(); session = connection.createQueueSession(false, Session.AUTO_ACKNOWLEDGE); connection.start(); @@ -85,7 +86,7 @@ @Override protected JMSServerControl createManagementControl() throws Exception { - HornetQQueue managementQueue = new HornetQQueue(ConfigurationImpl.DEFAULT_MANAGEMENT_ADDRESS.toString(), + HornetQQueue managementQueue = (HornetQQueue) HornetQJMSClient.createHornetQQueue(ConfigurationImpl.DEFAULT_MANAGEMENT_ADDRESS.toString(), ConfigurationImpl.DEFAULT_MANAGEMENT_ADDRESS.toString()); final JMSMessagingProxy proxy = new JMSMessagingProxy(session, managementQueue, ResourceNames.JMS_SERVER); 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 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSUtil.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -27,7 +27,8 @@ import junit.framework.Assert; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.jms.HornetQConnectionFactory; +import org.hornetq.jms.HornetQConnectionFactory; +import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.tests.util.RandomUtil; @@ -51,7 +52,7 @@ public static Connection createConnection(final String connectorFactory) throws JMSException { - HornetQConnectionFactory cf = new HornetQConnectionFactory(new TransportConfiguration(connectorFactory)); + HornetQConnectionFactory cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(new TransportConfiguration(connectorFactory)); cf.setBlockOnNonDurableSend(true); cf.setBlockOnDurableSend(true); @@ -64,7 +65,7 @@ final long connectionTTL, final long clientFailureCheckPeriod) throws JMSException { - HornetQConnectionFactory cf = new HornetQConnectionFactory(new TransportConfiguration(connectorFactory)); + HornetQConnectionFactory cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(new TransportConfiguration(connectorFactory)); cf.setBlockOnNonDurableSend(true); cf.setBlockOnDurableSend(true); @@ -102,7 +103,7 @@ public static String[] sendMessages(final Destination destination, final int messagesToSend) throws Exception { - HornetQConnectionFactory cf = new HornetQConnectionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); + HornetQConnectionFactory cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); return JMSUtil.sendMessages(cf, destination, messagesToSend); } 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 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/TopicControlTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -22,7 +22,8 @@ import junit.framework.Assert; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.jms.HornetQTopic; +import org.hornetq.api.jms.HornetQJMSClient; +import org.hornetq.jms.HornetQTopic; import org.hornetq.api.jms.management.SubscriptionInfo; import org.hornetq.api.jms.management.TopicControl; import org.hornetq.core.config.Configuration; @@ -427,7 +428,7 @@ String topicName = RandomUtil.randomString(); serverManager.createTopic(topicName, topicName); - topic = new HornetQTopic(topicName); + topic = (HornetQTopic) HornetQJMSClient.createHornetQTopic(topicName); } @Override Modified: trunk/tests/src/org/hornetq/tests/integration/jms/server/management/TopicControlUsingJMSTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/server/management/TopicControlUsingJMSTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/TopicControlUsingJMSTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -23,9 +23,10 @@ import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.management.ResourceNames; -import org.hornetq.api.jms.HornetQConnectionFactory; -import org.hornetq.api.jms.HornetQQueue; -import org.hornetq.api.jms.HornetQTopic; +import org.hornetq.jms.HornetQConnectionFactory; +import org.hornetq.api.jms.HornetQJMSClient; +import org.hornetq.jms.HornetQQueue; +import org.hornetq.jms.HornetQTopic; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; @@ -351,14 +352,14 @@ String topicName = RandomUtil.randomString(); serverManager.createTopic(topicName, topicName); - topic = new HornetQTopic(topicName); + topic = (HornetQTopic) HornetQJMSClient.createHornetQTopic(topicName); - HornetQConnectionFactory cf = new HornetQConnectionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); + HornetQConnectionFactory cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); connection = cf.createQueueConnection(); session = connection.createQueueSession(false, Session.AUTO_ACKNOWLEDGE); connection.start(); - HornetQQueue managementQueue = new HornetQQueue(ConfigurationImpl.DEFAULT_MANAGEMENT_ADDRESS.toString(), + HornetQQueue managementQueue = (HornetQQueue) HornetQJMSClient.createHornetQQueue(ConfigurationImpl.DEFAULT_MANAGEMENT_ADDRESS.toString(), ConfigurationImpl.DEFAULT_MANAGEMENT_ADDRESS.toString()); proxy = new JMSMessagingProxy(session, managementQueue, ResourceNames.JMS_TOPIC + topic.getTopicName()); } Modified: trunk/tests/src/org/hornetq/tests/integration/largemessage/ServerLargeMessageTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/largemessage/ServerLargeMessageTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/largemessage/ServerLargeMessageTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -15,12 +15,7 @@ import junit.framework.Assert; -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.ClientSessionFactoryImpl; +import org.hornetq.api.core.client.*; import org.hornetq.core.persistence.impl.journal.JournalStorageManager; import org.hornetq.core.persistence.impl.journal.LargeServerMessageImpl; import org.hornetq.core.server.HornetQServer; @@ -64,7 +59,7 @@ fileMessage.setMessageID(1005); - for (int i = 0; i < 2 * ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE; i++) + for (int i = 0; i < 2 * HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE; i++) { fileMessage.addBytes(new byte[] { UnitTestCase.getSamplebyte(i) }); } @@ -89,9 +84,9 @@ Assert.assertNotNull(msg); - Assert.assertEquals(msg.getBodySize(), 2 * ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE); + Assert.assertEquals(msg.getBodySize(), 2 * HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE); - for (int i = 0; i < 2 * ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE; i++) + for (int i = 0; i < 2 * HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE; i++) { Assert.assertEquals(UnitTestCase.getSamplebyte(i), msg.getBodyBuffer().readByte()); } Modified: trunk/tests/src/org/hornetq/tests/integration/management/AcceptorControlTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/AcceptorControlTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/management/AcceptorControlTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -21,6 +21,7 @@ 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; @@ -97,7 +98,7 @@ // started by the server Assert.assertTrue(acceptorControl.isStarted()); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); ClientSession session = sf.createSession(false, true, true); Assert.assertNotNull(session); session.close(); Modified: trunk/tests/src/org/hornetq/tests/integration/management/AcceptorControlUsingCoreTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/AcceptorControlUsingCoreTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/management/AcceptorControlUsingCoreTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -18,6 +18,7 @@ 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; @@ -48,7 +49,7 @@ @Override protected AcceptorControl createManagementControl(final String name) throws Exception { - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); session = sf.createSession(false, true, true); session.start(); Modified: trunk/tests/src/org/hornetq/tests/integration/management/AddressControlTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/AddressControlTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/management/AddressControlTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -19,11 +19,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -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.ClientSessionFactoryImpl; +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; @@ -348,7 +344,7 @@ server.getAddressSettingsRepository().addMatch(address.toString(), addressSettings); server.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); session = sf.createSession(false, true, false); session.start(); session.createQueue(address, address, true); @@ -404,7 +400,7 @@ server.getAddressSettingsRepository().addMatch(address.toString(), addressSettings); server.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); session = sf.createSession(false, true, false); session.createQueue(address, address, true); Assert.assertEquals(1024, addressControl.getNumberOfBytesPerPage()); @@ -426,7 +422,7 @@ server = HornetQServers.newHornetQServer(conf, mbeanServer, false); server.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); sf.setBlockOnNonDurableSend(true); sf.setBlockOnNonDurableSend(true); session = sf.createSession(false, true, false); Modified: trunk/tests/src/org/hornetq/tests/integration/management/AddressControlUsingCoreTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/AddressControlUsingCoreTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/management/AddressControlUsingCoreTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -22,6 +22,7 @@ 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; @@ -314,7 +315,7 @@ server = HornetQServers.newHornetQServer(conf, mbeanServer, false); server.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); sf.setBlockOnNonDurableSend(true); sf.setBlockOnNonDurableSend(true); session = sf.createSession(false, true, false); Modified: trunk/tests/src/org/hornetq/tests/integration/management/BridgeControlTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/BridgeControlTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/management/BridgeControlTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -23,7 +23,7 @@ import org.hornetq.api.Pair; import org.hornetq.api.SimpleString; -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.BridgeControl; import org.hornetq.api.core.management.NotificationType; @@ -171,7 +171,7 @@ RandomUtil.randomBoolean(), RandomUtil.randomBoolean(), RandomUtil.randomPositiveInt(), - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, connectorPair); Configuration conf_1 = new ConfigurationImpl(); Modified: trunk/tests/src/org/hornetq/tests/integration/management/BridgeControlUsingCoreTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/BridgeControlUsingCoreTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/management/BridgeControlUsingCoreTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -23,7 +23,7 @@ import org.hornetq.api.Pair; 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.ObjectNameBuilder; import org.hornetq.api.core.management.ResourceNames; @@ -149,7 +149,7 @@ RandomUtil.randomBoolean(), RandomUtil.randomBoolean(), RandomUtil.randomPositiveInt(), - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, connectorPair); Configuration conf_1 = new ConfigurationImpl(); @@ -174,7 +174,7 @@ server_0 = HornetQServers.newHornetQServer(conf_0, mbeanServer, false); server_0.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); session = sf.createSession(false, true, true); session.start(); } Modified: trunk/tests/src/org/hornetq/tests/integration/management/BroadcastGroupControlUsingCoreTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/BroadcastGroupControlUsingCoreTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/management/BroadcastGroupControlUsingCoreTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -16,6 +16,7 @@ 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; @@ -46,7 +47,7 @@ @Override protected BroadcastGroupControl createManagementControl(final String name) throws Exception { - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); session = sf.createSession(false, true, true); session.start(); Modified: trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControl2Test.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControl2Test.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControl2Test.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -24,7 +24,7 @@ import junit.framework.Assert; import org.hornetq.api.Pair; -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.core.config.Configuration; @@ -150,7 +150,7 @@ DiscoveryGroupConfiguration discoveryGroupConfig = new DiscoveryGroupConfiguration(discoveryName, groupAddress, groupPort, - ClientSessionFactoryImpl.DEFAULT_DISCOVERY_REFRESH_TIMEOUT); + HornetQClient.DEFAULT_DISCOVERY_REFRESH_TIMEOUT); Configuration conf_1 = new ConfigurationImpl(); conf_1.setSecurityEnabled(false); Modified: trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControlUsingCoreTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControlUsingCoreTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControlUsingCoreTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -18,6 +18,7 @@ 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; @@ -48,7 +49,7 @@ @Override protected ClusterConnectionControl createManagementControl(final String name) throws Exception { - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); session = sf.createSession(false, true, true); session.start(); Modified: trunk/tests/src/org/hornetq/tests/integration/management/DiscoveryGroupControlUsingCoreTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/DiscoveryGroupControlUsingCoreTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/management/DiscoveryGroupControlUsingCoreTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -16,6 +16,7 @@ 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; @@ -46,7 +47,7 @@ @Override protected DiscoveryGroupControl createManagementControl(final String name) throws Exception { - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); session = sf.createSession(false, true, true); session.start(); Modified: trunk/tests/src/org/hornetq/tests/integration/management/DivertControlUsingCoreTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/DivertControlUsingCoreTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/management/DivertControlUsingCoreTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -16,6 +16,7 @@ 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; @@ -46,7 +47,7 @@ @Override protected DivertControl createManagementControl(final String name) throws Exception { - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); session = sf.createSession(false, true, true); session.start(); Modified: trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlUsingCoreTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlUsingCoreTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlUsingCoreTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -16,6 +16,7 @@ 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; @@ -59,7 +60,7 @@ { super.setUp(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); session = sf.createSession(false, true, true); session.start(); Modified: trunk/tests/src/org/hornetq/tests/integration/management/NotificationTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/NotificationTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/management/NotificationTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -20,11 +20,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -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.ClientSessionFactory; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +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; @@ -219,7 +215,7 @@ service = HornetQServers.newHornetQServer(conf, false); service.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); session = sf.createSession(false, true, true); session.start(); Modified: trunk/tests/src/org/hornetq/tests/integration/management/QueueControlTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/QueueControlTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/management/QueueControlTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -18,12 +18,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -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.ClientSessionFactoryImpl; +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; @@ -1285,7 +1280,7 @@ server = HornetQServers.newHornetQServer(conf, mbeanServer, false); server.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); sf.setBlockOnNonDurableSend(true); sf.setBlockOnNonDurableSend(true); session = sf.createSession(false, true, false); Modified: trunk/tests/src/org/hornetq/tests/integration/management/QueueControlUsingCoreTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/QueueControlUsingCoreTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/management/QueueControlUsingCoreTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -19,6 +19,7 @@ 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; @@ -269,7 +270,7 @@ { super.setUp(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); session = sf.createSession(false, true, true); session.start(); } Modified: trunk/tests/src/org/hornetq/tests/integration/management/SecurityManagementTestBase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/SecurityManagementTestBase.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/management/SecurityManagementTestBase.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -15,11 +15,7 @@ import junit.framework.Assert; -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.ClientSessionFactory; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +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; @@ -75,7 +71,7 @@ protected void doSendManagementMessage(final String user, final String password, final boolean expectSuccess) throws Exception { - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); try { ClientSession session = null; Modified: trunk/tests/src/org/hornetq/tests/integration/management/SecurityNotificationTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/SecurityNotificationTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/management/SecurityNotificationTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -22,11 +22,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -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.ClientSessionFactory; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; +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; @@ -75,7 +71,7 @@ SecurityNotificationTest.flush(notifConsumer); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); try { @@ -107,7 +103,7 @@ SecurityNotificationTest.flush(notifConsumer); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); ClientSession guestSession = sf.createSession("guest", "guest", false, true, true, false, 1); try @@ -163,7 +159,7 @@ securityManager.addRole("admin", "notif"); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); adminSession = sf.createSession("admin", "admin", false, true, true, false, 1); adminSession.start(); Modified: trunk/tests/src/org/hornetq/tests/integration/remoting/NetworkAddressTestBase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/remoting/NetworkAddressTestBase.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/remoting/NetworkAddressTestBase.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -29,6 +29,7 @@ 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; @@ -202,7 +203,7 @@ try { - ClientSessionFactory sf = new ClientSessionFactoryImpl(connectorConfig); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(connectorConfig); if (mustConnect) { Modified: trunk/tests/src/org/hornetq/tests/integration/remoting/PingTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/remoting/PingTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/remoting/PingTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -19,10 +19,7 @@ import junit.framework.Assert; -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.SessionFailureListener; +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; @@ -106,7 +103,7 @@ { TransportConfiguration transportConfig = new TransportConfiguration("org.hornetq.integration.transports.netty.NettyConnectorFactory"); - ClientSessionFactory csf = new ClientSessionFactoryImpl(transportConfig); + ClientSessionFactory csf = HornetQClient.createClientSessionFactory(transportConfig); csf.setClientFailureCheckPeriod(PingTest.CLIENT_FAILURE_CHECK_PERIOD); csf.setConnectionTTL(PingTest.CLIENT_FAILURE_CHECK_PERIOD * 2); @@ -165,7 +162,7 @@ { TransportConfiguration transportConfig = new TransportConfiguration("org.hornetq.integration.transports.netty.NettyConnectorFactory"); - ClientSessionFactory csf = new ClientSessionFactoryImpl(transportConfig); + ClientSessionFactory csf = HornetQClient.createClientSessionFactory(transportConfig); csf.setClientFailureCheckPeriod(-1); csf.setConnectionTTL(-1); @@ -197,7 +194,7 @@ serverConn.addFailureListener(serverListener); - Thread.sleep(ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD); + Thread.sleep(HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD); Assert.assertNull(clientListener.getException()); @@ -221,7 +218,7 @@ { TransportConfiguration transportConfig = new TransportConfiguration("org.hornetq.integration.transports.netty.NettyConnectorFactory"); - ClientSessionFactoryImpl csf = new ClientSessionFactoryImpl(transportConfig); + ClientSessionFactoryImpl csf = (ClientSessionFactoryImpl) HornetQClient.createClientSessionFactory(transportConfig); csf.setClientFailureCheckPeriod(PingTest.CLIENT_FAILURE_CHECK_PERIOD); csf.setConnectionTTL(PingTest.CLIENT_FAILURE_CHECK_PERIOD * 2); @@ -314,7 +311,7 @@ TransportConfiguration transportConfig = new TransportConfiguration("org.hornetq.integration.transports.netty.NettyConnectorFactory"); - ClientSessionFactory csf = new ClientSessionFactoryImpl(transportConfig); + ClientSessionFactory csf = HornetQClient.createClientSessionFactory(transportConfig); csf.setClientFailureCheckPeriod(PingTest.CLIENT_FAILURE_CHECK_PERIOD); csf.setConnectionTTL(PingTest.CLIENT_FAILURE_CHECK_PERIOD * 2); Modified: trunk/tests/src/org/hornetq/tests/integration/remoting/SynchronousCloseTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/remoting/SynchronousCloseTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/remoting/SynchronousCloseTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -18,6 +18,7 @@ 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; @@ -86,11 +87,11 @@ ClientSessionFactory sf; if (isNetty()) { - sf = new ClientSessionFactoryImpl(new TransportConfiguration(NettyConnectorFactory.class.getName())); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(NettyConnectorFactory.class.getName())); } else { - sf = new ClientSessionFactoryImpl(new TransportConfiguration(InVMConnectorFactory.class.getName())); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); } return sf; Modified: trunk/tests/src/org/hornetq/tests/integration/replication/ReplicationOrderTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/replication/ReplicationOrderTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/replication/ReplicationOrderTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -18,12 +18,7 @@ import junit.framework.Assert; -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.ClientSessionFactoryImpl; +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; @@ -68,7 +63,7 @@ String address = RandomUtil.randomString(); String queue = RandomUtil.randomString(); - ClientSessionFactory csf = new ClientSessionFactoryImpl(getConnectorTransportConfiguration(true)); + ClientSessionFactory csf = HornetQClient.createClientSessionFactory(getConnectorTransportConfiguration(true)); csf.setBlockOnNonDurableSend(false); csf.setBlockOnDurableSend(false); ClientSession session = null; @@ -107,7 +102,7 @@ } session.close(); - csf = new ClientSessionFactoryImpl(getConnectorTransportConfiguration(true)); + csf = HornetQClient.createClientSessionFactory(getConnectorTransportConfiguration(true)); session = csf.createSession(true, true); session.start(); ClientConsumer consumer = session.createConsumer(queue); Modified: trunk/tests/src/org/hornetq/tests/integration/replication/ReplicationTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/replication/ReplicationTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/replication/ReplicationTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -32,7 +32,7 @@ import org.hornetq.api.core.buffers.HornetQBuffer; import org.hornetq.api.core.buffers.HornetQBuffers; 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; @@ -720,9 +720,9 @@ connectorConfig, null, false, - ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL, + HornetQClient.DEFAULT_CALL_TIMEOUT, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CONNECTION_TTL, 0, 1.0d, 0, Modified: trunk/tests/src/org/hornetq/tests/integration/security/SimpleClient.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/security/SimpleClient.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/security/SimpleClient.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -13,12 +13,7 @@ package org.hornetq.tests.integration.security; -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.ClientSessionFactoryImpl; +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; @@ -52,7 +47,7 @@ String queueName = RandomUtil.randomString(); String messageText = RandomUtil.randomString(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration(connectorFactoryClassName)); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration(connectorFactoryClassName)); ClientSession session = sf.createSession(false, true, true); session.createQueue(queueName, queueName, null, false); Modified: trunk/tests/src/org/hornetq/tests/integration/server/ExpiryRunnerTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/server/ExpiryRunnerTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/server/ExpiryRunnerTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -23,12 +23,7 @@ import junit.textui.TestRunner; import org.hornetq.api.SimpleString; -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.ClientSessionFactoryImpl; +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; @@ -260,7 +255,7 @@ // start the server server.start(); // then we create a client as normal - ClientSessionFactory sessionFactory = new ClientSessionFactoryImpl(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY)); + ClientSessionFactory sessionFactory = HornetQClient.createClientSessionFactory(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY)); sessionFactory.setBlockOnAcknowledge(true); clientSession = sessionFactory.createSession(false, true, true); clientSession.createQueue(qName, qName, null, false); Modified: trunk/tests/src/org/hornetq/tests/integration/server/LVQRecoveryTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/server/LVQRecoveryTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/server/LVQRecoveryTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -18,12 +18,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -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.ClientSessionFactoryImpl; +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; @@ -218,7 +213,7 @@ qs.setLastValueQueue(true); server.getAddressSettingsRepository().addMatch(address.toString(), qs); // then we create a client as normal - ClientSessionFactory sessionFactory = new ClientSessionFactoryImpl(new TransportConfiguration(ServiceTestBase.INVM_CONNECTOR_FACTORY)); + ClientSessionFactory sessionFactory = HornetQClient.createClientSessionFactory(new TransportConfiguration(ServiceTestBase.INVM_CONNECTOR_FACTORY)); sessionFactory.setBlockOnAcknowledge(true); sessionFactory.setAckBatchSize(0); clientSession = sessionFactory.createSession(false, true, true); @@ -239,7 +234,7 @@ qs.setLastValueQueue(true); server.getAddressSettingsRepository().addMatch(address.toString(), qs); // then we create a client as normal - ClientSessionFactory sessionFactory = new ClientSessionFactoryImpl(new TransportConfiguration(ServiceTestBase.INVM_CONNECTOR_FACTORY)); + ClientSessionFactory sessionFactory = HornetQClient.createClientSessionFactory(new TransportConfiguration(ServiceTestBase.INVM_CONNECTOR_FACTORY)); sessionFactory.setBlockOnAcknowledge(true); sessionFactory.setAckBatchSize(0); clientSession = sessionFactory.createSession(false, true, true); Modified: trunk/tests/src/org/hornetq/tests/integration/server/LVQTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/server/LVQTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/server/LVQTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -15,12 +15,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -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.ClientSessionFactoryImpl; +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; @@ -585,7 +580,7 @@ qs.setLastValueQueue(true); server.getAddressSettingsRepository().addMatch(address.toString(), qs); // then we create a client as normal - ClientSessionFactory sessionFactory = new ClientSessionFactoryImpl(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY)); + ClientSessionFactory sessionFactory = HornetQClient.createClientSessionFactory(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY)); sessionFactory.setBlockOnAcknowledge(true); sessionFactory.setAckBatchSize(0); clientSession = sessionFactory.createSession(false, true, true); Modified: trunk/tests/src/org/hornetq/tests/integration/server/PredefinedQueueTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/server/PredefinedQueueTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/server/PredefinedQueueTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -19,12 +19,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -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.ClientSessionFactoryImpl; +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; @@ -79,7 +74,7 @@ server.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(false, true, true); @@ -153,7 +148,7 @@ Assert.assertEquals(2, bindings.getBindings().size()); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(false, true, true); @@ -217,7 +212,7 @@ server.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(false, true, true); @@ -249,7 +244,7 @@ server.start(); - sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); session = sf.createSession(false, true, true); @@ -330,7 +325,7 @@ server.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(false, true, true); @@ -361,7 +356,7 @@ server.start(); - sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); session = sf.createSession(false, true, true); @@ -415,7 +410,7 @@ server.start(); - ClientSessionFactory sf = new ClientSessionFactoryImpl(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(new TransportConfiguration("org.hornetq.core.remoting.impl.invm.InVMConnectorFactory")); ClientSession session = sf.createSession(false, true, true); Modified: trunk/tests/src/org/hornetq/tests/integration/ssl/CoreClientOverSSLTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/ssl/CoreClientOverSSLTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/ssl/CoreClientOverSSLTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -19,12 +19,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -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.ClientSessionFactoryImpl; +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; @@ -75,7 +70,7 @@ tc.getParams().put(TransportConstants.KEYSTORE_PATH_PROP_NAME, TransportConstants.DEFAULT_KEYSTORE_PATH); tc.getParams().put(TransportConstants.KEYSTORE_PASSWORD_PROP_NAME, TransportConstants.DEFAULT_KEYSTORE_PASSWORD); - ClientSessionFactory sf = new ClientSessionFactoryImpl(tc); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(tc); ClientSession session = sf.createSession(false, true, true); session.createQueue(CoreClientOverSSLTest.QUEUE, CoreClientOverSSLTest.QUEUE, false); ClientProducer producer = session.createProducer(CoreClientOverSSLTest.QUEUE); @@ -98,7 +93,7 @@ tc.getParams().put(TransportConstants.KEYSTORE_PATH_PROP_NAME, TransportConstants.DEFAULT_KEYSTORE_PATH); tc.getParams().put(TransportConstants.KEYSTORE_PASSWORD_PROP_NAME, "invalid password"); - ClientSessionFactory sf = new ClientSessionFactoryImpl(tc); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(tc); try { sf.createSession(false, true, true); @@ -116,7 +111,7 @@ TransportConfiguration tc = new TransportConfiguration(NettyConnectorFactory.class.getName()); tc.getParams().put(TransportConstants.SSL_ENABLED_PROP_NAME, false); - ClientSessionFactory sf = new ClientSessionFactoryImpl(tc); + ClientSessionFactory sf = HornetQClient.createClientSessionFactory(tc); sf.setCallTimeout(2000); try { Modified: trunk/tests/src/org/hornetq/tests/integration/xa/XaTimeoutTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/xa/XaTimeoutTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/integration/xa/XaTimeoutTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -26,12 +26,7 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -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.ClientSessionFactoryImpl; +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; @@ -82,7 +77,7 @@ // start the server messagingService.start(); // then we create a client as normal - sessionFactory = new ClientSessionFactoryImpl(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY)); + sessionFactory = HornetQClient.createClientSessionFactory(new TransportConfiguration(UnitTestCase.INVM_CONNECTOR_FACTORY)); clientSession = sessionFactory.createSession(true, false, false); clientSession.createQueue(atestq, atestq, null, true); clientProducer = clientSession.createProducer(atestq); Modified: trunk/tests/src/org/hornetq/tests/opt/SendTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/opt/SendTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/opt/SendTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -29,8 +29,8 @@ import org.hornetq.api.core.client.ClientSession; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.jms.HornetQConnectionFactory; -import org.hornetq.api.jms.HornetQQueue; +import org.hornetq.jms.HornetQConnectionFactory; +import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; @@ -144,7 +144,7 @@ // TransportConfiguration tc = new TransportConfiguration(InVMConnectorFactory.class.getCanonicalName(), params); - HornetQConnectionFactory cf = new HornetQConnectionFactory(tc); + HornetQConnectionFactory cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(tc); cf.setProducerWindowSize(1024 * 1024); @@ -156,7 +156,7 @@ coreSession.createQueue("jms.queue.test_queue", "jms.queue.test_queue"); - Queue queue = new HornetQQueue("test_queue"); + Queue queue = HornetQJMSClient.createHornetQQueue("test_queue"); MessageProducer prod = sess.createProducer(queue); @@ -242,7 +242,7 @@ // TransportConfiguration tc = new TransportConfiguration(InVMConnectorFactory.class.getCanonicalName(), params); - HornetQConnectionFactory cf = new HornetQConnectionFactory(tc); + HornetQConnectionFactory cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(tc); cf.setProducerWindowSize(1024 * 1024); @@ -254,7 +254,7 @@ coreSession.createQueue("jms.queue.test_queue", "jms.queue.test_queue"); - Queue queue = new HornetQQueue("test_queue"); + Queue queue = HornetQJMSClient.createHornetQQueue("test_queue"); MessageConsumer cons = sess.createConsumer(queue); @@ -363,7 +363,7 @@ // TransportConfiguration tc = new TransportConfiguration(InVMConnectorFactory.class.getCanonicalName(), params); - HornetQConnectionFactory cf = new HornetQConnectionFactory(tc); + HornetQConnectionFactory cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(tc); cf.setProducerWindowSize(1024 * 1024); @@ -375,7 +375,7 @@ coreSession.createQueue("jms.queue.test_queue", "jms.queue.test_queue"); - Queue queue = new HornetQQueue("test_queue"); + Queue queue = HornetQJMSClient.createHornetQQueue("test_queue"); MessageProducer prod = sess.createProducer(queue); @@ -463,7 +463,7 @@ // TransportConfiguration tc = new TransportConfiguration(InVMConnectorFactory.class.getCanonicalName(), params); - HornetQConnectionFactory cf = new HornetQConnectionFactory(tc); + HornetQConnectionFactory cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(tc); Connection conn = cf.createConnection(); @@ -473,7 +473,7 @@ coreSession.createQueue("jms.queue.test_queue", "jms.queue.test_queue"); - Queue queue = new HornetQQueue("test_queue"); + Queue queue = HornetQJMSClient.createHornetQQueue("test_queue"); MessageConsumer cons = sess.createConsumer(queue); Modified: trunk/tests/src/org/hornetq/tests/stress/remote/PingStressTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/stress/remote/PingStressTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/stress/remote/PingStressTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -18,6 +18,7 @@ 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; @@ -120,7 +121,7 @@ server.getRemotingService().addInterceptor(noPongInterceptor); - final ClientSessionFactory csf1 = new ClientSessionFactoryImpl(transportConfig); + final ClientSessionFactory csf1 = HornetQClient.createClientSessionFactory(transportConfig); csf1.setClientFailureCheckPeriod(PingStressTest.PING_INTERVAL); csf1.setConnectionTTL((long)(PingStressTest.PING_INTERVAL * 1.5)); @@ -150,7 +151,7 @@ try { - final ClientSessionFactory csf2 = new ClientSessionFactoryImpl(transportConfig); + final ClientSessionFactory csf2 = HornetQClient.createClientSessionFactory(transportConfig); csf2.setClientFailureCheckPeriod(PingStressTest.PING_INTERVAL); csf2.setConnectionTTL((long)(PingStressTest.PING_INTERVAL * 1.5)); 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 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -41,8 +41,8 @@ import junit.framework.Assert; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.jms.HornetQConnectionFactory; -import org.hornetq.api.jms.HornetQQueue; +import org.hornetq.jms.HornetQConnectionFactory; +import org.hornetq.api.jms.HornetQJMSClient; import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; @@ -157,7 +157,7 @@ private static ConnectionFactory createConnectionFactory() { - HornetQConnectionFactory cf = new HornetQConnectionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); + HornetQConnectionFactory cf = (HornetQConnectionFactory) HornetQJMSClient.createConnectionFactory(new TransportConfiguration(InVMConnectorFactory.class.getName())); // Note! We disable automatic reconnection on the session factory. The bridge needs to do the reconnection cf.setReconnectAttempts(0); cf.setBlockOnNonDurableSend(true); @@ -182,8 +182,8 @@ ConnectionFactoryFactory sourceCFF = JMSBridgeImplTest.newConnectionFactoryFactory(failingSourceCF); ConnectionFactoryFactory targetCFF = JMSBridgeImplTest.newConnectionFactoryFactory(JMSBridgeImplTest.createConnectionFactory()); - DestinationFactory sourceDF = JMSBridgeImplTest.newDestinationFactory(new HornetQQueue(JMSBridgeImplTest.SOURCE)); - DestinationFactory targetDF = JMSBridgeImplTest.newDestinationFactory(new HornetQQueue(JMSBridgeImplTest.TARGET)); + DestinationFactory sourceDF = JMSBridgeImplTest.newDestinationFactory(HornetQJMSClient.createHornetQQueue(JMSBridgeImplTest.SOURCE)); + DestinationFactory targetDF = JMSBridgeImplTest.newDestinationFactory(HornetQJMSClient.createHornetQQueue(JMSBridgeImplTest.TARGET)); TransactionManager tm = JMSBridgeImplTest.newTransactionManager(); JMSBridgeImpl bridge = new JMSBridgeImpl(); @@ -237,8 +237,8 @@ ConnectionFactoryFactory sourceCFF = JMSBridgeImplTest.newConnectionFactoryFactory(failingSourceCF); ConnectionFactoryFactory targetCFF = JMSBridgeImplTest.newConnectionFactoryFactory(JMSBridgeImplTest.createConnectionFactory()); - DestinationFactory sourceDF = JMSBridgeImplTest.newDestinationFactory(new HornetQQueue(JMSBridgeImplTest.SOURCE)); - DestinationFactory targetDF = JMSBridgeImplTest.newDestinationFactory(new HornetQQueue(JMSBridgeImplTest.TARGET)); + DestinationFactory sourceDF = JMSBridgeImplTest.newDestinationFactory(HornetQJMSClient.createHornetQQueue(JMSBridgeImplTest.SOURCE)); + DestinationFactory targetDF = JMSBridgeImplTest.newDestinationFactory(HornetQJMSClient.createHornetQQueue(JMSBridgeImplTest.TARGET)); TransactionManager tm = JMSBridgeImplTest.newTransactionManager(); JMSBridgeImpl bridge = new JMSBridgeImpl(); @@ -277,8 +277,8 @@ ConnectionFactoryFactory sourceCFF = JMSBridgeImplTest.newConnectionFactoryFactory(JMSBridgeImplTest.createConnectionFactory()); ConnectionFactoryFactory targetCFF = JMSBridgeImplTest.newConnectionFactoryFactory(JMSBridgeImplTest.createConnectionFactory()); - DestinationFactory sourceDF = JMSBridgeImplTest.newDestinationFactory(new HornetQQueue(JMSBridgeImplTest.SOURCE)); - DestinationFactory targetDF = JMSBridgeImplTest.newDestinationFactory(new HornetQQueue(JMSBridgeImplTest.TARGET)); + DestinationFactory sourceDF = JMSBridgeImplTest.newDestinationFactory(HornetQJMSClient.createHornetQQueue(JMSBridgeImplTest.SOURCE)); + DestinationFactory targetDF = JMSBridgeImplTest.newDestinationFactory(HornetQJMSClient.createHornetQQueue(JMSBridgeImplTest.TARGET)); TransactionManager tm = JMSBridgeImplTest.newTransactionManager(); JMSBridgeImpl bridge = new JMSBridgeImpl(); @@ -337,8 +337,8 @@ ConnectionFactoryFactory sourceCFF = JMSBridgeImplTest.newConnectionFactoryFactory(JMSBridgeImplTest.createConnectionFactory()); ConnectionFactoryFactory targetCFF = JMSBridgeImplTest.newConnectionFactoryFactory(JMSBridgeImplTest.createConnectionFactory()); - DestinationFactory sourceDF = JMSBridgeImplTest.newDestinationFactory(new HornetQQueue(JMSBridgeImplTest.SOURCE)); - DestinationFactory targetDF = JMSBridgeImplTest.newDestinationFactory(new HornetQQueue(JMSBridgeImplTest.TARGET)); + DestinationFactory sourceDF = JMSBridgeImplTest.newDestinationFactory(HornetQJMSClient.createHornetQQueue(JMSBridgeImplTest.SOURCE)); + DestinationFactory targetDF = JMSBridgeImplTest.newDestinationFactory(HornetQJMSClient.createHornetQQueue(JMSBridgeImplTest.TARGET)); TransactionManager tm = JMSBridgeImplTest.newTransactionManager(); JMSBridgeImpl bridge = new JMSBridgeImpl(); @@ -426,8 +426,8 @@ ConnectionFactoryFactory sourceCFF = JMSBridgeImplTest.newConnectionFactoryFactory(failingSourceCF); ConnectionFactoryFactory targetCFF = JMSBridgeImplTest.newConnectionFactoryFactory(JMSBridgeImplTest.createConnectionFactory()); - DestinationFactory sourceDF = JMSBridgeImplTest.newDestinationFactory(new HornetQQueue(JMSBridgeImplTest.SOURCE)); - DestinationFactory targetDF = JMSBridgeImplTest.newDestinationFactory(new HornetQQueue(JMSBridgeImplTest.TARGET)); + DestinationFactory sourceDF = JMSBridgeImplTest.newDestinationFactory(HornetQJMSClient.createHornetQQueue(JMSBridgeImplTest.SOURCE)); + DestinationFactory targetDF = JMSBridgeImplTest.newDestinationFactory(HornetQJMSClient.createHornetQQueue(JMSBridgeImplTest.TARGET)); TransactionManager tm = JMSBridgeImplTest.newTransactionManager(); JMSBridgeImpl bridge = new JMSBridgeImpl(); @@ -486,8 +486,8 @@ ConnectionFactoryFactory sourceCFF = JMSBridgeImplTest.newConnectionFactoryFactory(failingSourceCF); ConnectionFactoryFactory targetCFF = JMSBridgeImplTest.newConnectionFactoryFactory(JMSBridgeImplTest.createConnectionFactory()); - DestinationFactory sourceDF = JMSBridgeImplTest.newDestinationFactory(new HornetQQueue(JMSBridgeImplTest.SOURCE)); - DestinationFactory targetDF = JMSBridgeImplTest.newDestinationFactory(new HornetQQueue(JMSBridgeImplTest.TARGET)); + DestinationFactory sourceDF = JMSBridgeImplTest.newDestinationFactory(HornetQJMSClient.createHornetQQueue(JMSBridgeImplTest.SOURCE)); + DestinationFactory targetDF = JMSBridgeImplTest.newDestinationFactory(HornetQJMSClient.createHornetQQueue(JMSBridgeImplTest.TARGET)); TransactionManager tm = JMSBridgeImplTest.newTransactionManager(); JMSBridgeImpl bridge = new JMSBridgeImpl(); Modified: trunk/tests/src/org/hornetq/tests/unit/jms/HornetQDestinationTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/jms/HornetQDestinationTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/unit/jms/HornetQDestinationTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -20,11 +20,10 @@ import junit.framework.Assert; -import org.hornetq.api.jms.HornetQDestination; -import org.hornetq.api.jms.HornetQQueue; -import org.hornetq.api.jms.HornetQTemporaryQueue; -import org.hornetq.api.jms.HornetQTemporaryTopic; -import org.hornetq.api.jms.HornetQTopic; +import org.hornetq.jms.HornetQDestination; +import org.hornetq.jms.HornetQQueue; +import org.hornetq.jms.*; +import org.hornetq.jms.HornetQTopic; import org.hornetq.tests.util.RandomUtil; import org.hornetq.tests.util.UnitTestCase; @@ -50,9 +49,9 @@ { String destinationName = RandomUtil.randomString(); String address = HornetQQueue.JMS_QUEUE_ADDRESS_PREFIX + destinationName; - HornetQDestination destination = HornetQDestination.fromAddress(address); - HornetQDestination sameDestination = HornetQDestination.fromAddress(address); - HornetQDestination differentDestination = HornetQDestination.fromAddress(address + RandomUtil.randomString()); + HornetQDestination destination = (HornetQDestination) HornetQDestination.fromAddress(address); + HornetQDestination sameDestination = (HornetQDestination) HornetQDestination.fromAddress(address); + HornetQDestination differentDestination = (HornetQDestination) HornetQDestination.fromAddress(address + RandomUtil.randomString()); Assert.assertFalse(destination.equals(null)); Assert.assertTrue(destination.equals(destination)); @@ -64,7 +63,7 @@ { String destinationName = RandomUtil.randomString(); String address = HornetQQueue.JMS_QUEUE_ADDRESS_PREFIX + destinationName; - HornetQDestination destination = HornetQDestination.fromAddress(address); + HornetQDestination destination = (HornetQDestination) HornetQDestination.fromAddress(address); Assert.assertTrue(destination instanceof Queue); Assert.assertEquals(destinationName, ((Queue)destination).getQueueName()); } @@ -73,7 +72,7 @@ { String destinationName = RandomUtil.randomString(); String address = HornetQTopic.JMS_TOPIC_ADDRESS_PREFIX + destinationName; - HornetQDestination destination = HornetQDestination.fromAddress(address); + HornetQDestination destination = (HornetQDestination) HornetQDestination.fromAddress(address); Assert.assertTrue(destination instanceof Topic); Assert.assertEquals(destinationName, ((Topic)destination).getTopicName()); } @@ -82,7 +81,7 @@ { String destinationName = RandomUtil.randomString(); String address = HornetQTemporaryQueue.JMS_TEMP_QUEUE_ADDRESS_PREFIX + destinationName; - HornetQDestination destination = HornetQDestination.fromAddress(address); + HornetQDestination destination = (HornetQDestination) HornetQDestination.fromAddress(address); Assert.assertTrue(destination instanceof TemporaryQueue); Assert.assertEquals(destinationName, ((TemporaryQueue)destination).getQueueName()); } @@ -91,7 +90,7 @@ { String destinationName = RandomUtil.randomString(); String address = HornetQTemporaryTopic.JMS_TEMP_TOPIC_ADDRESS_PREFIX + destinationName; - HornetQDestination destination = HornetQDestination.fromAddress(address); + HornetQDestination destination = (HornetQDestination) HornetQDestination.fromAddress(address); Assert.assertTrue(destination instanceof TemporaryTopic); Assert.assertEquals(destinationName, ((TemporaryTopic)destination).getTopicName()); } Modified: trunk/tests/src/org/hornetq/tests/unit/jms/HornetQQueueTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/jms/HornetQQueueTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/unit/jms/HornetQQueueTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -15,7 +15,8 @@ import junit.framework.Assert; -import org.hornetq.api.jms.HornetQQueue; +import org.hornetq.api.jms.HornetQJMSClient; +import org.hornetq.jms.HornetQQueue; import org.hornetq.tests.util.RandomUtil; import org.hornetq.tests.util.UnitTestCase; @@ -39,14 +40,14 @@ public void testIsTemporary() throws Exception { - HornetQQueue queue = new HornetQQueue(RandomUtil.randomString()); + HornetQQueue queue = (HornetQQueue) HornetQJMSClient.createHornetQQueue(RandomUtil.randomString()); Assert.assertFalse(queue.isTemporary()); } public void testGetQueueName() throws Exception { String queueName = RandomUtil.randomString(); - HornetQQueue queue = new HornetQQueue(queueName); + HornetQQueue queue = (HornetQQueue) HornetQJMSClient.createHornetQQueue(queueName); Assert.assertEquals(queueName, queue.getQueueName()); } Modified: trunk/tests/src/org/hornetq/tests/unit/jms/HornetQTopicTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/jms/HornetQTopicTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/unit/jms/HornetQTopicTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -16,7 +16,8 @@ import junit.framework.Assert; import org.hornetq.api.Pair; -import org.hornetq.api.jms.HornetQTopic; +import org.hornetq.api.jms.HornetQJMSClient; +import org.hornetq.jms.HornetQTopic; import org.hornetq.tests.util.RandomUtil; import org.hornetq.tests.util.UnitTestCase; @@ -40,14 +41,14 @@ public void testIsTemporary() throws Exception { - HornetQTopic topic = new HornetQTopic(RandomUtil.randomString()); + HornetQTopic topic = (HornetQTopic) HornetQJMSClient.createHornetQTopic(RandomUtil.randomString()); Assert.assertFalse(topic.isTemporary()); } public void testGetTopicName() throws Exception { String topicName = RandomUtil.randomString(); - HornetQTopic queue = new HornetQTopic(topicName); + HornetQTopic queue = (HornetQTopic) HornetQJMSClient.createHornetQTopic(topicName); Assert.assertEquals(topicName, queue.getTopicName()); } Modified: trunk/tests/src/org/hornetq/tests/unit/jms/referenceable/DestinationObjectFactoryTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/jms/referenceable/DestinationObjectFactoryTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/unit/jms/referenceable/DestinationObjectFactoryTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -17,8 +17,9 @@ import junit.framework.Assert; -import org.hornetq.api.jms.HornetQDestination; -import org.hornetq.api.jms.HornetQQueue; +import org.hornetq.jms.HornetQDestination; +import org.hornetq.api.jms.HornetQJMSClient; +import org.hornetq.jms.HornetQQueue; import org.hornetq.jms.referenceable.DestinationObjectFactory; import org.hornetq.tests.util.RandomUtil; import org.hornetq.tests.util.UnitTestCase; @@ -43,7 +44,7 @@ public void testReference() throws Exception { - HornetQDestination queue = new HornetQQueue(RandomUtil.randomString()); + HornetQDestination queue = (HornetQQueue) HornetQJMSClient.createHornetQQueue(RandomUtil.randomString()); Reference reference = queue.getReference(); DestinationObjectFactory factory = new DestinationObjectFactory(); Modified: trunk/tests/src/org/hornetq/tests/unit/ra/ResourceAdapterTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/ra/ResourceAdapterTest.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/unit/ra/ResourceAdapterTest.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -33,9 +33,10 @@ 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.jms.HornetQConnectionFactory; -import org.hornetq.api.jms.HornetQQueue; +import org.hornetq.api.core.client.HornetQClient; +import org.hornetq.jms.HornetQConnectionFactory; +import org.hornetq.api.jms.HornetQJMSClient; +import org.hornetq.jms.HornetQQueue; import org.hornetq.core.remoting.impl.invm.InVMConnector; import org.hornetq.core.server.HornetQServer; import org.hornetq.integration.transports.netty.NettyConnector; @@ -71,44 +72,44 @@ HornetQResourceAdapter ra = new HornetQResourceAdapter(); ra.setConnectorClassName(InVMConnector.class.getName()); HornetQConnectionFactory factory = ra.getDefaultHornetQConnectionFactory(); - Assert.assertEquals(factory.getCallTimeout(), ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT); + Assert.assertEquals(factory.getCallTimeout(), HornetQClient.DEFAULT_CALL_TIMEOUT); Assert.assertEquals(factory.getClientFailureCheckPeriod(), - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD); + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD); Assert.assertEquals(factory.getClientID(), null); Assert.assertEquals(factory.getConnectionLoadBalancingPolicyClassName(), - ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME); - Assert.assertEquals(factory.getConnectionTTL(), ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL); - Assert.assertEquals(factory.getConsumerMaxRate(), ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE); - Assert.assertEquals(factory.getConsumerWindowSize(), ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE); + HornetQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME); + Assert.assertEquals(factory.getConnectionTTL(), HornetQClient.DEFAULT_CONNECTION_TTL); + Assert.assertEquals(factory.getConsumerMaxRate(), HornetQClient.DEFAULT_CONSUMER_MAX_RATE); + Assert.assertEquals(factory.getConsumerWindowSize(), HornetQClient.DEFAULT_CONSUMER_WINDOW_SIZE); Assert.assertEquals(factory.getDiscoveryAddress(), null); Assert.assertEquals(factory.getDiscoveryInitialWaitTimeout(), - ClientSessionFactoryImpl.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT); + HornetQClient.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT); Assert.assertEquals(factory.getDiscoveryPort(), 0); Assert.assertEquals(factory.getDiscoveryRefreshTimeout(), - ClientSessionFactoryImpl.DEFAULT_DISCOVERY_REFRESH_TIMEOUT); - Assert.assertEquals(factory.getDupsOKBatchSize(), ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE); - Assert.assertEquals(factory.getMinLargeMessageSize(), ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE); - Assert.assertEquals(factory.getProducerMaxRate(), ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE); + HornetQClient.DEFAULT_DISCOVERY_REFRESH_TIMEOUT); + Assert.assertEquals(factory.getDupsOKBatchSize(), HornetQClient.DEFAULT_ACK_BATCH_SIZE); + Assert.assertEquals(factory.getMinLargeMessageSize(), HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE); + Assert.assertEquals(factory.getProducerMaxRate(), HornetQClient.DEFAULT_PRODUCER_MAX_RATE); Assert.assertEquals(factory.getConfirmationWindowSize(), - ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE); + HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE); // by default, reconnect attempts is set to -1 Assert.assertEquals(-1, factory.getReconnectAttempts()); - Assert.assertEquals(factory.getRetryInterval(), ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL); + Assert.assertEquals(factory.getRetryInterval(), HornetQClient.DEFAULT_RETRY_INTERVAL); Assert.assertEquals(factory.getRetryIntervalMultiplier(), - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER); + HornetQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER); Assert.assertEquals(factory.getScheduledThreadPoolMaxSize(), - ClientSessionFactoryImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE); - Assert.assertEquals(factory.getThreadPoolMaxSize(), ClientSessionFactoryImpl.DEFAULT_THREAD_POOL_MAX_SIZE); - Assert.assertEquals(factory.getTransactionBatchSize(), ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE); - Assert.assertEquals(factory.isAutoGroup(), ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP); - Assert.assertEquals(factory.isBlockOnAcknowledge(), ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE); + HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE); + Assert.assertEquals(factory.getThreadPoolMaxSize(), HornetQClient.DEFAULT_THREAD_POOL_MAX_SIZE); + Assert.assertEquals(factory.getTransactionBatchSize(), HornetQClient.DEFAULT_ACK_BATCH_SIZE); + Assert.assertEquals(factory.isAutoGroup(), HornetQClient.DEFAULT_AUTO_GROUP); + Assert.assertEquals(factory.isBlockOnAcknowledge(), HornetQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE); Assert.assertEquals(factory.isBlockOnNonDurableSend(), - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND); - Assert.assertEquals(factory.isBlockOnDurableSend(), ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND); + HornetQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND); + Assert.assertEquals(factory.isBlockOnDurableSend(), HornetQClient.DEFAULT_BLOCK_ON_DURABLE_SEND); Assert.assertEquals(factory.isFailoverOnServerShutdown(), - ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); - Assert.assertEquals(factory.isPreAcknowledge(), ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE); - Assert.assertEquals(factory.isUseGlobalPools(), ClientSessionFactoryImpl.DEFAULT_USE_GLOBAL_POOLS); + HornetQClient.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); + Assert.assertEquals(factory.isPreAcknowledge(), HornetQClient.DEFAULT_PRE_ACKNOWLEDGE); + Assert.assertEquals(factory.isUseGlobalPools(), HornetQClient.DEFAULT_USE_GLOBAL_POOLS); } public void test2DefaultConnectionFactorySame() throws Exception @@ -125,54 +126,54 @@ HornetQResourceAdapter ra = new HornetQResourceAdapter(); ra.setConnectorClassName(InVMConnector.class.getName()); HornetQConnectionFactory factory = ra.createHornetQConnectionFactory(new ConnectionFactoryProperties()); - Assert.assertEquals(factory.getCallTimeout(), ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT); + Assert.assertEquals(factory.getCallTimeout(), HornetQClient.DEFAULT_CALL_TIMEOUT); Assert.assertEquals(factory.getClientFailureCheckPeriod(), - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD); + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD); Assert.assertEquals(factory.getClientID(), null); Assert.assertEquals(factory.getConnectionLoadBalancingPolicyClassName(), - ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME); - Assert.assertEquals(factory.getConnectionTTL(), ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL); - Assert.assertEquals(factory.getConsumerMaxRate(), ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE); - Assert.assertEquals(factory.getConsumerWindowSize(), ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE); + HornetQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME); + Assert.assertEquals(factory.getConnectionTTL(), HornetQClient.DEFAULT_CONNECTION_TTL); + Assert.assertEquals(factory.getConsumerMaxRate(), HornetQClient.DEFAULT_CONSUMER_MAX_RATE); + Assert.assertEquals(factory.getConsumerWindowSize(), HornetQClient.DEFAULT_CONSUMER_WINDOW_SIZE); Assert.assertEquals(factory.getDiscoveryAddress(), null); Assert.assertEquals(factory.getDiscoveryInitialWaitTimeout(), - ClientSessionFactoryImpl.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT); + HornetQClient.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT); Assert.assertEquals(factory.getDiscoveryPort(), 0); Assert.assertEquals(factory.getDiscoveryRefreshTimeout(), - ClientSessionFactoryImpl.DEFAULT_DISCOVERY_REFRESH_TIMEOUT); - Assert.assertEquals(factory.getDupsOKBatchSize(), ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE); - Assert.assertEquals(factory.getMinLargeMessageSize(), ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE); - Assert.assertEquals(factory.getProducerMaxRate(), ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE); + HornetQClient.DEFAULT_DISCOVERY_REFRESH_TIMEOUT); + Assert.assertEquals(factory.getDupsOKBatchSize(), HornetQClient.DEFAULT_ACK_BATCH_SIZE); + Assert.assertEquals(factory.getMinLargeMessageSize(), HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE); + Assert.assertEquals(factory.getProducerMaxRate(), HornetQClient.DEFAULT_PRODUCER_MAX_RATE); Assert.assertEquals(factory.getConfirmationWindowSize(), - ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE); + HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE); // by default, reconnect attempts is set to -1 Assert.assertEquals(-1, factory.getReconnectAttempts()); - Assert.assertEquals(factory.getRetryInterval(), ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL); + Assert.assertEquals(factory.getRetryInterval(), HornetQClient.DEFAULT_RETRY_INTERVAL); Assert.assertEquals(factory.getRetryIntervalMultiplier(), - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER); + HornetQClient.DEFAULT_RETRY_INTERVAL_MULTIPLIER); Assert.assertEquals(factory.getScheduledThreadPoolMaxSize(), - ClientSessionFactoryImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE); - Assert.assertEquals(factory.getThreadPoolMaxSize(), ClientSessionFactoryImpl.DEFAULT_THREAD_POOL_MAX_SIZE); - Assert.assertEquals(factory.getTransactionBatchSize(), ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE); - Assert.assertEquals(factory.isAutoGroup(), ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP); - Assert.assertEquals(factory.isBlockOnAcknowledge(), ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE); + HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE); + Assert.assertEquals(factory.getThreadPoolMaxSize(), HornetQClient.DEFAULT_THREAD_POOL_MAX_SIZE); + Assert.assertEquals(factory.getTransactionBatchSize(), HornetQClient.DEFAULT_ACK_BATCH_SIZE); + Assert.assertEquals(factory.isAutoGroup(), HornetQClient.DEFAULT_AUTO_GROUP); + Assert.assertEquals(factory.isBlockOnAcknowledge(), HornetQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE); Assert.assertEquals(factory.isBlockOnNonDurableSend(), - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND); - Assert.assertEquals(factory.isBlockOnDurableSend(), ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND); + HornetQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND); + Assert.assertEquals(factory.isBlockOnDurableSend(), HornetQClient.DEFAULT_BLOCK_ON_DURABLE_SEND); Assert.assertEquals(factory.isFailoverOnServerShutdown(), - ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); - Assert.assertEquals(factory.isPreAcknowledge(), ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE); - Assert.assertEquals(factory.isUseGlobalPools(), ClientSessionFactoryImpl.DEFAULT_USE_GLOBAL_POOLS); + HornetQClient.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); + Assert.assertEquals(factory.isPreAcknowledge(), HornetQClient.DEFAULT_PRE_ACKNOWLEDGE); + Assert.assertEquals(factory.isUseGlobalPools(), HornetQClient.DEFAULT_USE_GLOBAL_POOLS); } public void testDefaultConnectionFactoryOverrides() throws Exception { HornetQResourceAdapter ra = new HornetQResourceAdapter(); ra.setConnectorClassName(InVMConnector.class.getName()); - ra.setAutoGroup(!ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP); - ra.setBlockOnAcknowledge(!ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE); - ra.setBlockOnNonDurableSend(!ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND); - ra.setBlockOnDurableSend(!ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND); + ra.setAutoGroup(!HornetQClient.DEFAULT_AUTO_GROUP); + ra.setBlockOnAcknowledge(!HornetQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE); + ra.setBlockOnNonDurableSend(!HornetQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND); + ra.setBlockOnDurableSend(!HornetQClient.DEFAULT_BLOCK_ON_DURABLE_SEND); ra.setCallTimeout(1l); ra.setClientFailureCheckPeriod(2l); ra.setClientID("myid"); @@ -183,9 +184,9 @@ ra.setDiscoveryInitialWaitTimeout(6l); ra.setDiscoveryRefreshTimeout(7l); ra.setDupsOKBatchSize(8); - ra.setFailoverOnServerShutdown(!ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); + ra.setFailoverOnServerShutdown(!HornetQClient.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); ra.setMinLargeMessageSize(10); - ra.setPreAcknowledge(!ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE); + ra.setPreAcknowledge(!HornetQClient.DEFAULT_PRE_ACKNOWLEDGE); ra.setProducerMaxRate(11); ra.setConfirmationWindowSize(12); ra.setReconnectAttempts(13); @@ -194,7 +195,7 @@ ra.setScheduledThreadPoolMaxSize(16); ra.setThreadPoolMaxSize(17); ra.setTransactionBatchSize(18); - ra.setUseGlobalPools(!ClientSessionFactoryImpl.DEFAULT_USE_GLOBAL_POOLS); + ra.setUseGlobalPools(!HornetQClient.DEFAULT_USE_GLOBAL_POOLS); HornetQConnectionFactory factory = ra.getDefaultHornetQConnectionFactory(); Assert.assertEquals(factory.getCallTimeout(), 1); Assert.assertEquals(factory.getClientFailureCheckPeriod(), 2); @@ -217,15 +218,15 @@ Assert.assertEquals(factory.getScheduledThreadPoolMaxSize(), 16); Assert.assertEquals(factory.getThreadPoolMaxSize(), 17); Assert.assertEquals(factory.getTransactionBatchSize(), 18); - Assert.assertEquals(factory.isAutoGroup(), !ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP); - Assert.assertEquals(factory.isBlockOnAcknowledge(), !ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE); + Assert.assertEquals(factory.isAutoGroup(), !HornetQClient.DEFAULT_AUTO_GROUP); + Assert.assertEquals(factory.isBlockOnAcknowledge(), !HornetQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE); Assert.assertEquals(factory.isBlockOnNonDurableSend(), - !ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND); - Assert.assertEquals(factory.isBlockOnDurableSend(), !ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND); + !HornetQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND); + Assert.assertEquals(factory.isBlockOnDurableSend(), !HornetQClient.DEFAULT_BLOCK_ON_DURABLE_SEND); Assert.assertEquals(factory.isFailoverOnServerShutdown(), - !ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); - Assert.assertEquals(factory.isPreAcknowledge(), !ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE); - Assert.assertEquals(factory.isUseGlobalPools(), !ClientSessionFactoryImpl.DEFAULT_USE_GLOBAL_POOLS); + !HornetQClient.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); + Assert.assertEquals(factory.isPreAcknowledge(), !HornetQClient.DEFAULT_PRE_ACKNOWLEDGE); + Assert.assertEquals(factory.isUseGlobalPools(), !HornetQClient.DEFAULT_USE_GLOBAL_POOLS); } public void testCreateConnectionFactoryOverrides() throws Exception @@ -233,10 +234,10 @@ HornetQResourceAdapter ra = new HornetQResourceAdapter(); ra.setConnectorClassName(InVMConnector.class.getName()); ConnectionFactoryProperties connectionFactoryProperties = new ConnectionFactoryProperties(); - connectionFactoryProperties.setAutoGroup(!ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP); - connectionFactoryProperties.setBlockOnAcknowledge(!ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE); - connectionFactoryProperties.setBlockOnNonDurableSend(!ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND); - connectionFactoryProperties.setBlockOnDurableSend(!ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND); + connectionFactoryProperties.setAutoGroup(!HornetQClient.DEFAULT_AUTO_GROUP); + connectionFactoryProperties.setBlockOnAcknowledge(!HornetQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE); + connectionFactoryProperties.setBlockOnNonDurableSend(!HornetQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND); + connectionFactoryProperties.setBlockOnDurableSend(!HornetQClient.DEFAULT_BLOCK_ON_DURABLE_SEND); connectionFactoryProperties.setCallTimeout(1l); connectionFactoryProperties.setClientFailureCheckPeriod(2l); connectionFactoryProperties.setClientID("myid"); @@ -247,9 +248,9 @@ connectionFactoryProperties.setDiscoveryInitialWaitTimeout(6l); connectionFactoryProperties.setDiscoveryRefreshTimeout(7l); connectionFactoryProperties.setDupsOKBatchSize(8); - connectionFactoryProperties.setFailoverOnServerShutdown(!ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); + connectionFactoryProperties.setFailoverOnServerShutdown(!HornetQClient.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); connectionFactoryProperties.setMinLargeMessageSize(10); - connectionFactoryProperties.setPreAcknowledge(!ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE); + connectionFactoryProperties.setPreAcknowledge(!HornetQClient.DEFAULT_PRE_ACKNOWLEDGE); connectionFactoryProperties.setProducerMaxRate(11); connectionFactoryProperties.setConfirmationWindowSize(12); connectionFactoryProperties.setReconnectAttempts(13); @@ -258,7 +259,7 @@ connectionFactoryProperties.setScheduledThreadPoolMaxSize(16); connectionFactoryProperties.setThreadPoolMaxSize(17); connectionFactoryProperties.setTransactionBatchSize(18); - connectionFactoryProperties.setUseGlobalPools(!ClientSessionFactoryImpl.DEFAULT_USE_GLOBAL_POOLS); + connectionFactoryProperties.setUseGlobalPools(!HornetQClient.DEFAULT_USE_GLOBAL_POOLS); HornetQConnectionFactory factory = ra.createHornetQConnectionFactory(connectionFactoryProperties); Assert.assertEquals(factory.getCallTimeout(), 1); Assert.assertEquals(factory.getClientFailureCheckPeriod(), 2); @@ -281,15 +282,15 @@ Assert.assertEquals(factory.getScheduledThreadPoolMaxSize(), 16); Assert.assertEquals(factory.getThreadPoolMaxSize(), 17); Assert.assertEquals(factory.getTransactionBatchSize(), 18); - Assert.assertEquals(factory.isAutoGroup(), !ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP); - Assert.assertEquals(factory.isBlockOnAcknowledge(), !ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE); + Assert.assertEquals(factory.isAutoGroup(), !HornetQClient.DEFAULT_AUTO_GROUP); + Assert.assertEquals(factory.isBlockOnAcknowledge(), !HornetQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE); Assert.assertEquals(factory.isBlockOnNonDurableSend(), - !ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND); - Assert.assertEquals(factory.isBlockOnDurableSend(), !ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND); + !HornetQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND); + Assert.assertEquals(factory.isBlockOnDurableSend(), !HornetQClient.DEFAULT_BLOCK_ON_DURABLE_SEND); Assert.assertEquals(factory.isFailoverOnServerShutdown(), - !ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); - Assert.assertEquals(factory.isPreAcknowledge(), !ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE); - Assert.assertEquals(factory.isUseGlobalPools(), !ClientSessionFactoryImpl.DEFAULT_USE_GLOBAL_POOLS); + !HornetQClient.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); + Assert.assertEquals(factory.isPreAcknowledge(), !HornetQClient.DEFAULT_PRE_ACKNOWLEDGE); + Assert.assertEquals(factory.isUseGlobalPools(), !HornetQClient.DEFAULT_USE_GLOBAL_POOLS); } public void testCreateConnectionFactoryOverrideConnector() throws Exception @@ -386,7 +387,7 @@ ClientSessionFactory factory = createInVMFactory(); ClientSession session = factory.createSession(false, false, false); - HornetQQueue queue = new HornetQQueue("test"); + HornetQQueue queue = (HornetQQueue) HornetQJMSClient.createHornetQQueue("test"); session.createQueue(queue.getSimpleAddress(), queue.getSimpleAddress(), true); session.close(); Modified: trunk/tests/src/org/hornetq/tests/util/JMSTestBase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/util/JMSTestBase.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/util/JMSTestBase.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -21,7 +21,7 @@ import javax.naming.NamingException; import org.hornetq.api.Pair; -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; @@ -180,30 +180,30 @@ jmsServer.createConnectionFactory("ManualReconnectionToSingleServerTest", connectorConfigs, null, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL, + HornetQClient.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + HornetQClient.DEFAULT_CONNECTION_TTL, callTimeout, - ClientSessionFactoryImpl.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT, - ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE, - ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, - ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP, - ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE, - ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE, - ClientSessionFactoryImpl.DEFAULT_USE_GLOBAL_POOLS, - ClientSessionFactoryImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, - ClientSessionFactoryImpl.DEFAULT_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT, + HornetQClient.DEFAULT_MIN_LARGE_MESSAGE_SIZE, + HornetQClient.DEFAULT_CONSUMER_WINDOW_SIZE, + HornetQClient.DEFAULT_CONSUMER_MAX_RATE, + HornetQClient.DEFAULT_CONFIRMATION_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_WINDOW_SIZE, + HornetQClient.DEFAULT_PRODUCER_MAX_RATE, + HornetQClient.DEFAULT_BLOCK_ON_ACKNOWLEDGE, + HornetQClient.DEFAULT_BLOCK_ON_DURABLE_SEND, + HornetQClient.DEFAULT_BLOCK_ON_NON_DURABLE_SEND, + HornetQClient.DEFAULT_AUTO_GROUP, + HornetQClient.DEFAULT_PRE_ACKNOWLEDGE, + HornetQClient.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_ACK_BATCH_SIZE, + HornetQClient.DEFAULT_USE_GLOBAL_POOLS, + HornetQClient.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE, + HornetQClient.DEFAULT_THREAD_POOL_MAX_SIZE, retryInterval, retryIntervalMultiplier, - ClientSessionFactoryImpl.DEFAULT_MAX_RETRY_INTERVAL, + HornetQClient.DEFAULT_MAX_RETRY_INTERVAL, reconnectAttempts, failoverOnServerShutdown, null, Modified: trunk/tests/src/org/hornetq/tests/util/ServiceTestBase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/util/ServiceTestBase.java 2010-01-06 08:44:23 UTC (rev 8722) +++ trunk/tests/src/org/hornetq/tests/util/ServiceTestBase.java 2010-01-06 08:57:20 UTC (rev 8723) @@ -25,6 +25,7 @@ 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; @@ -347,7 +348,7 @@ protected ClientSessionFactoryImpl createFactory(final String connectorClass) { - return new ClientSessionFactoryImpl(new TransportConfiguration(connectorClass), null); + return (ClientSessionFactoryImpl) HornetQClient.createClientSessionFactory(new TransportConfiguration(connectorClass), null); }

14 years, 11 months

1
0
0 / 0

JBoss hornetq SVN: r8722 - trunk/tests/joram-tests/config.

by do-not-reply＠jboss.org

Author: timfox Date: 2010-01-06 03:44:23 -0500 (Wed, 06 Jan 2010) New Revision: 8722 Modified: trunk/tests/joram-tests/config/provider.properties Log: corrected props file for joram tests Modified: trunk/tests/joram-tests/config/provider.properties =================================================================== --- trunk/tests/joram-tests/config/provider.properties 2010-01-05 19:49:35 UTC (rev 8721) +++ trunk/tests/joram-tests/config/provider.properties 2010-01-06 08:44:23 UTC (rev 8722) @@ -27,7 +27,7 @@ # Uncomment the chosen provider and comment the other ones ## -jms.provider.admin.class=org.hornetq.api.jms.HornetQAdmin +jms.provider.admin.class=org.hornetq.HornetQAdmin #jms.provider.admin.class = org.hornetq.api.jms.GenericAdmin #jms.provider.admin.class = org.objectweb.jtests.providers.admin.JoramAdmin #jms.provider.admin.class = org.objectweb.jtests.providers.admin.AshnaMQAdmin

14 years, 11 months

1
0
0 / 0

JBoss hornetq SVN: r8721 - in trunk: examples/common/config and 171 other directories.

by do-not-reply＠jboss.org

Author: timfox Date: 2010-01-05 14:49:35 -0500 (Tue, 05 Jan 2010) New Revision: 8721 Added: trunk/src/main/org/hornetq/api/core/management/ManagementHelper.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/server/HornetQServers.java trunk/src/main/org/hornetq/core/server/cluster/BridgeConfiguration.java trunk/src/main/org/hornetq/core/server/cluster/BroadcastGroupConfiguration.java trunk/src/main/org/hornetq/core/server/cluster/ClusterConnectionConfiguration.java trunk/src/main/org/hornetq/core/server/cluster/DiscoveryGroupConfiguration.java trunk/src/main/org/hornetq/core/server/cluster/DivertConfiguration.java trunk/src/main/org/hornetq/core/server/cluster/QueueConfiguration.java trunk/src/main/org/hornetq/jms/bridge/ConnectionFactoryFactory.java trunk/src/main/org/hornetq/jms/bridge/DestinationFactory.java trunk/src/main/org/hornetq/jms/bridge/JMSBridge.java trunk/src/main/org/hornetq/jms/bridge/JMSBridgeControl.java trunk/src/main/org/hornetq/jms/bridge/QualityOfServiceMode.java trunk/src/main/org/hornetq/jms/bridge/impl/JMSBridgeImpl.java trunk/src/main/org/hornetq/jms/bridge/impl/JNDIConnectionFactoryFactory.java trunk/src/main/org/hornetq/jms/bridge/impl/JNDIDestinationFactory.java trunk/src/main/org/hornetq/jms/bridge/impl/JNDIFactorySupport.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/JMSConfiguration.java trunk/src/main/org/hornetq/jms/server/config/QueueConfiguration.java trunk/src/main/org/hornetq/jms/server/config/TopicConfiguration.java trunk/src/main/org/hornetq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java trunk/src/main/org/hornetq/jms/server/config/impl/JMSConfigurationImpl.java trunk/src/main/org/hornetq/jms/server/config/impl/QueueConfigurationImpl.java trunk/src/main/org/hornetq/jms/server/config/impl/TopicConfigurationImpl.java trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java Removed: trunk/src/main/org/hornetq/api/core/config/Configuration.java trunk/src/main/org/hornetq/api/core/config/ConfigurationImpl.java trunk/src/main/org/hornetq/api/core/config/FileConfiguration.java trunk/src/main/org/hornetq/api/core/config/cluster/ trunk/src/main/org/hornetq/api/core/management/client/ trunk/src/main/org/hornetq/api/core/server/ trunk/src/main/org/hornetq/api/jms/bridge/ConnectionFactoryFactory.java trunk/src/main/org/hornetq/api/jms/bridge/DestinationFactory.java trunk/src/main/org/hornetq/api/jms/bridge/JMSBridge.java trunk/src/main/org/hornetq/api/jms/bridge/JMSBridgeControl.java trunk/src/main/org/hornetq/api/jms/bridge/JMSBridgeImpl.java trunk/src/main/org/hornetq/api/jms/bridge/JNDIConnectionFactoryFactory.java trunk/src/main/org/hornetq/api/jms/bridge/JNDIDestinationFactory.java trunk/src/main/org/hornetq/api/jms/bridge/JNDIFactorySupport.java trunk/src/main/org/hornetq/api/jms/bridge/QualityOfServiceMode.java trunk/src/main/org/hornetq/api/jms/config/ trunk/src/main/org/hornetq/api/jms/server/ Modified: trunk/docs/user-manual/en/embedding-hornetq.xml trunk/docs/user-manual/en/jms-bridge.xml trunk/docs/user-manual/en/management.xml trunk/docs/user-manual/en/using-server.xml trunk/examples/common/config/hornetq-example-beans.xml 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/server0/hornetq-beans.xml trunk/examples/core/perf/server0/hornetq-beans.xml trunk/examples/jms/applet/server0/hornetq-beans.xml trunk/examples/jms/application-layer-failover/server0/hornetq-beans.xml trunk/examples/jms/application-layer-failover/server1/hornetq-beans.xml trunk/examples/jms/bridge/server0/hornetq-beans.xml trunk/examples/jms/bridge/server1/hornetq-beans.xml trunk/examples/jms/browser/server0/hornetq-beans.xml trunk/examples/jms/client-kickoff/server0/hornetq-beans.xml trunk/examples/jms/client-side-load-balancing/server0/hornetq-beans.xml trunk/examples/jms/client-side-load-balancing/server1/hornetq-beans.xml trunk/examples/jms/client-side-load-balancing/server2/hornetq-beans.xml trunk/examples/jms/clustered-durable-subscription/server0/hornetq-beans.xml trunk/examples/jms/clustered-durable-subscription/server1/hornetq-beans.xml trunk/examples/jms/clustered-grouping/server0/hornetq-beans.xml trunk/examples/jms/clustered-grouping/server1/hornetq-beans.xml trunk/examples/jms/clustered-grouping/server2/hornetq-beans.xml trunk/examples/jms/clustered-queue/server0/hornetq-beans.xml trunk/examples/jms/clustered-queue/server1/hornetq-beans.xml trunk/examples/jms/clustered-topic/server0/hornetq-beans.xml trunk/examples/jms/clustered-topic/server1/hornetq-beans.xml trunk/examples/jms/consumer-rate-limit/server0/hornetq-beans.xml trunk/examples/jms/dead-letter/server0/hornetq-beans.xml trunk/examples/jms/delayed-redelivery/server0/hornetq-beans.xml trunk/examples/jms/divert/server0/hornetq-beans.xml trunk/examples/jms/divert/server1/hornetq-beans.xml trunk/examples/jms/durable-subscription/server0/hornetq-beans.xml trunk/examples/jms/embedded/src/org/hornetq/jms/example/EmbeddedExample.java trunk/examples/jms/expiry/server0/hornetq-beans.xml trunk/examples/jms/http-transport/server0/hornetq-beans.xml trunk/examples/jms/instantiate-connection-factory/server0/hornetq-beans.xml trunk/examples/jms/interceptor/server0/hornetq-beans.xml trunk/examples/jms/jaas/server0/hornetq-beans.xml trunk/examples/jms/jms-bridge/server0/hornetq-beans.xml trunk/examples/jms/jms-bridge/server1/hornetq-beans.xml trunk/examples/jms/jmx/server0/hornetq-beans.xml trunk/examples/jms/large-message/server0/hornetq-beans.xml trunk/examples/jms/last-value-queue/server0/hornetq-beans.xml trunk/examples/jms/management-notifications/server0/hornetq-beans.xml trunk/examples/jms/management/server0/hornetq-beans.xml trunk/examples/jms/message-counters/server0/hornetq-beans.xml trunk/examples/jms/message-group/server0/hornetq-beans.xml trunk/examples/jms/message-group2/server0/hornetq-beans.xml trunk/examples/jms/message-priority/server0/hornetq-beans.xml trunk/examples/jms/no-consumer-buffering/server0/hornetq-beans.xml trunk/examples/jms/non-transaction-failover/server0/hornetq-beans.xml trunk/examples/jms/non-transaction-failover/server1/hornetq-beans.xml trunk/examples/jms/paging/server0/hornetq-beans.xml trunk/examples/jms/perf/server0/hornetq-beans.xml trunk/examples/jms/pre-acknowledge/server0/hornetq-beans.xml trunk/examples/jms/producer-rate-limit/server0/hornetq-beans.xml trunk/examples/jms/queue-message-redistribution/server0/hornetq-beans.xml trunk/examples/jms/queue-message-redistribution/server1/hornetq-beans.xml trunk/examples/jms/queue-requestor/server0/hornetq-beans.xml trunk/examples/jms/queue-selector/server0/hornetq-beans.xml trunk/examples/jms/queue/server0/hornetq-beans.xml trunk/examples/jms/reattach-node/server0/hornetq-beans.xml trunk/examples/jms/request-reply/server0/hornetq-beans.xml trunk/examples/jms/scheduled-message/server0/hornetq-beans.xml trunk/examples/jms/security/server0/hornetq-beans.xml trunk/examples/jms/send-acknowledgements/server0/hornetq-beans.xml trunk/examples/jms/ssl-enabled/server0/hornetq-beans.xml trunk/examples/jms/static-selector-jms/server0/hornetq-beans.xml trunk/examples/jms/static-selector/server0/hornetq-beans.xml trunk/examples/jms/symmetric-cluster/server0/hornetq-beans.xml trunk/examples/jms/symmetric-cluster/server1/hornetq-beans.xml trunk/examples/jms/symmetric-cluster/server2/hornetq-beans.xml trunk/examples/jms/symmetric-cluster/server3/hornetq-beans.xml trunk/examples/jms/symmetric-cluster/server4/hornetq-beans.xml trunk/examples/jms/symmetric-cluster/server5/hornetq-beans.xml trunk/examples/jms/temp-queue/server0/hornetq-beans.xml trunk/examples/jms/topic-hierarchies/server0/hornetq-beans.xml trunk/examples/jms/topic-selector-example1/server0/hornetq-beans.xml trunk/examples/jms/topic-selector-example2/server0/hornetq-beans.xml trunk/examples/jms/topic/server0/hornetq-beans.xml trunk/examples/jms/transaction-failover/server0/hornetq-beans.xml trunk/examples/jms/transaction-failover/server1/hornetq-beans.xml trunk/examples/jms/transactional/server0/hornetq-beans.xml trunk/examples/jms/xa-heuristic/server0/hornetq-beans.xml trunk/examples/jms/xa-receive/server0/hornetq-beans.xml trunk/examples/jms/xa-send/server0/hornetq-beans.xml trunk/examples/jms/xa-with-jta/server0/hornetq-beans.xml trunk/examples/soak/normal/server0/hornetq-beans.xml trunk/src/config/jboss-as/clustered/hornetq-jboss-beans.xml trunk/src/config/jboss-as/non-clustered/hornetq-jboss-beans.xml trunk/src/config/stand-alone/clustered/hornetq-beans.xml trunk/src/config/stand-alone/non-clustered/hornetq-beans.xml trunk/src/config/trunk/clustered/hornetq-beans.xml trunk/src/config/trunk/non-clustered/hornetq-beans.xml trunk/src/main/org/hornetq/api/core/management/HornetQServerControl.java trunk/src/main/org/hornetq/api/core/management/ObjectNameBuilder.java trunk/src/main/org/hornetq/api/jms/management/JMSManagementHelper.java trunk/src/main/org/hornetq/core/deployers/impl/QueueDeployer.java trunk/src/main/org/hornetq/core/journal/impl/AIOSequentialFileFactory.java trunk/src/main/org/hornetq/core/journal/impl/NIOSequentialFileFactory.java trunk/src/main/org/hornetq/core/management/impl/BridgeControlImpl.java trunk/src/main/org/hornetq/core/management/impl/BroadcastGroupControlImpl.java trunk/src/main/org/hornetq/core/management/impl/ClusterConnectionControlImpl.java trunk/src/main/org/hornetq/core/management/impl/DiscoveryGroupControlImpl.java trunk/src/main/org/hornetq/core/management/impl/DivertControlImpl.java trunk/src/main/org/hornetq/core/management/impl/HornetQServerControlImpl.java trunk/src/main/org/hornetq/core/messagecounter/impl/MessageCounterManagerImpl.java trunk/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java trunk/src/main/org/hornetq/core/postoffice/impl/PostOfficeImpl.java trunk/src/main/org/hornetq/core/remoting/server/impl/RemotingServiceImpl.java trunk/src/main/org/hornetq/core/replication/impl/ReplicationEndpointImpl.java trunk/src/main/org/hornetq/core/security/impl/SecurityStoreImpl.java trunk/src/main/org/hornetq/core/server/HornetQServer.java trunk/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.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/group/impl/LocalGroupingHandler.java trunk/src/main/org/hornetq/core/server/group/impl/RemoteGroupingHandler.java trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java trunk/src/main/org/hornetq/core/server/impl/ServerConsumerImpl.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/NotificationService.java trunk/src/main/org/hornetq/core/server/management/impl/ManagementServiceImpl.java trunk/src/main/org/hornetq/jms/bridge/impl/JMSBridgeControlImpl.java trunk/src/main/org/hornetq/jms/management/impl/JMSServerControlImpl.java trunk/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java trunk/src/main/org/hornetq/jms/server/management/JMSManagementService.java trunk/src/main/org/hornetq/jms/server/management/impl/JMSManagementServiceImpl.java trunk/src/main/org/hornetq/service/HornetQFileConfigurationService.java trunk/src/main/org/hornetq/service/HornetQFileConfigurationServiceMBean.java trunk/src/main/org/hornetq/service/HornetQJMSStarterService.java trunk/src/main/org/hornetq/service/HornetQStarterService.java trunk/tests/jms-tests/config/hornetq-beans.xml trunk/tests/jms-tests/config/test-beans.xml trunk/tests/jms-tests/src/org/hornetq/jms/tests/HornetQServerTestCase.java trunk/tests/jms-tests/src/org/hornetq/jms/tests/tools/ConfigurationHelper.java trunk/tests/jms-tests/src/org/hornetq/jms/tests/tools/container/LocalTestServer.java trunk/tests/jms-tests/src/org/hornetq/jms/tests/tools/container/Server.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/String64KLimitTest.java trunk/tests/src/org/hornetq/tests/integration/client/ConsumerCloseTest.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/ExpiryAddressTest.java trunk/tests/src/org/hornetq/tests/integration/client/FailureDeadlockTest.java trunk/tests/src/org/hornetq/tests/integration/client/HeuristicXATest.java trunk/tests/src/org/hornetq/tests/integration/client/HornetQCrashTest.java trunk/tests/src/org/hornetq/tests/integration/client/JournalCrashTest.java trunk/tests/src/org/hornetq/tests/integration/client/LargeMessageTest.java trunk/tests/src/org/hornetq/tests/integration/client/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/ReceiveImmediateTest.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/SessionCloseTest.java trunk/tests/src/org/hornetq/tests/integration/client/SessionClosedOnRemotingConnectionFailureTest.java trunk/tests/src/org/hornetq/tests/integration/client/SessionFactoryTest.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/ClientTestBase.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/distribution/ClusterTestBase.java trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusteredGroupingTest.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/NettyReplicatedFailoverTest.java trunk/tests/src/org/hornetq/tests/integration/cluster/failover/PagingFailoverTest.java trunk/tests/src/org/hornetq/tests/integration/cluster/failover/ReplicatedAsynchronousFailoverTest.java trunk/tests/src/org/hornetq/tests/integration/cluster/failover/ReplicatedNettyAsynchronousFailoverTest.java trunk/tests/src/org/hornetq/tests/integration/cluster/failover/ReplicatedPagingFailoverTest.java trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/MultiThreadRandomReattachTest.java trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/NettyMultiThreadRandomReattachTest.java trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/RandomReattachTest.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/bridge/JMSBridgeReconnectionTest.java trunk/tests/src/org/hornetq/tests/integration/jms/bridge/JMSBridgeTest.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/ExceptionListenerTest.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/TopicControlTest.java trunk/tests/src/org/hornetq/tests/integration/jms/server/management/TopicControlUsingJMSTest.java trunk/tests/src/org/hornetq/tests/integration/journal/AIOJournalCompactTest.java trunk/tests/src/org/hornetq/tests/integration/journal/AIOJournalImplTest.java trunk/tests/src/org/hornetq/tests/integration/journal/ValidateTransactionHealthTest.java trunk/tests/src/org/hornetq/tests/integration/logging/LogDelegateTest.java trunk/tests/src/org/hornetq/tests/integration/management/AcceptorControlTest.java trunk/tests/src/org/hornetq/tests/integration/management/AddressControlTest.java trunk/tests/src/org/hornetq/tests/integration/management/AddressControlUsingCoreTest.java trunk/tests/src/org/hornetq/tests/integration/management/BridgeControlTest.java trunk/tests/src/org/hornetq/tests/integration/management/BridgeControlUsingCoreTest.java trunk/tests/src/org/hornetq/tests/integration/management/BroadcastGroupControlTest.java trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControl2Test.java trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControlTest.java trunk/tests/src/org/hornetq/tests/integration/management/CoreMessagingProxy.java trunk/tests/src/org/hornetq/tests/integration/management/DiscoveryGroupControlTest.java trunk/tests/src/org/hornetq/tests/integration/management/DivertControlTest.java trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlTest.java trunk/tests/src/org/hornetq/tests/integration/management/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/ManagementServiceImplTest.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/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/paging/PageCrashTest.java trunk/tests/src/org/hornetq/tests/integration/persistence/RestartSMTest.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/SynchronousCloseTest.java trunk/tests/src/org/hornetq/tests/integration/replication/ReplicationTest.java trunk/tests/src/org/hornetq/tests/integration/scheduling/DelayedMessageTest.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/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/unit/core/config/impl/ConfigurationImplTest.java trunk/tests/src/org/hornetq/tests/unit/core/config/impl/ConfigurationValidationTest.java trunk/tests/src/org/hornetq/tests/unit/core/config/impl/DefaultsFileConfigurationTest.java trunk/tests/src/org/hornetq/tests/unit/core/config/impl/FileConfigurationTest.java trunk/tests/src/org/hornetq/tests/unit/core/deployers/impl/QueueDeployerTest.java trunk/tests/src/org/hornetq/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.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/jms/misc/ManifestTest.java trunk/tests/src/org/hornetq/tests/util/JMSTestBase.java trunk/tests/src/org/hornetq/tests/util/ListJournal.java trunk/tests/src/org/hornetq/tests/util/ServiceTestBase.java Log: removed most of the server stuff from the api Modified: trunk/docs/user-manual/en/embedding-hornetq.xml =================================================================== --- trunk/docs/user-manual/en/embedding-hornetq.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/docs/user-manual/en/embedding-hornetq.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -36,8 +36,8 @@ <para>Create the configuration object - this contains configuration information for a HornetQ. If you want to configure it from a file on the classpath, use <literal >FileConfigurationImpl</literal></para> - <programlisting>import org.hornetq.api.core.config.Configuration; -import org.hornetq.api.core.config.FileConfiguration; + <programlisting>import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.impl.FileConfiguration; ... @@ -51,8 +51,8 @@ <para>The acceptors are configured through <literal>ConfigurationImpl</literal>. Just add the <literal>NettyAcceptorFactory</literal> on the transports the same way you would through the main configuration file.</para> - <programlisting>import org.hornetq.api.core.config.Configuration; -import org.hornetq.api.core.config.ConfigurationImpl; + <programlisting>import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.impl.ConfigurationImpl; ... @@ -99,7 +99,7 @@  <bean name="Configuration" - class="org.hornetq.api.core.config.FileConfiguration"> + class="org.hornetq.core.config.impl.FileConfiguration"> </bean>  Modified: trunk/docs/user-manual/en/jms-bridge.xml =================================================================== --- trunk/docs/user-manual/en/jms-bridge.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/docs/user-manual/en/jms-bridge.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -347,7 +347,7 @@ HornetQ that looks up the connection factory using JNDI. For other Application Servers or JMS providers a new implementation may have to be provided. This can easily be done by implementing the interface <literal - >org.hornetq.api.jms.bridge.ConnectionFactoryFactory</literal>.</para> + >org.hornetq.jms.bridge.ConnectionFactoryFactory</literal>.</para> </section> <section> <title>Source and Target Destination Factories</title> @@ -355,7 +355,7 @@ <para>In the configuration example above, we have used the default provided by HornetQ that looks up the destination using JNDI.</para> <para>A new implementation can be provided by implementing <literal - >org.hornetq.api.jms.bridge.DestinationFactory</literal> interface.</para> + >org.hornetq.jms.bridge.DestinationFactory</literal> interface.</para> </section> <section id="quality-of-service"> <title>Quality Of Service</title> Modified: trunk/docs/user-manual/en/management.xml =================================================================== --- trunk/docs/user-manual/en/management.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/docs/user-manual/en/management.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -588,7 +588,7 @@ retrieve the result of the operation (if any) stored in the reply's body. For portability, results are returned as a <ulink url="http://json.org">JSON</ulink> String rather than Java Serialization (the <literal - >org.hornetq.api.core.management.client.ManagementHelper</literal> can be used to + >org.hornetq.api.core.management.ManagementHelper</literal> can be used to convert the JSON string to Java objects).</para> <para>These steps can be simplified to make it easier to invoke management operations using Core messages:</para> @@ -602,7 +602,7 @@ </listitem> <listitem> <para>Use the helper class <literal - >org.hornetq.api.core.management.client.ManagementHelper</literal> to fill the + >org.hornetq.api.core.management.ManagementHelper</literal> to fill the message with the management properties</para> </listitem> <listitem> @@ -610,7 +610,7 @@ </listitem> <listitem> <para>Use the helper class <literal - >org.hornetq.api.core.management.client.ManagementHelper</literal> to retrieve + >org.hornetq.api.core.management.ManagementHelper</literal> to retrieve the operation result from the management reply</para> </listitem> </orderedlist> Modified: trunk/docs/user-manual/en/using-server.xml =================================================================== --- trunk/docs/user-manual/en/using-server.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/docs/user-manual/en/using-server.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -219,7 +219,7 @@ </bean>  -<bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"> +<bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"> </bean>  @@ -248,7 +248,7 @@  <bean name="JMSServerManager" - class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/common/config/hornetq-example-beans.xml =================================================================== --- trunk/examples/common/config/hornetq-example-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/common/config/hornetq-example-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </constructor> </bean> - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  @@ -80,7 +80,7 @@ </property> </bean> - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer" property="serverManagement"/> 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-05 17:41:42 UTC (rev 8720) +++ trunk/examples/core/embedded/src/org/hornetq/core/example/EmbeddedExample.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -21,13 +21,13 @@ 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.config.Configuration; -import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.server.HornetQServers; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; /** * 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-05 17:41:42 UTC (rev 8720) +++ trunk/examples/core/embedded-remote/src/org/hornetq/core/example/EmbeddedServer.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -15,11 +15,11 @@ import java.util.HashSet; -import org.hornetq.api.core.config.Configuration; -import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.server.HornetQServers; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; import org.hornetq.integration.transports.netty.NettyAcceptorFactory; /** Modified: trunk/examples/core/microcontainer/server0/hornetq-beans.xml =================================================================== --- trunk/examples/core/microcontainer/server0/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/core/microcontainer/server0/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -9,7 +9,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> Modified: trunk/examples/core/perf/server0/hornetq-beans.xml =================================================================== --- trunk/examples/core/perf/server0/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/core/perf/server0/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -3,7 +3,7 @@ <deployment xmlns="urn:jboss:bean-deployer:2.0">  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl"> Modified: trunk/examples/jms/applet/server0/hornetq-beans.xml =================================================================== --- trunk/examples/jms/applet/server0/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/applet/server0/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/application-layer-failover/server0/hornetq-beans.xml =================================================================== --- trunk/examples/jms/application-layer-failover/server0/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/application-layer-failover/server0/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/application-layer-failover/server1/hornetq-beans.xml =================================================================== --- trunk/examples/jms/application-layer-failover/server1/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/application-layer-failover/server1/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/bridge/server0/hornetq-beans.xml =================================================================== --- trunk/examples/jms/bridge/server0/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/bridge/server0/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/bridge/server1/hornetq-beans.xml =================================================================== --- trunk/examples/jms/bridge/server1/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/bridge/server1/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/browser/server0/hornetq-beans.xml =================================================================== --- trunk/examples/jms/browser/server0/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/browser/server0/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/client-kickoff/server0/hornetq-beans.xml =================================================================== --- trunk/examples/jms/client-kickoff/server0/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/client-kickoff/server0/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/client-side-load-balancing/server0/hornetq-beans.xml =================================================================== --- trunk/examples/jms/client-side-load-balancing/server0/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/client-side-load-balancing/server0/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/client-side-load-balancing/server1/hornetq-beans.xml =================================================================== --- trunk/examples/jms/client-side-load-balancing/server1/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/client-side-load-balancing/server1/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/client-side-load-balancing/server2/hornetq-beans.xml =================================================================== --- trunk/examples/jms/client-side-load-balancing/server2/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/client-side-load-balancing/server2/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/clustered-durable-subscription/server0/hornetq-beans.xml =================================================================== --- trunk/examples/jms/clustered-durable-subscription/server0/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/clustered-durable-subscription/server0/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/clustered-durable-subscription/server1/hornetq-beans.xml =================================================================== --- trunk/examples/jms/clustered-durable-subscription/server1/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/clustered-durable-subscription/server1/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/clustered-grouping/server0/hornetq-beans.xml =================================================================== --- trunk/examples/jms/clustered-grouping/server0/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/clustered-grouping/server0/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/clustered-grouping/server1/hornetq-beans.xml =================================================================== --- trunk/examples/jms/clustered-grouping/server1/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/clustered-grouping/server1/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/clustered-grouping/server2/hornetq-beans.xml =================================================================== --- trunk/examples/jms/clustered-grouping/server2/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/clustered-grouping/server2/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/clustered-queue/server0/hornetq-beans.xml =================================================================== --- trunk/examples/jms/clustered-queue/server0/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/clustered-queue/server0/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/clustered-queue/server1/hornetq-beans.xml =================================================================== --- trunk/examples/jms/clustered-queue/server1/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/clustered-queue/server1/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/clustered-topic/server0/hornetq-beans.xml =================================================================== --- trunk/examples/jms/clustered-topic/server0/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/clustered-topic/server0/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/clustered-topic/server1/hornetq-beans.xml =================================================================== --- trunk/examples/jms/clustered-topic/server1/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/clustered-topic/server1/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/consumer-rate-limit/server0/hornetq-beans.xml =================================================================== --- trunk/examples/jms/consumer-rate-limit/server0/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/consumer-rate-limit/server0/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/dead-letter/server0/hornetq-beans.xml =================================================================== --- trunk/examples/jms/dead-letter/server0/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/dead-letter/server0/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/delayed-redelivery/server0/hornetq-beans.xml =================================================================== --- trunk/examples/jms/delayed-redelivery/server0/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/delayed-redelivery/server0/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/divert/server0/hornetq-beans.xml =================================================================== --- trunk/examples/jms/divert/server0/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/divert/server0/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/divert/server1/hornetq-beans.xml =================================================================== --- trunk/examples/jms/divert/server1/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/divert/server1/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/durable-subscription/server0/hornetq-beans.xml =================================================================== --- trunk/examples/jms/durable-subscription/server0/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/durable-subscription/server0/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> 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-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/embedded/src/org/hornetq/jms/example/EmbeddedExample.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -25,21 +25,21 @@ import javax.naming.Context; import javax.naming.InitialContext; -import org.hornetq.api.core.config.Configuration; -import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.server.HornetQServers; -import org.hornetq.api.jms.config.ConnectionFactoryConfiguration; -import org.hornetq.api.jms.config.ConnectionFactoryConfigurationImpl; -import org.hornetq.api.jms.config.JMSConfiguration; -import org.hornetq.api.jms.config.JMSConfigurationImpl; -import org.hornetq.api.jms.config.QueueConfiguration; -import org.hornetq.api.jms.config.QueueConfigurationImpl; -import org.hornetq.api.jms.server.JMSServerManager; -import org.hornetq.api.jms.server.JMSServerManagerImpl; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; import org.hornetq.integration.transports.netty.NettyAcceptorFactory; import org.hornetq.integration.transports.netty.NettyConnectorFactory; +import org.hornetq.jms.server.JMSServerManager; +import org.hornetq.jms.server.config.ConnectionFactoryConfiguration; +import org.hornetq.jms.server.config.JMSConfiguration; +import org.hornetq.jms.server.config.QueueConfiguration; +import org.hornetq.jms.server.config.impl.ConnectionFactoryConfigurationImpl; +import org.hornetq.jms.server.config.impl.JMSConfigurationImpl; +import org.hornetq.jms.server.config.impl.QueueConfigurationImpl; +import org.hornetq.jms.server.impl.JMSServerManagerImpl; import org.jnp.server.Main; import org.jnp.server.NamingBeanImpl; Modified: trunk/examples/jms/expiry/server0/hornetq-beans.xml =================================================================== --- trunk/examples/jms/expiry/server0/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/expiry/server0/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/http-transport/server0/hornetq-beans.xml =================================================================== --- trunk/examples/jms/http-transport/server0/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/http-transport/server0/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/instantiate-connection-factory/server0/hornetq-beans.xml =================================================================== --- trunk/examples/jms/instantiate-connection-factory/server0/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/instantiate-connection-factory/server0/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/interceptor/server0/hornetq-beans.xml =================================================================== --- trunk/examples/jms/interceptor/server0/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/interceptor/server0/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/jaas/server0/hornetq-beans.xml =================================================================== --- trunk/examples/jms/jaas/server0/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/jaas/server0/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.JAASSecurityManager"> @@ -81,7 +81,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/jms-bridge/server0/hornetq-beans.xml =================================================================== --- trunk/examples/jms/jms-bridge/server0/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/jms-bridge/server0/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -28,7 +28,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -54,7 +54,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/jms-bridge/server1/hornetq-beans.xml =================================================================== --- trunk/examples/jms/jms-bridge/server1/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/jms-bridge/server1/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -28,7 +28,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -54,7 +54,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/jmx/server0/hornetq-beans.xml =================================================================== --- trunk/examples/jms/jmx/server0/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/jmx/server0/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/large-message/server0/hornetq-beans.xml =================================================================== --- trunk/examples/jms/large-message/server0/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/large-message/server0/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/last-value-queue/server0/hornetq-beans.xml =================================================================== --- trunk/examples/jms/last-value-queue/server0/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/last-value-queue/server0/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/management/server0/hornetq-beans.xml =================================================================== --- trunk/examples/jms/management/server0/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/management/server0/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/management-notifications/server0/hornetq-beans.xml =================================================================== --- trunk/examples/jms/management-notifications/server0/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/management-notifications/server0/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/message-counters/server0/hornetq-beans.xml =================================================================== --- trunk/examples/jms/message-counters/server0/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/message-counters/server0/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/message-group/server0/hornetq-beans.xml =================================================================== --- trunk/examples/jms/message-group/server0/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/message-group/server0/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/message-group2/server0/hornetq-beans.xml =================================================================== --- trunk/examples/jms/message-group2/server0/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/message-group2/server0/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/message-priority/server0/hornetq-beans.xml =================================================================== --- trunk/examples/jms/message-priority/server0/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/message-priority/server0/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/no-consumer-buffering/server0/hornetq-beans.xml =================================================================== --- trunk/examples/jms/no-consumer-buffering/server0/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/no-consumer-buffering/server0/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/non-transaction-failover/server0/hornetq-beans.xml =================================================================== --- trunk/examples/jms/non-transaction-failover/server0/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/non-transaction-failover/server0/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/non-transaction-failover/server1/hornetq-beans.xml =================================================================== --- trunk/examples/jms/non-transaction-failover/server1/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/non-transaction-failover/server1/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/paging/server0/hornetq-beans.xml =================================================================== --- trunk/examples/jms/paging/server0/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/paging/server0/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/perf/server0/hornetq-beans.xml =================================================================== --- trunk/examples/jms/perf/server0/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/perf/server0/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -16,7 +16,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl"> @@ -30,7 +30,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/pre-acknowledge/server0/hornetq-beans.xml =================================================================== --- trunk/examples/jms/pre-acknowledge/server0/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/pre-acknowledge/server0/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/producer-rate-limit/server0/hornetq-beans.xml =================================================================== --- trunk/examples/jms/producer-rate-limit/server0/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/producer-rate-limit/server0/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/queue/server0/hornetq-beans.xml =================================================================== --- trunk/examples/jms/queue/server0/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/queue/server0/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/queue-message-redistribution/server0/hornetq-beans.xml =================================================================== --- trunk/examples/jms/queue-message-redistribution/server0/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/queue-message-redistribution/server0/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/queue-message-redistribution/server1/hornetq-beans.xml =================================================================== --- trunk/examples/jms/queue-message-redistribution/server1/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/queue-message-redistribution/server1/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/queue-requestor/server0/hornetq-beans.xml =================================================================== --- trunk/examples/jms/queue-requestor/server0/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/queue-requestor/server0/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/queue-selector/server0/hornetq-beans.xml =================================================================== --- trunk/examples/jms/queue-selector/server0/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/queue-selector/server0/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/reattach-node/server0/hornetq-beans.xml =================================================================== --- trunk/examples/jms/reattach-node/server0/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/reattach-node/server0/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/request-reply/server0/hornetq-beans.xml =================================================================== --- trunk/examples/jms/request-reply/server0/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/request-reply/server0/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/scheduled-message/server0/hornetq-beans.xml =================================================================== --- trunk/examples/jms/scheduled-message/server0/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/scheduled-message/server0/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/security/server0/hornetq-beans.xml =================================================================== --- trunk/examples/jms/security/server0/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/security/server0/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/send-acknowledgements/server0/hornetq-beans.xml =================================================================== --- trunk/examples/jms/send-acknowledgements/server0/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/send-acknowledgements/server0/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/ssl-enabled/server0/hornetq-beans.xml =================================================================== --- trunk/examples/jms/ssl-enabled/server0/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/ssl-enabled/server0/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/static-selector/server0/hornetq-beans.xml =================================================================== --- trunk/examples/jms/static-selector/server0/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/static-selector/server0/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/static-selector-jms/server0/hornetq-beans.xml =================================================================== --- trunk/examples/jms/static-selector-jms/server0/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/static-selector-jms/server0/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/symmetric-cluster/server0/hornetq-beans.xml =================================================================== --- trunk/examples/jms/symmetric-cluster/server0/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/symmetric-cluster/server0/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/symmetric-cluster/server1/hornetq-beans.xml =================================================================== --- trunk/examples/jms/symmetric-cluster/server1/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/symmetric-cluster/server1/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/symmetric-cluster/server2/hornetq-beans.xml =================================================================== --- trunk/examples/jms/symmetric-cluster/server2/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/symmetric-cluster/server2/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/symmetric-cluster/server3/hornetq-beans.xml =================================================================== --- trunk/examples/jms/symmetric-cluster/server3/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/symmetric-cluster/server3/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/symmetric-cluster/server4/hornetq-beans.xml =================================================================== --- trunk/examples/jms/symmetric-cluster/server4/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/symmetric-cluster/server4/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/symmetric-cluster/server5/hornetq-beans.xml =================================================================== --- trunk/examples/jms/symmetric-cluster/server5/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/symmetric-cluster/server5/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/temp-queue/server0/hornetq-beans.xml =================================================================== --- trunk/examples/jms/temp-queue/server0/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/temp-queue/server0/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/topic/server0/hornetq-beans.xml =================================================================== --- trunk/examples/jms/topic/server0/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/topic/server0/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/topic-hierarchies/server0/hornetq-beans.xml =================================================================== --- trunk/examples/jms/topic-hierarchies/server0/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/topic-hierarchies/server0/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/topic-selector-example1/server0/hornetq-beans.xml =================================================================== --- trunk/examples/jms/topic-selector-example1/server0/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/topic-selector-example1/server0/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/topic-selector-example2/server0/hornetq-beans.xml =================================================================== --- trunk/examples/jms/topic-selector-example2/server0/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/topic-selector-example2/server0/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/transaction-failover/server0/hornetq-beans.xml =================================================================== --- trunk/examples/jms/transaction-failover/server0/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/transaction-failover/server0/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/transaction-failover/server1/hornetq-beans.xml =================================================================== --- trunk/examples/jms/transaction-failover/server1/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/transaction-failover/server1/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/transactional/server0/hornetq-beans.xml =================================================================== --- trunk/examples/jms/transactional/server0/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/transactional/server0/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/xa-heuristic/server0/hornetq-beans.xml =================================================================== --- trunk/examples/jms/xa-heuristic/server0/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/xa-heuristic/server0/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/xa-receive/server0/hornetq-beans.xml =================================================================== --- trunk/examples/jms/xa-receive/server0/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/xa-receive/server0/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/xa-send/server0/hornetq-beans.xml =================================================================== --- trunk/examples/jms/xa-send/server0/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/xa-send/server0/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/jms/xa-with-jta/server0/hornetq-beans.xml =================================================================== --- trunk/examples/jms/xa-with-jta/server0/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/jms/xa-with-jta/server0/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.spi.core.security.HornetQSecurityManagerImpl"> @@ -48,7 +48,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/examples/soak/normal/server0/hornetq-beans.xml =================================================================== --- trunk/examples/soak/normal/server0/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/examples/soak/normal/server0/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -16,7 +16,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQServer" class="org.hornetq.core.server.impl.HornetQServerImpl"> @@ -30,7 +30,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/src/config/jboss-as/clustered/hornetq-jboss-beans.xml =================================================================== --- trunk/src/config/jboss-as/clustered/hornetq-jboss-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/src/config/jboss-as/clustered/hornetq-jboss-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -9,7 +9,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.integration.jboss.security.JBossASSecurityManager"> @@ -36,7 +36,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/src/config/jboss-as/non-clustered/hornetq-jboss-beans.xml =================================================================== --- trunk/src/config/jboss-as/non-clustered/hornetq-jboss-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/src/config/jboss-as/non-clustered/hornetq-jboss-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -9,7 +9,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"/> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"/>  <bean name="HornetQSecurityManager" class="org.hornetq.integration.jboss.security.JBossASSecurityManager"> @@ -36,7 +36,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/src/config/stand-alone/clustered/hornetq-beans.xml =================================================================== --- trunk/src/config/stand-alone/clustered/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/src/config/stand-alone/clustered/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"> </bean>  @@ -49,7 +49,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/src/config/stand-alone/non-clustered/hornetq-beans.xml =================================================================== --- trunk/src/config/stand-alone/non-clustered/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/src/config/stand-alone/non-clustered/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"> </bean>  @@ -49,7 +49,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/src/config/trunk/clustered/hornetq-beans.xml =================================================================== --- trunk/src/config/trunk/clustered/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/src/config/trunk/clustered/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"> </bean>  @@ -49,7 +49,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/src/config/trunk/non-clustered/hornetq-beans.xml =================================================================== --- trunk/src/config/trunk/non-clustered/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/src/config/trunk/non-clustered/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"> </bean>  @@ -49,7 +49,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Deleted: trunk/src/main/org/hornetq/api/core/config/Configuration.java =================================================================== --- trunk/src/main/org/hornetq/api/core/config/Configuration.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/src/main/org/hornetq/api/core/config/Configuration.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -1,805 +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.List; -import java.util.Map; -import java.util.Set; - -import org.hornetq.api.SimpleString; -import org.hornetq.api.core.config.cluster.BridgeConfiguration; -import org.hornetq.api.core.config.cluster.BroadcastGroupConfiguration; -import org.hornetq.api.core.config.cluster.ClusterConnectionConfiguration; -import org.hornetq.api.core.config.cluster.DiscoveryGroupConfiguration; -import org.hornetq.api.core.config.cluster.DivertConfiguration; -import org.hornetq.api.core.config.cluster.QueueConfiguration; -import org.hornetq.api.core.interceptor.Interceptor; -import org.hornetq.core.server.JournalType; -import org.hornetq.core.server.group.impl.GroupingHandlerConfiguration; -import org.hornetq.spi.core.logging.LogDelegateFactory; - -/** - * - * A Configuration is used to configure HornetQ servers. - * - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * - */ -public interface Configuration extends Serializable -{ - // General attributes ------------------------------------------------------------------- - - /** - * Returns whether this server is clustered. - * - * Default value is {@value org.hornetq.api.core.config.ConfigurationImpl#DEFAULT_CLUSTERED}. - */ - boolean isClustered(); - - /** - * Sets whether this server is clustered or not. - */ - void setClustered(boolean clustered); - - /** - * Returns whether delivery count is persisted before messages are delivered to the consumers. - * - * Default value is {@value org.hornetq.api.core.config.ConfigurationImpl#DEFAULT_PERSIST_DELIVERY_COUNT_BEFORE_DELIVERY}. - */ - boolean isPersistDeliveryCountBeforeDelivery(); - - /** - * Sets whether delivery count is persisted before messages are delivered to consumers. - */ - void setPersistDeliveryCountBeforeDelivery(boolean persistDeliveryCountBeforeDelivery); - - /** - * Returns {@code true} if this server is a backup, {@code false} if it is a live server. - * - * If a backup server has been activated, returns {@code false}. - * - * Default value is {@value org.hornetq.api.core.config.ConfigurationImpl#DEFAULT_BACKUP}. - */ - boolean isBackup(); - - /** - * Sets whether this server is a backup or not. - */ - void setBackup(boolean backup); - - /** - * Returns whether this server shares its data store with a corresponding live or backup server. - * - * Default value is {@value org.hornetq.api.core.config.ConfigurationImpl#DEFAULT_SHARED_STORE}. - */ - boolean isSharedStore(); - - /** - * Sets whether this server shares its data store with a backup or live server. - */ - void setSharedStore(boolean sharedStore); - - /** - * Returns whether this server will use files to configure and deploy its resources. - * - * Default value is {@value org.hornetq.api.core.config.ConfigurationImpl#DEFAULT_FILE_DEPLOYMENT_ENABLED}. - */ - boolean isFileDeploymentEnabled(); - - /** - * Sets whether this server will use files to configure and deploy its resources. - */ - void setFileDeploymentEnabled(boolean enable); - - /** - * Returns whether this server is using persistence and store data. - * - * Default value is {@value org.hornetq.api.core.config.ConfigurationImpl#DEFAULT_PERSISTENCE_ENABLED}. - */ - boolean isPersistenceEnabled(); - - /** - * Sets whether this server is using persistence and store data. - */ - void setPersistenceEnabled(boolean enable); - - /** - * Returns the period (in milliseconds) to scan configuration files used by deployment. - * - * Default value is {@value org.hornetq.api.core.config.ConfigurationImpl#DEFAULT_FILE_DEPLOYER_SCAN_PERIOD}. - */ - long getFileDeployerScanPeriod(); - - /** - * Sets the period to scan configuration files used by deployment. - */ - void setFileDeployerScanPeriod(long period); - - /** - * Returns the maximum number of threads in the thread pool of this server. - * - * Default value is {@value org.hornetq.api.core.config.ConfigurationImpl#DEFAULT_THREAD_POOL_MAX_SIZE}. - */ - int getThreadPoolMaxSize(); - - /** - * Sets the maximum number of threads in the thread pool of this server. - */ - void setThreadPoolMaxSize(int maxSize); - - /** - * Returns the maximum number of threads in the scheduled thread pool of this server. - * - * Default value is {@value org.hornetq.api.core.config.ConfigurationImpl#DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE}. - */ - int getScheduledThreadPoolMaxSize(); - - /** - * Sets the maximum number of threads in the scheduled thread pool of this server. - */ - void setScheduledThreadPoolMaxSize(int maxSize); - - /** - * Returns the interval time (in milliseconds) to invalidate security credentials. - * - * Default value is {@value org.hornetq.api.core.config.ConfigurationImpl#DEFAULT_SECURITY_INVALIDATION_INTERVAL}. - */ - long getSecurityInvalidationInterval(); - - /** - * Sets the interval time (in milliseconds) to invalidate security credentials. - */ - void setSecurityInvalidationInterval(long interval); - - /** - * Returns whether security is enabled for this server. - * - * Default value is {@value org.hornetq.api.core.config.ConfigurationImpl#DEFAULT_SECURITY_ENABLED}. - */ - boolean isSecurityEnabled(); - - /** - * Sets whether security is enabled for this server. - */ - void setSecurityEnabled(boolean enabled); - - /** - * Returns whether this server is manageable using JMX or not. - * - * Default value is {@value org.hornetq.api.core.config.ConfigurationImpl#DEFAULT_JMX_MANAGEMENT_ENABLED}. - */ - boolean isJMXManagementEnabled(); - - /** - * Sets whether this server is manageable using JMX or not. - */ - void setJMXManagementEnabled(boolean enabled); - - /** - * Returns the domain used by JMX MBeans (provided JMX management is enabled). - * - * Default value is {@value org.hornetq.api.core.config.ConfigurationImpl#DEFAULT_JMX_DOMAIN}. - */ - String getJMXDomain(); - - /** - * Sets the domain used by JMX MBeans (provided JMX management is enabled). - * - * Changing this JMX domain is required if multiple HornetQ servers are run inside - * the same JVM and all servers are using the same MBeanServer. - */ - void setJMXDomain(String domain); - - /** - * Returns the list of interceptors classes used by this server. - */ - List<String> getInterceptorClassNames(); - - /** - * Sets the list of interceptors classes used by this server. - * - * Classes must implement {@link Interceptor}. - */ - void setInterceptorClassNames(List<String> interceptors); - - /** - * Returns the connection time to live. - * - * This value overrides the connection time to live sent by the client. - * - * Default value is {@value org.hornetq.api.core.config.ConfigurationImpl#DEFAULT_CONNECTION_TTL_OVERRIDE}. - */ - long getConnectionTTLOverride(); - - /** - * Sets the connection time to live. - */ - void setConnectionTTLOverride(long ttl); - - /** - * Returns whether code coming from connection is executed asynchronously or not. - * - * Default value is {@value org.hornetq.api.core.config.ConfigurationImpl#DEFAULT_ASYNC_CONNECTION_EXECUTION_ENABLED}. - */ - boolean isAsyncConnectionExecutionEnabled(); - - /** - * Sets whether code coming from connection is executed asynchronously or not. - */ - void setEnabledAsyncConnectionExecution(boolean enabled); - - /** - * Returns the acceptors configured for this server. - */ - Set<TransportConfiguration> getAcceptorConfigurations(); - - /** - * Sets the acceptors configured for this server. - */ - void setAcceptorConfigurations(Set<TransportConfiguration> infos); - - /** - * Returns the connectors configured for this server. - */ - Map<String, TransportConfiguration> getConnectorConfigurations(); - - /** - * Sets the connectors configured for this server. - */ - void setConnectorConfigurations(Map<String, TransportConfiguration> infos); - - /** - * Returns the name of the connector used to connect to the backup. - * - * If this server has no backup or is itself a backup, the value is {@code null}. - */ - String getBackupConnectorName(); - - /** - * Sets the name of the connector used to connect to the backup. - */ - void setBackupConnectorName(String name); - - /** - * Returns the broadcast groups configured for this server. - */ - List<BroadcastGroupConfiguration> getBroadcastGroupConfigurations(); - - /** - * Sets the broadcast groups configured for this server. - */ - void setBroadcastGroupConfigurations(List<BroadcastGroupConfiguration> configs); - - /** - * Returns the discovery groups configured for this server. - */ - Map<String, DiscoveryGroupConfiguration> getDiscoveryGroupConfigurations(); - - /** - * Sets the discovery groups configured for this server. - */ - void setDiscoveryGroupConfigurations(Map<String, DiscoveryGroupConfiguration> configs); - - /** - * Returns the grouping handler configured for this server. - */ - GroupingHandlerConfiguration getGroupingHandlerConfiguration(); - - /** - * Sets the grouping handler configured for this server. - */ - void setGroupingHandlerConfiguration(GroupingHandlerConfiguration groupingHandlerConfiguration); - - /** - * Returns the bridges configured for this server. - */ - List<BridgeConfiguration> getBridgeConfigurations(); - - /** - * Sets the bridges configured for this server. - */ - void setBridgeConfigurations(final List<BridgeConfiguration> configs); - - /** - * Returns the diverts configured for this server. - */ - List<DivertConfiguration> getDivertConfigurations(); - - /** - * Sets the diverts configured for this server. - */ - void setDivertConfigurations(final List<DivertConfiguration> configs); - - /** - * Returns the cluster connections configured for this server. - */ - List<ClusterConnectionConfiguration> getClusterConfigurations(); - - /** - * Sets the cluster connections configured for this server. - */ - void setClusterConfigurations(final List<ClusterConnectionConfiguration> configs); - - /** - * Returns the queues configured for this server. - */ - List<QueueConfiguration> getQueueConfigurations(); - - /** - * Sets the queues configured for this server. - */ - void setQueueConfigurations(final List<QueueConfiguration> configs); - - /** - * Returns the management address of this server. - * - * Clients can send management messages to this address to manage this server. - * - * Default value is "hornetq.management". - */ - SimpleString getManagementAddress(); - - /** - * Sets the management address of this server. - */ - void setManagementAddress(SimpleString address); - - /** - * Returns the management notification address of this server. - * - * Clients can bind queues to this address to receive management notifications emitted by this server. - * - * Default value is "hornetq.notifications". - */ - SimpleString getManagementNotificationAddress(); - - /** - * Sets the management notification address of this server. - */ - void setManagementNotificationAddress(SimpleString address); - - /** - * Returns the management cluster user for this server. - * - * Default value is {@value org.hornetq.api.core.config.ConfigurationImpl#DEFAULT_MANAGEMENT_CLUSTER_USER}. - */ - String getManagementClusterUser(); - - /** - * Sets the management cluster user for this server. - */ - void setManagementClusterUser(String user); - - /** - * Returns the management cluster password for this server. - * - * Default value is {@value org.hornetq.api.core.config.ConfigurationImpl#DEFAULT_MANAGEMENT_CLUSTER_PASSWORD}. - */ - String getManagementClusterPassword(); - - /** - * Sets the management cluster password for this server. - */ - void setManagementClusterPassword(String password); - - /** - * Returns the size of the cache for pre-creating message IDs. - * - * Default value is {@value org.hornetq.api.core.config.ConfigurationImpl#DEFAULT_ID_CACHE_SIZE}. - */ - int getIDCacheSize(); - - /** - * Sets the size of the cache for pre-creating message IDs. - */ - void setIDCacheSize(int idCacheSize); - - /** - * Returns whether message ID cache is persisted. - * - * Default value is {@value org.hornetq.api.core.config.ConfigurationImpl#DEFAULT_PERSIST_ID_CACHE}. - */ - boolean isPersistIDCache(); - - /** - * Sets whether message ID cache is persisted. - */ - void setPersistIDCache(boolean persist); - - /** - * Returns the name of the {@link LogDelegateFactory} implementation used by this server - * for logging. - * - * Default value is "org.hornetq.core.logging.impl.JULLogDelegateFactory" - */ - String getLogDelegateFactoryClassName(); - - /** - * Sets the name of the {@link LogDelegateFactory} implementation used by this server - * for logging. - */ - void setLogDelegateFactoryClassName(String className); - - // Journal related attributes ------------------------------------------------------------ - - /** - * Returns the file system directory used to store bindings. - * - * Default value is {@value org.hornetq.api.core.config.ConfigurationImpl#DEFAULT_BINDINGS_DIRECTORY}. - */ - String getBindingsDirectory(); - - /** - * Sets the file system directory used to store bindings. - */ - void setBindingsDirectory(String dir); - - /** - * Returns the file system directory used to store journal log. - * - * Default value is {@value org.hornetq.api.core.config.ConfigurationImpl#DEFAULT_JOURNAL_DIR}. - */ - String getJournalDirectory(); - - /** - * Sets the file system directory used to store journal log. - */ - void setJournalDirectory(String dir); - - /** - * Returns the type of journal used by this server (either {@code NIO} or {@code ASYNCIO}). - * - * Default value is ASYNCIO. - */ - JournalType getJournalType(); - - /** - * Sets the type of journal used by this server (either {@code NIO} or {@code ASYNCIO}). - */ - void setJournalType(JournalType type); - - /** - * Returns whether the journal is synchronized when receiving transactional data. - * - * Default value is {@value org.hornetq.api.core.config.ConfigurationImpl#DEFAULT_JOURNAL_SYNC_TRANSACTIONAL}. - */ - boolean isJournalSyncTransactional(); - - /** - * Sets whether the journal is synchronized when receiving transactional data. - */ - void setJournalSyncTransactional(boolean sync); - - /** - * Returns whether the journal is synchronized when receiving non-transactional data. - * - * Default value is {@value org.hornetq.api.core.config.ConfigurationImpl#DEFAULT_JOURNAL_SYNC_NON_TRANSACTIONAL}. - */ - boolean isJournalSyncNonTransactional(); - - /** - * Sets whether the journal is synchronized when receiving non-transactional data. - */ - void setJournalSyncNonTransactional(boolean sync); - - /** - * Returns the size (in bytes) of each journal files. - * - * Default value is {@value org.hornetq.api.core.config.ConfigurationImpl#DEFAULT_JOURNAL_FILE_SIZE}. - */ - int getJournalFileSize(); - - /** - * Sets the size (in bytes) of each journal files. - */ - void setJournalFileSize(int size); - - /** - * Returns the minimal number of journal files before compacting. - * - * Default value is {@value org.hornetq.api.core.config.ConfigurationImpl#DEFAULT_JOURNAL_COMPACT_MIN_FILES}. - */ - int getJournalCompactMinFiles(); - - /** - * Sets the minimal number of journal files before compacting. - */ - void setJournalCompactMinFiles(int minFiles); - - /** - * Returns the percentage of live data before compacting the journal. - * - * Default value is {@value org.hornetq.api.core.config.ConfigurationImpl#DEFAULT_JOURNAL_COMPACT_PERCENTAGE}. - */ - int getJournalCompactPercentage(); - - /** - * Sets the percentage of live data before compacting the journal. - */ - void setJournalCompactPercentage(int percentage); - - /** - * Returns the number of journal files to pre-create. - * - * Default value is {@value org.hornetq.api.core.config.ConfigurationImpl#DEFAULT_JOURNAL_MIN_FILES}. - */ - int getJournalMinFiles(); - - /** - * Sets the number of journal files to pre-create. - */ - void setJournalMinFiles(int files); - - // AIO and NIO need different values for these params - - /** - * Returns the maximum number of write requests that can be in the AIO queue at any given time. - * - * Default value is {@value org.hornetq.api.core.config.ConfigurationImpl#DEFAULT_JOURNAL_MAX_IO_AIO}. - */ - int getJournalMaxIO_AIO(); - - /** - * Sets the maximum number of write requests that can be in the AIO queue at any given time. - */ - void setJournalMaxIO_AIO(int journalMaxIO); - - /** - * Returns the timeout (in nanoseconds) used to flush buffers in the AIO queue. - * - * Default value is {@value org.hornetq.api.core.config.ConfigurationImpl#DEFAULT_JOURNAL_BUFFER_TIMEOUT_AIO}. - */ - int getJournalBufferTimeout_AIO(); - - /** - * Sets the timeout (in nanoseconds) used to flush buffers in the AIO queue. - */ - void setJournalBufferTimeout_AIO(int journalBufferTimeout); - - /** - * Returns the buffer size (in bytes) for AIO. - * - * Default value is {@value org.hornetq.api.core.config.ConfigurationImpl#DEFAULT_JOURNAL_BUFFER_SIZE_AIO}. - */ - int getJournalBufferSize_AIO(); - - /** - * Sets the buffer size (in bytes) for AIO. - */ - void setJournalBufferSize_AIO(int journalBufferSize); - - /** - * Returns the maximum number of write requests for NIO journal. - * - * Default value is {@value org.hornetq.api.core.config.ConfigurationImpl#DEFAULT_JOURNAL_MAX_IO_NIO}. - */ - int getJournalMaxIO_NIO(); - - /** - * Sets the maximum number of write requests for NIO journal. - */ - void setJournalMaxIO_NIO(int journalMaxIO); - - /** - * Returns the timeout (in nanoseconds) used to flush buffers in the NIO. - * - * Default value is {@value org.hornetq.api.core.config.ConfigurationImpl#DEFAULT_JOURNAL_BUFFER_TIMEOUT_NIO}. - */ - int getJournalBufferTimeout_NIO(); - - /** - * Sets the timeout (in nanoseconds) used to flush buffers in the NIO. - */ - void setJournalBufferTimeout_NIO(int journalBufferTimeout); - - /** - * Returns the buffer size (in bytes) for NIO. - * - * Default value is {@value org.hornetq.api.core.config.ConfigurationImpl#DEFAULT_JOURNAL_BUFFER_SIZE_NIO}. - */ - int getJournalBufferSize_NIO(); - - /** - * Sets the buffer size (in bytes) for NIO. - */ - void setJournalBufferSize_NIO(int journalBufferSize); - - /** - * Returns whether the bindings directory is created on this server startup. - * - * Default value is {@value org.hornetq.api.core.config.ConfigurationImpl#DEFAULT_CREATE_BINDINGS_DIR}. - */ - boolean isCreateBindingsDir(); - - /** - * Sets whether the bindings directory is created on this server startup. - */ - void setCreateBindingsDir(boolean create); - - /** - * Returns whether the journal directory is created on this server startup. - * - * Default value is {@value org.hornetq.api.core.config.ConfigurationImpl#DEFAULT_CREATE_JOURNAL_DIR}. - */ - boolean isCreateJournalDir(); - - /** - * Sets whether the journal directory is created on this server startup. - */ - void setCreateJournalDir(boolean create); - - // Undocumented attributes - - boolean isLogJournalWriteRate(); - - void setLogJournalWriteRate(boolean rate); - - int getJournalPerfBlastPages(); - - void setJournalPerfBlastPages(int pages); - - long getServerDumpInterval(); - - void setServerDumpInterval(long interval); - - int getMemoryWarningThreshold(); - - void setMemoryWarningThreshold(int memoryWarningThreshold); - - long getMemoryMeasureInterval(); - - void setMemoryMeasureInterval(long memoryMeasureInterval); - - boolean isRunSyncSpeedTest(); - - void setRunSyncSpeedTest(boolean run); - - // Paging Properties -------------------------------------------------------------------- - - /** - * Returns the file system directory used to store paging files. - * - * Default value is {@value org.hornetq.api.core.config.ConfigurationImpl#DEFAULT_PAGING_DIR}. - */ - String getPagingDirectory(); - - /** - * Sets the file system directory used to store paging files. - */ - void setPagingDirectory(String dir); - - // Large Messages Properties ------------------------------------------------------------ - - /** - * Returns the file system directory used to store large messages. - * - * Default value is {@value org.hornetq.api.core.config.ConfigurationImpl#DEFAULT_LARGE_MESSAGES_DIR}. - */ - String getLargeMessagesDirectory(); - - /** - * Sets the file system directory used to store large messages. - */ - void setLargeMessagesDirectory(String directory); - - // Other Properties --------------------------------------------------------------------- - - /** - * Returns whether wildcard routing is supported by this server. - * - * Default value is {@value org.hornetq.api.core.config.ConfigurationImpl#DEFAULT_WILDCARD_ROUTING_ENABLED}. - */ - boolean isWildcardRoutingEnabled(); - - /** - * Sets whether wildcard routing is supported by this server. - */ - void setWildcardRoutingEnabled(boolean enabled); - - /** - * Returns the timeout (in milliseconds) after which transactions is removed - * from the resource manager after it was created. - * - * Default value is {@value org.hornetq.api.core.config.ConfigurationImpl#DEFAULT_TRANSACTION_TIMEOUT}. - */ - long getTransactionTimeout(); - - /** - * Sets the timeout (in milliseconds) after which transactions is removed - * from the resource manager after it was created. - */ - void setTransactionTimeout(long timeout); - - /** - * Returns whether message counter is enabled for this server. - * - * Default value is {@value org.hornetq.api.core.config.ConfigurationImpl#DEFAULT_MESSAGE_COUNTER_ENABLED}. - */ - boolean isMessageCounterEnabled(); - - /** - * Sets whether message counter is enabled for this server. - */ - void setMessageCounterEnabled(boolean enabled); - - /** - * Returns the sample period (in milliseconds) to take message counter snapshot. - * - * Default value is {@value org.hornetq.api.core.config.ConfigurationImpl#DEFAULT_MESSAGE_COUNTER_SAMPLE_PERIOD}. - */ - long getMessageCounterSamplePeriod(); - - /** - * Sets the sample period to take message counter snapshot. - * - * @param period value must be greater than 1000ms - */ - void setMessageCounterSamplePeriod(long period); - - /** - * Returns the maximum number of days kept in memory for message counter. - * - * Default value is {@value org.hornetq.api.core.config.ConfigurationImpl#DEFAULT_MESSAGE_COUNTER_MAX_DAY_HISTORY}. - */ - int getMessageCounterMaxDayHistory(); - - /** - * Sets the maximum number of days kept in memory for message counter. - * - * @param maxDayHistory value must be greater than 0 - */ - void setMessageCounterMaxDayHistory(int maxDayHistory); - - /** - * Returns the frequency (in milliseconds) to scan transactions to detect which transactions - * have timed out. - * - * Default value is {@value org.hornetq.api.core.config.ConfigurationImpl#DEFAULT_TRANSACTION_TIMEOUT_SCAN_PERIOD}. - */ - long getTransactionTimeoutScanPeriod(); - - /** - * Sets the frequency (in milliseconds) to scan transactions to detect which transactions - * have timed out. - */ - void setTransactionTimeoutScanPeriod(long period); - - /** - * Returns the frequency (in milliseconds) to scan messages to detect which messages - * have expired. - * - * Default value is {@value org.hornetq.api.core.config.ConfigurationImpl#DEFAULT_MESSAGE_EXPIRY_SCAN_PERIOD}. - */ - long getMessageExpiryScanPeriod(); - - /** - * Sets the frequency (in milliseconds) to scan messages to detect which messages - * have expired. - */ - void setMessageExpiryScanPeriod(long messageExpiryScanPeriod); - - /** - * Returns the priority of the thread used to scan message expiration. - * - * Default value is {@value org.hornetq.api.core.config.ConfigurationImpl#DEFAULT_MESSAGE_EXPIRY_THREAD_PRIORITY}. - */ - int getMessageExpiryThreadPriority(); - - /** - * Sets the priority of the thread used to scan message expiration. - */ - void setMessageExpiryThreadPriority(int messageExpiryThreadPriority); - -} Deleted: trunk/src/main/org/hornetq/api/core/config/ConfigurationImpl.java =================================================================== --- trunk/src/main/org/hornetq/api/core/config/ConfigurationImpl.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/src/main/org/hornetq/api/core/config/ConfigurationImpl.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -1,1277 +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.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.LinkedHashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.hornetq.api.SimpleString; -import org.hornetq.api.core.config.cluster.BridgeConfiguration; -import org.hornetq.api.core.config.cluster.BroadcastGroupConfiguration; -import org.hornetq.api.core.config.cluster.ClusterConnectionConfiguration; -import org.hornetq.api.core.config.cluster.DiscoveryGroupConfiguration; -import org.hornetq.api.core.config.cluster.DivertConfiguration; -import org.hornetq.api.core.config.cluster.QueueConfiguration; -import org.hornetq.core.logging.impl.JULLogDelegateFactory; -import org.hornetq.core.server.JournalType; -import org.hornetq.core.server.group.impl.GroupingHandlerConfiguration; - -/** - * @author <a href="mailto:ataylor@redhat.com>Andy Taylor</a> - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - */ -public class ConfigurationImpl implements Configuration -{ - // Constants ------------------------------------------------------------------------------ - - private static final long serialVersionUID = 4077088945050267843L; - - public static final boolean DEFAULT_CLUSTERED = false; - - public static final boolean DEFAULT_PERSIST_DELIVERY_COUNT_BEFORE_DELIVERY = false; - - public static final boolean DEFAULT_BACKUP = false; - - public static final boolean DEFAULT_SHARED_STORE = false; - - public static final boolean DEFAULT_FILE_DEPLOYMENT_ENABLED = false; - - public static final boolean DEFAULT_PERSISTENCE_ENABLED = true; - - public static final long DEFAULT_FILE_DEPLOYER_SCAN_PERIOD = 5000; - - public static final int DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE = 5; - - public static final int DEFAULT_THREAD_POOL_MAX_SIZE = -1; - - public static final long DEFAULT_SECURITY_INVALIDATION_INTERVAL = 10000; - - public static final boolean DEFAULT_SECURITY_ENABLED = true; - - public static final boolean DEFAULT_JMX_MANAGEMENT_ENABLED = true; - - public static final String DEFAULT_JMX_DOMAIN = "org.hornetq"; - - public static final long DEFAULT_CONNECTION_TTL_OVERRIDE = -1; - - public static final boolean DEFAULT_ASYNC_CONNECTION_EXECUTION_ENABLED = false; - - public static final String DEFAULT_BINDINGS_DIRECTORY = "data/bindings"; - - public static final boolean DEFAULT_CREATE_BINDINGS_DIR = true; - - public static final String DEFAULT_JOURNAL_DIR = "data/journal"; - - public static final String DEFAULT_PAGING_DIR = "data/paging"; - - public static final String DEFAULT_LARGE_MESSAGES_DIR = "data/largemessages"; - - public static final boolean DEFAULT_CREATE_JOURNAL_DIR = true; - - public static final JournalType DEFAULT_JOURNAL_TYPE = JournalType.ASYNCIO; - - public static final boolean DEFAULT_JOURNAL_SYNC_TRANSACTIONAL = true; - - public static final boolean DEFAULT_JOURNAL_SYNC_NON_TRANSACTIONAL = true; - - public static final int DEFAULT_JOURNAL_FILE_SIZE = 10485760; - - public static final int DEFAULT_JOURNAL_COMPACT_MIN_FILES = 10; - - public static final int DEFAULT_JOURNAL_COMPACT_PERCENTAGE = 30; - - public static final int DEFAULT_JOURNAL_MIN_FILES = 2; - - // AIO and NIO need to have different defaults for some values - - public static final int DEFAULT_JOURNAL_MAX_IO_AIO = 500; - - public static final int DEFAULT_JOURNAL_BUFFER_TIMEOUT_AIO = (int)(1000000000d / 2000); - - public static final int DEFAULT_JOURNAL_BUFFER_SIZE_AIO = 490 * 1024; - - public static final int DEFAULT_JOURNAL_MAX_IO_NIO = 1; - - public static final int DEFAULT_JOURNAL_BUFFER_TIMEOUT_NIO = (int)(1000000000d / 300); - - public static final int DEFAULT_JOURNAL_BUFFER_SIZE_NIO = 490 * 1024; - - public static final boolean DEFAULT_JOURNAL_LOG_WRITE_RATE = false; - - public static final int DEFAULT_JOURNAL_PERF_BLAST_PAGES = -1; - - public static final boolean DEFAULT_RUN_SYNC_SPEED_TEST = false; - - public static final boolean DEFAULT_WILDCARD_ROUTING_ENABLED = true; - - public static final boolean DEFAULT_MESSAGE_COUNTER_ENABLED = false; - - public static final long DEFAULT_MESSAGE_COUNTER_SAMPLE_PERIOD = 10000; - - public static final int DEFAULT_MESSAGE_COUNTER_MAX_DAY_HISTORY = 10; - - public static final long DEFAULT_TRANSACTION_TIMEOUT = 300000; // 5 minutes - - public static final long DEFAULT_TRANSACTION_TIMEOUT_SCAN_PERIOD = 1000; - - public static final SimpleString DEFAULT_MANAGEMENT_ADDRESS = new SimpleString("hornetq.management"); - - public static final SimpleString DEFAULT_MANAGEMENT_NOTIFICATION_ADDRESS = new SimpleString("hornetq.notifications"); - - public static final String DEFAULT_MANAGEMENT_CLUSTER_USER = "HORNETQ.MANAGEMENT.ADMIN.USER"; - - public static final String DEFAULT_MANAGEMENT_CLUSTER_PASSWORD = "CHANGE ME!!"; - - public static final long DEFAULT_BROADCAST_PERIOD = 1000; - - public static final long DEFAULT_BROADCAST_REFRESH_TIMEOUT = 10000; - - public static final long DEFAULT_MESSAGE_EXPIRY_SCAN_PERIOD = 30000; - - public static final int DEFAULT_MESSAGE_EXPIRY_THREAD_PRIORITY = 3; - - public static final int DEFAULT_ID_CACHE_SIZE = 2000; - - public static final boolean DEFAULT_PERSIST_ID_CACHE = true; - - public static final boolean DEFAULT_CLUSTER_DUPLICATE_DETECTION = true; - - public static final boolean DEFAULT_CLUSTER_FORWARD_WHEN_NO_CONSUMERS = false; - - public static final int DEFAULT_CLUSTER_MAX_HOPS = 1; - - public static final long DEFAULT_CLUSTER_RETRY_INTERVAL = 500; - - public static final boolean DEFAULT_DIVERT_EXCLUSIVE = false; - - public static final boolean DEFAULT_BRIDGE_DUPLICATE_DETECTION = true; - - public static final int DEFAULT_BRIDGE_RECONNECT_ATTEMPTS = -1; - - public static final long DEFAULT_SERVER_DUMP_INTERVAL = -1; - - public static final int DEFAULT_MEMORY_WARNING_THRESHOLD = 25; - - public static final long DEFAULT_MEMORY_MEASURE_INTERVAL = -1; // in milliseconds - - public static final String DEFAULT_LOG_DELEGATE_FACTORY_CLASS_NAME = JULLogDelegateFactory.class.getCanonicalName(); - - // Attributes ----------------------------------------------------------------------------- - - protected boolean clustered = ConfigurationImpl.DEFAULT_CLUSTERED; - - protected boolean backup = ConfigurationImpl.DEFAULT_BACKUP; - - protected boolean sharedStore = ConfigurationImpl.DEFAULT_SHARED_STORE; - - protected boolean fileDeploymentEnabled = ConfigurationImpl.DEFAULT_FILE_DEPLOYMENT_ENABLED; - - protected boolean persistenceEnabled = ConfigurationImpl.DEFAULT_PERSISTENCE_ENABLED; - - protected long fileDeploymentScanPeriod = ConfigurationImpl.DEFAULT_FILE_DEPLOYER_SCAN_PERIOD; - - protected boolean persistDeliveryCountBeforeDelivery = ConfigurationImpl.DEFAULT_PERSIST_DELIVERY_COUNT_BEFORE_DELIVERY; - - protected int scheduledThreadPoolMaxSize = ConfigurationImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE; - - protected int threadPoolMaxSize = ConfigurationImpl.DEFAULT_THREAD_POOL_MAX_SIZE; - - protected long securityInvalidationInterval = ConfigurationImpl.DEFAULT_SECURITY_INVALIDATION_INTERVAL; - - protected boolean securityEnabled = ConfigurationImpl.DEFAULT_SECURITY_ENABLED; - - protected boolean jmxManagementEnabled = ConfigurationImpl.DEFAULT_JMX_MANAGEMENT_ENABLED; - - protected String jmxDomain = ConfigurationImpl.DEFAULT_JMX_DOMAIN; - - protected long connectionTTLOverride = ConfigurationImpl.DEFAULT_CONNECTION_TTL_OVERRIDE; - - protected boolean asyncConnectionExecutionEnabled = ConfigurationImpl.DEFAULT_ASYNC_CONNECTION_EXECUTION_ENABLED; - - protected long messageExpiryScanPeriod = ConfigurationImpl.DEFAULT_MESSAGE_EXPIRY_SCAN_PERIOD; - - protected int messageExpiryThreadPriority = ConfigurationImpl.DEFAULT_MESSAGE_EXPIRY_THREAD_PRIORITY; - - protected int idCacheSize = ConfigurationImpl.DEFAULT_ID_CACHE_SIZE; - - protected boolean persistIDCache = ConfigurationImpl.DEFAULT_PERSIST_ID_CACHE; - - protected String logDelegateFactoryClassName = ConfigurationImpl.DEFAULT_LOG_DELEGATE_FACTORY_CLASS_NAME; - - protected List<String> interceptorClassNames = new ArrayList<String>(); - - protected Map<String, TransportConfiguration> connectorConfigs = new HashMap<String, TransportConfiguration>(); - - protected Set<TransportConfiguration> acceptorConfigs = new HashSet<TransportConfiguration>(); - - protected String backupConnectorName; - - protected List<BridgeConfiguration> bridgeConfigurations = new ArrayList<BridgeConfiguration>(); - - protected List<DivertConfiguration> divertConfigurations = new ArrayList<DivertConfiguration>(); - - protected List<ClusterConnectionConfiguration> clusterConfigurations = new ArrayList<ClusterConnectionConfiguration>(); - - protected List<QueueConfiguration> queueConfigurations = new ArrayList<QueueConfiguration>(); - - protected List<BroadcastGroupConfiguration> broadcastGroupConfigurations = new ArrayList<BroadcastGroupConfiguration>(); - - protected Map<String, DiscoveryGroupConfiguration> discoveryGroupConfigurations = new LinkedHashMap<String, DiscoveryGroupConfiguration>(); - - // Paging related attributes ------------------------------------------------------------ - - protected String pagingDirectory = ConfigurationImpl.DEFAULT_PAGING_DIR; - - // File related attributes ----------------------------------------------------------- - - protected String largeMessagesDirectory = ConfigurationImpl.DEFAULT_LARGE_MESSAGES_DIR; - - protected String bindingsDirectory = ConfigurationImpl.DEFAULT_BINDINGS_DIRECTORY; - - protected boolean createBindingsDir = ConfigurationImpl.DEFAULT_CREATE_BINDINGS_DIR; - - protected String journalDirectory = ConfigurationImpl.DEFAULT_JOURNAL_DIR; - - protected boolean createJournalDir = ConfigurationImpl.DEFAULT_CREATE_JOURNAL_DIR; - - public JournalType journalType = ConfigurationImpl.DEFAULT_JOURNAL_TYPE; - - protected boolean journalSyncTransactional = ConfigurationImpl.DEFAULT_JOURNAL_SYNC_TRANSACTIONAL; - - protected boolean journalSyncNonTransactional = ConfigurationImpl.DEFAULT_JOURNAL_SYNC_NON_TRANSACTIONAL; - - protected int journalCompactMinFiles = ConfigurationImpl.DEFAULT_JOURNAL_COMPACT_MIN_FILES; - - protected int journalCompactPercentage = ConfigurationImpl.DEFAULT_JOURNAL_COMPACT_PERCENTAGE; - - protected int journalFileSize = ConfigurationImpl.DEFAULT_JOURNAL_FILE_SIZE; - - protected int journalMinFiles = ConfigurationImpl.DEFAULT_JOURNAL_MIN_FILES; - - // AIO and NIO need different values for these attributes - - protected int journalMaxIO_AIO = ConfigurationImpl.DEFAULT_JOURNAL_MAX_IO_AIO; - - protected int journalBufferTimeout_AIO = ConfigurationImpl.DEFAULT_JOURNAL_BUFFER_TIMEOUT_AIO; - - protected int journalBufferSize_AIO = ConfigurationImpl.DEFAULT_JOURNAL_BUFFER_SIZE_AIO; - - protected int journalMaxIO_NIO = ConfigurationImpl.DEFAULT_JOURNAL_MAX_IO_NIO; - - protected int journalBufferTimeout_NIO = ConfigurationImpl.DEFAULT_JOURNAL_BUFFER_TIMEOUT_NIO; - - protected int journalBufferSize_NIO = ConfigurationImpl.DEFAULT_JOURNAL_BUFFER_SIZE_NIO; - - protected boolean logJournalWriteRate = ConfigurationImpl.DEFAULT_JOURNAL_LOG_WRITE_RATE; - - protected int journalPerfBlastPages = ConfigurationImpl.DEFAULT_JOURNAL_PERF_BLAST_PAGES; - - protected boolean runSyncSpeedTest = ConfigurationImpl.DEFAULT_RUN_SYNC_SPEED_TEST; - - protected boolean wildcardRoutingEnabled = ConfigurationImpl.DEFAULT_WILDCARD_ROUTING_ENABLED; - - protected boolean messageCounterEnabled = ConfigurationImpl.DEFAULT_MESSAGE_COUNTER_ENABLED; - - protected long messageCounterSamplePeriod = ConfigurationImpl.DEFAULT_MESSAGE_COUNTER_SAMPLE_PERIOD; - - protected int messageCounterMaxDayHistory = ConfigurationImpl.DEFAULT_MESSAGE_COUNTER_MAX_DAY_HISTORY; - - protected long transactionTimeout = ConfigurationImpl.DEFAULT_TRANSACTION_TIMEOUT; - - protected long transactionTimeoutScanPeriod = ConfigurationImpl.DEFAULT_TRANSACTION_TIMEOUT_SCAN_PERIOD; - - protected SimpleString managementAddress = ConfigurationImpl.DEFAULT_MANAGEMENT_ADDRESS; - - protected SimpleString managementNotificationAddress = ConfigurationImpl.DEFAULT_MANAGEMENT_NOTIFICATION_ADDRESS; - - protected String managementClusterUser = ConfigurationImpl.DEFAULT_MANAGEMENT_CLUSTER_USER; - - protected String managementClusterPassword = ConfigurationImpl.DEFAULT_MANAGEMENT_CLUSTER_PASSWORD; - - protected long serverDumpInterval = ConfigurationImpl.DEFAULT_SERVER_DUMP_INTERVAL; - - // percentage of free memory which triggers warning from the memory manager - protected int memoryWarningThreshold = ConfigurationImpl.DEFAULT_MEMORY_WARNING_THRESHOLD; - - protected long memoryMeasureInterval = ConfigurationImpl.DEFAULT_MEMORY_MEASURE_INTERVAL; - - protected GroupingHandlerConfiguration groupingHandlerConfiguration; - - // Public ------------------------------------------------------------------------- - - public boolean isClustered() - { - return clustered; - } - - public void setClustered(final boolean clustered) - { - this.clustered = clustered; - } - - public boolean isBackup() - { - return backup; - } - - public boolean isFileDeploymentEnabled() - { - return fileDeploymentEnabled; - } - - public void setFileDeploymentEnabled(final boolean enable) - { - fileDeploymentEnabled = enable; - } - - public boolean isPersistenceEnabled() - { - return persistenceEnabled; - } - - public void setPersistenceEnabled(final boolean enable) - { - persistenceEnabled = enable; - } - - public long getFileDeployerScanPeriod() - { - return fileDeploymentScanPeriod; - } - - public void setFileDeployerScanPeriod(final long period) - { - fileDeploymentScanPeriod = period; - } - - /** - * @return the persistDeliveryCountBeforeDelivery - */ - public boolean isPersistDeliveryCountBeforeDelivery() - { - return persistDeliveryCountBeforeDelivery; - } - - public void setPersistDeliveryCountBeforeDelivery(final boolean persistDeliveryCountBeforeDelivery) - { - this.persistDeliveryCountBeforeDelivery = persistDeliveryCountBeforeDelivery; - } - - public void setBackup(final boolean backup) - { - this.backup = backup; - } - - public boolean isSharedStore() - { - return sharedStore; - } - - public void setSharedStore(final boolean sharedStore) - { - this.sharedStore = sharedStore; - } - - public int getScheduledThreadPoolMaxSize() - { - return scheduledThreadPoolMaxSize; - } - - public void setScheduledThreadPoolMaxSize(final int maxSize) - { - scheduledThreadPoolMaxSize = maxSize; - } - - public int getThreadPoolMaxSize() - { - return threadPoolMaxSize; - } - - public void setThreadPoolMaxSize(final int maxSize) - { - threadPoolMaxSize = maxSize; - } - - public long getSecurityInvalidationInterval() - { - return securityInvalidationInterval; - } - - public void setSecurityInvalidationInterval(final long interval) - { - securityInvalidationInterval = interval; - } - - public long getConnectionTTLOverride() - { - return connectionTTLOverride; - } - - public void setConnectionTTLOverride(final long ttl) - { - connectionTTLOverride = ttl; - } - - public boolean isAsyncConnectionExecutionEnabled() - { - return asyncConnectionExecutionEnabled; - } - - public void setEnabledAsyncConnectionExecution(final boolean enabled) - { - asyncConnectionExecutionEnabled = enabled; - } - - public List<String> getInterceptorClassNames() - { - return interceptorClassNames; - } - - public void setInterceptorClassNames(final List<String> interceptors) - { - interceptorClassNames = interceptors; - } - - public Set<TransportConfiguration> getAcceptorConfigurations() - { - return acceptorConfigs; - } - - public void setAcceptorConfigurations(final Set<TransportConfiguration> infos) - { - acceptorConfigs = infos; - } - - public Map<String, TransportConfiguration> getConnectorConfigurations() - { - return connectorConfigs; - } - - public void setConnectorConfigurations(final Map<String, TransportConfiguration> infos) - { - connectorConfigs = infos; - } - - public String getBackupConnectorName() - { - return backupConnectorName; - } - - public void setBackupConnectorName(final String backupConnectorName) - { - this.backupConnectorName = backupConnectorName; - } - - public GroupingHandlerConfiguration getGroupingHandlerConfiguration() - { - return groupingHandlerConfiguration; - } - - public void setGroupingHandlerConfiguration(final GroupingHandlerConfiguration groupingHandlerConfiguration) - { - this.groupingHandlerConfiguration = groupingHandlerConfiguration; - } - - public List<BridgeConfiguration> getBridgeConfigurations() - { - return bridgeConfigurations; - } - - public void setBridgeConfigurations(final List<BridgeConfiguration> configs) - { - bridgeConfigurations = configs; - } - - public List<BroadcastGroupConfiguration> getBroadcastGroupConfigurations() - { - return broadcastGroupConfigurations; - } - - public void setBroadcastGroupConfigurations(final List<BroadcastGroupConfiguration> configs) - { - broadcastGroupConfigurations = configs; - } - - public List<ClusterConnectionConfiguration> getClusterConfigurations() - { - return clusterConfigurations; - } - - public void setClusterConfigurations(final List<ClusterConnectionConfiguration> configs) - { - clusterConfigurations = configs; - } - - public List<DivertConfiguration> getDivertConfigurations() - { - return divertConfigurations; - } - - public void setDivertConfigurations(final List<DivertConfiguration> configs) - { - divertConfigurations = configs; - } - - public List<QueueConfiguration> getQueueConfigurations() - { - return queueConfigurations; - } - - public void setQueueConfigurations(final List<QueueConfiguration> configs) - { - queueConfigurations = configs; - } - - public Map<String, DiscoveryGroupConfiguration> getDiscoveryGroupConfigurations() - { - return discoveryGroupConfigurations; - } - - public void setDiscoveryGroupConfigurations(final Map<String, DiscoveryGroupConfiguration> discoveryGroupConfigurations) - { - this.discoveryGroupConfigurations = discoveryGroupConfigurations; - } - - public int getIDCacheSize() - { - return idCacheSize; - } - - public void setIDCacheSize(final int idCacheSize) - { - this.idCacheSize = idCacheSize; - } - - public boolean isPersistIDCache() - { - return persistIDCache; - } - - public void setPersistIDCache(final boolean persist) - { - persistIDCache = persist; - } - - public String getBindingsDirectory() - { - return bindingsDirectory; - } - - public void setBindingsDirectory(final String dir) - { - bindingsDirectory = dir; - } - - public String getJournalDirectory() - { - return journalDirectory; - } - - public void setJournalDirectory(final String dir) - { - journalDirectory = dir; - } - - public JournalType getJournalType() - { - return journalType; - } - - public void setPagingDirectory(final String dir) - { - pagingDirectory = dir; - } - - public String getPagingDirectory() - { - return pagingDirectory; - } - - public void setJournalType(final JournalType type) - { - journalType = type; - } - - public boolean isJournalSyncTransactional() - { - return journalSyncTransactional; - } - - public void setJournalSyncTransactional(final boolean sync) - { - journalSyncTransactional = sync; - } - - public boolean isJournalSyncNonTransactional() - { - return journalSyncNonTransactional; - } - - public void setJournalSyncNonTransactional(final boolean sync) - { - journalSyncNonTransactional = sync; - } - - public int getJournalFileSize() - { - return journalFileSize; - } - - public void setJournalFileSize(final int size) - { - journalFileSize = size; - } - - public int getJournalMinFiles() - { - return journalMinFiles; - } - - public void setJournalMinFiles(final int files) - { - journalMinFiles = files; - } - - public boolean isLogJournalWriteRate() - { - return logJournalWriteRate; - } - - public void setLogJournalWriteRate(final boolean logJournalWriteRate) - { - this.logJournalWriteRate = logJournalWriteRate; - } - - public int getJournalPerfBlastPages() - { - return journalPerfBlastPages; - } - - public void setJournalPerfBlastPages(final int journalPerfBlastPages) - { - this.journalPerfBlastPages = journalPerfBlastPages; - } - - public boolean isRunSyncSpeedTest() - { - return runSyncSpeedTest; - } - - public void setRunSyncSpeedTest(final boolean run) - { - runSyncSpeedTest = run; - } - - public boolean isCreateBindingsDir() - { - return createBindingsDir; - } - - public void setCreateBindingsDir(final boolean create) - { - createBindingsDir = create; - } - - public boolean isCreateJournalDir() - { - return createJournalDir; - } - - public void setCreateJournalDir(final boolean create) - { - createJournalDir = create; - } - - public boolean isWildcardRoutingEnabled() - { - return wildcardRoutingEnabled; - } - - public void setWildcardRoutingEnabled(final boolean enabled) - { - wildcardRoutingEnabled = enabled; - } - - public long getTransactionTimeout() - { - return transactionTimeout; - } - - public void setTransactionTimeout(final long timeout) - { - transactionTimeout = timeout; - } - - public long getTransactionTimeoutScanPeriod() - { - return transactionTimeoutScanPeriod; - } - - public void setTransactionTimeoutScanPeriod(final long period) - { - transactionTimeoutScanPeriod = period; - } - - public long getMessageExpiryScanPeriod() - { - return messageExpiryScanPeriod; - } - - public void setMessageExpiryScanPeriod(final long messageExpiryScanPeriod) - { - this.messageExpiryScanPeriod = messageExpiryScanPeriod; - } - - public int getMessageExpiryThreadPriority() - { - return messageExpiryThreadPriority; - } - - public void setMessageExpiryThreadPriority(final int messageExpiryThreadPriority) - { - this.messageExpiryThreadPriority = messageExpiryThreadPriority; - } - - public boolean isSecurityEnabled() - { - return securityEnabled; - } - - public void setSecurityEnabled(final boolean enabled) - { - securityEnabled = enabled; - } - - public boolean isJMXManagementEnabled() - { - return jmxManagementEnabled; - } - - public void setJMXManagementEnabled(final boolean enabled) - { - jmxManagementEnabled = enabled; - } - - public String getJMXDomain() - { - return jmxDomain; - } - - public void setJMXDomain(final String domain) - { - jmxDomain = domain; - } - - public String getLargeMessagesDirectory() - { - return largeMessagesDirectory; - } - - public void setLargeMessagesDirectory(final String directory) - { - largeMessagesDirectory = directory; - } - - public boolean isMessageCounterEnabled() - { - return messageCounterEnabled; - } - - public void setMessageCounterEnabled(final boolean enabled) - { - messageCounterEnabled = enabled; - } - - public long getMessageCounterSamplePeriod() - { - return messageCounterSamplePeriod; - } - - public void setMessageCounterSamplePeriod(long period) - { - this.messageCounterSamplePeriod = period; - } - - public int getMessageCounterMaxDayHistory() - { - return messageCounterMaxDayHistory; - } - - public void setMessageCounterMaxDayHistory(final int maxDayHistory) - { - messageCounterMaxDayHistory = maxDayHistory; - } - - public SimpleString getManagementAddress() - { - return managementAddress; - } - - public void setManagementAddress(final SimpleString address) - { - managementAddress = address; - } - - public SimpleString getManagementNotificationAddress() - { - return managementNotificationAddress; - } - - public void setManagementNotificationAddress(final SimpleString address) - { - managementNotificationAddress = address; - } - - public String getManagementClusterUser() - { - return managementClusterUser; - } - - public void setManagementClusterUser(final String user) - { - managementClusterUser = user; - } - - public String getManagementClusterPassword() - { - return managementClusterPassword; - } - - public void setManagementClusterPassword(final String clusterPassword) - { - managementClusterPassword = clusterPassword; - } - - public int getJournalCompactMinFiles() - { - return journalCompactMinFiles; - } - - public int getJournalCompactPercentage() - { - return journalCompactPercentage; - } - - public void setJournalCompactMinFiles(final int minFiles) - { - journalCompactMinFiles = minFiles; - } - - public void setJournalCompactPercentage(final int percentage) - { - journalCompactPercentage = percentage; - } - - public long getServerDumpInterval() - { - return serverDumpInterval; - } - - public void setServerDumpInterval(final long intervalInMilliseconds) - { - serverDumpInterval = intervalInMilliseconds; - } - - public int getMemoryWarningThreshold() - { - return memoryWarningThreshold; - } - - public void setMemoryWarningThreshold(final int memoryWarningThreshold) - { - this.memoryWarningThreshold = memoryWarningThreshold; - } - - public long getMemoryMeasureInterval() - { - return memoryMeasureInterval; - } - - public void setMemoryMeasureInterval(final long memoryMeasureInterval) - { - this.memoryMeasureInterval = memoryMeasureInterval; - } - - public String getLogDelegateFactoryClassName() - { - return logDelegateFactoryClassName; - } - - public void setLogDelegateFactoryClassName(final String className) - { - logDelegateFactoryClassName = className; - } - - public int getJournalMaxIO_AIO() - { - return journalMaxIO_AIO; - } - - public void setJournalMaxIO_AIO(final int journalMaxIO) - { - journalMaxIO_AIO = journalMaxIO; - } - - public int getJournalBufferTimeout_AIO() - { - return journalBufferTimeout_AIO; - } - - public void setJournalBufferTimeout_AIO(final int journalBufferTimeout) - { - journalBufferTimeout_AIO = journalBufferTimeout; - } - - public int getJournalBufferSize_AIO() - { - return journalBufferSize_AIO; - } - - public void setJournalBufferSize_AIO(final int journalBufferSize) - { - journalBufferSize_AIO = journalBufferSize; - } - - public int getJournalMaxIO_NIO() - { - return journalMaxIO_NIO; - } - - public void setJournalMaxIO_NIO(final int journalMaxIO) - { - journalMaxIO_NIO = journalMaxIO; - } - - public int getJournalBufferTimeout_NIO() - { - return journalBufferTimeout_NIO; - } - - public void setJournalBufferTimeout_NIO(final int journalBufferTimeout) - { - journalBufferTimeout_NIO = journalBufferTimeout; - } - - public int getJournalBufferSize_NIO() - { - return journalBufferSize_NIO; - } - - public void setJournalBufferSize_NIO(final int journalBufferSize) - { - journalBufferSize_NIO = journalBufferSize; - } - - @Override - public boolean equals(final Object obj) - { - if (this == obj) - { - return true; - } - if (obj == null) - { - return false; - } - if (getClass() != obj.getClass()) - { - return false; - } - ConfigurationImpl other = (ConfigurationImpl)obj; - if (asyncConnectionExecutionEnabled != other.asyncConnectionExecutionEnabled) - { - return false; - } - if (backup != other.backup) - { - return false; - } - if (sharedStore != other.sharedStore) - { - return false; - } - if (backupConnectorName == null) - { - if (other.backupConnectorName != null) - { - return false; - } - } - else if (!backupConnectorName.equals(other.backupConnectorName)) - { - return false; - } - if (bindingsDirectory == null) - { - if (other.bindingsDirectory != null) - { - return false; - } - } - else if (!bindingsDirectory.equals(other.bindingsDirectory)) - { - return false; - } - - if (clustered != other.clustered) - { - return false; - } - if (connectionTTLOverride != other.connectionTTLOverride) - { - return false; - } - if (createBindingsDir != other.createBindingsDir) - { - return false; - } - if (createJournalDir != other.createJournalDir) - { - return false; - } - - if (fileDeploymentEnabled != other.fileDeploymentEnabled) - { - return false; - } - if (fileDeploymentScanPeriod != other.fileDeploymentScanPeriod) - { - return false; - } - if (idCacheSize != other.idCacheSize) - { - return false; - } - if (jmxManagementEnabled != other.jmxManagementEnabled) - { - return false; - } - if (journalBufferSize_AIO != other.journalBufferSize_AIO) - { - return false; - } - if (journalBufferTimeout_AIO != other.journalBufferTimeout_AIO) - { - return false; - } - if (journalMaxIO_AIO != other.journalMaxIO_AIO) - { - return false; - } - if (journalBufferSize_NIO != other.journalBufferSize_NIO) - { - return false; - } - if (journalBufferTimeout_NIO != other.journalBufferTimeout_NIO) - { - return false; - } - if (journalMaxIO_NIO != other.journalMaxIO_NIO) - { - return false; - } - if (journalCompactMinFiles != other.journalCompactMinFiles) - { - return false; - } - if (journalCompactPercentage != other.journalCompactPercentage) - { - return false; - } - if (journalDirectory == null) - { - if (other.journalDirectory != null) - { - return false; - } - } - else if (!journalDirectory.equals(other.journalDirectory)) - { - return false; - } - if (journalFileSize != other.journalFileSize) - { - return false; - } - - if (journalMinFiles != other.journalMinFiles) - { - return false; - } - if (journalPerfBlastPages != other.journalPerfBlastPages) - { - return false; - } - if (journalSyncNonTransactional != other.journalSyncNonTransactional) - { - return false; - } - if (journalSyncTransactional != other.journalSyncTransactional) - { - return false; - } - if (journalType == null) - { - if (other.journalType != null) - { - return false; - } - } - else if (!journalType.equals(other.journalType)) - { - return false; - } - if (largeMessagesDirectory == null) - { - if (other.largeMessagesDirectory != null) - { - return false; - } - } - else if (!largeMessagesDirectory.equals(other.largeMessagesDirectory)) - { - return false; - } - if (logJournalWriteRate != other.logJournalWriteRate) - { - return false; - } - if (managementAddress == null) - { - if (other.managementAddress != null) - { - return false; - } - } - else if (!managementAddress.equals(other.managementAddress)) - { - return false; - } - if (managementClusterPassword == null) - { - if (other.managementClusterPassword != null) - { - return false; - } - } - else if (!managementClusterPassword.equals(other.managementClusterPassword)) - { - return false; - } - if (managementClusterUser == null) - { - if (other.managementClusterUser != null) - { - return false; - } - } - else if (!managementClusterUser.equals(other.managementClusterUser)) - { - return false; - } - if (managementNotificationAddress == null) - { - if (other.managementNotificationAddress != null) - { - return false; - } - } - else if (!managementNotificationAddress.equals(other.managementNotificationAddress)) - { - return false; - } - if (messageCounterEnabled != other.messageCounterEnabled) - { - return false; - } - if (messageCounterMaxDayHistory != other.messageCounterMaxDayHistory) - { - return false; - } - if (messageCounterSamplePeriod != other.messageCounterSamplePeriod) - { - return false; - } - if (messageExpiryScanPeriod != other.messageExpiryScanPeriod) - { - return false; - } - if (messageExpiryThreadPriority != other.messageExpiryThreadPriority) - { - return false; - } - if (pagingDirectory == null) - { - if (other.pagingDirectory != null) - { - return false; - } - } - else if (!pagingDirectory.equals(other.pagingDirectory)) - { - return false; - } - if (persistDeliveryCountBeforeDelivery != other.persistDeliveryCountBeforeDelivery) - { - return false; - } - if (persistIDCache != other.persistIDCache) - { - return false; - } - if (persistenceEnabled != other.persistenceEnabled) - { - return false; - } - if (scheduledThreadPoolMaxSize != other.scheduledThreadPoolMaxSize) - { - return false; - } - if (securityEnabled != other.securityEnabled) - { - return false; - } - if (securityInvalidationInterval != other.securityInvalidationInterval) - { - return false; - } - if (serverDumpInterval != other.serverDumpInterval) - { - return false; - } - if (threadPoolMaxSize != other.threadPoolMaxSize) - { - return false; - } - if (transactionTimeout != other.transactionTimeout) - { - return false; - } - if (transactionTimeoutScanPeriod != other.transactionTimeoutScanPeriod) - { - return false; - } - if (wildcardRoutingEnabled != other.wildcardRoutingEnabled) - { - return false; - } - return true; - } - -} Deleted: trunk/src/main/org/hornetq/api/core/config/FileConfiguration.java =================================================================== --- trunk/src/main/org/hornetq/api/core/config/FileConfiguration.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/src/main/org/hornetq/api/core/config/FileConfiguration.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -1,847 +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.InputStreamReader; -import java.io.Reader; -import java.net.URL; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import org.hornetq.api.Pair; -import org.hornetq.api.SimpleString; -import org.hornetq.api.core.client.ClientSessionFactoryImpl; -import org.hornetq.api.core.config.cluster.BridgeConfiguration; -import org.hornetq.api.core.config.cluster.BroadcastGroupConfiguration; -import org.hornetq.api.core.config.cluster.ClusterConnectionConfiguration; -import org.hornetq.api.core.config.cluster.DiscoveryGroupConfiguration; -import org.hornetq.api.core.config.cluster.DivertConfiguration; -import org.hornetq.core.config.impl.Validators; -import org.hornetq.core.logging.Logger; -import org.hornetq.core.server.JournalType; -import org.hornetq.core.server.group.impl.GroupingHandlerConfiguration; -import org.hornetq.utils.XMLConfigurationUtil; -import org.hornetq.utils.XMLUtil; -import org.w3c.dom.Element; -import org.w3c.dom.NamedNodeMap; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; - -/** - * ConfigurationImpl - * This class allows the Configuration class to be configured via a config file. - * - * @author <a href="ataylor(a)redhat.com">Andy Taylor</a> - * @author <a href="tim.fox(a)jboss.com">Tim Fox</a> - */ -public class FileConfiguration extends ConfigurationImpl -{ - private static final long serialVersionUID = -4766689627675039596L; - - private static final Logger log = Logger.getLogger(FileConfiguration.class); - - // Constants ------------------------------------------------------------------------ - - private static final String DEFAULT_CONFIGURATION_URL = "hornetq-configuration.xml"; - - private static final String CONFIGURATION_SCHEMA_URL = "schema/hornetq-configuration.xsd"; - - // For a bridge confirmations must be activated or send acknowledgements won't return - - public static final int DEFAULT_CONFIRMATION_WINDOW_SIZE = 1024 * 1024; - - // Static -------------------------------------------------------------------------- - - // Attributes ---------------------------------------------------------------------- - - private String configurationUrl = FileConfiguration.DEFAULT_CONFIGURATION_URL; - - private boolean started; - - // Public ------------------------------------------------------------------------- - - public synchronized void start() throws Exception - { - if (started) - { - return; - } - - URL url = getClass().getClassLoader().getResource(configurationUrl); - FileConfiguration.log.debug("Loading server configuration from " + url); - - Reader reader = new InputStreamReader(url.openStream()); - String xml = org.hornetq.utils.XMLUtil.readerToString(reader); - xml = XMLUtil.replaceSystemProps(xml); - Element e = org.hornetq.utils.XMLUtil.stringToElement(xml); - org.hornetq.utils.XMLUtil.validate(e, FileConfiguration.CONFIGURATION_SCHEMA_URL); - - clustered = XMLConfigurationUtil.getBoolean(e, "clustered", clustered); - - backup = XMLConfigurationUtil.getBoolean(e, "backup", backup); - - sharedStore = XMLConfigurationUtil.getBoolean(e, "shared-store", sharedStore); - - // Defaults to true when using FileConfiguration - fileDeploymentEnabled = XMLConfigurationUtil.getBoolean(e, "file-deployment-enabled", true); - - persistenceEnabled = XMLConfigurationUtil.getBoolean(e, "persistence-enabled", persistenceEnabled); - - persistDeliveryCountBeforeDelivery = XMLConfigurationUtil.getBoolean(e, - "persist-delivery-count-before-delivery", - persistDeliveryCountBeforeDelivery); - - // NOTE! All the defaults come from the super class - - scheduledThreadPoolMaxSize = XMLConfigurationUtil.getInteger(e, - "scheduled-thread-pool-max-size", - scheduledThreadPoolMaxSize, - Validators.GT_ZERO); - - threadPoolMaxSize = XMLConfigurationUtil.getInteger(e, - "thread-pool-max-size", - threadPoolMaxSize, - Validators.MINUS_ONE_OR_GT_ZERO); - - securityEnabled = XMLConfigurationUtil.getBoolean(e, "security-enabled", securityEnabled); - - jmxManagementEnabled = XMLConfigurationUtil.getBoolean(e, "jmx-management-enabled", jmxManagementEnabled); - - jmxDomain = XMLConfigurationUtil.getString(e, "jmx-domain", jmxDomain, Validators.NOT_NULL_OR_EMPTY); - - securityInvalidationInterval = XMLConfigurationUtil.getLong(e, - "security-invalidation-interval", - securityInvalidationInterval, - Validators.GT_ZERO); - - connectionTTLOverride = XMLConfigurationUtil.getLong(e, - "connection-ttl-override", - connectionTTLOverride, - Validators.MINUS_ONE_OR_GT_ZERO); - - asyncConnectionExecutionEnabled = XMLConfigurationUtil.getBoolean(e, - "async-connection-execution-enabled", - asyncConnectionExecutionEnabled); - - transactionTimeout = XMLConfigurationUtil.getLong(e, - "transaction-timeout", - transactionTimeout, - Validators.GT_ZERO); - - transactionTimeoutScanPeriod = XMLConfigurationUtil.getLong(e, - "transaction-timeout-scan-period", - transactionTimeoutScanPeriod, - Validators.GT_ZERO); - - messageExpiryScanPeriod = XMLConfigurationUtil.getLong(e, - "message-expiry-scan-period", - messageExpiryScanPeriod, - Validators.GT_ZERO); - - messageExpiryThreadPriority = XMLConfigurationUtil.getInteger(e, - "message-expiry-thread-priority", - messageExpiryThreadPriority, - Validators.THREAD_PRIORITY_RANGE); - - idCacheSize = XMLConfigurationUtil.getInteger(e, "id-cache-size", idCacheSize, Validators.GT_ZERO); - - persistIDCache = XMLConfigurationUtil.getBoolean(e, "persist-id-cache", persistIDCache); - - managementAddress = new SimpleString(XMLConfigurationUtil.getString(e, - "management-address", - managementAddress.toString(), - Validators.NOT_NULL_OR_EMPTY)); - - managementNotificationAddress = new SimpleString(XMLConfigurationUtil.getString(e, - "management-notification-address", - managementNotificationAddress.toString(), - Validators.NOT_NULL_OR_EMPTY)); - - managementClusterPassword = XMLConfigurationUtil.getString(e, - "management-cluster-password", - managementClusterPassword, - Validators.NOT_NULL_OR_EMPTY); - - managementClusterUser = XMLConfigurationUtil.getString(e, - "management-cluster-user", - managementClusterUser, - Validators.NOT_NULL_OR_EMPTY); - - logDelegateFactoryClassName = XMLConfigurationUtil.getString(e, - "log-delegate-factory-class-name", - logDelegateFactoryClassName, - Validators.NOT_NULL_OR_EMPTY); - - NodeList interceptorNodes = e.getElementsByTagName("remoting-interceptors"); - - ArrayList<String> interceptorList = new ArrayList<String>(); - - if (interceptorNodes.getLength() > 0) - { - NodeList interceptors = interceptorNodes.item(0).getChildNodes(); - - for (int i = 0; i < interceptors.getLength(); i++) - { - if ("class-name".equalsIgnoreCase(interceptors.item(i).getNodeName())) - { - String clazz = interceptors.item(i).getTextContent(); - - interceptorList.add(clazz); - } - } - } - - interceptorClassNames = interceptorList; - - NodeList backups = e.getElementsByTagName("backup-connector-ref"); - - // There should be only one - this will be enforced by the DTD - - if (backups.getLength() > 0) - { - Node backupNode = backups.item(0); - - backupConnectorName = backupNode.getAttributes().getNamedItem("connector-name").getNodeValue(); - } - - NodeList connectorNodes = e.getElementsByTagName("connector"); - - for (int i = 0; i < connectorNodes.getLength(); i++) - { - Element connectorNode = (Element)connectorNodes.item(i); - - TransportConfiguration connectorConfig = parseTransportConfiguration(connectorNode); - - if (connectorConfig.getName() == null) - { - FileConfiguration.log.warn("Cannot deploy a connector with no name specified."); - - continue; - } - - if (connectorConfigs.containsKey(connectorConfig.getName())) - { - FileConfiguration.log.warn("There is already a connector with name " + connectorConfig.getName() + - " deployed. This one will not be deployed."); - - continue; - } - - connectorConfigs.put(connectorConfig.getName(), connectorConfig); - } - - NodeList acceptorNodes = e.getElementsByTagName("acceptor"); - - for (int i = 0; i < acceptorNodes.getLength(); i++) - { - Element acceptorNode = (Element)acceptorNodes.item(i); - - TransportConfiguration acceptorConfig = parseTransportConfiguration(acceptorNode); - - acceptorConfigs.add(acceptorConfig); - } - - NodeList bgNodes = e.getElementsByTagName("broadcast-group"); - - for (int i = 0; i < bgNodes.getLength(); i++) - { - Element bgNode = (Element)bgNodes.item(i); - - parseBroadcastGroupConfiguration(bgNode); - } - - NodeList dgNodes = e.getElementsByTagName("discovery-group"); - - for (int i = 0; i < dgNodes.getLength(); i++) - { - Element dgNode = (Element)dgNodes.item(i); - - parseDiscoveryGroupConfiguration(dgNode); - } - - NodeList brNodes = e.getElementsByTagName("bridge"); - - for (int i = 0; i < brNodes.getLength(); i++) - { - Element mfNode = (Element)brNodes.item(i); - - parseBridgeConfiguration(mfNode); - } - - NodeList gaNodes = e.getElementsByTagName("grouping-handler"); - - for (int i = 0; i < gaNodes.getLength(); i++) - { - Element gaNode = (Element)gaNodes.item(i); - - parseGroupingHandlerConfiguration(gaNode); - } - - NodeList ccNodes = e.getElementsByTagName("cluster-connection"); - - for (int i = 0; i < ccNodes.getLength(); i++) - { - Element ccNode = (Element)ccNodes.item(i); - - parseClusterConnectionConfiguration(ccNode); - } - - NodeList dvNodes = e.getElementsByTagName("divert"); - - for (int i = 0; i < dvNodes.getLength(); i++) - { - Element dvNode = (Element)dvNodes.item(i); - - parseDivertConfiguration(dvNode); - } - - // Persistence config - - largeMessagesDirectory = XMLConfigurationUtil.getString(e, - "large-messages-directory", - largeMessagesDirectory, - Validators.NOT_NULL_OR_EMPTY); - - bindingsDirectory = XMLConfigurationUtil.getString(e, - "bindings-directory", - bindingsDirectory, - Validators.NOT_NULL_OR_EMPTY); - - createBindingsDir = XMLConfigurationUtil.getBoolean(e, "create-bindings-dir", createBindingsDir); - - journalDirectory = XMLConfigurationUtil.getString(e, - "journal-directory", - journalDirectory, - Validators.NOT_NULL_OR_EMPTY); - - pagingDirectory = XMLConfigurationUtil.getString(e, - "paging-directory", - pagingDirectory, - Validators.NOT_NULL_OR_EMPTY); - - createJournalDir = XMLConfigurationUtil.getBoolean(e, "create-journal-dir", createJournalDir); - - String s = XMLConfigurationUtil.getString(e, "journal-type", journalType.toString(), Validators.JOURNAL_TYPE); - - if (s.equals(JournalType.NIO.toString())) - { - journalType = JournalType.NIO; - } - else if (s.equals(JournalType.ASYNCIO.toString())) - { - journalType = JournalType.ASYNCIO; - } - - journalSyncTransactional = XMLConfigurationUtil.getBoolean(e, - "journal-sync-transactional", - journalSyncTransactional); - - journalSyncNonTransactional = XMLConfigurationUtil.getBoolean(e, - "journal-sync-non-transactional", - journalSyncNonTransactional); - - journalFileSize = XMLConfigurationUtil.getInteger(e, "journal-file-size", journalFileSize, Validators.GT_ZERO); - - int journalBufferTimeout = XMLConfigurationUtil.getInteger(e, - "journal-buffer-timeout", - journalType == JournalType.ASYNCIO ? ConfigurationImpl.DEFAULT_JOURNAL_BUFFER_TIMEOUT_AIO - : ConfigurationImpl.DEFAULT_JOURNAL_BUFFER_TIMEOUT_NIO, - Validators.GT_ZERO); - - int journalBufferSize = XMLConfigurationUtil.getInteger(e, - "journal-buffer-size", - journalType == JournalType.ASYNCIO ? ConfigurationImpl.DEFAULT_JOURNAL_BUFFER_SIZE_AIO - : ConfigurationImpl.DEFAULT_JOURNAL_BUFFER_SIZE_NIO, - Validators.GT_ZERO); - - int journalMaxIO = XMLConfigurationUtil.getInteger(e, - "journal-max-io", - journalType == JournalType.ASYNCIO ? ConfigurationImpl.DEFAULT_JOURNAL_MAX_IO_AIO - : ConfigurationImpl.DEFAULT_JOURNAL_MAX_IO_NIO, - Validators.GT_ZERO); - - if (journalType == JournalType.ASYNCIO) - { - journalBufferTimeout_AIO = journalBufferTimeout; - journalBufferSize_AIO = journalBufferSize; - journalMaxIO_AIO = journalMaxIO; - } - else - { - journalBufferTimeout_NIO = journalBufferTimeout; - journalBufferSize_NIO = journalBufferSize; - journalMaxIO_NIO = journalMaxIO; - } - - journalMinFiles = XMLConfigurationUtil.getInteger(e, "journal-min-files", journalMinFiles, Validators.GT_ZERO); - - journalCompactMinFiles = XMLConfigurationUtil.getInteger(e, - "journal-compact-min-files", - journalCompactMinFiles, - Validators.GE_ZERO); - - journalCompactPercentage = XMLConfigurationUtil.getInteger(e, - "journal-compact-percentage", - journalCompactPercentage, - Validators.PERCENTAGE); - - logJournalWriteRate = XMLConfigurationUtil.getBoolean(e, - "log-journal-write-rate", - ConfigurationImpl.DEFAULT_JOURNAL_LOG_WRITE_RATE); - - journalPerfBlastPages = XMLConfigurationUtil.getInteger(e, - "perf-blast-pages", - ConfigurationImpl.DEFAULT_JOURNAL_PERF_BLAST_PAGES, - Validators.MINUS_ONE_OR_GT_ZERO); - - runSyncSpeedTest = XMLConfigurationUtil.getBoolean(e, "run-sync-speed-test", runSyncSpeedTest); - - wildcardRoutingEnabled = XMLConfigurationUtil.getBoolean(e, "wild-card-routing-enabled", wildcardRoutingEnabled); - - messageCounterEnabled = XMLConfigurationUtil.getBoolean(e, "message-counter-enabled", messageCounterEnabled); - - messageCounterSamplePeriod = XMLConfigurationUtil.getLong(e, - "message-counter-sample-period", - messageCounterSamplePeriod, - Validators.GT_ZERO); - - messageCounterMaxDayHistory = XMLConfigurationUtil.getInteger(e, - "message-counter-max-day-history", - messageCounterMaxDayHistory, - Validators.GT_ZERO); - - serverDumpInterval = XMLConfigurationUtil.getLong(e, - "server-dump-interval", - serverDumpInterval, - Validators.MINUS_ONE_OR_GT_ZERO); // in - // milliseconds - - memoryWarningThreshold = XMLConfigurationUtil.getInteger(e, - "memory-warning-threshold", - memoryWarningThreshold, - Validators.PERCENTAGE); - - memoryMeasureInterval = XMLConfigurationUtil.getLong(e, - "memory-measure-interval", - memoryMeasureInterval, - Validators.MINUS_ONE_OR_GT_ZERO); // in - - started = true; - } - - public synchronized void stop() throws Exception - { - started = false; - } - - public String getConfigurationUrl() - { - return configurationUrl; - } - - public void setConfigurationUrl(final String configurationUrl) - { - this.configurationUrl = configurationUrl; - } - - // Private ------------------------------------------------------------------------- - - private TransportConfiguration parseTransportConfiguration(final Element e) - { - Node nameNode = e.getAttributes().getNamedItem("name"); - - String name = nameNode != null ? nameNode.getNodeValue() : null; - - String clazz = XMLConfigurationUtil.getString(e, "factory-class", null, Validators.NOT_NULL_OR_EMPTY); - - Map<String, Object> params = new HashMap<String, Object>(); - - NodeList paramsNodes = e.getElementsByTagName("param"); - - for (int i = 0; i < paramsNodes.getLength(); i++) - { - Node paramNode = paramsNodes.item(i); - NamedNodeMap attributes = paramNode.getAttributes(); - - Node nkey = attributes.getNamedItem("key"); - - String key = nkey.getTextContent(); - - Node nValue = attributes.getNamedItem("value"); - - params.put(key, nValue.getTextContent()); - } - - return new TransportConfiguration(clazz, params, name); - } - - private void parseBroadcastGroupConfiguration(final Element e) - { - String name = e.getAttribute("name"); - - String localAddress = XMLConfigurationUtil.getString(e, "local-bind-address", null, Validators.NO_CHECK); - - int localBindPort = XMLConfigurationUtil.getInteger(e, "local-bind-port", -1, Validators.MINUS_ONE_OR_GT_ZERO); - - String groupAddress = XMLConfigurationUtil.getString(e, "group-address", null, Validators.NOT_NULL_OR_EMPTY); - - int groupPort = XMLConfigurationUtil.getInteger(e, "group-port", -1, Validators.GT_ZERO); - - long broadcastPeriod = XMLConfigurationUtil.getLong(e, - "broadcast-period", - ConfigurationImpl.DEFAULT_BROADCAST_PERIOD, - Validators.GT_ZERO); - - NodeList children = e.getChildNodes(); - - List<Pair<String, String>> connectorNames = new ArrayList<Pair<String, String>>(); - - for (int j = 0; j < children.getLength(); j++) - { - Node child = children.item(j); - - if (child.getNodeName().equals("connector-ref")) - { - String connectorName = child.getAttributes().getNamedItem("connector-name").getNodeValue(); - - Node backupConnectorNode = child.getAttributes().getNamedItem("backup-connector-name"); - - String backupConnectorName = null; - - if (backupConnectorNode != null) - { - backupConnectorName = backupConnectorNode.getNodeValue(); - } - - Pair<String, String> connectorInfo = new Pair<String, String>(connectorName, backupConnectorName); - - connectorNames.add(connectorInfo); - } - } - - BroadcastGroupConfiguration config = new BroadcastGroupConfiguration(name, - localAddress, - localBindPort, - groupAddress, - groupPort, - broadcastPeriod, - connectorNames); - - broadcastGroupConfigurations.add(config); - } - - private void parseDiscoveryGroupConfiguration(final Element e) - { - String name = e.getAttribute("name"); - - String groupAddress = XMLConfigurationUtil.getString(e, "group-address", null, Validators.NOT_NULL_OR_EMPTY); - - int groupPort = XMLConfigurationUtil.getInteger(e, "group-port", -1, Validators.MINUS_ONE_OR_GT_ZERO); - - long refreshTimeout = XMLConfigurationUtil.getLong(e, - "refresh-timeout", - ConfigurationImpl.DEFAULT_BROADCAST_REFRESH_TIMEOUT, - Validators.GT_ZERO); - - DiscoveryGroupConfiguration config = new DiscoveryGroupConfiguration(name, - groupAddress, - groupPort, - refreshTimeout); - - if (discoveryGroupConfigurations.containsKey(name)) - { - FileConfiguration.log.warn("There is already a discovery group with name " + name + - " deployed. This one will not be deployed."); - - return; - } - else - { - discoveryGroupConfigurations.put(name, config); - } - } - - private void parseClusterConnectionConfiguration(final Element e) - { - String name = e.getAttribute("name"); - - String address = XMLConfigurationUtil.getString(e, "address", null, Validators.NOT_NULL_OR_EMPTY); - - boolean duplicateDetection = XMLConfigurationUtil.getBoolean(e, - "use-duplicate-detection", - ConfigurationImpl.DEFAULT_CLUSTER_DUPLICATE_DETECTION); - - boolean forwardWhenNoConsumers = XMLConfigurationUtil.getBoolean(e, - "forward-when-no-consumers", - ConfigurationImpl.DEFAULT_CLUSTER_FORWARD_WHEN_NO_CONSUMERS); - - int maxHops = XMLConfigurationUtil.getInteger(e, - "max-hops", - ConfigurationImpl.DEFAULT_CLUSTER_MAX_HOPS, - Validators.GE_ZERO); - - long retryInterval = XMLConfigurationUtil.getLong(e, - "retry-interval", - ConfigurationImpl.DEFAULT_CLUSTER_RETRY_INTERVAL, - Validators.GT_ZERO); - - int confirmationWindowSize = XMLConfigurationUtil.getInteger(e, - "confirmation-window-size", - FileConfiguration.DEFAULT_CONFIRMATION_WINDOW_SIZE, - Validators.GT_ZERO); - - String discoveryGroupName = null; - - List<Pair<String, String>> connectorPairs = new ArrayList<Pair<String, String>>(); - - NodeList children = e.getChildNodes(); - - for (int j = 0; j < children.getLength(); j++) - { - Node child = children.item(j); - - if (child.getNodeName().equals("discovery-group-ref")) - { - discoveryGroupName = child.getAttributes().getNamedItem("discovery-group-name").getNodeValue(); - } - else if (child.getNodeName().equals("connector-ref")) - { - String connectorName = child.getAttributes().getNamedItem("connector-name").getNodeValue(); - - Node backupNode = child.getAttributes().getNamedItem("backup-connector-name"); - - String backupConnectorName = null; - - if (backupNode != null) - { - backupConnectorName = backupNode.getNodeValue(); - } - - Pair<String, String> connectorPair = new Pair<String, String>(connectorName, backupConnectorName); - - connectorPairs.add(connectorPair); - } - } - - ClusterConnectionConfiguration config; - - if (discoveryGroupName == null) - { - config = new ClusterConnectionConfiguration(name, - address, - retryInterval, - duplicateDetection, - forwardWhenNoConsumers, - maxHops, - confirmationWindowSize, - connectorPairs); - } - else - { - config = new ClusterConnectionConfiguration(name, - address, - retryInterval, - duplicateDetection, - forwardWhenNoConsumers, - maxHops, - confirmationWindowSize, - discoveryGroupName); - } - - clusterConfigurations.add(config); - } - - private void parseGroupingHandlerConfiguration(final Element node) - { - String name = node.getAttribute("name"); - String type = XMLConfigurationUtil.getString(node, "type", null, Validators.NOT_NULL_OR_EMPTY); - String address = XMLConfigurationUtil.getString(node, "address", null, Validators.NOT_NULL_OR_EMPTY); - Integer timeout = XMLConfigurationUtil.getInteger(node, - "timeout", - GroupingHandlerConfiguration.DEFAULT_TIMEOUT, - Validators.GT_ZERO); - groupingHandlerConfiguration = new GroupingHandlerConfiguration(new SimpleString(name), - type.equals(GroupingHandlerConfiguration.TYPE.LOCAL.getType()) ? GroupingHandlerConfiguration.TYPE.LOCAL - : GroupingHandlerConfiguration.TYPE.REMOTE, - new SimpleString(address), - timeout); - } - - private void parseBridgeConfiguration(final Element brNode) - { - String name = brNode.getAttribute("name"); - - String queueName = XMLConfigurationUtil.getString(brNode, "queue-name", null, Validators.NOT_NULL_OR_EMPTY); - - String forwardingAddress = XMLConfigurationUtil.getString(brNode, - "forwarding-address", - null, - Validators.NOT_NULL_OR_EMPTY); - - String transformerClassName = XMLConfigurationUtil.getString(brNode, - "transformer-class-name", - null, - Validators.NO_CHECK); - - long retryInterval = XMLConfigurationUtil.getLong(brNode, - "retry-interval", - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL, - Validators.GT_ZERO); - - // Default bridge conf - int confirmationWindowSize = XMLConfigurationUtil.getInteger(brNode, - "confirmation-window-size", - FileConfiguration.DEFAULT_CONFIRMATION_WINDOW_SIZE, - Validators.GT_ZERO); - - double retryIntervalMultiplier = XMLConfigurationUtil.getDouble(brNode, - "retry-interval-multiplier", - ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER, - Validators.GT_ZERO); - - int reconnectAttempts = XMLConfigurationUtil.getInteger(brNode, - "reconnect-attempts", - ConfigurationImpl.DEFAULT_BRIDGE_RECONNECT_ATTEMPTS, - Validators.MINUS_ONE_OR_GE_ZERO); - - boolean failoverOnServerShutdown = XMLConfigurationUtil.getBoolean(brNode, - "failover-on-server-shutdown", - ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); - - boolean useDuplicateDetection = XMLConfigurationUtil.getBoolean(brNode, - "use-duplicate-detection", - ConfigurationImpl.DEFAULT_BRIDGE_DUPLICATE_DETECTION); - - String filterString = null; - - Pair<String, String> connectorPair = null; - - String discoveryGroupName = null; - - NodeList children = brNode.getChildNodes(); - - for (int j = 0; j < children.getLength(); j++) - { - Node child = children.item(j); - - if (child.getNodeName().equals("filter")) - { - filterString = child.getAttributes().getNamedItem("string").getNodeValue(); - } - else if (child.getNodeName().equals("discovery-group-ref")) - { - discoveryGroupName = child.getAttributes().getNamedItem("discovery-group-name").getNodeValue(); - } - else if (child.getNodeName().equals("connector-ref")) - { - String connectorName = child.getAttributes().getNamedItem("connector-name").getNodeValue(); - - Node backupNode = child.getAttributes().getNamedItem("backup-connector-name"); - - String backupConnectorName = null; - - if (backupNode != null) - { - backupConnectorName = backupNode.getNodeValue(); - } - - connectorPair = new Pair<String, String>(connectorName, backupConnectorName); - } - } - - BridgeConfiguration config; - - if (connectorPair != null) - { - config = new BridgeConfiguration(name, - queueName, - forwardingAddress, - filterString, - transformerClassName, - retryInterval, - retryIntervalMultiplier, - reconnectAttempts, - failoverOnServerShutdown, - useDuplicateDetection, - confirmationWindowSize, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, - connectorPair); - } - else - { - config = new BridgeConfiguration(name, - queueName, - forwardingAddress, - filterString, - transformerClassName, - retryInterval, - retryIntervalMultiplier, - reconnectAttempts, - failoverOnServerShutdown, - useDuplicateDetection, - confirmationWindowSize, - ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, - discoveryGroupName); - } - - bridgeConfigurations.add(config); - } - - private void parseDivertConfiguration(final Element e) - { - String name = e.getAttribute("name"); - - String routingName = XMLConfigurationUtil.getString(e, "routing-name", null, Validators.NO_CHECK); - - String address = XMLConfigurationUtil.getString(e, "address", null, Validators.NOT_NULL_OR_EMPTY); - - String forwardingAddress = XMLConfigurationUtil.getString(e, - "forwarding-address", - null, - Validators.NOT_NULL_OR_EMPTY); - - boolean exclusive = XMLConfigurationUtil.getBoolean(e, "exclusive", ConfigurationImpl.DEFAULT_DIVERT_EXCLUSIVE); - - String transformerClassName = XMLConfigurationUtil.getString(e, - "transformer-class-name", - null, - Validators.NO_CHECK); - - String filterString = null; - - NodeList children = e.getChildNodes(); - - for (int j = 0; j < children.getLength(); j++) - { - Node child = children.item(j); - - if (child.getNodeName().equals("filter")) - { - filterString = child.getAttributes().getNamedItem("string").getNodeValue(); - } - } - - DivertConfiguration config = new DivertConfiguration(name, - routingName, - address, - forwardingAddress, - exclusive, - filterString, - transformerClassName); - - divertConfigurations.add(config); - } -} Modified: trunk/src/main/org/hornetq/api/core/management/HornetQServerControl.java =================================================================== --- trunk/src/main/org/hornetq/api/core/management/HornetQServerControl.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/src/main/org/hornetq/api/core/management/HornetQServerControl.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -15,8 +15,8 @@ import javax.management.MBeanOperationInfo; -import org.hornetq.api.core.config.Configuration; import org.hornetq.api.core.exception.HornetQException; +import org.hornetq.core.config.Configuration; import org.hornetq.core.server.management.Operation; import org.hornetq.core.server.management.Parameter; Copied: trunk/src/main/org/hornetq/api/core/management/ManagementHelper.java (from rev 8720, trunk/src/main/org/hornetq/api/core/management/client/ManagementHelper.java) =================================================================== --- trunk/src/main/org/hornetq/api/core/management/ManagementHelper.java (rev 0) +++ trunk/src/main/org/hornetq/api/core/management/ManagementHelper.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -0,0 +1,407 @@ +/* + * 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.management; + +import java.util.Collections; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; + +import org.hornetq.api.SimpleString; +import org.hornetq.api.core.message.Message; +import org.hornetq.core.logging.Logger; +import org.hornetq.utils.json.JSONArray; +import org.hornetq.utils.json.JSONObject; + +/* + * + * Operation params and results are encoded as JSON arrays + * + * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + * @version <tt>$Revision$</tt> + */ +public class ManagementHelper +{ + // Constants ----------------------------------------------------- + + private static final Logger log = Logger.getLogger(ManagementHelper.class); + + public static final SimpleString HDR_RESOURCE_NAME = new SimpleString("_HQ_ResourceName"); + + public static final SimpleString HDR_ATTRIBUTE = new SimpleString("_HQ_Attribute"); + + public static final SimpleString HDR_OPERATION_NAME = new SimpleString("_HQ_OperationName"); + + public static final SimpleString HDR_OPERATION_SUCCEEDED = new SimpleString("_HQ_OperationSucceeded"); + + public static final SimpleString HDR_NOTIFICATION_TYPE = new SimpleString("_HQ_NotifType"); + + public static final SimpleString HDR_NOTIFICATION_TIMESTAMP = new SimpleString("_HQ_NotifTimestamp"); + + public static final SimpleString HDR_ROUTING_NAME = new SimpleString("_HQ_RoutingName"); + + public static final SimpleString HDR_CLUSTER_NAME = new SimpleString("_HQ_ClusterName"); + + public static final SimpleString HDR_ADDRESS = new SimpleString("_HQ_Address"); + + public static final SimpleString HDR_BINDING_ID = new SimpleString("_HQ_Binding_ID"); + + public static final SimpleString HDR_BINDING_TYPE = new SimpleString("_HQ_Binding_Type"); + + public static final SimpleString HDR_FILTERSTRING = new SimpleString("_HQ_FilterString"); + + public static final SimpleString HDR_DISTANCE = new SimpleString("_HQ_Distance"); + + public static final SimpleString HDR_CONSUMER_COUNT = new SimpleString("_HQ_ConsumerCount"); + + public static final SimpleString HDR_USER = new SimpleString("_HQ_User"); + + public static final SimpleString HDR_CHECK_TYPE = new SimpleString("_HQ_CheckType"); + + public static final SimpleString HDR_PROPOSAL_GROUP_ID = new SimpleString("_JBM_ProposalGroupId"); + + public static final SimpleString HDR_PROPOSAL_VALUE = new SimpleString("_JBM_ProposalValue"); + + public static final SimpleString HDR_PROPOSAL_ALT_VALUE = new SimpleString("_JBM_ProposalAltValue"); + + // Attributes ---------------------------------------------------- + + // Static -------------------------------------------------------- + + public static void putAttribute(final Message message, final String resourceName, final String attribute) + { + message.putStringProperty(ManagementHelper.HDR_RESOURCE_NAME, new SimpleString(resourceName)); + message.putStringProperty(ManagementHelper.HDR_ATTRIBUTE, new SimpleString(attribute)); + } + + public static void putOperationInvocation(final Message message, + final String resourceName, + final String operationName) throws Exception + { + ManagementHelper.putOperationInvocation(message, resourceName, operationName, (Object[])null); + } + + public static void putOperationInvocation(final Message message, + final String resourceName, + final String operationName, + final Object... parameters) throws Exception + { + // store the name of the operation in the headers + message.putStringProperty(ManagementHelper.HDR_RESOURCE_NAME, new SimpleString(resourceName)); + message.putStringProperty(ManagementHelper.HDR_OPERATION_NAME, new SimpleString(operationName)); + + // and the params go in the body, since might be too large for header + + String paramString; + + if (parameters != null) + { + JSONArray jsonArray = ManagementHelper.toJSONArray(parameters); + + paramString = jsonArray.toString(); + } + else + { + paramString = null; + } + + message.getBodyBuffer().writeNullableString(paramString); + } + + private static JSONArray toJSONArray(final Object[] array) throws Exception + { + JSONArray jsonArray = new JSONArray(); + + for (Object parameter : array) + { + if (parameter instanceof Map) + { + Map<String, Object> map = (Map<String, Object>)parameter; + + JSONObject jsonObject = new JSONObject(); + + for (Map.Entry<String, Object> entry : map.entrySet()) + { + String key = entry.getKey(); + + Object val = entry.getValue(); + + if (val != null) + { + if (val.getClass().isArray()) + { + val = ManagementHelper.toJSONArray((Object[])val); + } + else + { + ManagementHelper.checkType(val); + } + } + + jsonObject.put(key, val); + } + + jsonArray.put(jsonObject); + } + else + { + if (parameter != null) + { + Class clz = parameter.getClass(); + + if (clz.isArray()) + { + Object[] innerArray = (Object[])parameter; + + jsonArray.put(ManagementHelper.toJSONArray(innerArray)); + } + else + { + ManagementHelper.checkType(parameter); + + jsonArray.put(parameter); + } + } + else + { + jsonArray.put((Object)null); + } + } + } + + return jsonArray; + } + + private static Object[] fromJSONArray(final JSONArray jsonArray) throws Exception + { + Object[] array = new Object[jsonArray.length()]; + + for (int i = 0; i < jsonArray.length(); i++) + { + Object val = jsonArray.get(i); + + if (val instanceof JSONArray) + { + Object[] inner = ManagementHelper.fromJSONArray((JSONArray)val); + + array[i] = inner; + } + else if (val instanceof JSONObject) + { + JSONObject jsonObject = (JSONObject)val; + + Map<String, Object> map = new HashMap<String, Object>(); + + Iterator<String> iter = jsonObject.keys(); + + while (iter.hasNext()) + { + String key = iter.next(); + + Object innerVal = jsonObject.get(key); + + if (innerVal instanceof JSONArray) + { + innerVal = ManagementHelper.fromJSONArray(((JSONArray)innerVal)); + } + else if (innerVal instanceof JSONObject) + { + Map<String, Object> innerMap = new HashMap<String, Object>(); + JSONObject o = (JSONObject)innerVal; + Iterator it = o.keys(); + while (it.hasNext()) + { + String k = (String)it.next(); + innerMap.put(k, o.get(k)); + } + innerVal = innerMap; + } + else if (innerVal instanceof Integer) + { + innerVal = ((Integer)innerVal).longValue(); + } + + map.put(key, innerVal); + } + + array[i] = map; + } + else + { + if (val == JSONObject.NULL) + { + array[i] = null; + } + else + { + array[i] = val; + } + } + } + + return array; + } + + private static void checkType(final Object param) + { + if (param instanceof Integer == false && param instanceof Long == false && + param instanceof Double == false && + param instanceof String == false && + param instanceof Boolean == false && + param instanceof Map == false && + param instanceof Byte == false && + param instanceof Short == false) + { + throw new IllegalArgumentException("Params for management operations must be of the following type: " + "int long double String boolean Map or array thereof " + + " but found " + + param.getClass().getName()); + } + } + + public static Object[] retrieveOperationParameters(final Message message) throws Exception + { + String jsonString = message.getBodyBuffer().readNullableString(); + + if (jsonString != null) + { + JSONArray jsonArray = new JSONArray(jsonString); + + return ManagementHelper.fromJSONArray(jsonArray); + } + else + { + return null; + } + } + + public static boolean isOperationResult(final Message message) + { + return message.containsProperty(ManagementHelper.HDR_OPERATION_SUCCEEDED); + } + + public static boolean isAttributesResult(final Message message) + { + return !ManagementHelper.isOperationResult(message); + } + + public static void storeResult(final Message message, final Object result) throws Exception + { + String resultString; + + if (result != null) + { + // Result is stored in body, also encoded as JSON array of length 1 + + JSONArray jsonArray = ManagementHelper.toJSONArray(new Object[] { result }); + + resultString = jsonArray.toString(); + } + else + { + resultString = null; + } + + message.getBodyBuffer().writeNullableString(resultString); + } + + public static Object[] getResults(final Message message) throws Exception + { + String jsonString = message.getBodyBuffer().readNullableString(); + + if (jsonString != null) + { + JSONArray jsonArray = new JSONArray(jsonString); + + Object[] res = ManagementHelper.fromJSONArray(jsonArray); + + return res; + } + else + { + return null; + } + } + + public static Object getResult(final Message message) throws Exception + { + Object[] res = ManagementHelper.getResults(message); + + if (res != null) + { + return res[0]; + } + else + { + return null; + } + } + + public static boolean hasOperationSucceeded(final Message message) + { + if (!ManagementHelper.isOperationResult(message)) + { + return false; + } + if (message.containsProperty(ManagementHelper.HDR_OPERATION_SUCCEEDED)) + { + return message.getBooleanProperty(ManagementHelper.HDR_OPERATION_SUCCEEDED); + } + return false; + } + + public static Map<String, Object> fromCommaSeparatedKeyValues(final String str) throws Exception + { + if (str == null || str.trim().length() == 0) + { + return Collections.emptyMap(); + } + + // create a JSON array with 1 object: + JSONArray array = new JSONArray("[{" + str + "}]"); + Map<String, Object> params = (Map<String, Object>)ManagementHelper.fromJSONArray(array)[0]; + return params; + } + + public static Object[] fromCommaSeparatedArrayOfCommaSeparatedKeyValues(final String str) throws Exception + { + if (str == null || str.trim().length() == 0) + { + return new Object[0]; + } + + String s = str; + + // if there is a single item, we wrap it in to make it a JSON object + if (!s.trim().startsWith("{")) + { + s = "{" + s + "}"; + } + JSONArray array = new JSONArray("[" + s + "]"); + return ManagementHelper.fromJSONArray(array); + } + + // Constructors -------------------------------------------------- + + // Public -------------------------------------------------------- + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- +} Modified: trunk/src/main/org/hornetq/api/core/management/ObjectNameBuilder.java =================================================================== --- trunk/src/main/org/hornetq/api/core/management/ObjectNameBuilder.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/src/main/org/hornetq/api/core/management/ObjectNameBuilder.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -16,11 +16,11 @@ import javax.management.ObjectName; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.jms.management.ConnectionFactoryControl; import org.hornetq.api.jms.management.JMSQueueControl; import org.hornetq.api.jms.management.JMSServerControl; import org.hornetq.api.jms.management.TopicControl; +import org.hornetq.core.config.impl.ConfigurationImpl; /** * Helper class to build ObjectNames for HornetQ resources. Deleted: trunk/src/main/org/hornetq/api/jms/bridge/ConnectionFactoryFactory.java =================================================================== --- trunk/src/main/org/hornetq/api/jms/bridge/ConnectionFactoryFactory.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/src/main/org/hornetq/api/jms/bridge/ConnectionFactoryFactory.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -1,30 +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.jms.bridge; - -import javax.jms.ConnectionFactory; - -/** - * A ConnectionFactoryFactory - * - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * @version <tt>$Revision$</tt> - * - * $Id$ - * - */ -public interface ConnectionFactoryFactory -{ - ConnectionFactory createConnectionFactory() throws Exception; -} Deleted: trunk/src/main/org/hornetq/api/jms/bridge/DestinationFactory.java =================================================================== --- trunk/src/main/org/hornetq/api/jms/bridge/DestinationFactory.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/src/main/org/hornetq/api/jms/bridge/DestinationFactory.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -1,29 +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.jms.bridge; - -import javax.jms.Destination; - -/** - * - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * @version <tt>$Revision: $</tt>10 Oct 2007 - * - * $Id: $ - * - */ -public interface DestinationFactory -{ - Destination createDestination() throws Exception; -} Deleted: trunk/src/main/org/hornetq/api/jms/bridge/JMSBridge.java =================================================================== --- trunk/src/main/org/hornetq/api/jms/bridge/JMSBridge.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/src/main/org/hornetq/api/jms/bridge/JMSBridge.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -1,112 +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.jms.bridge; - -import javax.transaction.TransactionManager; - -import org.hornetq.core.server.HornetQComponent; - -/** - * - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> - * - * @version <tt>$Revision$</tt> - * - */ -public interface JMSBridge extends HornetQComponent -{ - void pause() throws Exception; - - void resume() throws Exception; - - DestinationFactory getSourceDestinationFactory(); - - void setSourceDestinationFactory(DestinationFactory dest); - - DestinationFactory getTargetDestinationFactory(); - - void setTargetDestinationFactory(DestinationFactory dest); - - String getSourceUsername(); - - void setSourceUsername(String name); - - String getSourcePassword(); - - void setSourcePassword(String pwd); - - String getTargetUsername(); - - void setTargetUsername(String name); - - String getTargetPassword(); - - void setTargetPassword(String pwd); - - String getSelector(); - - void setSelector(String selector); - - long getFailureRetryInterval(); - - void setFailureRetryInterval(long interval); - - int getMaxRetries(); - - void setMaxRetries(int retries); - - QualityOfServiceMode getQualityOfServiceMode(); - - void setQualityOfServiceMode(QualityOfServiceMode mode); - - int getMaxBatchSize(); - - void setMaxBatchSize(int size); - - long getMaxBatchTime(); - - void setMaxBatchTime(long time); - - String getSubscriptionName(); - - void setSubscriptionName(String subname); - - String getClientID(); - - void setClientID(String clientID); - - String getTransactionManagerLocatorClass(); - - void setTransactionManagerLocatorClass(String transactionManagerLocatorClass); - - String getTransactionManagerLocatorMethod(); - - void setTransactionManagerLocatorMethod(String transactionManagerLocatorMethod); - - boolean isAddMessageIDInHeader(); - - void setAddMessageIDInHeader(boolean value); - - boolean isPaused(); - - boolean isFailed(); - - void setSourceConnectionFactoryFactory(ConnectionFactoryFactory cff); - - void setTargetConnectionFactoryFactory(ConnectionFactoryFactory cff); - - void setTransactionManager(TransactionManager tm); - -} \ No newline at end of file Deleted: trunk/src/main/org/hornetq/api/jms/bridge/JMSBridgeControl.java =================================================================== --- trunk/src/main/org/hornetq/api/jms/bridge/JMSBridgeControl.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/src/main/org/hornetq/api/jms/bridge/JMSBridgeControl.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -1,94 +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.jms.bridge; - -import org.hornetq.api.core.management.HornetQComponentControl; - -/** - * A JMSBridgeControl - * - * @author <a href="jose(a)voxeo.com">Jose de Castro</a> - * - */ -public interface JMSBridgeControl extends HornetQComponentControl -{ - void pause() throws Exception; - - void resume() throws Exception; - - String getSourceUsername(); - - void setSourceUsername(String name); - - String getSourcePassword(); - - void setSourcePassword(String pwd); - - String getTargetUsername(); - - void setTargetUsername(String name); - - String getTargetPassword(); - - void setTargetPassword(String pwd); - - String getSelector(); - - void setSelector(String selector); - - long getFailureRetryInterval(); - - void setFailureRetryInterval(long interval); - - int getMaxRetries(); - - void setMaxRetries(int retries); - - String getQualityOfServiceMode(); - - void setQualityOfServiceMode(String mode); - - int getMaxBatchSize(); - - void setMaxBatchSize(int size); - - long getMaxBatchTime(); - - void setMaxBatchTime(long time); - - String getSubscriptionName(); - - void setSubscriptionName(String subname); - - String getClientID(); - - void setClientID(String clientID); - - String getTransactionManagerLocatorClass(); - - void setTransactionManagerLocatorClass(String transactionManagerLocatorClass); - - String getTransactionManagerLocatorMethod(); - - void setTransactionManagerLocatorMethod(String transactionManagerLocatorMethod); - - boolean isAddMessageIDInHeader(); - - void setAddMessageIDInHeader(boolean value); - - boolean isPaused(); - - boolean isFailed(); - -} Deleted: trunk/src/main/org/hornetq/api/jms/bridge/JMSBridgeImpl.java =================================================================== --- trunk/src/main/org/hornetq/api/jms/bridge/JMSBridgeImpl.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/src/main/org/hornetq/api/jms/bridge/JMSBridgeImpl.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -1,2004 +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.jms.bridge; - -import java.lang.reflect.Method; -import java.util.Enumeration; -import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.Map; - -import javax.jms.Connection; -import javax.jms.ConnectionFactory; -import javax.jms.Destination; -import javax.jms.ExceptionListener; -import javax.jms.JMSException; -import javax.jms.Message; -import javax.jms.MessageConsumer; -import javax.jms.MessageProducer; -import javax.jms.Session; -import javax.jms.Topic; -import javax.jms.XAConnection; -import javax.jms.XAConnectionFactory; -import javax.jms.XASession; -import javax.management.MBeanServer; -import javax.management.ObjectName; -import javax.management.StandardMBean; -import javax.transaction.Transaction; -import javax.transaction.TransactionManager; -import javax.transaction.xa.XAResource; - -import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.jms.HornetQMessageConstants; -import org.hornetq.core.logging.Logger; -import org.hornetq.core.server.HornetQComponent; -import org.hornetq.jms.bridge.impl.JMSBridgeControlImpl; -import org.hornetq.jms.client.HornetQSession; - -/** - * - * A JMSBridge - * - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * @version <tt>$Revision:4566 $</tt> - * - * $Id:JMSBridge.java 4566 2008-06-24 08:01:35Z jmesnil $ - * - */ -public class JMSBridgeImpl implements HornetQComponent, JMSBridge -{ - private static final Logger log; - - private static boolean trace; - - static - { - log = Logger.getLogger(JMSBridgeImpl.class); - - JMSBridgeImpl.trace = JMSBridgeImpl.log.isTraceEnabled(); - } - - private static final int TEN_YEARS = 60 * 60 * 24 * 365 * 10; // in ms - - private final Object lock = new Object(); - - private String sourceUsername; - - private String sourcePassword; - - private String targetUsername; - - private String targetPassword; - - private TransactionManager tm; - - private String selector; - - private long failureRetryInterval; - - private int maxRetries; - - private QualityOfServiceMode qualityOfServiceMode; - - private int maxBatchSize; - - private long maxBatchTime; - - private String subName; - - private String clientID; - - private volatile boolean addMessageIDInHeader; - - private boolean started; - - private final LinkedList<Message> messages; - - private ConnectionFactoryFactory sourceCff; - - private ConnectionFactoryFactory targetCff; - - private DestinationFactory sourceDestinationFactory; - - private DestinationFactory targetDestinationFactory; - - private Connection sourceConn; - - private Connection targetConn; - - private Destination sourceDestination; - - private Destination targetDestination; - - private Session sourceSession; - - private Session targetSession; - - private MessageConsumer sourceConsumer; - - private MessageProducer targetProducer; - - private BatchTimeChecker timeChecker; - - private Thread checkerThread; - - private Thread sourceReceiver; - - private long batchExpiryTime; - - private boolean paused; - - private Transaction tx; - - private boolean failed; - - private int forwardMode; - - private String transactionManagerLocatorClass = "org.hornetq.integration.jboss.tm.JBoss5TransactionManagerLocator"; - - private String transactionManagerLocatorMethod = "getTm"; - - private MBeanServer mbeanServer; - - private ObjectName objectName; - - private static final int FORWARD_MODE_XA = 0; - - private static final int FORWARD_MODE_LOCALTX = 1; - - private static final int FORWARD_MODE_NONTX = 2; - - /* - * Constructor for MBean - */ - public JMSBridgeImpl() - { - messages = new LinkedList<Message>(); - } - - public JMSBridgeImpl(final ConnectionFactoryFactory sourceCff, - final ConnectionFactoryFactory targetCff, - final DestinationFactory sourceDestinationFactory, - final DestinationFactory targetDestinationFactory, - final String sourceUsername, - final String sourcePassword, - final String targetUsername, - final String targetPassword, - final String selector, - final long failureRetryInterval, - final int maxRetries, - final QualityOfServiceMode qosMode, - final int maxBatchSize, - final long maxBatchTime, - final String subName, - final String clientID, - final boolean addMessageIDInHeader) - { - - this(sourceCff, - targetCff, - sourceDestinationFactory, - targetDestinationFactory, - sourceUsername, - sourcePassword, - targetUsername, - targetPassword, - selector, - failureRetryInterval, - maxRetries, - qosMode, - maxBatchSize, - maxBatchTime, - subName, - clientID, - addMessageIDInHeader, - null, - null); - } - - public JMSBridgeImpl(final ConnectionFactoryFactory sourceCff, - final ConnectionFactoryFactory targetCff, - final DestinationFactory sourceDestinationFactory, - final DestinationFactory targetDestinationFactory, - final String sourceUsername, - final String sourcePassword, - final String targetUsername, - final String targetPassword, - final String selector, - final long failureRetryInterval, - final int maxRetries, - final QualityOfServiceMode qosMode, - final int maxBatchSize, - final long maxBatchTime, - final String subName, - final String clientID, - final boolean addMessageIDInHeader, - final MBeanServer mbeanServer, - final String objectName) - { - this(); - - this.sourceCff = sourceCff; - - this.targetCff = targetCff; - - this.sourceDestinationFactory = sourceDestinationFactory; - - this.targetDestinationFactory = targetDestinationFactory; - - this.sourceUsername = sourceUsername; - - this.sourcePassword = sourcePassword; - - this.targetUsername = targetUsername; - - this.targetPassword = targetPassword; - - this.selector = selector; - - this.failureRetryInterval = failureRetryInterval; - - this.maxRetries = maxRetries; - - qualityOfServiceMode = qosMode; - - this.maxBatchSize = maxBatchSize; - - this.maxBatchTime = maxBatchTime; - - this.subName = subName; - - this.clientID = clientID; - - this.addMessageIDInHeader = addMessageIDInHeader; - - checkParams(); - - if (mbeanServer != null) - { - if (objectName != null) - { - this.mbeanServer = mbeanServer; - - try - { - JMSBridgeControlImpl controlBean = new JMSBridgeControlImpl(this); - this.objectName = ObjectName.getInstance(objectName); - StandardMBean mbean = new StandardMBean(controlBean, JMSBridgeControl.class); - mbeanServer.registerMBean(mbean, this.objectName); - JMSBridgeImpl.log.debug("Registered JMSBridge instance as: " + this.objectName.getCanonicalName()); - } - catch (Exception e) - { - throw new IllegalStateException("Failed to register JMSBridge MBean", e); - } - } - else - { - throw new IllegalArgumentException("objectName is required when specifying an MBeanServer"); - } - } - - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace("Created " + this); - } - } - - // HornetQComponent overrides -------------------------------------------------- - - public synchronized void start() throws Exception - { - if (started) - { - JMSBridgeImpl.log.warn("Attempt to start, but is already started"); - return; - } - - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace("Starting " + this); - } - - checkParams(); - - TransactionManager tm = getTm(); - - // There may already be a JTA transaction associated to the thread - - boolean ok; - - Transaction toResume = null; - try - { - toResume = tm.suspend(); - - ok = setupJMSObjects(); - } - finally - { - if (toResume != null) - { - tm.resume(toResume); - } - } - - if (ok) - { - // start the source connection - - sourceConn.start(); - - started = true; - - if (maxBatchTime != -1) - { - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace("Starting time checker thread"); - } - - timeChecker = new BatchTimeChecker(); - - checkerThread = new Thread(timeChecker, "jmsbridge-checker-thread"); - - batchExpiryTime = System.currentTimeMillis() + maxBatchTime; - - checkerThread.start(); - - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace("Started time checker thread"); - } - } - - sourceReceiver = new SourceReceiver(); - sourceReceiver.start(); - - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace("Started " + this); - } - } - else - { - JMSBridgeImpl.log.warn("Failed to start bridge"); - handleFailureOnStartup(); - } - - } - - public synchronized void stop() throws Exception - { - if (!started) - { - JMSBridgeImpl.log.warn("Attempt to stop, but is already stopped"); - return; - } - - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace("Stopping " + this); - } - - synchronized (lock) - { - started = false; - - // This must be inside sync block - if (checkerThread != null) - { - checkerThread.interrupt(); - } - - if (sourceReceiver != null) - { - sourceReceiver.interrupt(); - } - } - - // This must be outside sync block - if (checkerThread != null) - { - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace("Waiting for checker thread to finish"); - } - - checkerThread.join(); - - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace("Checker thread has finished"); - } - } - - // This must be outside sync block - if (sourceReceiver != null) - { - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace("Waiting for source receiver thread to finish"); - } - - sourceReceiver.join(); - - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace("Source receiver thread has finished"); - } - } - - if (tx != null) - { - // Terminate any transaction - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace("Rolling back remaining tx"); - } - - try - { - tx.rollback(); - } - catch (Exception ignore) - { - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace("Failed to rollback", ignore); - } - } - - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace("Rolled back remaining tx"); - } - } - - try - { - sourceConn.close(); - } - catch (Exception ignore) - { - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace("Failed to close source conn", ignore); - } - } - - if (targetConn != null) - { - try - { - targetConn.close(); - } - catch (Exception ignore) - { - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace("Failed to close target conn", ignore); - } - } - } - - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace("Stopped " + this); - } - } - - public synchronized boolean isStarted() - { - return started; - } - - public void destroy() - { - if (mbeanServer != null && objectName != null) - { - try - { - mbeanServer.unregisterMBean(objectName); - } - catch (Exception e) - { - JMSBridgeImpl.log.warn("Failed to unregisted JMS Bridge " + objectName); - } - } - } - - // JMSBridge implementation ------------------------------------------------------------ - - public synchronized void pause() throws Exception - { - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace("Pausing " + this); - } - - synchronized (lock) - { - paused = true; - - sourceConn.stop(); - } - - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace("Paused " + this); - } - } - - public synchronized void resume() throws Exception - { - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace("Resuming " + this); - } - - synchronized (lock) - { - paused = false; - - sourceConn.start(); - } - - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace("Resumed " + this); - } - } - - public DestinationFactory getSourceDestinationFactory() - { - return sourceDestinationFactory; - } - - public void setSourceDestinationFactory(final DestinationFactory dest) - { - checkBridgeNotStarted(); - JMSBridgeImpl.checkNotNull(dest, "TargetDestinationFactory"); - - sourceDestinationFactory = dest; - } - - public DestinationFactory getTargetDestinationFactory() - { - return targetDestinationFactory; - } - - public void setTargetDestinationFactory(final DestinationFactory dest) - { - checkBridgeNotStarted(); - JMSBridgeImpl.checkNotNull(dest, "TargetDestinationFactory"); - - targetDestinationFactory = dest; - } - - public String getSourceUsername() - { - return sourceUsername; - } - - public synchronized void setSourceUsername(final String name) - { - checkBridgeNotStarted(); - - sourceUsername = name; - } - - public synchronized String getSourcePassword() - { - return sourcePassword; - } - - public synchronized void setSourcePassword(final String pwd) - { - checkBridgeNotStarted(); - - sourcePassword = pwd; - } - - public synchronized String getTargetUsername() - { - return targetUsername; - } - - public synchronized void setTargetUsername(final String name) - { - checkBridgeNotStarted(); - - targetUsername = name; - } - - public synchronized String getTargetPassword() - { - return targetPassword; - } - - public synchronized void setTargetPassword(final String pwd) - { - checkBridgeNotStarted(); - - targetPassword = pwd; - } - - public synchronized String getSelector() - { - return selector; - } - - public synchronized void setSelector(final String selector) - { - checkBridgeNotStarted(); - - this.selector = selector; - } - - public synchronized long getFailureRetryInterval() - { - return failureRetryInterval; - } - - public synchronized void setFailureRetryInterval(final long interval) - { - checkBridgeNotStarted(); - if (interval < 1) - { - throw new IllegalArgumentException("FailureRetryInterval must be >= 1"); - } - - failureRetryInterval = interval; - } - - public synchronized int getMaxRetries() - { - return maxRetries; - } - - public synchronized void setMaxRetries(final int retries) - { - checkBridgeNotStarted(); - JMSBridgeImpl.checkValidValue(retries, "MaxRetries"); - - maxRetries = retries; - } - - public synchronized QualityOfServiceMode getQualityOfServiceMode() - { - return qualityOfServiceMode; - } - - public synchronized void setQualityOfServiceMode(final QualityOfServiceMode mode) - { - checkBridgeNotStarted(); - JMSBridgeImpl.checkNotNull(mode, "QualityOfServiceMode"); - - qualityOfServiceMode = mode; - } - - public synchronized int getMaxBatchSize() - { - return maxBatchSize; - } - - public synchronized void setMaxBatchSize(final int size) - { - checkBridgeNotStarted(); - JMSBridgeImpl.checkMaxBatchSize(size); - - maxBatchSize = size; - } - - public synchronized long getMaxBatchTime() - { - return maxBatchTime; - } - - public synchronized void setMaxBatchTime(final long time) - { - checkBridgeNotStarted(); - JMSBridgeImpl.checkValidValue(time, "MaxBatchTime"); - - maxBatchTime = time; - } - - public synchronized String getSubscriptionName() - { - return subName; - } - - public synchronized void setSubscriptionName(final String subname) - { - checkBridgeNotStarted(); - subName = subname; - } - - public synchronized String getClientID() - { - return clientID; - } - - public synchronized void setClientID(final String clientID) - { - checkBridgeNotStarted(); - - this.clientID = clientID; - } - - public String getTransactionManagerLocatorClass() - { - return transactionManagerLocatorClass; - } - - public void setTransactionManagerLocatorClass(final String transactionManagerLocatorClass) - { - checkBridgeNotStarted(); - this.transactionManagerLocatorClass = transactionManagerLocatorClass; - } - - public String getTransactionManagerLocatorMethod() - { - return transactionManagerLocatorMethod; - } - - public void setTransactionManagerLocatorMethod(final String transactionManagerLocatorMethod) - { - this.transactionManagerLocatorMethod = transactionManagerLocatorMethod; - } - - public boolean isAddMessageIDInHeader() - { - return addMessageIDInHeader; - } - - public void setAddMessageIDInHeader(final boolean value) - { - addMessageIDInHeader = value; - } - - public synchronized boolean isPaused() - { - return paused; - } - - public synchronized boolean isFailed() - { - return failed; - } - - public synchronized void setSourceConnectionFactoryFactory(final ConnectionFactoryFactory cff) - { - checkBridgeNotStarted(); - JMSBridgeImpl.checkNotNull(cff, "SourceConnectionFactoryFactory"); - - sourceCff = cff; - } - - public synchronized void setTargetConnectionFactoryFactory(final ConnectionFactoryFactory cff) - { - checkBridgeNotStarted(); - JMSBridgeImpl.checkNotNull(cff, "TargetConnectionFactoryFactory"); - - targetCff = cff; - } - - public void setTransactionManager(final TransactionManager tm) - { - this.tm = tm; - } - - // Public --------------------------------------------------------------------------- - - // Private ------------------------------------------------------------------- - - private void checkParams() - { - JMSBridgeImpl.checkNotNull(sourceCff, "sourceCff"); - JMSBridgeImpl.checkNotNull(targetCff, "targetCff"); - JMSBridgeImpl.checkNotNull(sourceDestinationFactory, "sourceDestinationFactory"); - JMSBridgeImpl.checkNotNull(targetDestinationFactory, "targetDestinationFactory"); - JMSBridgeImpl.checkValidValue(failureRetryInterval, "failureRetryInterval"); - JMSBridgeImpl.checkValidValue(maxRetries, "maxRetries"); - if (failureRetryInterval == -1 && maxRetries > 0) - { - throw new IllegalArgumentException("If failureRetryInterval == -1 maxRetries must be set to -1"); - } - JMSBridgeImpl.checkMaxBatchSize(maxBatchSize); - JMSBridgeImpl.checkValidValue(maxBatchTime, "maxBatchTime"); - JMSBridgeImpl.checkNotNull(qualityOfServiceMode, "qualityOfServiceMode"); - } - - /** - * Check the object is not null - * - * @throws IllegalArgumentException if the object is null - */ - private static void checkNotNull(final Object obj, final String name) - { - if (obj == null) - { - throw new IllegalArgumentException(name + " cannot be null"); - } - } - - /** - * Check the bridge is not started - * - * @throws IllegalStateException if the bridge is started - */ - private void checkBridgeNotStarted() - { - if (started) - { - throw new IllegalStateException("Cannot set bridge attributes while it is started"); - } - } - - /** - * Check that value is either equals to -1 or greater than 0 - * - * @throws IllegalArgumentException if the value is not valid - */ - private static void checkValidValue(final long value, final String name) - { - if (!(value == -1 || value > 0)) - { - throw new IllegalArgumentException(name + " must be > 0 or -1"); - } - } - - private static void checkMaxBatchSize(final int size) - { - if (!(size >= 1)) - { - throw new IllegalArgumentException("maxBatchSize must be >= 1"); - } - } - - private void enlistResources(final Transaction tx) throws Exception - { - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace("Enlisting resources in tx"); - } - - XAResource resSource = ((XASession)sourceSession).getXAResource(); - - tx.enlistResource(resSource); - - XAResource resDest = ((XASession)targetSession).getXAResource(); - - tx.enlistResource(resDest); - - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace("Enlisted resources in tx"); - } - } - - private void delistResources(final Transaction tx) - { - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace("Delisting resources from tx"); - } - - XAResource resSource = ((XASession)sourceSession).getXAResource(); - - try - { - tx.delistResource(resSource, XAResource.TMSUCCESS); - } - catch (Exception e) - { - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace("Failed to delist source resource", e); - } - } - - XAResource resDest = ((XASession)targetSession).getXAResource(); - - try - { - tx.delistResource(resDest, XAResource.TMSUCCESS); - } - catch (Exception e) - { - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace("Failed to delist target resource", e); - } - } - - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace("Delisted resources from tx"); - } - } - - private Transaction startTx() throws Exception - { - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace("Starting JTA transaction"); - } - - TransactionManager tm = getTm(); - - // Set timeout to a large value since we do not want to time out while waiting for messages - // to arrive - 10 years should be enough - tm.setTransactionTimeout(JMSBridgeImpl.TEN_YEARS); - - tm.begin(); - - Transaction tx = tm.getTransaction(); - - // Remove the association between current thread - we don't want it - // we will be committing /rolling back directly on the transaction object - - tm.suspend(); - - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace("Started JTA transaction"); - } - - return tx; - } - - private TransactionManager getTm() - { - if (tm == null) - { - try - { - ClassLoader loader = Thread.currentThread().getContextClassLoader(); - Class aClass = loader.loadClass(transactionManagerLocatorClass); - Object o = aClass.newInstance(); - Method m = aClass.getMethod(transactionManagerLocatorMethod); - tm = (TransactionManager)m.invoke(o); - } - catch (Exception e) - { - throw new IllegalStateException("unable to create TransactionManager from " + transactionManagerLocatorClass + - "." + - transactionManagerLocatorMethod, - e); - } - - if (tm == null) - { - throw new IllegalStateException("Cannot locate a transaction manager"); - } - } - - return tm; - } - - private Connection createConnection(final String username, final String password, final ConnectionFactoryFactory cff) throws Exception - { - Connection conn; - - ConnectionFactory cf = cff.createConnectionFactory(); - - if (qualityOfServiceMode == QualityOfServiceMode.ONCE_AND_ONLY_ONCE && !(cf instanceof XAConnectionFactory)) - { - throw new IllegalArgumentException("Connection factory must be XAConnectionFactory"); - } - - if (username == null) - { - if (qualityOfServiceMode == QualityOfServiceMode.ONCE_AND_ONLY_ONCE) - { - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace("Creating an XA connection"); - } - conn = ((XAConnectionFactory)cf).createXAConnection(); - } - else - { - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace("Creating a non XA connection"); - } - conn = cf.createConnection(); - } - } - else - { - if (qualityOfServiceMode == QualityOfServiceMode.ONCE_AND_ONLY_ONCE) - { - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace("Creating an XA connection"); - } - conn = ((XAConnectionFactory)cf).createXAConnection(username, password); - } - else - { - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace("Creating a non XA connection"); - } - conn = cf.createConnection(username, password); - } - } - - return conn; - } - - /* - * Source and target on same server - * -------------------------------- - * If the source and target destinations are on the same server (same resource manager) then, - * in order to get ONCE_AND_ONLY_ONCE, we simply need to consuming and send in a single - * local JMS transaction. - * - * We actually use a single local transacted session for the other QoS modes too since this - * is more performant than using DUPS_OK_ACKNOWLEDGE or AUTO_ACKNOWLEDGE session ack modes, so effectively - * the QoS is upgraded. - * - * Source and target on different server - * ------------------------------------- - * If the source and target destinations are on a different servers (different resource managers) then: - * - * If desired QoS is ONCE_AND_ONLY_ONCE, then we start a JTA transaction and enlist the consuming and sending - * XAResources in that. - * - * If desired QoS is DUPLICATES_OK then, we use CLIENT_ACKNOWLEDGE for the consuming session and - * AUTO_ACKNOWLEDGE (this is ignored) for the sending session if the maxBatchSize == 1, otherwise we - * use a local transacted session for the sending session where maxBatchSize > 1, since this is more performant - * When bridging a batch, we make sure to manually acknowledge the consuming session, if it is CLIENT_ACKNOWLEDGE - * *after* the batch has been sent - * - * If desired QoS is AT_MOST_ONCE then, if maxBatchSize == 1, we use AUTO_ACKNOWLEDGE for the consuming session, - * and AUTO_ACKNOWLEDGE for the sending session. - * If maxBatchSize > 1, we use CLIENT_ACKNOWLEDGE for the consuming session and a local transacted session for the - * sending session. - * - * When bridging a batch, we make sure to manually acknowledge the consuming session, if it is CLIENT_ACKNOWLEDGE - * *before* the batch has been sent - * - */ - private boolean setupJMSObjects() - { - try - { - if (sourceCff == targetCff) - { - // Source and target destinations are on the server - we can get once and only once - // just using a local transacted session - // everything becomes once and only once - - forwardMode = JMSBridgeImpl.FORWARD_MODE_LOCALTX; - } - else - { - // Different servers - if (qualityOfServiceMode == QualityOfServiceMode.ONCE_AND_ONLY_ONCE) - { - // Use XA - - forwardMode = JMSBridgeImpl.FORWARD_MODE_XA; - } - else - { - forwardMode = JMSBridgeImpl.FORWARD_MODE_NONTX; - } - } - - // Lookup the destinations - sourceDestination = sourceDestinationFactory.createDestination(); - - targetDestination = targetDestinationFactory.createDestination(); - - sourceConn = createConnection(sourceUsername, sourcePassword, sourceCff); - - if (forwardMode != JMSBridgeImpl.FORWARD_MODE_LOCALTX) - { - targetConn = createConnection(targetUsername, targetPassword, targetCff); - - targetConn.setExceptionListener(new BridgeExceptionListener()); - } - - if (clientID != null) - { - sourceConn.setClientID(clientID); - } - - sourceConn.setExceptionListener(new BridgeExceptionListener()); - - Session sess; - - if (forwardMode == JMSBridgeImpl.FORWARD_MODE_LOCALTX) - { - // We simply use a single local transacted session for consuming and sending - - sourceSession = sourceConn.createSession(true, Session.SESSION_TRANSACTED); - - sess = sourceSession; - } - else - { - if (forwardMode == JMSBridgeImpl.FORWARD_MODE_XA) - { - // Create an XASession for consuming from the source - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace("Creating XA source session"); - } - - sourceSession = ((XAConnection)sourceConn).createXASession(); - - sess = ((XASession)sourceSession).getSession(); - } - else - { - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace("Creating non XA source session"); - } - - // Create a standard session for consuming from the source - - // We use ack mode client ack - - sourceSession = sourceConn.createSession(false, Session.CLIENT_ACKNOWLEDGE); - - sess = sourceSession; - } - } - - if (forwardMode == JMSBridgeImpl.FORWARD_MODE_XA && sourceSession instanceof HornetQSession) - { - HornetQSession jsession = (HornetQSession)sourceSession; - - ClientSession clientSession = jsession.getCoreSession(); - - // clientSession.setTreatAsNonTransactedWhenNotEnlisted(false); - } - - if (subName == null) - { - if (selector == null) - { - sourceConsumer = sess.createConsumer(sourceDestination); - } - else - { - sourceConsumer = sess.createConsumer(sourceDestination, selector, false); - } - } - else - { - // Durable subscription - if (selector == null) - { - sourceConsumer = sess.createDurableSubscriber((Topic)sourceDestination, subName); - } - else - { - sourceConsumer = sess.createDurableSubscriber((Topic)sourceDestination, subName, selector, false); - } - } - - // Now the sending session - - if (forwardMode != JMSBridgeImpl.FORWARD_MODE_LOCALTX) - { - if (forwardMode == JMSBridgeImpl.FORWARD_MODE_XA) - { - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace("Creating XA dest session"); - } - - // Create an XA sesion for sending to the destination - - targetSession = ((XAConnection)targetConn).createXASession(); - - sess = ((XASession)targetSession).getSession(); - } - else - { - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace("Creating non XA dest session"); - } - - // Create a standard session for sending to the target - - // If batch size > 1 we use a transacted session since is more efficient - - boolean transacted = maxBatchSize > 1; - - targetSession = targetConn.createSession(transacted, transacted ? Session.SESSION_TRANSACTED - : Session.AUTO_ACKNOWLEDGE); - - sess = targetSession; - } - } - - if (forwardMode == JMSBridgeImpl.FORWARD_MODE_XA) - { - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace("Starting JTA transaction"); - } - - tx = startTx(); - - enlistResources(tx); - } - - targetProducer = sess.createProducer(null); - - return true; - } - catch (Exception e) - { - // We shouldn't log this, as it's expected when trying to connect when target/source is not available - - // If this fails we should attempt to cleanup or we might end up in some weird state - - cleanup(); - - return false; - } - } - - private void cleanup() - { - // Stop the source connection - try - { - sourceConn.stop(); - } - catch (Throwable ignore) - { - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace("Failed to stop source connection", ignore); - } - } - - if (tx != null) - { - try - { - delistResources(tx); - } - catch (Throwable ignore) - { - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace("Failed to delist resources", ignore); - } - } - try - { - // Terminate the tx - tx.rollback(); - } - catch (Throwable ignore) - { - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace("Failed to rollback", ignore); - } - } - } - - // Close the old objects - try - { - sourceConn.close(); - } - catch (Throwable ignore) - { - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace("Failed to close source connection", ignore); - } - } - try - { - if (targetConn != null) - { - targetConn.close(); - } - } - catch (Throwable ignore) - { - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace("Failed to close target connection", ignore); - } - } - } - - private void pause(final long interval) - { - long start = System.currentTimeMillis(); - while (System.currentTimeMillis() - start < failureRetryInterval) - { - try - { - Thread.sleep(failureRetryInterval); - } - catch (InterruptedException ex) - { - } - } - } - - private boolean setupJMSObjectsWithRetry() - { - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace("Setting up connections"); - } - - int count = 0; - - while (true) - { - boolean ok = setupJMSObjects(); - - if (ok) - { - return true; - } - - count++; - - if (maxRetries != -1 && count == maxRetries) - { - break; - } - - JMSBridgeImpl.log.info("Failed to set up JMS bridge connections. Most probably the source or target servers are unavailable. Will retry after a pause of " + failureRetryInterval + - " ms"); - - pause(failureRetryInterval); - } - - // If we get here then we exceeded maxRetries - return false; - } - - private void sendBatch() - { - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace("Sending batch of " + messages.size() + " messages"); - } - - if (paused) - { - // Don't send now - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace("Paused, so not sending now"); - } - - return; - } - - if (forwardMode == JMSBridgeImpl.FORWARD_MODE_LOCALTX) - { - sendBatchLocalTx(); - } - else if (forwardMode == JMSBridgeImpl.FORWARD_MODE_XA) - { - sendBatchXA(); - } - else - { - sendBatchNonTransacted(); - } - } - - private void sendBatchNonTransacted() - { - try - { - if (qualityOfServiceMode == QualityOfServiceMode.ONCE_AND_ONLY_ONCE) - { - // We client ack before sending - - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace("Client acking source session"); - } - - ((Message)messages.getLast()).acknowledge(); - - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace("Client acked source session"); - } - } - - sendMessages(); - - if (maxBatchSize > 1) - { - // The sending session is transacted - we need to commit it - - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace("Committing target session"); - } - - targetSession.commit(); - - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace("Committed source session"); - } - } - - if (qualityOfServiceMode == QualityOfServiceMode.DUPLICATES_OK) - { - // We client ack after sending - - // Note we could actually use Session.DUPS_OK_ACKNOWLEDGE here - // For a slightly less strong delivery guarantee - - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace("Client acking source session"); - } - - messages.getLast().acknowledge(); - - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace("Client acked source session"); - } - } - - // Clear the messages - messages.clear(); - } - catch (Exception e) - { - JMSBridgeImpl.log.warn("Failed to send + acknowledge batch, closing JMS objects", e); - - handleFailureOnSend(); - } - } - - private void sendBatchXA() - { - try - { - sendMessages(); - - // Commit the JTA transaction and start another - - delistResources(tx); - - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace("Committing JTA transaction"); - } - - tx.commit(); - - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace("Committed JTA transaction"); - } - - tx = startTx(); - - enlistResources(tx); - - // Clear the messages - messages.clear(); - } - catch (Exception e) - { - JMSBridgeImpl.log.warn("Failed to send + acknowledge batch, closing JMS objects", e); - - handleFailureOnSend(); - } - } - - private void sendBatchLocalTx() - { - try - { - sendMessages(); - - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace("Committing source session"); - } - - sourceSession.commit(); - - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace("Committed source session"); - } - - // Clear the messages - messages.clear(); - } - catch (Exception e) - { - JMSBridgeImpl.log.warn("Failed to send + acknowledge batch, closing JMS objects", e); - - handleFailureOnSend(); - } - } - - private void sendMessages() throws Exception - { - Iterator iter = messages.iterator(); - - Message msg = null; - - while (iter.hasNext()) - { - msg = (Message)iter.next(); - - if (addMessageIDInHeader) - { - addMessageIDInHeader(msg); - } - - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace("Sending message " + msg); - } - - // Make sure the correct time to live gets propagated - - long timeToLive = msg.getJMSExpiration(); - - if (timeToLive != 0) - { - timeToLive -= System.currentTimeMillis(); - - if (timeToLive <= 0) - { - timeToLive = 1; // Should have already expired - set to 1 so it expires when it is consumed or delivered - } - } - - targetProducer.send(targetDestination, msg, msg.getJMSDeliveryMode(), msg.getJMSPriority(), timeToLive); - - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace("Sent message " + msg); - } - } - } - - private void handleFailureOnSend() - { - handleFailure(new FailureHandler()); - } - - private void handleFailureOnStartup() - { - handleFailure(new StartupFailureHandler()); - } - - private void handleFailure(final Runnable failureHandler) - { - failed = true; - - // Failure must be handled on a separate thread to the calling thread (either onMessage or start). - // In the case of onMessage we can't close the connection from inside the onMessage method - // since it will block waiting for onMessage to complete. In the case of start we want to return - // from the call before the connections are reestablished so that the caller is not blocked unnecessarily. - Thread t = new Thread(failureHandler, "jmsbridge-failurehandler-thread"); - - t.start(); - } - - private void addMessageIDInHeader(final Message msg) throws Exception - { - // We concatenate the old message id as a header in the message - // This allows the target to then use this as the JMSCorrelationID of any response message - // thus enabling a distributed request-response pattern. - // Each bridge (if there are more than one) in the chain can concatenate the message id - // So in the case of multiple bridges having routed the message this can be used in a multi-hop - // distributed request/response - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace("Adding old message id in Message header"); - } - - JMSBridgeImpl.copyProperties(msg); - - String val = null; - - val = msg.getStringProperty(HornetQMessageConstants.JBOSS_MESSAGING_BRIDGE_MESSAGE_ID_LIST); - - if (val == null) - { - val = msg.getJMSMessageID(); - } - else - { - StringBuffer sb = new StringBuffer(val); - - sb.append(",").append(msg.getJMSMessageID()); - - val = sb.toString(); - } - - msg.setStringProperty(HornetQMessageConstants.JBOSS_MESSAGING_BRIDGE_MESSAGE_ID_LIST, val); - } - - /* - * JMS does not let you add a property on received message without first - * calling clearProperties, so we need to save and re-add all the old properties so we - * don't lose them!! - */ - private static void copyProperties(final Message msg) throws JMSException - { - Enumeration en = msg.getPropertyNames(); - - Map<String, Object> oldProps = null; - - while (en.hasMoreElements()) - { - String propName = (String)en.nextElement(); - - if (oldProps == null) - { - oldProps = new HashMap<String, Object>(); - } - - oldProps.put(propName, msg.getObjectProperty(propName)); - } - - msg.clearProperties(); - - if (oldProps != null) - { - Iterator oldPropsIter = oldProps.entrySet().iterator(); - - while (oldPropsIter.hasNext()) - { - Map.Entry entry = (Map.Entry)oldPropsIter.next(); - - String propName = (String)entry.getKey(); - - msg.setObjectProperty(propName, entry.getValue()); - } - } - } - - // Inner classes --------------------------------------------------------------- - - /** - * We use a Thread which polls the sourceDestination instead of a MessageListener - * to ensure that message delivery does not happen concurrently with - * transaction enlistment of the XAResource (see HORNETQ-27) - * - */ - private final class SourceReceiver extends Thread - { - SourceReceiver() - { - super("jmsbridge-source-receiver-thread"); - } - - @Override - public void run() - { - while (started) - { - synchronized (lock) - { - if (paused || failed) - { - try - { - lock.wait(500); - } - catch (InterruptedException e) - { - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace(this + " thread was interrupted"); - } - } - continue; - } - - Message msg = null; - try - { - msg = sourceConsumer.receive(1000); - } - catch (JMSException jmse) - { - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace(this + " exception while receiving a message", jmse); - } - } - - if (msg == null) - { - try - { - lock.wait(500); - } - catch (InterruptedException e) - { - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace(this + " thread was interrupted"); - } - } - continue; - } - - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace(this + " received message " + msg); - } - - messages.add(msg); - - batchExpiryTime = System.currentTimeMillis() + maxBatchTime; - - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace(this + " rescheduled batchExpiryTime to " + batchExpiryTime); - } - - if (maxBatchSize != -1 && messages.size() >= maxBatchSize) - { - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace(this + " maxBatchSize has been reached so sending batch"); - } - - sendBatch(); - - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace(this + " sent batch"); - } - } - } - } - } - } - - private class FailureHandler implements Runnable - { - /** - * Start the source connection - note the source connection must not be started before - * otherwise messages will be received and ignored - */ - protected void startSourceConnection() - { - try - { - sourceConn.start(); - } - catch (JMSException e) - { - JMSBridgeImpl.log.error("Failed to start source connection", e); - } - } - - protected void succeeded() - { - JMSBridgeImpl.log.info("Succeeded in reconnecting to servers"); - - synchronized (lock) - { - failed = false; - - startSourceConnection(); - } - } - - protected void failed() - { - // We haven't managed to recreate connections or maxRetries = 0 - JMSBridgeImpl.log.warn("Unable to set up connections, bridge will be stopped"); - - try - { - stop(); - } - catch (Exception ignore) - { - } - } - - public void run() - { - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace("Failure handler running"); - } - - // Clear the messages - messages.clear(); - - cleanup(); - - boolean ok = false; - - if (maxRetries > 0 || maxRetries == -1) - { - JMSBridgeImpl.log.warn("Will retry after a pause of " + failureRetryInterval + " ms"); - - pause(failureRetryInterval); - - // Now we try - ok = setupJMSObjectsWithRetry(); - } - - if (!ok) - { - failed(); - } - else - { - succeeded(); - } - } - } - - private class StartupFailureHandler extends FailureHandler - { - protected void failed() - { - // Don't call super - JMSBridgeImpl.log.warn("Unable to set up connections, bridge will not be started"); - } - - protected void succeeded() - { - // Don't call super - a bit ugly in this case but better than taking the lock twice. - JMSBridgeImpl.log.info("Succeeded in connecting to servers"); - - synchronized (lock) - { - failed = false; - started = true; - - // Start the source connection - note the source connection must not be started before - // otherwise messages will be received and ignored - - try - { - sourceConn.start(); - } - catch (JMSException e) - { - JMSBridgeImpl.log.error("Failed to start source connection", e); - } - } - } - } - - private class BatchTimeChecker implements Runnable - { - public void run() - { - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace(this + " running"); - } - - synchronized (lock) - { - while (started) - { - long toWait = batchExpiryTime - System.currentTimeMillis(); - - if (toWait <= 0) - { - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace(this + " waited enough"); - } - - synchronized (lock) - { - if (!failed && !messages.isEmpty()) - { - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace(this + " got some messages so sending batch"); - } - - sendBatch(); - - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace(this + " sent batch"); - } - } - } - - batchExpiryTime = System.currentTimeMillis() + maxBatchTime; - } - else - { - try - { - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace(this + " waiting for " + toWait); - } - - lock.wait(toWait); - - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace(this + " woke up"); - } - } - catch (InterruptedException e) - { - // Ignore - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace(this + " thread was interrupted"); - } - } - - } - } - } - } - } - - private class BridgeExceptionListener implements ExceptionListener - { - public void onException(final JMSException e) - { - JMSBridgeImpl.log.warn("Detected failure on bridge connection"); - - synchronized (lock) - { - if (failed) - { - // The failure has already been detected and is being handled - if (JMSBridgeImpl.trace) - { - JMSBridgeImpl.log.trace("Failure recovery already in progress"); - } - } - else - { - handleFailure(new FailureHandler()); - } - } - } - } -} Deleted: trunk/src/main/org/hornetq/api/jms/bridge/JNDIConnectionFactoryFactory.java =================================================================== --- trunk/src/main/org/hornetq/api/jms/bridge/JNDIConnectionFactoryFactory.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/src/main/org/hornetq/api/jms/bridge/JNDIConnectionFactoryFactory.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -1,42 +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.jms.bridge; - -import java.util.Hashtable; - -import javax.jms.ConnectionFactory; - - -/** - * A JNDIConnectionFactoryFactory - * - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * @version <tt>$Revision:4566 $</tt> - * - * $Id:JNDIConnectionFactoryFactory.java 4566 2008-06-24 08:01:35Z jmesnil $ - * - */ -public class JNDIConnectionFactoryFactory extends JNDIFactorySupport implements ConnectionFactoryFactory -{ - public JNDIConnectionFactoryFactory(final Hashtable jndiProperties, final String lookup) - { - super(jndiProperties, lookup); - } - - public ConnectionFactory createConnectionFactory() throws Exception - { - return (ConnectionFactory)createObject(); - } - -} Deleted: trunk/src/main/org/hornetq/api/jms/bridge/JNDIDestinationFactory.java =================================================================== --- trunk/src/main/org/hornetq/api/jms/bridge/JNDIDestinationFactory.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/src/main/org/hornetq/api/jms/bridge/JNDIDestinationFactory.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -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.jms.bridge; - -import java.util.Hashtable; - -import javax.jms.Destination; - - -/** - * - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * @version <tt>$Revision: $</tt>10 Oct 2007 - * - * $Id: $ - * - */ -public class JNDIDestinationFactory extends JNDIFactorySupport implements DestinationFactory -{ - public JNDIDestinationFactory(final Hashtable jndiProperties, final String lookup) - { - super(jndiProperties, lookup); - } - - public Destination createDestination() throws Exception - { - return (Destination)createObject(); - } -} Deleted: trunk/src/main/org/hornetq/api/jms/bridge/JNDIFactorySupport.java =================================================================== --- trunk/src/main/org/hornetq/api/jms/bridge/JNDIFactorySupport.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/src/main/org/hornetq/api/jms/bridge/JNDIFactorySupport.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -1,69 +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.jms.bridge; - -import java.util.Hashtable; - -import javax.naming.InitialContext; - -/** - * - * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> - * @version <tt>$Revision: $</tt>10 Oct 2007 - * - * $Id: $ - * - */ -public abstract class JNDIFactorySupport -{ - protected Hashtable jndiProperties; - - protected String lookup; - - protected JNDIFactorySupport(final Hashtable jndiProperties, final String lookup) - { - this.jndiProperties = jndiProperties; - - this.lookup = lookup; - } - - protected Object createObject() throws Exception - { - InitialContext ic = null; - - Object obj = null; - - try - { - if (jndiProperties == null) - { - ic = new InitialContext(); - } - else - { - ic = new InitialContext(jndiProperties); - } - - obj = ic.lookup(lookup); - } - finally - { - if (ic != null) - { - ic.close(); - } - } - return obj; - } -} Deleted: trunk/src/main/org/hornetq/api/jms/bridge/QualityOfServiceMode.java =================================================================== --- trunk/src/main/org/hornetq/api/jms/bridge/QualityOfServiceMode.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/src/main/org/hornetq/api/jms/bridge/QualityOfServiceMode.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -1,102 +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.jms.bridge; - -/** - * <h3>Quality of server (QoS) levels</h3> - * - * <h4>QOS_AT_MOST_ONCE</h4> - * - * With this QoS mode messages will reach the destination from the source at - * most once. The messages are consumed from the source and acknowledged before - * sending to the destination. Therefore there is a possibility that if failure - * occurs between removing them from the source and them arriving at the - * destination they could be lost. Hence delivery will occur at most once. This - * mode is avilable for both persistent and non persistent messages. - * - * <h4>QOS_DUPLICATES_OK</h4> - * - * With this QoS mode, the messages are consumed from the source and then - * acknowledged after they have been successfully sent to the destination. - * Therefore there is a possibility that if failure occurs after sending to the - * destination but before acknowledging them, they could be sent again when the - * system recovers. I.e. the destination might receive duplicates after a - * failure. This mode is available for both persistent and non persistent - * messages. - * - * <h4>QOS_ONCE_AND_ONLY_ONCE</h4> - * - * This QoS mode ensures messages will reach the destination from the source - * once and only once. (Sometimes this mode is known as "exactly once"). If both - * the source and the destination are on the same HornetQ server - * instance then this can be achieved by sending and acknowledging the messages - * in the same local transaction. If the source and destination are on different - * servers this is achieved by enlisting the sending and consuming sessions in a - * JTA transaction. The JTA transaction is controlled by JBoss Transactions JTA - * implementation which is a fully recovering transaction manager, thus - * providing a very high degree of durability. If JTA is required then both - * supplied connection factories need to be XAConnectionFactory implementations. - * This mode is only available for persistent messages. This is likely to be the - * slowest mode since it requires extra persistence for the transaction logging. - * - * Note: For a specific application it may possible to provide once and only - * once semantics without using the QOS_ONCE_AND_ONLY_ONCE QoS level. This can - * be done by using the QOS_DUPLICATES_OK mode and then checking for duplicates - * at the destination and discarding them. Some JMS servers provide automatic - * duplicate message detection functionality, or this may be possible to - * implement on the application level by maintaining a cache of received message - * ids on disk and comparing received messages to them. The cache would only be - * valid for a certain period of time so this approach is not as watertight as - * using QOS_ONCE_AND_ONLY_ONCE but may be a good choice depending on your - * specific application. - * - * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> - * - * @version <tt>$Revision$</tt> - * - */ -public enum QualityOfServiceMode -{ - AT_MOST_ONCE(0), DUPLICATES_OK(1), ONCE_AND_ONLY_ONCE(2); - - private final int value; - - QualityOfServiceMode(final int value) - { - this.value = value; - } - - public int intValue() - { - return value; - } - - public static QualityOfServiceMode valueOf(final int value) - { - if (value == AT_MOST_ONCE.value) - { - return AT_MOST_ONCE; - } - if (value == DUPLICATES_OK.value) - { - return DUPLICATES_OK; - } - if (value == ONCE_AND_ONLY_ONCE.value) - { - return ONCE_AND_ONLY_ONCE; - } - throw new IllegalArgumentException("invalid QualityOfServiceMode value: " + value); - } - -} Modified: trunk/src/main/org/hornetq/api/jms/management/JMSManagementHelper.java =================================================================== --- trunk/src/main/org/hornetq/api/jms/management/JMSManagementHelper.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/src/main/org/hornetq/api/jms/management/JMSManagementHelper.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -16,7 +16,7 @@ import javax.jms.JMSException; import javax.jms.Message; -import org.hornetq.api.core.management.client.ManagementHelper; +import org.hornetq.api.core.management.ManagementHelper; import org.hornetq.jms.client.HornetQMessage; /* Copied: trunk/src/main/org/hornetq/core/config/Configuration.java (from rev 8720, trunk/src/main/org/hornetq/api/core/config/Configuration.java) =================================================================== --- trunk/src/main/org/hornetq/core/config/Configuration.java (rev 0) +++ trunk/src/main/org/hornetq/core/config/Configuration.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -0,0 +1,807 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package org.hornetq.core.config; + +import java.io.Serializable; +import java.util.List; +import java.util.Map; +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.core.config.impl.ConfigurationImpl; +import org.hornetq.core.server.JournalType; +import org.hornetq.core.server.cluster.BridgeConfiguration; +import org.hornetq.core.server.cluster.BroadcastGroupConfiguration; +import org.hornetq.core.server.cluster.ClusterConnectionConfiguration; +import org.hornetq.core.server.cluster.DiscoveryGroupConfiguration; +import org.hornetq.core.server.cluster.DivertConfiguration; +import org.hornetq.core.server.cluster.QueueConfiguration; +import org.hornetq.core.server.group.impl.GroupingHandlerConfiguration; +import org.hornetq.spi.core.logging.LogDelegateFactory; + +/** + * + * A Configuration is used to configure HornetQ servers. + * + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + */ +public interface Configuration extends Serializable +{ + // General attributes ------------------------------------------------------------------- + + /** + * Returns whether this server is clustered. + * + * Default value is {@value org.hornetq.core.config.impl.ConfigurationImpl#DEFAULT_CLUSTERED}. + */ + boolean isClustered(); + + /** + * Sets whether this server is clustered or not. + */ + void setClustered(boolean clustered); + + /** + * Returns whether delivery count is persisted before messages are delivered to the consumers. + * + * Default value is {@value org.hornetq.core.config.impl.ConfigurationImpl#DEFAULT_PERSIST_DELIVERY_COUNT_BEFORE_DELIVERY}. + */ + boolean isPersistDeliveryCountBeforeDelivery(); + + /** + * Sets whether delivery count is persisted before messages are delivered to consumers. + */ + void setPersistDeliveryCountBeforeDelivery(boolean persistDeliveryCountBeforeDelivery); + + /** + * Returns {@code true} if this server is a backup, {@code false} if it is a live server. + * + * If a backup server has been activated, returns {@code false}. + * + * Default value is {@value org.hornetq.core.config.impl.ConfigurationImpl#DEFAULT_BACKUP}. + */ + boolean isBackup(); + + /** + * Sets whether this server is a backup or not. + */ + void setBackup(boolean backup); + + /** + * Returns whether this server shares its data store with a corresponding live or backup server. + * + * Default value is {@value org.hornetq.core.config.impl.ConfigurationImpl#DEFAULT_SHARED_STORE}. + */ + boolean isSharedStore(); + + /** + * Sets whether this server shares its data store with a backup or live server. + */ + void setSharedStore(boolean sharedStore); + + /** + * Returns whether this server will use files to configure and deploy its resources. + * + * Default value is {@value org.hornetq.core.config.impl.ConfigurationImpl#DEFAULT_FILE_DEPLOYMENT_ENABLED}. + */ + boolean isFileDeploymentEnabled(); + + /** + * Sets whether this server will use files to configure and deploy its resources. + */ + void setFileDeploymentEnabled(boolean enable); + + /** + * Returns whether this server is using persistence and store data. + * + * Default value is {@value org.hornetq.core.config.impl.ConfigurationImpl#DEFAULT_PERSISTENCE_ENABLED}. + */ + boolean isPersistenceEnabled(); + + /** + * Sets whether this server is using persistence and store data. + */ + void setPersistenceEnabled(boolean enable); + + /** + * Returns the period (in milliseconds) to scan configuration files used by deployment. + * + * Default value is {@value org.hornetq.core.config.impl.ConfigurationImpl#DEFAULT_FILE_DEPLOYER_SCAN_PERIOD}. + */ + long getFileDeployerScanPeriod(); + + /** + * Sets the period to scan configuration files used by deployment. + */ + void setFileDeployerScanPeriod(long period); + + /** + * Returns the maximum number of threads in the thread pool of this server. + * + * Default value is {@value org.hornetq.core.config.impl.ConfigurationImpl#DEFAULT_THREAD_POOL_MAX_SIZE}. + */ + int getThreadPoolMaxSize(); + + /** + * Sets the maximum number of threads in the thread pool of this server. + */ + void setThreadPoolMaxSize(int maxSize); + + /** + * Returns the maximum number of threads in the scheduled thread pool of this server. + * + * Default value is {@value org.hornetq.core.config.impl.ConfigurationImpl#DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE}. + */ + int getScheduledThreadPoolMaxSize(); + + /** + * Sets the maximum number of threads in the scheduled thread pool of this server. + */ + void setScheduledThreadPoolMaxSize(int maxSize); + + /** + * Returns the interval time (in milliseconds) to invalidate security credentials. + * + * Default value is {@value org.hornetq.core.config.impl.ConfigurationImpl#DEFAULT_SECURITY_INVALIDATION_INTERVAL}. + */ + long getSecurityInvalidationInterval(); + + /** + * Sets the interval time (in milliseconds) to invalidate security credentials. + */ + void setSecurityInvalidationInterval(long interval); + + /** + * Returns whether security is enabled for this server. + * + * Default value is {@value org.hornetq.core.config.impl.ConfigurationImpl#DEFAULT_SECURITY_ENABLED}. + */ + boolean isSecurityEnabled(); + + /** + * Sets whether security is enabled for this server. + */ + void setSecurityEnabled(boolean enabled); + + /** + * Returns whether this server is manageable using JMX or not. + * + * Default value is {@value org.hornetq.core.config.impl.ConfigurationImpl#DEFAULT_JMX_MANAGEMENT_ENABLED}. + */ + boolean isJMXManagementEnabled(); + + /** + * Sets whether this server is manageable using JMX or not. + */ + void setJMXManagementEnabled(boolean enabled); + + /** + * Returns the domain used by JMX MBeans (provided JMX management is enabled). + * + * Default value is {@value org.hornetq.core.config.impl.ConfigurationImpl#DEFAULT_JMX_DOMAIN}. + */ + String getJMXDomain(); + + /** + * Sets the domain used by JMX MBeans (provided JMX management is enabled). + * + * Changing this JMX domain is required if multiple HornetQ servers are run inside + * the same JVM and all servers are using the same MBeanServer. + */ + void setJMXDomain(String domain); + + /** + * Returns the list of interceptors classes used by this server. + */ + List<String> getInterceptorClassNames(); + + /** + * Sets the list of interceptors classes used by this server. + * + * Classes must implement {@link Interceptor}. + */ + void setInterceptorClassNames(List<String> interceptors); + + /** + * Returns the connection time to live. + * + * This value overrides the connection time to live sent by the client. + * + * Default value is {@value org.hornetq.core.config.impl.ConfigurationImpl#DEFAULT_CONNECTION_TTL_OVERRIDE}. + */ + long getConnectionTTLOverride(); + + /** + * Sets the connection time to live. + */ + void setConnectionTTLOverride(long ttl); + + /** + * Returns whether code coming from connection is executed asynchronously or not. + * + * Default value is {@value org.hornetq.core.config.impl.ConfigurationImpl#DEFAULT_ASYNC_CONNECTION_EXECUTION_ENABLED}. + */ + boolean isAsyncConnectionExecutionEnabled(); + + /** + * Sets whether code coming from connection is executed asynchronously or not. + */ + void setEnabledAsyncConnectionExecution(boolean enabled); + + /** + * Returns the acceptors configured for this server. + */ + Set<TransportConfiguration> getAcceptorConfigurations(); + + /** + * Sets the acceptors configured for this server. + */ + void setAcceptorConfigurations(Set<TransportConfiguration> infos); + + /** + * Returns the connectors configured for this server. + */ + Map<String, TransportConfiguration> getConnectorConfigurations(); + + /** + * Sets the connectors configured for this server. + */ + void setConnectorConfigurations(Map<String, TransportConfiguration> infos); + + /** + * Returns the name of the connector used to connect to the backup. + * + * If this server has no backup or is itself a backup, the value is {@code null}. + */ + String getBackupConnectorName(); + + /** + * Sets the name of the connector used to connect to the backup. + */ + void setBackupConnectorName(String name); + + /** + * Returns the broadcast groups configured for this server. + */ + List<BroadcastGroupConfiguration> getBroadcastGroupConfigurations(); + + /** + * Sets the broadcast groups configured for this server. + */ + void setBroadcastGroupConfigurations(List<BroadcastGroupConfiguration> configs); + + /** + * Returns the discovery groups configured for this server. + */ + Map<String, DiscoveryGroupConfiguration> getDiscoveryGroupConfigurations(); + + /** + * Sets the discovery groups configured for this server. + */ + void setDiscoveryGroupConfigurations(Map<String, DiscoveryGroupConfiguration> configs); + + /** + * Returns the grouping handler configured for this server. + */ + GroupingHandlerConfiguration getGroupingHandlerConfiguration(); + + /** + * Sets the grouping handler configured for this server. + */ + void setGroupingHandlerConfiguration(GroupingHandlerConfiguration groupingHandlerConfiguration); + + /** + * Returns the bridges configured for this server. + */ + List<BridgeConfiguration> getBridgeConfigurations(); + + /** + * Sets the bridges configured for this server. + */ + void setBridgeConfigurations(final List<BridgeConfiguration> configs); + + /** + * Returns the diverts configured for this server. + */ + List<DivertConfiguration> getDivertConfigurations(); + + /** + * Sets the diverts configured for this server. + */ + void setDivertConfigurations(final List<DivertConfiguration> configs); + + /** + * Returns the cluster connections configured for this server. + */ + List<ClusterConnectionConfiguration> getClusterConfigurations(); + + /** + * Sets the cluster connections configured for this server. + */ + void setClusterConfigurations(final List<ClusterConnectionConfiguration> configs); + + /** + * Returns the queues configured for this server. + */ + List<QueueConfiguration> getQueueConfigurations(); + + /** + * Sets the queues configured for this server. + */ + void setQueueConfigurations(final List<QueueConfiguration> configs); + + /** + * Returns the management address of this server. + * + * Clients can send management messages to this address to manage this server. + * + * Default value is "hornetq.management". + */ + SimpleString getManagementAddress(); + + /** + * Sets the management address of this server. + */ + void setManagementAddress(SimpleString address); + + /** + * Returns the management notification address of this server. + * + * Clients can bind queues to this address to receive management notifications emitted by this server. + * + * Default value is "hornetq.notifications". + */ + SimpleString getManagementNotificationAddress(); + + /** + * Sets the management notification address of this server. + */ + void setManagementNotificationAddress(SimpleString address); + + /** + * Returns the management cluster user for this server. + * + * Default value is {@value org.hornetq.core.config.impl.ConfigurationImpl#DEFAULT_MANAGEMENT_CLUSTER_USER}. + */ + String getManagementClusterUser(); + + /** + * Sets the management cluster user for this server. + */ + void setManagementClusterUser(String user); + + /** + * Returns the management cluster password for this server. + * + * Default value is {@value org.hornetq.core.config.impl.ConfigurationImpl#DEFAULT_MANAGEMENT_CLUSTER_PASSWORD}. + */ + String getManagementClusterPassword(); + + /** + * Sets the management cluster password for this server. + */ + void setManagementClusterPassword(String password); + + /** + * Returns the size of the cache for pre-creating message IDs. + * + * Default value is {@value org.hornetq.core.config.impl.ConfigurationImpl#DEFAULT_ID_CACHE_SIZE}. + */ + int getIDCacheSize(); + + /** + * Sets the size of the cache for pre-creating message IDs. + */ + void setIDCacheSize(int idCacheSize); + + /** + * Returns whether message ID cache is persisted. + * + * Default value is {@value org.hornetq.core.config.impl.ConfigurationImpl#DEFAULT_PERSIST_ID_CACHE}. + */ + boolean isPersistIDCache(); + + /** + * Sets whether message ID cache is persisted. + */ + void setPersistIDCache(boolean persist); + + /** + * Returns the name of the {@link LogDelegateFactory} implementation used by this server + * for logging. + * + * Default value is "org.hornetq.core.logging.impl.JULLogDelegateFactory" + */ + String getLogDelegateFactoryClassName(); + + /** + * Sets the name of the {@link LogDelegateFactory} implementation used by this server + * for logging. + */ + void setLogDelegateFactoryClassName(String className); + + // Journal related attributes ------------------------------------------------------------ + + /** + * Returns the file system directory used to store bindings. + * + * Default value is {@value org.hornetq.core.config.impl.ConfigurationImpl#DEFAULT_BINDINGS_DIRECTORY}. + */ + String getBindingsDirectory(); + + /** + * Sets the file system directory used to store bindings. + */ + void setBindingsDirectory(String dir); + + /** + * Returns the file system directory used to store journal log. + * + * Default value is {@value org.hornetq.core.config.impl.ConfigurationImpl#DEFAULT_JOURNAL_DIR}. + */ + String getJournalDirectory(); + + /** + * Sets the file system directory used to store journal log. + */ + void setJournalDirectory(String dir); + + /** + * Returns the type of journal used by this server (either {@code NIO} or {@code ASYNCIO}). + * + * Default value is ASYNCIO. + */ + JournalType getJournalType(); + + /** + * Sets the type of journal used by this server (either {@code NIO} or {@code ASYNCIO}). + */ + void setJournalType(JournalType type); + + /** + * Returns whether the journal is synchronized when receiving transactional data. + * + * Default value is {@value org.hornetq.core.config.impl.ConfigurationImpl#DEFAULT_JOURNAL_SYNC_TRANSACTIONAL}. + */ + boolean isJournalSyncTransactional(); + + /** + * Sets whether the journal is synchronized when receiving transactional data. + */ + void setJournalSyncTransactional(boolean sync); + + /** + * Returns whether the journal is synchronized when receiving non-transactional data. + * + * Default value is {@value org.hornetq.core.config.impl.ConfigurationImpl#DEFAULT_JOURNAL_SYNC_NON_TRANSACTIONAL}. + */ + boolean isJournalSyncNonTransactional(); + + /** + * Sets whether the journal is synchronized when receiving non-transactional data. + */ + void setJournalSyncNonTransactional(boolean sync); + + /** + * Returns the size (in bytes) of each journal files. + * + * Default value is {@value org.hornetq.core.config.impl.ConfigurationImpl#DEFAULT_JOURNAL_FILE_SIZE}. + */ + int getJournalFileSize(); + + /** + * Sets the size (in bytes) of each journal files. + */ + void setJournalFileSize(int size); + + /** + * Returns the minimal number of journal files before compacting. + * + * Default value is {@value org.hornetq.core.config.impl.ConfigurationImpl#DEFAULT_JOURNAL_COMPACT_MIN_FILES}. + */ + int getJournalCompactMinFiles(); + + /** + * Sets the minimal number of journal files before compacting. + */ + void setJournalCompactMinFiles(int minFiles); + + /** + * Returns the percentage of live data before compacting the journal. + * + * Default value is {@value org.hornetq.core.config.impl.ConfigurationImpl#DEFAULT_JOURNAL_COMPACT_PERCENTAGE}. + */ + int getJournalCompactPercentage(); + + /** + * Sets the percentage of live data before compacting the journal. + */ + void setJournalCompactPercentage(int percentage); + + /** + * Returns the number of journal files to pre-create. + * + * Default value is {@value org.hornetq.core.config.impl.ConfigurationImpl#DEFAULT_JOURNAL_MIN_FILES}. + */ + int getJournalMinFiles(); + + /** + * Sets the number of journal files to pre-create. + */ + void setJournalMinFiles(int files); + + // AIO and NIO need different values for these params + + /** + * Returns the maximum number of write requests that can be in the AIO queue at any given time. + * + * Default value is {@value org.hornetq.core.config.impl.ConfigurationImpl#DEFAULT_JOURNAL_MAX_IO_AIO}. + */ + int getJournalMaxIO_AIO(); + + /** + * Sets the maximum number of write requests that can be in the AIO queue at any given time. + */ + void setJournalMaxIO_AIO(int journalMaxIO); + + /** + * Returns the timeout (in nanoseconds) used to flush buffers in the AIO queue. + * + * Default value is {@value org.hornetq.core.config.impl.ConfigurationImpl#DEFAULT_JOURNAL_BUFFER_TIMEOUT_AIO}. + */ + int getJournalBufferTimeout_AIO(); + + /** + * Sets the timeout (in nanoseconds) used to flush buffers in the AIO queue. + */ + void setJournalBufferTimeout_AIO(int journalBufferTimeout); + + /** + * Returns the buffer size (in bytes) for AIO. + * + * Default value is {@value org.hornetq.core.config.impl.ConfigurationImpl#DEFAULT_JOURNAL_BUFFER_SIZE_AIO}. + */ + int getJournalBufferSize_AIO(); + + /** + * Sets the buffer size (in bytes) for AIO. + */ + void setJournalBufferSize_AIO(int journalBufferSize); + + /** + * Returns the maximum number of write requests for NIO journal. + * + * Default value is {@value org.hornetq.core.config.impl.ConfigurationImpl#DEFAULT_JOURNAL_MAX_IO_NIO}. + */ + int getJournalMaxIO_NIO(); + + /** + * Sets the maximum number of write requests for NIO journal. + */ + void setJournalMaxIO_NIO(int journalMaxIO); + + /** + * Returns the timeout (in nanoseconds) used to flush buffers in the NIO. + * + * Default value is {@value org.hornetq.core.config.impl.ConfigurationImpl#DEFAULT_JOURNAL_BUFFER_TIMEOUT_NIO}. + */ + int getJournalBufferTimeout_NIO(); + + /** + * Sets the timeout (in nanoseconds) used to flush buffers in the NIO. + */ + void setJournalBufferTimeout_NIO(int journalBufferTimeout); + + /** + * Returns the buffer size (in bytes) for NIO. + * + * Default value is {@value org.hornetq.core.config.impl.ConfigurationImpl#DEFAULT_JOURNAL_BUFFER_SIZE_NIO}. + */ + int getJournalBufferSize_NIO(); + + /** + * Sets the buffer size (in bytes) for NIO. + */ + void setJournalBufferSize_NIO(int journalBufferSize); + + /** + * Returns whether the bindings directory is created on this server startup. + * + * Default value is {@value org.hornetq.core.config.impl.ConfigurationImpl#DEFAULT_CREATE_BINDINGS_DIR}. + */ + boolean isCreateBindingsDir(); + + /** + * Sets whether the bindings directory is created on this server startup. + */ + void setCreateBindingsDir(boolean create); + + /** + * Returns whether the journal directory is created on this server startup. + * + * Default value is {@value org.hornetq.core.config.impl.ConfigurationImpl#DEFAULT_CREATE_JOURNAL_DIR}. + */ + boolean isCreateJournalDir(); + + /** + * Sets whether the journal directory is created on this server startup. + */ + void setCreateJournalDir(boolean create); + + // Undocumented attributes + + boolean isLogJournalWriteRate(); + + void setLogJournalWriteRate(boolean rate); + + int getJournalPerfBlastPages(); + + void setJournalPerfBlastPages(int pages); + + long getServerDumpInterval(); + + void setServerDumpInterval(long interval); + + int getMemoryWarningThreshold(); + + void setMemoryWarningThreshold(int memoryWarningThreshold); + + long getMemoryMeasureInterval(); + + void setMemoryMeasureInterval(long memoryMeasureInterval); + + boolean isRunSyncSpeedTest(); + + void setRunSyncSpeedTest(boolean run); + + // Paging Properties -------------------------------------------------------------------- + + /** + * Returns the file system directory used to store paging files. + * + * Default value is {@value org.hornetq.core.config.impl.ConfigurationImpl#DEFAULT_PAGING_DIR}. + */ + String getPagingDirectory(); + + /** + * Sets the file system directory used to store paging files. + */ + void setPagingDirectory(String dir); + + // Large Messages Properties ------------------------------------------------------------ + + /** + * Returns the file system directory used to store large messages. + * + * Default value is {@value org.hornetq.core.config.impl.ConfigurationImpl#DEFAULT_LARGE_MESSAGES_DIR}. + */ + String getLargeMessagesDirectory(); + + /** + * Sets the file system directory used to store large messages. + */ + void setLargeMessagesDirectory(String directory); + + // Other Properties --------------------------------------------------------------------- + + /** + * Returns whether wildcard routing is supported by this server. + * + * Default value is {@value org.hornetq.core.config.impl.ConfigurationImpl#DEFAULT_WILDCARD_ROUTING_ENABLED}. + */ + boolean isWildcardRoutingEnabled(); + + /** + * Sets whether wildcard routing is supported by this server. + */ + void setWildcardRoutingEnabled(boolean enabled); + + /** + * Returns the timeout (in milliseconds) after which transactions is removed + * from the resource manager after it was created. + * + * Default value is {@value org.hornetq.core.config.impl.ConfigurationImpl#DEFAULT_TRANSACTION_TIMEOUT}. + */ + long getTransactionTimeout(); + + /** + * Sets the timeout (in milliseconds) after which transactions is removed + * from the resource manager after it was created. + */ + void setTransactionTimeout(long timeout); + + /** + * Returns whether message counter is enabled for this server. + * + * Default value is {@value org.hornetq.core.config.impl.ConfigurationImpl#DEFAULT_MESSAGE_COUNTER_ENABLED}. + */ + boolean isMessageCounterEnabled(); + + /** + * Sets whether message counter is enabled for this server. + */ + void setMessageCounterEnabled(boolean enabled); + + /** + * Returns the sample period (in milliseconds) to take message counter snapshot. + * + * Default value is {@value org.hornetq.core.config.impl.ConfigurationImpl#DEFAULT_MESSAGE_COUNTER_SAMPLE_PERIOD}. + */ + long getMessageCounterSamplePeriod(); + + /** + * Sets the sample period to take message counter snapshot. + * + * @param period value must be greater than 1000ms + */ + void setMessageCounterSamplePeriod(long period); + + /** + * Returns the maximum number of days kept in memory for message counter. + * + * Default value is {@value org.hornetq.core.config.impl.ConfigurationImpl#DEFAULT_MESSAGE_COUNTER_MAX_DAY_HISTORY}. + */ + int getMessageCounterMaxDayHistory(); + + /** + * Sets the maximum number of days kept in memory for message counter. + * + * @param maxDayHistory value must be greater than 0 + */ + void setMessageCounterMaxDayHistory(int maxDayHistory); + + /** + * Returns the frequency (in milliseconds) to scan transactions to detect which transactions + * have timed out. + * + * Default value is {@value org.hornetq.core.config.impl.ConfigurationImpl#DEFAULT_TRANSACTION_TIMEOUT_SCAN_PERIOD}. + */ + long getTransactionTimeoutScanPeriod(); + + /** + * Sets the frequency (in milliseconds) to scan transactions to detect which transactions + * have timed out. + */ + void setTransactionTimeoutScanPeriod(long period); + + /** + * Returns the frequency (in milliseconds) to scan messages to detect which messages + * have expired. + * + * Default value is {@value org.hornetq.core.config.impl.ConfigurationImpl#DEFAULT_MESSAGE_EXPIRY_SCAN_PERIOD}. + */ + long getMessageExpiryScanPeriod(); + + /** + * Sets the frequency (in milliseconds) to scan messages to detect which messages + * have expired. + */ + void setMessageExpiryScanPeriod(long messageExpiryScanPeriod); + + /** + * Returns the priority of the thread used to scan message expiration. + * + * Default value is {@value org.hornetq.core.config.impl.ConfigurationImpl#DEFAULT_MESSAGE_EXPIRY_THREAD_PRIORITY}. + */ + int getMessageExpiryThreadPriority(); + + /** + * Sets the priority of the thread used to scan message expiration. + */ + void setMessageExpiryThreadPriority(int messageExpiryThreadPriority); + +} Copied: trunk/src/main/org/hornetq/core/config/impl/ConfigurationImpl.java (from rev 8720, trunk/src/main/org/hornetq/api/core/config/ConfigurationImpl.java) =================================================================== --- trunk/src/main/org/hornetq/core/config/impl/ConfigurationImpl.java (rev 0) +++ trunk/src/main/org/hornetq/core/config/impl/ConfigurationImpl.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -0,0 +1,1279 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package org.hornetq.core.config.impl; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import org.hornetq.api.SimpleString; +import org.hornetq.api.core.config.TransportConfiguration; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.logging.impl.JULLogDelegateFactory; +import org.hornetq.core.server.JournalType; +import org.hornetq.core.server.cluster.BridgeConfiguration; +import org.hornetq.core.server.cluster.BroadcastGroupConfiguration; +import org.hornetq.core.server.cluster.ClusterConnectionConfiguration; +import org.hornetq.core.server.cluster.DiscoveryGroupConfiguration; +import org.hornetq.core.server.cluster.DivertConfiguration; +import org.hornetq.core.server.cluster.QueueConfiguration; +import org.hornetq.core.server.group.impl.GroupingHandlerConfiguration; + +/** + * @author <a href="mailto:ataylor@redhat.com>Andy Taylor</a> + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + */ +public class ConfigurationImpl implements Configuration +{ + // Constants ------------------------------------------------------------------------------ + + private static final long serialVersionUID = 4077088945050267843L; + + public static final boolean DEFAULT_CLUSTERED = false; + + public static final boolean DEFAULT_PERSIST_DELIVERY_COUNT_BEFORE_DELIVERY = false; + + public static final boolean DEFAULT_BACKUP = false; + + public static final boolean DEFAULT_SHARED_STORE = false; + + public static final boolean DEFAULT_FILE_DEPLOYMENT_ENABLED = false; + + public static final boolean DEFAULT_PERSISTENCE_ENABLED = true; + + public static final long DEFAULT_FILE_DEPLOYER_SCAN_PERIOD = 5000; + + public static final int DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE = 5; + + public static final int DEFAULT_THREAD_POOL_MAX_SIZE = -1; + + public static final long DEFAULT_SECURITY_INVALIDATION_INTERVAL = 10000; + + public static final boolean DEFAULT_SECURITY_ENABLED = true; + + public static final boolean DEFAULT_JMX_MANAGEMENT_ENABLED = true; + + public static final String DEFAULT_JMX_DOMAIN = "org.hornetq"; + + public static final long DEFAULT_CONNECTION_TTL_OVERRIDE = -1; + + public static final boolean DEFAULT_ASYNC_CONNECTION_EXECUTION_ENABLED = false; + + public static final String DEFAULT_BINDINGS_DIRECTORY = "data/bindings"; + + public static final boolean DEFAULT_CREATE_BINDINGS_DIR = true; + + public static final String DEFAULT_JOURNAL_DIR = "data/journal"; + + public static final String DEFAULT_PAGING_DIR = "data/paging"; + + public static final String DEFAULT_LARGE_MESSAGES_DIR = "data/largemessages"; + + public static final boolean DEFAULT_CREATE_JOURNAL_DIR = true; + + public static final JournalType DEFAULT_JOURNAL_TYPE = JournalType.ASYNCIO; + + public static final boolean DEFAULT_JOURNAL_SYNC_TRANSACTIONAL = true; + + public static final boolean DEFAULT_JOURNAL_SYNC_NON_TRANSACTIONAL = true; + + public static final int DEFAULT_JOURNAL_FILE_SIZE = 10485760; + + public static final int DEFAULT_JOURNAL_COMPACT_MIN_FILES = 10; + + public static final int DEFAULT_JOURNAL_COMPACT_PERCENTAGE = 30; + + public static final int DEFAULT_JOURNAL_MIN_FILES = 2; + + // AIO and NIO need to have different defaults for some values + + public static final int DEFAULT_JOURNAL_MAX_IO_AIO = 500; + + public static final int DEFAULT_JOURNAL_BUFFER_TIMEOUT_AIO = (int)(1000000000d / 2000); + + public static final int DEFAULT_JOURNAL_BUFFER_SIZE_AIO = 490 * 1024; + + public static final int DEFAULT_JOURNAL_MAX_IO_NIO = 1; + + public static final int DEFAULT_JOURNAL_BUFFER_TIMEOUT_NIO = (int)(1000000000d / 300); + + public static final int DEFAULT_JOURNAL_BUFFER_SIZE_NIO = 490 * 1024; + + public static final boolean DEFAULT_JOURNAL_LOG_WRITE_RATE = false; + + public static final int DEFAULT_JOURNAL_PERF_BLAST_PAGES = -1; + + public static final boolean DEFAULT_RUN_SYNC_SPEED_TEST = false; + + public static final boolean DEFAULT_WILDCARD_ROUTING_ENABLED = true; + + public static final boolean DEFAULT_MESSAGE_COUNTER_ENABLED = false; + + public static final long DEFAULT_MESSAGE_COUNTER_SAMPLE_PERIOD = 10000; + + public static final int DEFAULT_MESSAGE_COUNTER_MAX_DAY_HISTORY = 10; + + public static final long DEFAULT_TRANSACTION_TIMEOUT = 300000; // 5 minutes + + public static final long DEFAULT_TRANSACTION_TIMEOUT_SCAN_PERIOD = 1000; + + public static final SimpleString DEFAULT_MANAGEMENT_ADDRESS = new SimpleString("hornetq.management"); + + public static final SimpleString DEFAULT_MANAGEMENT_NOTIFICATION_ADDRESS = new SimpleString("hornetq.notifications"); + + public static final String DEFAULT_MANAGEMENT_CLUSTER_USER = "HORNETQ.MANAGEMENT.ADMIN.USER"; + + public static final String DEFAULT_MANAGEMENT_CLUSTER_PASSWORD = "CHANGE ME!!"; + + public static final long DEFAULT_BROADCAST_PERIOD = 1000; + + public static final long DEFAULT_BROADCAST_REFRESH_TIMEOUT = 10000; + + public static final long DEFAULT_MESSAGE_EXPIRY_SCAN_PERIOD = 30000; + + public static final int DEFAULT_MESSAGE_EXPIRY_THREAD_PRIORITY = 3; + + public static final int DEFAULT_ID_CACHE_SIZE = 2000; + + public static final boolean DEFAULT_PERSIST_ID_CACHE = true; + + public static final boolean DEFAULT_CLUSTER_DUPLICATE_DETECTION = true; + + public static final boolean DEFAULT_CLUSTER_FORWARD_WHEN_NO_CONSUMERS = false; + + public static final int DEFAULT_CLUSTER_MAX_HOPS = 1; + + public static final long DEFAULT_CLUSTER_RETRY_INTERVAL = 500; + + public static final boolean DEFAULT_DIVERT_EXCLUSIVE = false; + + public static final boolean DEFAULT_BRIDGE_DUPLICATE_DETECTION = true; + + public static final int DEFAULT_BRIDGE_RECONNECT_ATTEMPTS = -1; + + public static final long DEFAULT_SERVER_DUMP_INTERVAL = -1; + + public static final int DEFAULT_MEMORY_WARNING_THRESHOLD = 25; + + public static final long DEFAULT_MEMORY_MEASURE_INTERVAL = -1; // in milliseconds + + public static final String DEFAULT_LOG_DELEGATE_FACTORY_CLASS_NAME = JULLogDelegateFactory.class.getCanonicalName(); + + // Attributes ----------------------------------------------------------------------------- + + protected boolean clustered = ConfigurationImpl.DEFAULT_CLUSTERED; + + protected boolean backup = ConfigurationImpl.DEFAULT_BACKUP; + + protected boolean sharedStore = ConfigurationImpl.DEFAULT_SHARED_STORE; + + protected boolean fileDeploymentEnabled = ConfigurationImpl.DEFAULT_FILE_DEPLOYMENT_ENABLED; + + protected boolean persistenceEnabled = ConfigurationImpl.DEFAULT_PERSISTENCE_ENABLED; + + protected long fileDeploymentScanPeriod = ConfigurationImpl.DEFAULT_FILE_DEPLOYER_SCAN_PERIOD; + + protected boolean persistDeliveryCountBeforeDelivery = ConfigurationImpl.DEFAULT_PERSIST_DELIVERY_COUNT_BEFORE_DELIVERY; + + protected int scheduledThreadPoolMaxSize = ConfigurationImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE; + + protected int threadPoolMaxSize = ConfigurationImpl.DEFAULT_THREAD_POOL_MAX_SIZE; + + protected long securityInvalidationInterval = ConfigurationImpl.DEFAULT_SECURITY_INVALIDATION_INTERVAL; + + protected boolean securityEnabled = ConfigurationImpl.DEFAULT_SECURITY_ENABLED; + + protected boolean jmxManagementEnabled = ConfigurationImpl.DEFAULT_JMX_MANAGEMENT_ENABLED; + + protected String jmxDomain = ConfigurationImpl.DEFAULT_JMX_DOMAIN; + + protected long connectionTTLOverride = ConfigurationImpl.DEFAULT_CONNECTION_TTL_OVERRIDE; + + protected boolean asyncConnectionExecutionEnabled = ConfigurationImpl.DEFAULT_ASYNC_CONNECTION_EXECUTION_ENABLED; + + protected long messageExpiryScanPeriod = ConfigurationImpl.DEFAULT_MESSAGE_EXPIRY_SCAN_PERIOD; + + protected int messageExpiryThreadPriority = ConfigurationImpl.DEFAULT_MESSAGE_EXPIRY_THREAD_PRIORITY; + + protected int idCacheSize = ConfigurationImpl.DEFAULT_ID_CACHE_SIZE; + + protected boolean persistIDCache = ConfigurationImpl.DEFAULT_PERSIST_ID_CACHE; + + protected String logDelegateFactoryClassName = ConfigurationImpl.DEFAULT_LOG_DELEGATE_FACTORY_CLASS_NAME; + + protected List<String> interceptorClassNames = new ArrayList<String>(); + + protected Map<String, TransportConfiguration> connectorConfigs = new HashMap<String, TransportConfiguration>(); + + protected Set<TransportConfiguration> acceptorConfigs = new HashSet<TransportConfiguration>(); + + protected String backupConnectorName; + + protected List<BridgeConfiguration> bridgeConfigurations = new ArrayList<BridgeConfiguration>(); + + protected List<DivertConfiguration> divertConfigurations = new ArrayList<DivertConfiguration>(); + + protected List<ClusterConnectionConfiguration> clusterConfigurations = new ArrayList<ClusterConnectionConfiguration>(); + + protected List<QueueConfiguration> queueConfigurations = new ArrayList<QueueConfiguration>(); + + protected List<BroadcastGroupConfiguration> broadcastGroupConfigurations = new ArrayList<BroadcastGroupConfiguration>(); + + protected Map<String, DiscoveryGroupConfiguration> discoveryGroupConfigurations = new LinkedHashMap<String, DiscoveryGroupConfiguration>(); + + // Paging related attributes ------------------------------------------------------------ + + protected String pagingDirectory = ConfigurationImpl.DEFAULT_PAGING_DIR; + + // File related attributes ----------------------------------------------------------- + + protected String largeMessagesDirectory = ConfigurationImpl.DEFAULT_LARGE_MESSAGES_DIR; + + protected String bindingsDirectory = ConfigurationImpl.DEFAULT_BINDINGS_DIRECTORY; + + protected boolean createBindingsDir = ConfigurationImpl.DEFAULT_CREATE_BINDINGS_DIR; + + protected String journalDirectory = ConfigurationImpl.DEFAULT_JOURNAL_DIR; + + protected boolean createJournalDir = ConfigurationImpl.DEFAULT_CREATE_JOURNAL_DIR; + + public JournalType journalType = ConfigurationImpl.DEFAULT_JOURNAL_TYPE; + + protected boolean journalSyncTransactional = ConfigurationImpl.DEFAULT_JOURNAL_SYNC_TRANSACTIONAL; + + protected boolean journalSyncNonTransactional = ConfigurationImpl.DEFAULT_JOURNAL_SYNC_NON_TRANSACTIONAL; + + protected int journalCompactMinFiles = ConfigurationImpl.DEFAULT_JOURNAL_COMPACT_MIN_FILES; + + protected int journalCompactPercentage = ConfigurationImpl.DEFAULT_JOURNAL_COMPACT_PERCENTAGE; + + protected int journalFileSize = ConfigurationImpl.DEFAULT_JOURNAL_FILE_SIZE; + + protected int journalMinFiles = ConfigurationImpl.DEFAULT_JOURNAL_MIN_FILES; + + // AIO and NIO need different values for these attributes + + protected int journalMaxIO_AIO = ConfigurationImpl.DEFAULT_JOURNAL_MAX_IO_AIO; + + protected int journalBufferTimeout_AIO = ConfigurationImpl.DEFAULT_JOURNAL_BUFFER_TIMEOUT_AIO; + + protected int journalBufferSize_AIO = ConfigurationImpl.DEFAULT_JOURNAL_BUFFER_SIZE_AIO; + + protected int journalMaxIO_NIO = ConfigurationImpl.DEFAULT_JOURNAL_MAX_IO_NIO; + + protected int journalBufferTimeout_NIO = ConfigurationImpl.DEFAULT_JOURNAL_BUFFER_TIMEOUT_NIO; + + protected int journalBufferSize_NIO = ConfigurationImpl.DEFAULT_JOURNAL_BUFFER_SIZE_NIO; + + protected boolean logJournalWriteRate = ConfigurationImpl.DEFAULT_JOURNAL_LOG_WRITE_RATE; + + protected int journalPerfBlastPages = ConfigurationImpl.DEFAULT_JOURNAL_PERF_BLAST_PAGES; + + protected boolean runSyncSpeedTest = ConfigurationImpl.DEFAULT_RUN_SYNC_SPEED_TEST; + + protected boolean wildcardRoutingEnabled = ConfigurationImpl.DEFAULT_WILDCARD_ROUTING_ENABLED; + + protected boolean messageCounterEnabled = ConfigurationImpl.DEFAULT_MESSAGE_COUNTER_ENABLED; + + protected long messageCounterSamplePeriod = ConfigurationImpl.DEFAULT_MESSAGE_COUNTER_SAMPLE_PERIOD; + + protected int messageCounterMaxDayHistory = ConfigurationImpl.DEFAULT_MESSAGE_COUNTER_MAX_DAY_HISTORY; + + protected long transactionTimeout = ConfigurationImpl.DEFAULT_TRANSACTION_TIMEOUT; + + protected long transactionTimeoutScanPeriod = ConfigurationImpl.DEFAULT_TRANSACTION_TIMEOUT_SCAN_PERIOD; + + protected SimpleString managementAddress = ConfigurationImpl.DEFAULT_MANAGEMENT_ADDRESS; + + protected SimpleString managementNotificationAddress = ConfigurationImpl.DEFAULT_MANAGEMENT_NOTIFICATION_ADDRESS; + + protected String managementClusterUser = ConfigurationImpl.DEFAULT_MANAGEMENT_CLUSTER_USER; + + protected String managementClusterPassword = ConfigurationImpl.DEFAULT_MANAGEMENT_CLUSTER_PASSWORD; + + protected long serverDumpInterval = ConfigurationImpl.DEFAULT_SERVER_DUMP_INTERVAL; + + // percentage of free memory which triggers warning from the memory manager + protected int memoryWarningThreshold = ConfigurationImpl.DEFAULT_MEMORY_WARNING_THRESHOLD; + + protected long memoryMeasureInterval = ConfigurationImpl.DEFAULT_MEMORY_MEASURE_INTERVAL; + + protected GroupingHandlerConfiguration groupingHandlerConfiguration; + + // Public ------------------------------------------------------------------------- + + public boolean isClustered() + { + return clustered; + } + + public void setClustered(final boolean clustered) + { + this.clustered = clustered; + } + + public boolean isBackup() + { + return backup; + } + + public boolean isFileDeploymentEnabled() + { + return fileDeploymentEnabled; + } + + public void setFileDeploymentEnabled(final boolean enable) + { + fileDeploymentEnabled = enable; + } + + public boolean isPersistenceEnabled() + { + return persistenceEnabled; + } + + public void setPersistenceEnabled(final boolean enable) + { + persistenceEnabled = enable; + } + + public long getFileDeployerScanPeriod() + { + return fileDeploymentScanPeriod; + } + + public void setFileDeployerScanPeriod(final long period) + { + fileDeploymentScanPeriod = period; + } + + /** + * @return the persistDeliveryCountBeforeDelivery + */ + public boolean isPersistDeliveryCountBeforeDelivery() + { + return persistDeliveryCountBeforeDelivery; + } + + public void setPersistDeliveryCountBeforeDelivery(final boolean persistDeliveryCountBeforeDelivery) + { + this.persistDeliveryCountBeforeDelivery = persistDeliveryCountBeforeDelivery; + } + + public void setBackup(final boolean backup) + { + this.backup = backup; + } + + public boolean isSharedStore() + { + return sharedStore; + } + + public void setSharedStore(final boolean sharedStore) + { + this.sharedStore = sharedStore; + } + + public int getScheduledThreadPoolMaxSize() + { + return scheduledThreadPoolMaxSize; + } + + public void setScheduledThreadPoolMaxSize(final int maxSize) + { + scheduledThreadPoolMaxSize = maxSize; + } + + public int getThreadPoolMaxSize() + { + return threadPoolMaxSize; + } + + public void setThreadPoolMaxSize(final int maxSize) + { + threadPoolMaxSize = maxSize; + } + + public long getSecurityInvalidationInterval() + { + return securityInvalidationInterval; + } + + public void setSecurityInvalidationInterval(final long interval) + { + securityInvalidationInterval = interval; + } + + public long getConnectionTTLOverride() + { + return connectionTTLOverride; + } + + public void setConnectionTTLOverride(final long ttl) + { + connectionTTLOverride = ttl; + } + + public boolean isAsyncConnectionExecutionEnabled() + { + return asyncConnectionExecutionEnabled; + } + + public void setEnabledAsyncConnectionExecution(final boolean enabled) + { + asyncConnectionExecutionEnabled = enabled; + } + + public List<String> getInterceptorClassNames() + { + return interceptorClassNames; + } + + public void setInterceptorClassNames(final List<String> interceptors) + { + interceptorClassNames = interceptors; + } + + public Set<TransportConfiguration> getAcceptorConfigurations() + { + return acceptorConfigs; + } + + public void setAcceptorConfigurations(final Set<TransportConfiguration> infos) + { + acceptorConfigs = infos; + } + + public Map<String, TransportConfiguration> getConnectorConfigurations() + { + return connectorConfigs; + } + + public void setConnectorConfigurations(final Map<String, TransportConfiguration> infos) + { + connectorConfigs = infos; + } + + public String getBackupConnectorName() + { + return backupConnectorName; + } + + public void setBackupConnectorName(final String backupConnectorName) + { + this.backupConnectorName = backupConnectorName; + } + + public GroupingHandlerConfiguration getGroupingHandlerConfiguration() + { + return groupingHandlerConfiguration; + } + + public void setGroupingHandlerConfiguration(final GroupingHandlerConfiguration groupingHandlerConfiguration) + { + this.groupingHandlerConfiguration = groupingHandlerConfiguration; + } + + public List<BridgeConfiguration> getBridgeConfigurations() + { + return bridgeConfigurations; + } + + public void setBridgeConfigurations(final List<BridgeConfiguration> configs) + { + bridgeConfigurations = configs; + } + + public List<BroadcastGroupConfiguration> getBroadcastGroupConfigurations() + { + return broadcastGroupConfigurations; + } + + public void setBroadcastGroupConfigurations(final List<BroadcastGroupConfiguration> configs) + { + broadcastGroupConfigurations = configs; + } + + public List<ClusterConnectionConfiguration> getClusterConfigurations() + { + return clusterConfigurations; + } + + public void setClusterConfigurations(final List<ClusterConnectionConfiguration> configs) + { + clusterConfigurations = configs; + } + + public List<DivertConfiguration> getDivertConfigurations() + { + return divertConfigurations; + } + + public void setDivertConfigurations(final List<DivertConfiguration> configs) + { + divertConfigurations = configs; + } + + public List<QueueConfiguration> getQueueConfigurations() + { + return queueConfigurations; + } + + public void setQueueConfigurations(final List<QueueConfiguration> configs) + { + queueConfigurations = configs; + } + + public Map<String, DiscoveryGroupConfiguration> getDiscoveryGroupConfigurations() + { + return discoveryGroupConfigurations; + } + + public void setDiscoveryGroupConfigurations(final Map<String, DiscoveryGroupConfiguration> discoveryGroupConfigurations) + { + this.discoveryGroupConfigurations = discoveryGroupConfigurations; + } + + public int getIDCacheSize() + { + return idCacheSize; + } + + public void setIDCacheSize(final int idCacheSize) + { + this.idCacheSize = idCacheSize; + } + + public boolean isPersistIDCache() + { + return persistIDCache; + } + + public void setPersistIDCache(final boolean persist) + { + persistIDCache = persist; + } + + public String getBindingsDirectory() + { + return bindingsDirectory; + } + + public void setBindingsDirectory(final String dir) + { + bindingsDirectory = dir; + } + + public String getJournalDirectory() + { + return journalDirectory; + } + + public void setJournalDirectory(final String dir) + { + journalDirectory = dir; + } + + public JournalType getJournalType() + { + return journalType; + } + + public void setPagingDirectory(final String dir) + { + pagingDirectory = dir; + } + + public String getPagingDirectory() + { + return pagingDirectory; + } + + public void setJournalType(final JournalType type) + { + journalType = type; + } + + public boolean isJournalSyncTransactional() + { + return journalSyncTransactional; + } + + public void setJournalSyncTransactional(final boolean sync) + { + journalSyncTransactional = sync; + } + + public boolean isJournalSyncNonTransactional() + { + return journalSyncNonTransactional; + } + + public void setJournalSyncNonTransactional(final boolean sync) + { + journalSyncNonTransactional = sync; + } + + public int getJournalFileSize() + { + return journalFileSize; + } + + public void setJournalFileSize(final int size) + { + journalFileSize = size; + } + + public int getJournalMinFiles() + { + return journalMinFiles; + } + + public void setJournalMinFiles(final int files) + { + journalMinFiles = files; + } + + public boolean isLogJournalWriteRate() + { + return logJournalWriteRate; + } + + public void setLogJournalWriteRate(final boolean logJournalWriteRate) + { + this.logJournalWriteRate = logJournalWriteRate; + } + + public int getJournalPerfBlastPages() + { + return journalPerfBlastPages; + } + + public void setJournalPerfBlastPages(final int journalPerfBlastPages) + { + this.journalPerfBlastPages = journalPerfBlastPages; + } + + public boolean isRunSyncSpeedTest() + { + return runSyncSpeedTest; + } + + public void setRunSyncSpeedTest(final boolean run) + { + runSyncSpeedTest = run; + } + + public boolean isCreateBindingsDir() + { + return createBindingsDir; + } + + public void setCreateBindingsDir(final boolean create) + { + createBindingsDir = create; + } + + public boolean isCreateJournalDir() + { + return createJournalDir; + } + + public void setCreateJournalDir(final boolean create) + { + createJournalDir = create; + } + + public boolean isWildcardRoutingEnabled() + { + return wildcardRoutingEnabled; + } + + public void setWildcardRoutingEnabled(final boolean enabled) + { + wildcardRoutingEnabled = enabled; + } + + public long getTransactionTimeout() + { + return transactionTimeout; + } + + public void setTransactionTimeout(final long timeout) + { + transactionTimeout = timeout; + } + + public long getTransactionTimeoutScanPeriod() + { + return transactionTimeoutScanPeriod; + } + + public void setTransactionTimeoutScanPeriod(final long period) + { + transactionTimeoutScanPeriod = period; + } + + public long getMessageExpiryScanPeriod() + { + return messageExpiryScanPeriod; + } + + public void setMessageExpiryScanPeriod(final long messageExpiryScanPeriod) + { + this.messageExpiryScanPeriod = messageExpiryScanPeriod; + } + + public int getMessageExpiryThreadPriority() + { + return messageExpiryThreadPriority; + } + + public void setMessageExpiryThreadPriority(final int messageExpiryThreadPriority) + { + this.messageExpiryThreadPriority = messageExpiryThreadPriority; + } + + public boolean isSecurityEnabled() + { + return securityEnabled; + } + + public void setSecurityEnabled(final boolean enabled) + { + securityEnabled = enabled; + } + + public boolean isJMXManagementEnabled() + { + return jmxManagementEnabled; + } + + public void setJMXManagementEnabled(final boolean enabled) + { + jmxManagementEnabled = enabled; + } + + public String getJMXDomain() + { + return jmxDomain; + } + + public void setJMXDomain(final String domain) + { + jmxDomain = domain; + } + + public String getLargeMessagesDirectory() + { + return largeMessagesDirectory; + } + + public void setLargeMessagesDirectory(final String directory) + { + largeMessagesDirectory = directory; + } + + public boolean isMessageCounterEnabled() + { + return messageCounterEnabled; + } + + public void setMessageCounterEnabled(final boolean enabled) + { + messageCounterEnabled = enabled; + } + + public long getMessageCounterSamplePeriod() + { + return messageCounterSamplePeriod; + } + + public void setMessageCounterSamplePeriod(long period) + { + this.messageCounterSamplePeriod = period; + } + + public int getMessageCounterMaxDayHistory() + { + return messageCounterMaxDayHistory; + } + + public void setMessageCounterMaxDayHistory(final int maxDayHistory) + { + messageCounterMaxDayHistory = maxDayHistory; + } + + public SimpleString getManagementAddress() + { + return managementAddress; + } + + public void setManagementAddress(final SimpleString address) + { + managementAddress = address; + } + + public SimpleString getManagementNotificationAddress() + { + return managementNotificationAddress; + } + + public void setManagementNotificationAddress(final SimpleString address) + { + managementNotificationAddress = address; + } + + public String getManagementClusterUser() + { + return managementClusterUser; + } + + public void setManagementClusterUser(final String user) + { + managementClusterUser = user; + } + + public String getManagementClusterPassword() + { + return managementClusterPassword; + } + + public void setManagementClusterPassword(final String clusterPassword) + { + managementClusterPassword = clusterPassword; + } + + public int getJournalCompactMinFiles() + { + return journalCompactMinFiles; + } + + public int getJournalCompactPercentage() + { + return journalCompactPercentage; + } + + public void setJournalCompactMinFiles(final int minFiles) + { + journalCompactMinFiles = minFiles; + } + + public void setJournalCompactPercentage(final int percentage) + { + journalCompactPercentage = percentage; + } + + public long getServerDumpInterval() + { + return serverDumpInterval; + } + + public void setServerDumpInterval(final long intervalInMilliseconds) + { + serverDumpInterval = intervalInMilliseconds; + } + + public int getMemoryWarningThreshold() + { + return memoryWarningThreshold; + } + + public void setMemoryWarningThreshold(final int memoryWarningThreshold) + { + this.memoryWarningThreshold = memoryWarningThreshold; + } + + public long getMemoryMeasureInterval() + { + return memoryMeasureInterval; + } + + public void setMemoryMeasureInterval(final long memoryMeasureInterval) + { + this.memoryMeasureInterval = memoryMeasureInterval; + } + + public String getLogDelegateFactoryClassName() + { + return logDelegateFactoryClassName; + } + + public void setLogDelegateFactoryClassName(final String className) + { + logDelegateFactoryClassName = className; + } + + public int getJournalMaxIO_AIO() + { + return journalMaxIO_AIO; + } + + public void setJournalMaxIO_AIO(final int journalMaxIO) + { + journalMaxIO_AIO = journalMaxIO; + } + + public int getJournalBufferTimeout_AIO() + { + return journalBufferTimeout_AIO; + } + + public void setJournalBufferTimeout_AIO(final int journalBufferTimeout) + { + journalBufferTimeout_AIO = journalBufferTimeout; + } + + public int getJournalBufferSize_AIO() + { + return journalBufferSize_AIO; + } + + public void setJournalBufferSize_AIO(final int journalBufferSize) + { + journalBufferSize_AIO = journalBufferSize; + } + + public int getJournalMaxIO_NIO() + { + return journalMaxIO_NIO; + } + + public void setJournalMaxIO_NIO(final int journalMaxIO) + { + journalMaxIO_NIO = journalMaxIO; + } + + public int getJournalBufferTimeout_NIO() + { + return journalBufferTimeout_NIO; + } + + public void setJournalBufferTimeout_NIO(final int journalBufferTimeout) + { + journalBufferTimeout_NIO = journalBufferTimeout; + } + + public int getJournalBufferSize_NIO() + { + return journalBufferSize_NIO; + } + + public void setJournalBufferSize_NIO(final int journalBufferSize) + { + journalBufferSize_NIO = journalBufferSize; + } + + @Override + public boolean equals(final Object obj) + { + if (this == obj) + { + return true; + } + if (obj == null) + { + return false; + } + if (getClass() != obj.getClass()) + { + return false; + } + ConfigurationImpl other = (ConfigurationImpl)obj; + if (asyncConnectionExecutionEnabled != other.asyncConnectionExecutionEnabled) + { + return false; + } + if (backup != other.backup) + { + return false; + } + if (sharedStore != other.sharedStore) + { + return false; + } + if (backupConnectorName == null) + { + if (other.backupConnectorName != null) + { + return false; + } + } + else if (!backupConnectorName.equals(other.backupConnectorName)) + { + return false; + } + if (bindingsDirectory == null) + { + if (other.bindingsDirectory != null) + { + return false; + } + } + else if (!bindingsDirectory.equals(other.bindingsDirectory)) + { + return false; + } + + if (clustered != other.clustered) + { + return false; + } + if (connectionTTLOverride != other.connectionTTLOverride) + { + return false; + } + if (createBindingsDir != other.createBindingsDir) + { + return false; + } + if (createJournalDir != other.createJournalDir) + { + return false; + } + + if (fileDeploymentEnabled != other.fileDeploymentEnabled) + { + return false; + } + if (fileDeploymentScanPeriod != other.fileDeploymentScanPeriod) + { + return false; + } + if (idCacheSize != other.idCacheSize) + { + return false; + } + if (jmxManagementEnabled != other.jmxManagementEnabled) + { + return false; + } + if (journalBufferSize_AIO != other.journalBufferSize_AIO) + { + return false; + } + if (journalBufferTimeout_AIO != other.journalBufferTimeout_AIO) + { + return false; + } + if (journalMaxIO_AIO != other.journalMaxIO_AIO) + { + return false; + } + if (journalBufferSize_NIO != other.journalBufferSize_NIO) + { + return false; + } + if (journalBufferTimeout_NIO != other.journalBufferTimeout_NIO) + { + return false; + } + if (journalMaxIO_NIO != other.journalMaxIO_NIO) + { + return false; + } + if (journalCompactMinFiles != other.journalCompactMinFiles) + { + return false; + } + if (journalCompactPercentage != other.journalCompactPercentage) + { + return false; + } + if (journalDirectory == null) + { + if (other.journalDirectory != null) + { + return false; + } + } + else if (!journalDirectory.equals(other.journalDirectory)) + { + return false; + } + if (journalFileSize != other.journalFileSize) + { + return false; + } + + if (journalMinFiles != other.journalMinFiles) + { + return false; + } + if (journalPerfBlastPages != other.journalPerfBlastPages) + { + return false; + } + if (journalSyncNonTransactional != other.journalSyncNonTransactional) + { + return false; + } + if (journalSyncTransactional != other.journalSyncTransactional) + { + return false; + } + if (journalType == null) + { + if (other.journalType != null) + { + return false; + } + } + else if (!journalType.equals(other.journalType)) + { + return false; + } + if (largeMessagesDirectory == null) + { + if (other.largeMessagesDirectory != null) + { + return false; + } + } + else if (!largeMessagesDirectory.equals(other.largeMessagesDirectory)) + { + return false; + } + if (logJournalWriteRate != other.logJournalWriteRate) + { + return false; + } + if (managementAddress == null) + { + if (other.managementAddress != null) + { + return false; + } + } + else if (!managementAddress.equals(other.managementAddress)) + { + return false; + } + if (managementClusterPassword == null) + { + if (other.managementClusterPassword != null) + { + return false; + } + } + else if (!managementClusterPassword.equals(other.managementClusterPassword)) + { + return false; + } + if (managementClusterUser == null) + { + if (other.managementClusterUser != null) + { + return false; + } + } + else if (!managementClusterUser.equals(other.managementClusterUser)) + { + return false; + } + if (managementNotificationAddress == null) + { + if (other.managementNotificationAddress != null) + { + return false; + } + } + else if (!managementNotificationAddress.equals(other.managementNotificationAddress)) + { + return false; + } + if (messageCounterEnabled != other.messageCounterEnabled) + { + return false; + } + if (messageCounterMaxDayHistory != other.messageCounterMaxDayHistory) + { + return false; + } + if (messageCounterSamplePeriod != other.messageCounterSamplePeriod) + { + return false; + } + if (messageExpiryScanPeriod != other.messageExpiryScanPeriod) + { + return false; + } + if (messageExpiryThreadPriority != other.messageExpiryThreadPriority) + { + return false; + } + if (pagingDirectory == null) + { + if (other.pagingDirectory != null) + { + return false; + } + } + else if (!pagingDirectory.equals(other.pagingDirectory)) + { + return false; + } + if (persistDeliveryCountBeforeDelivery != other.persistDeliveryCountBeforeDelivery) + { + return false; + } + if (persistIDCache != other.persistIDCache) + { + return false; + } + if (persistenceEnabled != other.persistenceEnabled) + { + return false; + } + if (scheduledThreadPoolMaxSize != other.scheduledThreadPoolMaxSize) + { + return false; + } + if (securityEnabled != other.securityEnabled) + { + return false; + } + if (securityInvalidationInterval != other.securityInvalidationInterval) + { + return false; + } + if (serverDumpInterval != other.serverDumpInterval) + { + return false; + } + if (threadPoolMaxSize != other.threadPoolMaxSize) + { + return false; + } + if (transactionTimeout != other.transactionTimeout) + { + return false; + } + if (transactionTimeoutScanPeriod != other.transactionTimeoutScanPeriod) + { + return false; + } + if (wildcardRoutingEnabled != other.wildcardRoutingEnabled) + { + return false; + } + return true; + } + +} Copied: trunk/src/main/org/hornetq/core/config/impl/FileConfiguration.java (from rev 8720, trunk/src/main/org/hornetq/api/core/config/FileConfiguration.java) =================================================================== --- trunk/src/main/org/hornetq/core/config/impl/FileConfiguration.java (rev 0) +++ trunk/src/main/org/hornetq/core/config/impl/FileConfiguration.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -0,0 +1,847 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package org.hornetq.core.config.impl; + +import java.io.InputStreamReader; +import java.io.Reader; +import java.net.URL; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import org.hornetq.api.Pair; +import org.hornetq.api.SimpleString; +import org.hornetq.api.core.client.ClientSessionFactoryImpl; +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; +import org.hornetq.core.server.cluster.BroadcastGroupConfiguration; +import org.hornetq.core.server.cluster.ClusterConnectionConfiguration; +import org.hornetq.core.server.cluster.DiscoveryGroupConfiguration; +import org.hornetq.core.server.cluster.DivertConfiguration; +import org.hornetq.core.server.group.impl.GroupingHandlerConfiguration; +import org.hornetq.utils.XMLConfigurationUtil; +import org.hornetq.utils.XMLUtil; +import org.w3c.dom.Element; +import org.w3c.dom.NamedNodeMap; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; + +/** + * ConfigurationImpl + * This class allows the Configuration class to be configured via a config file. + * + * @author <a href="ataylor(a)redhat.com">Andy Taylor</a> + * @author <a href="tim.fox(a)jboss.com">Tim Fox</a> + */ +public class FileConfiguration extends ConfigurationImpl +{ + private static final long serialVersionUID = -4766689627675039596L; + + private static final Logger log = Logger.getLogger(FileConfiguration.class); + + // Constants ------------------------------------------------------------------------ + + private static final String DEFAULT_CONFIGURATION_URL = "hornetq-configuration.xml"; + + private static final String CONFIGURATION_SCHEMA_URL = "schema/hornetq-configuration.xsd"; + + // For a bridge confirmations must be activated or send acknowledgements won't return + + public static final int DEFAULT_CONFIRMATION_WINDOW_SIZE = 1024 * 1024; + + // Static -------------------------------------------------------------------------- + + // Attributes ---------------------------------------------------------------------- + + private String configurationUrl = FileConfiguration.DEFAULT_CONFIGURATION_URL; + + private boolean started; + + // Public ------------------------------------------------------------------------- + + public synchronized void start() throws Exception + { + if (started) + { + return; + } + + URL url = getClass().getClassLoader().getResource(configurationUrl); + FileConfiguration.log.debug("Loading server configuration from " + url); + + Reader reader = new InputStreamReader(url.openStream()); + String xml = org.hornetq.utils.XMLUtil.readerToString(reader); + xml = XMLUtil.replaceSystemProps(xml); + Element e = org.hornetq.utils.XMLUtil.stringToElement(xml); + org.hornetq.utils.XMLUtil.validate(e, FileConfiguration.CONFIGURATION_SCHEMA_URL); + + clustered = XMLConfigurationUtil.getBoolean(e, "clustered", clustered); + + backup = XMLConfigurationUtil.getBoolean(e, "backup", backup); + + sharedStore = XMLConfigurationUtil.getBoolean(e, "shared-store", sharedStore); + + // Defaults to true when using FileConfiguration + fileDeploymentEnabled = XMLConfigurationUtil.getBoolean(e, "file-deployment-enabled", true); + + persistenceEnabled = XMLConfigurationUtil.getBoolean(e, "persistence-enabled", persistenceEnabled); + + persistDeliveryCountBeforeDelivery = XMLConfigurationUtil.getBoolean(e, + "persist-delivery-count-before-delivery", + persistDeliveryCountBeforeDelivery); + + // NOTE! All the defaults come from the super class + + scheduledThreadPoolMaxSize = XMLConfigurationUtil.getInteger(e, + "scheduled-thread-pool-max-size", + scheduledThreadPoolMaxSize, + Validators.GT_ZERO); + + threadPoolMaxSize = XMLConfigurationUtil.getInteger(e, + "thread-pool-max-size", + threadPoolMaxSize, + Validators.MINUS_ONE_OR_GT_ZERO); + + securityEnabled = XMLConfigurationUtil.getBoolean(e, "security-enabled", securityEnabled); + + jmxManagementEnabled = XMLConfigurationUtil.getBoolean(e, "jmx-management-enabled", jmxManagementEnabled); + + jmxDomain = XMLConfigurationUtil.getString(e, "jmx-domain", jmxDomain, Validators.NOT_NULL_OR_EMPTY); + + securityInvalidationInterval = XMLConfigurationUtil.getLong(e, + "security-invalidation-interval", + securityInvalidationInterval, + Validators.GT_ZERO); + + connectionTTLOverride = XMLConfigurationUtil.getLong(e, + "connection-ttl-override", + connectionTTLOverride, + Validators.MINUS_ONE_OR_GT_ZERO); + + asyncConnectionExecutionEnabled = XMLConfigurationUtil.getBoolean(e, + "async-connection-execution-enabled", + asyncConnectionExecutionEnabled); + + transactionTimeout = XMLConfigurationUtil.getLong(e, + "transaction-timeout", + transactionTimeout, + Validators.GT_ZERO); + + transactionTimeoutScanPeriod = XMLConfigurationUtil.getLong(e, + "transaction-timeout-scan-period", + transactionTimeoutScanPeriod, + Validators.GT_ZERO); + + messageExpiryScanPeriod = XMLConfigurationUtil.getLong(e, + "message-expiry-scan-period", + messageExpiryScanPeriod, + Validators.GT_ZERO); + + messageExpiryThreadPriority = XMLConfigurationUtil.getInteger(e, + "message-expiry-thread-priority", + messageExpiryThreadPriority, + Validators.THREAD_PRIORITY_RANGE); + + idCacheSize = XMLConfigurationUtil.getInteger(e, "id-cache-size", idCacheSize, Validators.GT_ZERO); + + persistIDCache = XMLConfigurationUtil.getBoolean(e, "persist-id-cache", persistIDCache); + + managementAddress = new SimpleString(XMLConfigurationUtil.getString(e, + "management-address", + managementAddress.toString(), + Validators.NOT_NULL_OR_EMPTY)); + + managementNotificationAddress = new SimpleString(XMLConfigurationUtil.getString(e, + "management-notification-address", + managementNotificationAddress.toString(), + Validators.NOT_NULL_OR_EMPTY)); + + managementClusterPassword = XMLConfigurationUtil.getString(e, + "management-cluster-password", + managementClusterPassword, + Validators.NOT_NULL_OR_EMPTY); + + managementClusterUser = XMLConfigurationUtil.getString(e, + "management-cluster-user", + managementClusterUser, + Validators.NOT_NULL_OR_EMPTY); + + logDelegateFactoryClassName = XMLConfigurationUtil.getString(e, + "log-delegate-factory-class-name", + logDelegateFactoryClassName, + Validators.NOT_NULL_OR_EMPTY); + + NodeList interceptorNodes = e.getElementsByTagName("remoting-interceptors"); + + ArrayList<String> interceptorList = new ArrayList<String>(); + + if (interceptorNodes.getLength() > 0) + { + NodeList interceptors = interceptorNodes.item(0).getChildNodes(); + + for (int i = 0; i < interceptors.getLength(); i++) + { + if ("class-name".equalsIgnoreCase(interceptors.item(i).getNodeName())) + { + String clazz = interceptors.item(i).getTextContent(); + + interceptorList.add(clazz); + } + } + } + + interceptorClassNames = interceptorList; + + NodeList backups = e.getElementsByTagName("backup-connector-ref"); + + // There should be only one - this will be enforced by the DTD + + if (backups.getLength() > 0) + { + Node backupNode = backups.item(0); + + backupConnectorName = backupNode.getAttributes().getNamedItem("connector-name").getNodeValue(); + } + + NodeList connectorNodes = e.getElementsByTagName("connector"); + + for (int i = 0; i < connectorNodes.getLength(); i++) + { + Element connectorNode = (Element)connectorNodes.item(i); + + TransportConfiguration connectorConfig = parseTransportConfiguration(connectorNode); + + if (connectorConfig.getName() == null) + { + FileConfiguration.log.warn("Cannot deploy a connector with no name specified."); + + continue; + } + + if (connectorConfigs.containsKey(connectorConfig.getName())) + { + FileConfiguration.log.warn("There is already a connector with name " + connectorConfig.getName() + + " deployed. This one will not be deployed."); + + continue; + } + + connectorConfigs.put(connectorConfig.getName(), connectorConfig); + } + + NodeList acceptorNodes = e.getElementsByTagName("acceptor"); + + for (int i = 0; i < acceptorNodes.getLength(); i++) + { + Element acceptorNode = (Element)acceptorNodes.item(i); + + TransportConfiguration acceptorConfig = parseTransportConfiguration(acceptorNode); + + acceptorConfigs.add(acceptorConfig); + } + + NodeList bgNodes = e.getElementsByTagName("broadcast-group"); + + for (int i = 0; i < bgNodes.getLength(); i++) + { + Element bgNode = (Element)bgNodes.item(i); + + parseBroadcastGroupConfiguration(bgNode); + } + + NodeList dgNodes = e.getElementsByTagName("discovery-group"); + + for (int i = 0; i < dgNodes.getLength(); i++) + { + Element dgNode = (Element)dgNodes.item(i); + + parseDiscoveryGroupConfiguration(dgNode); + } + + NodeList brNodes = e.getElementsByTagName("bridge"); + + for (int i = 0; i < brNodes.getLength(); i++) + { + Element mfNode = (Element)brNodes.item(i); + + parseBridgeConfiguration(mfNode); + } + + NodeList gaNodes = e.getElementsByTagName("grouping-handler"); + + for (int i = 0; i < gaNodes.getLength(); i++) + { + Element gaNode = (Element)gaNodes.item(i); + + parseGroupingHandlerConfiguration(gaNode); + } + + NodeList ccNodes = e.getElementsByTagName("cluster-connection"); + + for (int i = 0; i < ccNodes.getLength(); i++) + { + Element ccNode = (Element)ccNodes.item(i); + + parseClusterConnectionConfiguration(ccNode); + } + + NodeList dvNodes = e.getElementsByTagName("divert"); + + for (int i = 0; i < dvNodes.getLength(); i++) + { + Element dvNode = (Element)dvNodes.item(i); + + parseDivertConfiguration(dvNode); + } + + // Persistence config + + largeMessagesDirectory = XMLConfigurationUtil.getString(e, + "large-messages-directory", + largeMessagesDirectory, + Validators.NOT_NULL_OR_EMPTY); + + bindingsDirectory = XMLConfigurationUtil.getString(e, + "bindings-directory", + bindingsDirectory, + Validators.NOT_NULL_OR_EMPTY); + + createBindingsDir = XMLConfigurationUtil.getBoolean(e, "create-bindings-dir", createBindingsDir); + + journalDirectory = XMLConfigurationUtil.getString(e, + "journal-directory", + journalDirectory, + Validators.NOT_NULL_OR_EMPTY); + + pagingDirectory = XMLConfigurationUtil.getString(e, + "paging-directory", + pagingDirectory, + Validators.NOT_NULL_OR_EMPTY); + + createJournalDir = XMLConfigurationUtil.getBoolean(e, "create-journal-dir", createJournalDir); + + String s = XMLConfigurationUtil.getString(e, "journal-type", journalType.toString(), Validators.JOURNAL_TYPE); + + if (s.equals(JournalType.NIO.toString())) + { + journalType = JournalType.NIO; + } + else if (s.equals(JournalType.ASYNCIO.toString())) + { + journalType = JournalType.ASYNCIO; + } + + journalSyncTransactional = XMLConfigurationUtil.getBoolean(e, + "journal-sync-transactional", + journalSyncTransactional); + + journalSyncNonTransactional = XMLConfigurationUtil.getBoolean(e, + "journal-sync-non-transactional", + journalSyncNonTransactional); + + journalFileSize = XMLConfigurationUtil.getInteger(e, "journal-file-size", journalFileSize, Validators.GT_ZERO); + + int journalBufferTimeout = XMLConfigurationUtil.getInteger(e, + "journal-buffer-timeout", + journalType == JournalType.ASYNCIO ? ConfigurationImpl.DEFAULT_JOURNAL_BUFFER_TIMEOUT_AIO + : ConfigurationImpl.DEFAULT_JOURNAL_BUFFER_TIMEOUT_NIO, + Validators.GT_ZERO); + + int journalBufferSize = XMLConfigurationUtil.getInteger(e, + "journal-buffer-size", + journalType == JournalType.ASYNCIO ? ConfigurationImpl.DEFAULT_JOURNAL_BUFFER_SIZE_AIO + : ConfigurationImpl.DEFAULT_JOURNAL_BUFFER_SIZE_NIO, + Validators.GT_ZERO); + + int journalMaxIO = XMLConfigurationUtil.getInteger(e, + "journal-max-io", + journalType == JournalType.ASYNCIO ? ConfigurationImpl.DEFAULT_JOURNAL_MAX_IO_AIO + : ConfigurationImpl.DEFAULT_JOURNAL_MAX_IO_NIO, + Validators.GT_ZERO); + + if (journalType == JournalType.ASYNCIO) + { + journalBufferTimeout_AIO = journalBufferTimeout; + journalBufferSize_AIO = journalBufferSize; + journalMaxIO_AIO = journalMaxIO; + } + else + { + journalBufferTimeout_NIO = journalBufferTimeout; + journalBufferSize_NIO = journalBufferSize; + journalMaxIO_NIO = journalMaxIO; + } + + journalMinFiles = XMLConfigurationUtil.getInteger(e, "journal-min-files", journalMinFiles, Validators.GT_ZERO); + + journalCompactMinFiles = XMLConfigurationUtil.getInteger(e, + "journal-compact-min-files", + journalCompactMinFiles, + Validators.GE_ZERO); + + journalCompactPercentage = XMLConfigurationUtil.getInteger(e, + "journal-compact-percentage", + journalCompactPercentage, + Validators.PERCENTAGE); + + logJournalWriteRate = XMLConfigurationUtil.getBoolean(e, + "log-journal-write-rate", + ConfigurationImpl.DEFAULT_JOURNAL_LOG_WRITE_RATE); + + journalPerfBlastPages = XMLConfigurationUtil.getInteger(e, + "perf-blast-pages", + ConfigurationImpl.DEFAULT_JOURNAL_PERF_BLAST_PAGES, + Validators.MINUS_ONE_OR_GT_ZERO); + + runSyncSpeedTest = XMLConfigurationUtil.getBoolean(e, "run-sync-speed-test", runSyncSpeedTest); + + wildcardRoutingEnabled = XMLConfigurationUtil.getBoolean(e, "wild-card-routing-enabled", wildcardRoutingEnabled); + + messageCounterEnabled = XMLConfigurationUtil.getBoolean(e, "message-counter-enabled", messageCounterEnabled); + + messageCounterSamplePeriod = XMLConfigurationUtil.getLong(e, + "message-counter-sample-period", + messageCounterSamplePeriod, + Validators.GT_ZERO); + + messageCounterMaxDayHistory = XMLConfigurationUtil.getInteger(e, + "message-counter-max-day-history", + messageCounterMaxDayHistory, + Validators.GT_ZERO); + + serverDumpInterval = XMLConfigurationUtil.getLong(e, + "server-dump-interval", + serverDumpInterval, + Validators.MINUS_ONE_OR_GT_ZERO); // in + // milliseconds + + memoryWarningThreshold = XMLConfigurationUtil.getInteger(e, + "memory-warning-threshold", + memoryWarningThreshold, + Validators.PERCENTAGE); + + memoryMeasureInterval = XMLConfigurationUtil.getLong(e, + "memory-measure-interval", + memoryMeasureInterval, + Validators.MINUS_ONE_OR_GT_ZERO); // in + + started = true; + } + + public synchronized void stop() throws Exception + { + started = false; + } + + public String getConfigurationUrl() + { + return configurationUrl; + } + + public void setConfigurationUrl(final String configurationUrl) + { + this.configurationUrl = configurationUrl; + } + + // Private ------------------------------------------------------------------------- + + private TransportConfiguration parseTransportConfiguration(final Element e) + { + Node nameNode = e.getAttributes().getNamedItem("name"); + + String name = nameNode != null ? nameNode.getNodeValue() : null; + + String clazz = XMLConfigurationUtil.getString(e, "factory-class", null, Validators.NOT_NULL_OR_EMPTY); + + Map<String, Object> params = new HashMap<String, Object>(); + + NodeList paramsNodes = e.getElementsByTagName("param"); + + for (int i = 0; i < paramsNodes.getLength(); i++) + { + Node paramNode = paramsNodes.item(i); + NamedNodeMap attributes = paramNode.getAttributes(); + + Node nkey = attributes.getNamedItem("key"); + + String key = nkey.getTextContent(); + + Node nValue = attributes.getNamedItem("value"); + + params.put(key, nValue.getTextContent()); + } + + return new TransportConfiguration(clazz, params, name); + } + + private void parseBroadcastGroupConfiguration(final Element e) + { + String name = e.getAttribute("name"); + + String localAddress = XMLConfigurationUtil.getString(e, "local-bind-address", null, Validators.NO_CHECK); + + int localBindPort = XMLConfigurationUtil.getInteger(e, "local-bind-port", -1, Validators.MINUS_ONE_OR_GT_ZERO); + + String groupAddress = XMLConfigurationUtil.getString(e, "group-address", null, Validators.NOT_NULL_OR_EMPTY); + + int groupPort = XMLConfigurationUtil.getInteger(e, "group-port", -1, Validators.GT_ZERO); + + long broadcastPeriod = XMLConfigurationUtil.getLong(e, + "broadcast-period", + ConfigurationImpl.DEFAULT_BROADCAST_PERIOD, + Validators.GT_ZERO); + + NodeList children = e.getChildNodes(); + + List<Pair<String, String>> connectorNames = new ArrayList<Pair<String, String>>(); + + for (int j = 0; j < children.getLength(); j++) + { + Node child = children.item(j); + + if (child.getNodeName().equals("connector-ref")) + { + String connectorName = child.getAttributes().getNamedItem("connector-name").getNodeValue(); + + Node backupConnectorNode = child.getAttributes().getNamedItem("backup-connector-name"); + + String backupConnectorName = null; + + if (backupConnectorNode != null) + { + backupConnectorName = backupConnectorNode.getNodeValue(); + } + + Pair<String, String> connectorInfo = new Pair<String, String>(connectorName, backupConnectorName); + + connectorNames.add(connectorInfo); + } + } + + BroadcastGroupConfiguration config = new BroadcastGroupConfiguration(name, + localAddress, + localBindPort, + groupAddress, + groupPort, + broadcastPeriod, + connectorNames); + + broadcastGroupConfigurations.add(config); + } + + private void parseDiscoveryGroupConfiguration(final Element e) + { + String name = e.getAttribute("name"); + + String groupAddress = XMLConfigurationUtil.getString(e, "group-address", null, Validators.NOT_NULL_OR_EMPTY); + + int groupPort = XMLConfigurationUtil.getInteger(e, "group-port", -1, Validators.MINUS_ONE_OR_GT_ZERO); + + long refreshTimeout = XMLConfigurationUtil.getLong(e, + "refresh-timeout", + ConfigurationImpl.DEFAULT_BROADCAST_REFRESH_TIMEOUT, + Validators.GT_ZERO); + + DiscoveryGroupConfiguration config = new DiscoveryGroupConfiguration(name, + groupAddress, + groupPort, + refreshTimeout); + + if (discoveryGroupConfigurations.containsKey(name)) + { + FileConfiguration.log.warn("There is already a discovery group with name " + name + + " deployed. This one will not be deployed."); + + return; + } + else + { + discoveryGroupConfigurations.put(name, config); + } + } + + private void parseClusterConnectionConfiguration(final Element e) + { + String name = e.getAttribute("name"); + + String address = XMLConfigurationUtil.getString(e, "address", null, Validators.NOT_NULL_OR_EMPTY); + + boolean duplicateDetection = XMLConfigurationUtil.getBoolean(e, + "use-duplicate-detection", + ConfigurationImpl.DEFAULT_CLUSTER_DUPLICATE_DETECTION); + + boolean forwardWhenNoConsumers = XMLConfigurationUtil.getBoolean(e, + "forward-when-no-consumers", + ConfigurationImpl.DEFAULT_CLUSTER_FORWARD_WHEN_NO_CONSUMERS); + + int maxHops = XMLConfigurationUtil.getInteger(e, + "max-hops", + ConfigurationImpl.DEFAULT_CLUSTER_MAX_HOPS, + Validators.GE_ZERO); + + long retryInterval = XMLConfigurationUtil.getLong(e, + "retry-interval", + ConfigurationImpl.DEFAULT_CLUSTER_RETRY_INTERVAL, + Validators.GT_ZERO); + + int confirmationWindowSize = XMLConfigurationUtil.getInteger(e, + "confirmation-window-size", + FileConfiguration.DEFAULT_CONFIRMATION_WINDOW_SIZE, + Validators.GT_ZERO); + + String discoveryGroupName = null; + + List<Pair<String, String>> connectorPairs = new ArrayList<Pair<String, String>>(); + + NodeList children = e.getChildNodes(); + + for (int j = 0; j < children.getLength(); j++) + { + Node child = children.item(j); + + if (child.getNodeName().equals("discovery-group-ref")) + { + discoveryGroupName = child.getAttributes().getNamedItem("discovery-group-name").getNodeValue(); + } + else if (child.getNodeName().equals("connector-ref")) + { + String connectorName = child.getAttributes().getNamedItem("connector-name").getNodeValue(); + + Node backupNode = child.getAttributes().getNamedItem("backup-connector-name"); + + String backupConnectorName = null; + + if (backupNode != null) + { + backupConnectorName = backupNode.getNodeValue(); + } + + Pair<String, String> connectorPair = new Pair<String, String>(connectorName, backupConnectorName); + + connectorPairs.add(connectorPair); + } + } + + ClusterConnectionConfiguration config; + + if (discoveryGroupName == null) + { + config = new ClusterConnectionConfiguration(name, + address, + retryInterval, + duplicateDetection, + forwardWhenNoConsumers, + maxHops, + confirmationWindowSize, + connectorPairs); + } + else + { + config = new ClusterConnectionConfiguration(name, + address, + retryInterval, + duplicateDetection, + forwardWhenNoConsumers, + maxHops, + confirmationWindowSize, + discoveryGroupName); + } + + clusterConfigurations.add(config); + } + + private void parseGroupingHandlerConfiguration(final Element node) + { + String name = node.getAttribute("name"); + String type = XMLConfigurationUtil.getString(node, "type", null, Validators.NOT_NULL_OR_EMPTY); + String address = XMLConfigurationUtil.getString(node, "address", null, Validators.NOT_NULL_OR_EMPTY); + Integer timeout = XMLConfigurationUtil.getInteger(node, + "timeout", + GroupingHandlerConfiguration.DEFAULT_TIMEOUT, + Validators.GT_ZERO); + groupingHandlerConfiguration = new GroupingHandlerConfiguration(new SimpleString(name), + type.equals(GroupingHandlerConfiguration.TYPE.LOCAL.getType()) ? GroupingHandlerConfiguration.TYPE.LOCAL + : GroupingHandlerConfiguration.TYPE.REMOTE, + new SimpleString(address), + timeout); + } + + private void parseBridgeConfiguration(final Element brNode) + { + String name = brNode.getAttribute("name"); + + String queueName = XMLConfigurationUtil.getString(brNode, "queue-name", null, Validators.NOT_NULL_OR_EMPTY); + + String forwardingAddress = XMLConfigurationUtil.getString(brNode, + "forwarding-address", + null, + Validators.NOT_NULL_OR_EMPTY); + + String transformerClassName = XMLConfigurationUtil.getString(brNode, + "transformer-class-name", + null, + Validators.NO_CHECK); + + long retryInterval = XMLConfigurationUtil.getLong(brNode, + "retry-interval", + ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL, + Validators.GT_ZERO); + + // Default bridge conf + int confirmationWindowSize = XMLConfigurationUtil.getInteger(brNode, + "confirmation-window-size", + FileConfiguration.DEFAULT_CONFIRMATION_WINDOW_SIZE, + Validators.GT_ZERO); + + double retryIntervalMultiplier = XMLConfigurationUtil.getDouble(brNode, + "retry-interval-multiplier", + ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER, + Validators.GT_ZERO); + + int reconnectAttempts = XMLConfigurationUtil.getInteger(brNode, + "reconnect-attempts", + ConfigurationImpl.DEFAULT_BRIDGE_RECONNECT_ATTEMPTS, + Validators.MINUS_ONE_OR_GE_ZERO); + + boolean failoverOnServerShutdown = XMLConfigurationUtil.getBoolean(brNode, + "failover-on-server-shutdown", + ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN); + + boolean useDuplicateDetection = XMLConfigurationUtil.getBoolean(brNode, + "use-duplicate-detection", + ConfigurationImpl.DEFAULT_BRIDGE_DUPLICATE_DETECTION); + + String filterString = null; + + Pair<String, String> connectorPair = null; + + String discoveryGroupName = null; + + NodeList children = brNode.getChildNodes(); + + for (int j = 0; j < children.getLength(); j++) + { + Node child = children.item(j); + + if (child.getNodeName().equals("filter")) + { + filterString = child.getAttributes().getNamedItem("string").getNodeValue(); + } + else if (child.getNodeName().equals("discovery-group-ref")) + { + discoveryGroupName = child.getAttributes().getNamedItem("discovery-group-name").getNodeValue(); + } + else if (child.getNodeName().equals("connector-ref")) + { + String connectorName = child.getAttributes().getNamedItem("connector-name").getNodeValue(); + + Node backupNode = child.getAttributes().getNamedItem("backup-connector-name"); + + String backupConnectorName = null; + + if (backupNode != null) + { + backupConnectorName = backupNode.getNodeValue(); + } + + connectorPair = new Pair<String, String>(connectorName, backupConnectorName); + } + } + + BridgeConfiguration config; + + if (connectorPair != null) + { + config = new BridgeConfiguration(name, + queueName, + forwardingAddress, + filterString, + transformerClassName, + retryInterval, + retryIntervalMultiplier, + reconnectAttempts, + failoverOnServerShutdown, + useDuplicateDetection, + confirmationWindowSize, + ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + connectorPair); + } + else + { + config = new BridgeConfiguration(name, + queueName, + forwardingAddress, + filterString, + transformerClassName, + retryInterval, + retryIntervalMultiplier, + reconnectAttempts, + failoverOnServerShutdown, + useDuplicateDetection, + confirmationWindowSize, + ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD, + discoveryGroupName); + } + + bridgeConfigurations.add(config); + } + + private void parseDivertConfiguration(final Element e) + { + String name = e.getAttribute("name"); + + String routingName = XMLConfigurationUtil.getString(e, "routing-name", null, Validators.NO_CHECK); + + String address = XMLConfigurationUtil.getString(e, "address", null, Validators.NOT_NULL_OR_EMPTY); + + String forwardingAddress = XMLConfigurationUtil.getString(e, + "forwarding-address", + null, + Validators.NOT_NULL_OR_EMPTY); + + boolean exclusive = XMLConfigurationUtil.getBoolean(e, "exclusive", ConfigurationImpl.DEFAULT_DIVERT_EXCLUSIVE); + + String transformerClassName = XMLConfigurationUtil.getString(e, + "transformer-class-name", + null, + Validators.NO_CHECK); + + String filterString = null; + + NodeList children = e.getChildNodes(); + + for (int j = 0; j < children.getLength(); j++) + { + Node child = children.item(j); + + if (child.getNodeName().equals("filter")) + { + filterString = child.getAttributes().getNamedItem("string").getNodeValue(); + } + } + + DivertConfiguration config = new DivertConfiguration(name, + routingName, + address, + forwardingAddress, + exclusive, + filterString, + transformerClassName); + + divertConfigurations.add(config); + } +} Modified: trunk/src/main/org/hornetq/core/deployers/impl/QueueDeployer.java =================================================================== --- trunk/src/main/org/hornetq/core/deployers/impl/QueueDeployer.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/src/main/org/hornetq/core/deployers/impl/QueueDeployer.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -13,9 +13,9 @@ package org.hornetq.core.deployers.impl; -import org.hornetq.api.core.config.cluster.QueueConfiguration; import org.hornetq.api.core.management.HornetQServerControl; import org.hornetq.core.deployers.DeploymentManager; +import org.hornetq.core.server.cluster.QueueConfiguration; import org.w3c.dom.Node; import org.w3c.dom.NodeList; Modified: trunk/src/main/org/hornetq/core/journal/impl/AIOSequentialFileFactory.java =================================================================== --- trunk/src/main/org/hornetq/core/journal/impl/AIOSequentialFileFactory.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/src/main/org/hornetq/core/journal/impl/AIOSequentialFileFactory.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -19,9 +19,9 @@ import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; -import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.core.asyncio.BufferCallback; import org.hornetq.core.asyncio.impl.AsynchronousFileImpl; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.journal.SequentialFile; import org.hornetq.core.logging.Logger; import org.hornetq.utils.HornetQThreadFactory; Modified: trunk/src/main/org/hornetq/core/journal/impl/NIOSequentialFileFactory.java =================================================================== --- trunk/src/main/org/hornetq/core/journal/impl/NIOSequentialFileFactory.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/src/main/org/hornetq/core/journal/impl/NIOSequentialFileFactory.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -15,7 +15,7 @@ import java.nio.ByteBuffer; -import org.hornetq.api.core.config.ConfigurationImpl; +import org.hornetq.core.config.impl.ConfigurationImpl; 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/management/impl/BridgeControlImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/management/impl/BridgeControlImpl.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/src/main/org/hornetq/core/management/impl/BridgeControlImpl.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -15,11 +15,11 @@ import javax.management.MBeanOperationInfo; -import org.hornetq.api.core.config.cluster.BridgeConfiguration; import org.hornetq.api.core.management.AddressControl; import org.hornetq.api.core.management.BridgeControl; import org.hornetq.core.persistence.StorageManager; import org.hornetq.core.server.cluster.Bridge; +import org.hornetq.core.server.cluster.BridgeConfiguration; /** * A BridgeControl Modified: trunk/src/main/org/hornetq/core/management/impl/BroadcastGroupControlImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/management/impl/BroadcastGroupControlImpl.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/src/main/org/hornetq/core/management/impl/BroadcastGroupControlImpl.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -16,11 +16,11 @@ import javax.management.MBeanOperationInfo; import org.hornetq.api.Pair; -import org.hornetq.api.core.config.cluster.BroadcastGroupConfiguration; import org.hornetq.api.core.management.AddressControl; import org.hornetq.api.core.management.BroadcastGroupControl; import org.hornetq.core.persistence.StorageManager; import org.hornetq.core.server.cluster.BroadcastGroup; +import org.hornetq.core.server.cluster.BroadcastGroupConfiguration; import org.hornetq.utils.json.JSONArray; import org.hornetq.utils.json.JSONObject; Modified: trunk/src/main/org/hornetq/core/management/impl/ClusterConnectionControlImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/management/impl/ClusterConnectionControlImpl.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/src/main/org/hornetq/core/management/impl/ClusterConnectionControlImpl.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -19,11 +19,11 @@ import javax.management.MBeanOperationInfo; import org.hornetq.api.Pair; -import org.hornetq.api.core.config.cluster.ClusterConnectionConfiguration; import org.hornetq.api.core.management.AddressControl; import org.hornetq.api.core.management.ClusterConnectionControl; import org.hornetq.core.persistence.StorageManager; import org.hornetq.core.server.cluster.ClusterConnection; +import org.hornetq.core.server.cluster.ClusterConnectionConfiguration; import org.hornetq.utils.json.JSONArray; import org.hornetq.utils.json.JSONObject; Modified: trunk/src/main/org/hornetq/core/management/impl/DiscoveryGroupControlImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/management/impl/DiscoveryGroupControlImpl.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/src/main/org/hornetq/core/management/impl/DiscoveryGroupControlImpl.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -15,11 +15,11 @@ import javax.management.MBeanOperationInfo; -import org.hornetq.api.core.config.cluster.DiscoveryGroupConfiguration; import org.hornetq.api.core.management.AddressControl; import org.hornetq.api.core.management.DiscoveryGroupControl; import org.hornetq.core.cluster.DiscoveryGroup; import org.hornetq.core.persistence.StorageManager; +import org.hornetq.core.server.cluster.DiscoveryGroupConfiguration; /** * A AcceptorControl Modified: trunk/src/main/org/hornetq/core/management/impl/DivertControlImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/management/impl/DivertControlImpl.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/src/main/org/hornetq/core/management/impl/DivertControlImpl.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -15,10 +15,10 @@ import javax.management.MBeanOperationInfo; -import org.hornetq.api.core.config.cluster.DivertConfiguration; import org.hornetq.api.core.management.DivertControl; import org.hornetq.core.persistence.StorageManager; import org.hornetq.core.server.Divert; +import org.hornetq.core.server.cluster.DivertConfiguration; /** * A DivertControl Modified: trunk/src/main/org/hornetq/core/management/impl/HornetQServerControlImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/management/impl/HornetQServerControlImpl.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/src/main/org/hornetq/core/management/impl/HornetQServerControlImpl.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -34,13 +34,13 @@ import javax.transaction.xa.Xid; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.config.Configuration; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; import org.hornetq.api.core.management.AddressControl; import org.hornetq.api.core.management.HornetQServerControl; import org.hornetq.api.core.management.NotificationType; import org.hornetq.api.core.management.QueueControl; +import org.hornetq.core.config.Configuration; import org.hornetq.core.logging.Logger; import org.hornetq.core.messagecounter.MessageCounterManager; import org.hornetq.core.messagecounter.impl.MessageCounterManagerImpl; Modified: trunk/src/main/org/hornetq/core/messagecounter/impl/MessageCounterManagerImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/messagecounter/impl/MessageCounterManagerImpl.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/src/main/org/hornetq/core/messagecounter/impl/MessageCounterManagerImpl.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -21,7 +21,7 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import org.hornetq.api.core.config.ConfigurationImpl; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; import org.hornetq.core.messagecounter.MessageCounter; import org.hornetq.core.messagecounter.MessageCounterManager; 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-05 17:41:42 UTC (rev 8720) +++ trunk/src/main/org/hornetq/core/persistence/impl/journal/JournalStorageManager.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -28,9 +28,9 @@ 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.Configuration; import org.hornetq.api.core.exception.HornetQException; import org.hornetq.api.core.message.Message; +import org.hornetq.core.config.Configuration; import org.hornetq.core.filter.Filter; import org.hornetq.core.journal.EncodingSupport; import org.hornetq.core.journal.IOAsyncTask; Modified: trunk/src/main/org/hornetq/core/postoffice/impl/PostOfficeImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/postoffice/impl/PostOfficeImpl.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/src/main/org/hornetq/core/postoffice/impl/PostOfficeImpl.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -27,8 +27,8 @@ import org.hornetq.api.SimpleString; 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.client.ManagementHelper; import org.hornetq.api.core.message.Message; import org.hornetq.core.filter.Filter; import org.hornetq.core.journal.IOAsyncTask; 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-05 17:41:42 UTC (rev 8720) +++ trunk/src/main/org/hornetq/core/remoting/server/impl/RemotingServiceImpl.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -24,10 +24,10 @@ import org.hornetq.api.core.buffers.HornetQBuffer; import org.hornetq.api.core.client.ClientSessionFactoryImpl; -import org.hornetq.api.core.config.Configuration; 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; import org.hornetq.core.remoting.ChannelHandler; Modified: trunk/src/main/org/hornetq/core/replication/impl/ReplicationEndpointImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/replication/impl/ReplicationEndpointImpl.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/src/main/org/hornetq/core/replication/impl/ReplicationEndpointImpl.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -17,8 +17,8 @@ import java.util.concurrent.ConcurrentMap; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.config.Configuration; import org.hornetq.api.core.exception.HornetQException; +import org.hornetq.core.config.Configuration; import org.hornetq.core.journal.Journal; import org.hornetq.core.journal.JournalLoadInformation; import org.hornetq.core.logging.Logger; Modified: trunk/src/main/org/hornetq/core/security/impl/SecurityStoreImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/security/impl/SecurityStoreImpl.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/src/main/org/hornetq/core/security/impl/SecurityStoreImpl.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -21,8 +21,8 @@ import org.hornetq.api.SimpleString; 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.client.ManagementHelper; import org.hornetq.core.logging.Logger; import org.hornetq.core.security.CheckType; import org.hornetq.core.security.Role; Modified: trunk/src/main/org/hornetq/core/server/HornetQServer.java =================================================================== --- trunk/src/main/org/hornetq/core/server/HornetQServer.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/src/main/org/hornetq/core/server/HornetQServer.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -19,7 +19,7 @@ import javax.management.MBeanServer; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.config.Configuration; +import org.hornetq.core.config.Configuration; import org.hornetq.core.management.impl.HornetQServerControlImpl; import org.hornetq.core.persistence.StorageManager; import org.hornetq.core.postoffice.PostOffice; Copied: trunk/src/main/org/hornetq/core/server/HornetQServers.java (from rev 8720, trunk/src/main/org/hornetq/api/core/server/HornetQServers.java) =================================================================== --- trunk/src/main/org/hornetq/core/server/HornetQServers.java (rev 0) +++ trunk/src/main/org/hornetq/core/server/HornetQServers.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -0,0 +1,96 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package org.hornetq.core.server; + +import java.lang.management.ManagementFactory; + +import javax.management.MBeanServer; + +import org.hornetq.core.config.Configuration; +import org.hornetq.core.logging.Logger; +import org.hornetq.core.server.impl.HornetQServerImpl; +import org.hornetq.spi.core.security.HornetQSecurityManager; +import org.hornetq.spi.core.security.HornetQSecurityManagerImpl; + +/** + * HornetQServers is a factory class for instantiating HornetQServer instances. + * + * This class should be used when you want to instantiate a HornetQServer instance for embedding in + * your own application, as opposed to directly instantiating an implementing instance. + * + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + * Created 24 Jan 2009 15:17:18 + * + * + */ +public class HornetQServers +{ + private static final Logger log = Logger.getLogger(HornetQServers.class); + + public static HornetQServer newHornetQServer(final Configuration config, final boolean enablePersistence) + { + HornetQSecurityManager securityManager = new HornetQSecurityManagerImpl(); + + HornetQServer server = HornetQServers.newHornetQServer(config, + ManagementFactory.getPlatformMBeanServer(), + securityManager, + enablePersistence); + + return server; + } + + public static HornetQServer newHornetQServer(final Configuration config) + { + return HornetQServers.newHornetQServer(config, config.isPersistenceEnabled()); + } + + public static HornetQServer newHornetQServer(final Configuration config, + final MBeanServer mbeanServer, + final boolean enablePersistence) + { + HornetQSecurityManager securityManager = new HornetQSecurityManagerImpl(); + + HornetQServer server = HornetQServers.newHornetQServer(config, mbeanServer, securityManager, enablePersistence); + + return server; + } + + public static HornetQServer newHornetQServer(final Configuration config, final MBeanServer mbeanServer) + { + return HornetQServers.newHornetQServer(config, mbeanServer, true); + } + + public static HornetQServer newHornetQServer(final Configuration config, + final MBeanServer mbeanServer, + final HornetQSecurityManager securityManager) + { + HornetQServer server = HornetQServers.newHornetQServer(config, mbeanServer, securityManager, true); + + return server; + } + + public static HornetQServer newHornetQServer(final Configuration config, + final MBeanServer mbeanServer, + final HornetQSecurityManager securityManager, + final boolean enablePersistence) + { + config.setPersistenceEnabled(enablePersistence); + + HornetQServer server = new HornetQServerImpl(config, mbeanServer, securityManager); + + return server; + } + +} Copied: trunk/src/main/org/hornetq/core/server/cluster/BridgeConfiguration.java (from rev 8720, trunk/src/main/org/hornetq/api/core/config/cluster/BridgeConfiguration.java) =================================================================== --- trunk/src/main/org/hornetq/core/server/cluster/BridgeConfiguration.java (rev 0) +++ trunk/src/main/org/hornetq/core/server/cluster/BridgeConfiguration.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -0,0 +1,294 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package org.hornetq.core.server.cluster; + +import java.io.Serializable; + +import org.hornetq.api.Pair; + +/** + * A BridgeConfiguration + * + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + * Created 13 Jan 2009 09:32:43 + * + * + */ +public class BridgeConfiguration implements Serializable +{ + private static final long serialVersionUID = -1057244274380572226L; + + private String name; + + private String queueName; + + private String forwardingAddress; + + private String filterString; + + private Pair<String, String> connectorPair; + + private String discoveryGroupName; + + private String transformerClassName; + + private long retryInterval; + + private double retryIntervalMultiplier; + + private int reconnectAttempts; + + private boolean failoverOnServerShutdown; + + private boolean useDuplicateDetection; + + private int confirmationWindowSize; + + private final long clientFailureCheckPeriod; + + public BridgeConfiguration(final String name, + final String queueName, + final String forwardingAddress, + final String filterString, + final String transformerClassName, + final long retryInterval, + final double retryIntervalMultiplier, + final int reconnectAttempts, + final boolean failoverOnServerShutdown, + final boolean useDuplicateDetection, + final int confirmationWindowSize, + final long clientFailureCheckPeriod, + final Pair<String, String> connectorPair) + { + this.name = name; + this.queueName = queueName; + this.forwardingAddress = forwardingAddress; + this.filterString = filterString; + this.transformerClassName = transformerClassName; + this.retryInterval = retryInterval; + this.retryIntervalMultiplier = retryIntervalMultiplier; + this.reconnectAttempts = reconnectAttempts; + this.failoverOnServerShutdown = failoverOnServerShutdown; + this.useDuplicateDetection = useDuplicateDetection; + this.confirmationWindowSize = confirmationWindowSize; + this.clientFailureCheckPeriod = clientFailureCheckPeriod; + this.connectorPair = connectorPair; + discoveryGroupName = null; + } + + public BridgeConfiguration(final String name, + final String queueName, + final String forwardingAddress, + final String filterString, + final String transformerClassName, + final long retryInterval, + final double retryIntervalMultiplier, + final int reconnectAttempts, + final boolean failoverOnServerShutdown, + final boolean useDuplicateDetection, + final int confirmationWindowSize, + final long clientFailureCheckPeriod, + final String discoveryGroupName) + { + this.name = name; + this.queueName = queueName; + this.forwardingAddress = forwardingAddress; + this.filterString = filterString; + this.transformerClassName = transformerClassName; + this.retryInterval = retryInterval; + this.retryIntervalMultiplier = retryIntervalMultiplier; + this.reconnectAttempts = reconnectAttempts; + this.failoverOnServerShutdown = failoverOnServerShutdown; + this.useDuplicateDetection = useDuplicateDetection; + this.confirmationWindowSize = confirmationWindowSize; + this.clientFailureCheckPeriod = clientFailureCheckPeriod; + connectorPair = null; + this.discoveryGroupName = discoveryGroupName; + } + + public String getName() + { + return name; + } + + public String getQueueName() + { + return queueName; + } + + public String getForwardingAddress() + { + return forwardingAddress; + } + + public String getFilterString() + { + return filterString; + } + + public String getTransformerClassName() + { + return transformerClassName; + } + + public Pair<String, String> getConnectorPair() + { + return connectorPair; + } + + public String getDiscoveryGroupName() + { + return discoveryGroupName; + } + + public long getRetryInterval() + { + return retryInterval; + } + + public double getRetryIntervalMultiplier() + { + return retryIntervalMultiplier; + } + + public int getReconnectAttempts() + { + return reconnectAttempts; + } + + public boolean isFailoverOnServerShutdown() + { + return failoverOnServerShutdown; + } + + public boolean isUseDuplicateDetection() + { + return useDuplicateDetection; + } + + public int getConfirmationWindowSize() + { + return confirmationWindowSize; + } + + public long getClientFailureCheckPeriod() + { + return clientFailureCheckPeriod; + } + + /** + * @param name the name to set + */ + public void setName(final String name) + { + this.name = name; + } + + /** + * @param queueName the queueName to set + */ + public void setQueueName(final String queueName) + { + this.queueName = queueName; + } + + /** + * @param forwardingAddress the forwardingAddress to set + */ + public void setForwardingAddress(final String forwardingAddress) + { + this.forwardingAddress = forwardingAddress; + } + + /** + * @param filterString the filterString to set + */ + public void setFilterString(final String filterString) + { + this.filterString = filterString; + } + + /** + * @param connectorPair the connectorPair to set + */ + public void setConnectorPair(final Pair<String, String> connectorPair) + { + this.connectorPair = connectorPair; + } + + /** + * @param discoveryGroupName the discoveryGroupName to set + */ + public void setDiscoveryGroupName(final String discoveryGroupName) + { + this.discoveryGroupName = discoveryGroupName; + } + + /** + * @param transformerClassName the transformerClassName to set + */ + public void setTransformerClassName(final String transformerClassName) + { + this.transformerClassName = transformerClassName; + } + + /** + * @param retryInterval the retryInterval to set + */ + public void setRetryInterval(final long retryInterval) + { + this.retryInterval = retryInterval; + } + + /** + * @param retryIntervalMultiplier the retryIntervalMultiplier to set + */ + public void setRetryIntervalMultiplier(final double retryIntervalMultiplier) + { + this.retryIntervalMultiplier = retryIntervalMultiplier; + } + + /** + * @param reconnectAttempts the reconnectAttempts to set + */ + public void setReconnectAttempts(final int reconnectAttempts) + { + this.reconnectAttempts = reconnectAttempts; + } + + /** + * @param failoverOnServerShutdown the failoverOnServerShutdown to set + */ + public void setFailoverOnServerShutdown(final boolean failoverOnServerShutdown) + { + this.failoverOnServerShutdown = failoverOnServerShutdown; + } + + /** + * @param useDuplicateDetection the useDuplicateDetection to set + */ + public void setUseDuplicateDetection(final boolean useDuplicateDetection) + { + this.useDuplicateDetection = useDuplicateDetection; + } + + /** + * @param confirmationWindowSize the confirmationWindowSize to set + */ + public void setConfirmationWindowSize(final int confirmationWindowSize) + { + this.confirmationWindowSize = confirmationWindowSize; + } +} Copied: trunk/src/main/org/hornetq/core/server/cluster/BroadcastGroupConfiguration.java (from rev 8720, trunk/src/main/org/hornetq/api/core/config/cluster/BroadcastGroupConfiguration.java) =================================================================== --- trunk/src/main/org/hornetq/core/server/cluster/BroadcastGroupConfiguration.java (rev 0) +++ trunk/src/main/org/hornetq/core/server/cluster/BroadcastGroupConfiguration.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -0,0 +1,159 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package org.hornetq.core.server.cluster; + +import java.io.Serializable; +import java.util.List; + +import org.hornetq.api.Pair; +import org.hornetq.core.logging.Logger; + +/** + * A BroadcastGroupConfiguration + * + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + * Created 18 Nov 2008 08:44:30 + * + */ +public class BroadcastGroupConfiguration implements Serializable +{ + private static final long serialVersionUID = 1052413739064253955L; + + private static final Logger log = Logger.getLogger(BroadcastGroupConfiguration.class); + + private String name; + + private String localBindAddress; + + private int localBindPort; + + private String groupAddress; + + private int groupPort; + + private long broadcastPeriod; + + private List<Pair<String, String>> connectorInfos; + + public BroadcastGroupConfiguration(final String name, + final String localBindAddress, + final int localBindPort, + final String groupAddress, + final int groupPort, + final long broadcastPeriod, + final List<Pair<String, String>> connectorInfos) + { + super(); + this.name = name; + this.localBindAddress = localBindAddress; + this.localBindPort = localBindPort; + this.groupAddress = groupAddress; + this.groupPort = groupPort; + this.broadcastPeriod = broadcastPeriod; + this.connectorInfos = connectorInfos; + } + + public String getName() + { + return name; + } + + public String getLocalBindAddress() + { + return localBindAddress; + } + + public int getLocalBindPort() + { + return localBindPort; + } + + public String getGroupAddress() + { + return groupAddress; + } + + public int getGroupPort() + { + return groupPort; + } + + public long getBroadcastPeriod() + { + return broadcastPeriod; + } + + public List<Pair<String, String>> getConnectorInfos() + { + return connectorInfos; + } + + /** + * @param name the name to set + */ + public void setName(final String name) + { + this.name = name; + } + + /** + * @param localBindAddress the localBindAddress to set + */ + public void setLocalBindAddress(final String localBindAddress) + { + this.localBindAddress = localBindAddress; + } + + /** + * @param localBindPort the localBindPort to set + */ + public void setLocalBindPort(final int localBindPort) + { + this.localBindPort = localBindPort; + } + + /** + * @param groupAddress the groupAddress to set + */ + public void setGroupAddress(final String groupAddress) + { + this.groupAddress = groupAddress; + } + + /** + * @param groupPort the groupPort to set + */ + public void setGroupPort(final int groupPort) + { + this.groupPort = groupPort; + } + + /** + * @param broadcastPeriod the broadcastPeriod to set + */ + public void setBroadcastPeriod(final long broadcastPeriod) + { + this.broadcastPeriod = broadcastPeriod; + } + + /** + * @param connectorInfos the connectorInfos to set + */ + public void setConnectorInfos(final List<Pair<String, String>> connectorInfos) + { + this.connectorInfos = connectorInfos; + } + +} Copied: trunk/src/main/org/hornetq/core/server/cluster/ClusterConnectionConfiguration.java (from rev 8720, trunk/src/main/org/hornetq/api/core/config/cluster/ClusterConnectionConfiguration.java) =================================================================== --- trunk/src/main/org/hornetq/core/server/cluster/ClusterConnectionConfiguration.java (rev 0) +++ trunk/src/main/org/hornetq/core/server/cluster/ClusterConnectionConfiguration.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -0,0 +1,136 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package org.hornetq.core.server.cluster; + +import java.io.Serializable; +import java.util.List; + +import org.hornetq.api.Pair; + +/** + * A ClusterConnectionConfiguration + * + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + * Created 13 Jan 2009 09:42:17 + * + * + */ +public class ClusterConnectionConfiguration implements Serializable +{ + private static final long serialVersionUID = 8948303813427795935L; + + private final String name; + + private final String address; + + private final long retryInterval; + + private final boolean duplicateDetection; + + private final boolean forwardWhenNoConsumers; + + private final List<Pair<String, String>> staticConnectorNamePairs; + + private final String discoveryGroupName; + + private final int maxHops; + + private final int confirmationWindowSize; + + public ClusterConnectionConfiguration(final String name, + final String address, + final long retryInterval, + final boolean duplicateDetection, + final boolean forwardWhenNoConsumers, + final int maxHops, + final int confirmationWindowSize, + final List<Pair<String, String>> staticConnectorNamePairs) + { + this.name = name; + this.address = address; + this.retryInterval = retryInterval; + this.staticConnectorNamePairs = staticConnectorNamePairs; + this.duplicateDetection = duplicateDetection; + this.forwardWhenNoConsumers = forwardWhenNoConsumers; + discoveryGroupName = null; + this.maxHops = maxHops; + this.confirmationWindowSize = confirmationWindowSize; + } + + public ClusterConnectionConfiguration(final String name, + final String address, + final long retryInterval, + final boolean duplicateDetection, + final boolean forwardWhenNoConsumers, + final int maxHops, + final int confirmationWindowSize, + final String discoveryGroupName) + { + this.name = name; + this.address = address; + this.retryInterval = retryInterval; + this.duplicateDetection = duplicateDetection; + this.forwardWhenNoConsumers = forwardWhenNoConsumers; + this.discoveryGroupName = discoveryGroupName; + staticConnectorNamePairs = null; + this.maxHops = maxHops; + this.confirmationWindowSize = confirmationWindowSize; + } + + public String getName() + { + return name; + } + + public String getAddress() + { + return address; + } + + public boolean isDuplicateDetection() + { + return duplicateDetection; + } + + public boolean isForwardWhenNoConsumers() + { + return forwardWhenNoConsumers; + } + + public int getMaxHops() + { + return maxHops; + } + + public int getConfirmationWindowSize() + { + return confirmationWindowSize; + } + + public List<Pair<String, String>> getStaticConnectorNamePairs() + { + return staticConnectorNamePairs; + } + + public String getDiscoveryGroupName() + { + return discoveryGroupName; + } + + public long getRetryInterval() + { + return retryInterval; + } +} Copied: trunk/src/main/org/hornetq/core/server/cluster/DiscoveryGroupConfiguration.java (from rev 8720, trunk/src/main/org/hornetq/api/core/config/cluster/DiscoveryGroupConfiguration.java) =================================================================== --- trunk/src/main/org/hornetq/core/server/cluster/DiscoveryGroupConfiguration.java (rev 0) +++ trunk/src/main/org/hornetq/core/server/cluster/DiscoveryGroupConfiguration.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -0,0 +1,101 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package org.hornetq.core.server.cluster; + +import java.io.Serializable; + +/** + * A DiscoveryGroupConfiguration + * + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + * Created 18 Nov 2008 08:47:30 + * + * + */ +public class DiscoveryGroupConfiguration implements Serializable +{ + private static final long serialVersionUID = 8657206421727863400L; + + private String name; + + private String groupAddress; + + private int groupPort; + + private long refreshTimeout; + + public DiscoveryGroupConfiguration(final String name, + final String groupAddress, + final int groupPort, + final long refreshTimeout) + { + this.name = name; + this.groupAddress = groupAddress; + this.groupPort = groupPort; + this.refreshTimeout = refreshTimeout; + } + + public String getName() + { + return name; + } + + public String getGroupAddress() + { + return groupAddress; + } + + public int getGroupPort() + { + return groupPort; + } + + public long getRefreshTimeout() + { + return refreshTimeout; + } + + /** + * @param name the name to set + */ + public void setName(final String name) + { + this.name = name; + } + + /** + * @param groupAddress the groupAddress to set + */ + public void setGroupAddress(final String groupAddress) + { + this.groupAddress = groupAddress; + } + + /** + * @param groupPort the groupPort to set + */ + public void setGroupPort(final int groupPort) + { + this.groupPort = groupPort; + } + + /** + * @param refreshTimeout the refreshTimeout to set + */ + public void setRefreshTimeout(final long refreshTimeout) + { + this.refreshTimeout = refreshTimeout; + } +} Copied: trunk/src/main/org/hornetq/core/server/cluster/DivertConfiguration.java (from rev 8720, trunk/src/main/org/hornetq/api/core/config/cluster/DivertConfiguration.java) =================================================================== --- trunk/src/main/org/hornetq/core/server/cluster/DivertConfiguration.java (rev 0) +++ trunk/src/main/org/hornetq/core/server/cluster/DivertConfiguration.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -0,0 +1,164 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package org.hornetq.core.server.cluster; + +import java.io.Serializable; + +import org.hornetq.core.logging.Logger; +import org.hornetq.utils.UUIDGenerator; + +/** + * A DivertConfiguration + * + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + * Created 13 Jan 2009 09:36:19 + * + * + */ +public class DivertConfiguration implements Serializable +{ + private static final long serialVersionUID = 6910543740464269629L; + + private static final Logger log = Logger.getLogger(DivertConfiguration.class); + + private String name; + + private String routingName; + + private String address; + + private String forwardingAddress; + + private boolean exclusive; + + private String filterString; + + private String transformerClassName; + + public DivertConfiguration(final String name, + final String routingName, + final String address, + final String forwardingAddress, + final boolean exclusive, + final String filterString, + final String transformerClassName) + { + this.name = name; + if (routingName == null) + { + this.routingName = UUIDGenerator.getInstance().generateStringUUID(); + } + else + { + this.routingName = routingName; + } + this.address = address; + this.forwardingAddress = forwardingAddress; + this.exclusive = exclusive; + this.filterString = filterString; + this.transformerClassName = transformerClassName; + } + + public String getName() + { + return name; + } + + public String getRoutingName() + { + return routingName; + } + + public String getAddress() + { + return address; + } + + public String getForwardingAddress() + { + return forwardingAddress; + } + + public boolean isExclusive() + { + return exclusive; + } + + public String getFilterString() + { + return filterString; + } + + public String getTransformerClassName() + { + return transformerClassName; + } + + /** + * @param name the name to set + */ + public void setName(final String name) + { + this.name = name; + } + + /** + * @param routingName the routingName to set + */ + public void setRoutingName(final String routingName) + { + this.routingName = routingName; + } + + /** + * @param address the address to set + */ + public void setAddress(final String address) + { + this.address = address; + } + + /** + * @param forwardingAddress the forwardingAddress to set + */ + public void setForwardingAddress(final String forwardingAddress) + { + this.forwardingAddress = forwardingAddress; + } + + /** + * @param exclusive the exclusive to set + */ + public void setExclusive(final boolean exclusive) + { + this.exclusive = exclusive; + } + + /** + * @param filterString the filterString to set + */ + public void setFilterString(final String filterString) + { + this.filterString = filterString; + } + + /** + * @param transformerClassName the transformerClassName to set + */ + public void setTransformerClassName(final String transformerClassName) + { + this.transformerClassName = transformerClassName; + } +} Copied: trunk/src/main/org/hornetq/core/server/cluster/QueueConfiguration.java (from rev 8720, trunk/src/main/org/hornetq/api/core/config/cluster/QueueConfiguration.java) =================================================================== --- trunk/src/main/org/hornetq/core/server/cluster/QueueConfiguration.java (rev 0) +++ trunk/src/main/org/hornetq/core/server/cluster/QueueConfiguration.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -0,0 +1,98 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package org.hornetq.core.server.cluster; + +import java.io.Serializable; + +/** + * A QueueConfiguration + * + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * + * Created 13 Jan 2009 09:39:21 + * + * + */ +public class QueueConfiguration implements Serializable +{ + private static final long serialVersionUID = 650404974977490254L; + + private String address; + + private String name; + + private String filterString; + + private boolean durable; + + public QueueConfiguration(final String address, final String name, final String filterString, final boolean durable) + { + this.address = address; + this.name = name; + this.filterString = filterString; + this.durable = durable; + } + + public String getAddress() + { + return address; + } + + public String getName() + { + return name; + } + + public String getFilterString() + { + return filterString; + } + + public boolean isDurable() + { + return durable; + } + + /** + * @param address the address to set + */ + public void setAddress(final String address) + { + this.address = address; + } + + /** + * @param name the name to set + */ + public void setName(final String name) + { + this.name = name; + } + + /** + * @param filterString the filterString to set + */ + public void setFilterString(final String filterString) + { + this.filterString = filterString; + } + + /** + * @param durable the durable to set + */ + public void setDurable(final boolean durable) + { + this.durable = durable; + } +} 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-05 17:41:42 UTC (rev 8720) +++ trunk/src/main/org/hornetq/core/server/cluster/impl/BridgeImpl.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -31,9 +31,9 @@ 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.management.ManagementHelper; import org.hornetq.api.core.management.NotificationType; import org.hornetq.api.core.management.ResourceNames; -import org.hornetq.api.core.management.client.ManagementHelper; import org.hornetq.api.core.message.Message; import org.hornetq.core.client.impl.ClientSessionInternal; import org.hornetq.core.filter.Filter; 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-05 17:41:42 UTC (rev 8720) +++ trunk/src/main/org/hornetq/core/server/cluster/impl/ClusterConnectionImpl.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -28,8 +28,8 @@ import org.hornetq.api.SimpleString; 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.api.core.management.client.ManagementHelper; import org.hornetq.core.cluster.DiscoveryEntry; import org.hornetq.core.cluster.DiscoveryGroup; import org.hornetq.core.cluster.DiscoveryListener; 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-05 17:41:42 UTC (rev 8720) +++ trunk/src/main/org/hornetq/core/server/cluster/impl/ClusterManagerImpl.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -27,23 +27,23 @@ import org.hornetq.api.Pair; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.config.Configuration; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.config.cluster.BridgeConfiguration; -import org.hornetq.api.core.config.cluster.BroadcastGroupConfiguration; -import org.hornetq.api.core.config.cluster.ClusterConnectionConfiguration; -import org.hornetq.api.core.config.cluster.DiscoveryGroupConfiguration; import org.hornetq.core.cluster.DiscoveryGroup; import org.hornetq.core.cluster.impl.DiscoveryGroupImpl; +import org.hornetq.core.config.Configuration; import org.hornetq.core.logging.Logger; import org.hornetq.core.postoffice.Binding; import org.hornetq.core.postoffice.PostOffice; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.Queue; import org.hornetq.core.server.cluster.Bridge; +import org.hornetq.core.server.cluster.BridgeConfiguration; import org.hornetq.core.server.cluster.BroadcastGroup; +import org.hornetq.core.server.cluster.BroadcastGroupConfiguration; import org.hornetq.core.server.cluster.ClusterConnection; +import org.hornetq.core.server.cluster.ClusterConnectionConfiguration; import org.hornetq.core.server.cluster.ClusterManager; +import org.hornetq.core.server.cluster.DiscoveryGroupConfiguration; import org.hornetq.core.server.cluster.Transformer; import org.hornetq.core.server.management.ManagementService; import org.hornetq.utils.UUID; Modified: trunk/src/main/org/hornetq/core/server/group/impl/LocalGroupingHandler.java =================================================================== --- trunk/src/main/org/hornetq/core/server/group/impl/LocalGroupingHandler.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/src/main/org/hornetq/core/server/group/impl/LocalGroupingHandler.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -17,8 +17,8 @@ import java.util.concurrent.ConcurrentHashMap; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.management.ManagementHelper; import org.hornetq.api.core.management.NotificationType; -import org.hornetq.api.core.management.client.ManagementHelper; import org.hornetq.core.logging.Logger; import org.hornetq.core.persistence.StorageManager; import org.hornetq.core.postoffice.BindingType; Modified: trunk/src/main/org/hornetq/core/server/group/impl/RemoteGroupingHandler.java =================================================================== --- trunk/src/main/org/hornetq/core/server/group/impl/RemoteGroupingHandler.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/src/main/org/hornetq/core/server/group/impl/RemoteGroupingHandler.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -24,8 +24,8 @@ import java.util.logging.Logger; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.management.ManagementHelper; import org.hornetq.api.core.management.NotificationType; -import org.hornetq.api.core.management.client.ManagementHelper; import org.hornetq.core.postoffice.BindingType; import org.hornetq.core.server.group.GroupingHandler; import org.hornetq.core.server.management.ManagementService; Modified: trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/src/main/org/hornetq/core/server/impl/HornetQServerImpl.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -36,14 +36,12 @@ import org.hornetq.api.SimpleString; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.ClientSessionFactoryImpl; -import org.hornetq.api.core.config.Configuration; -import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.config.cluster.DivertConfiguration; -import org.hornetq.api.core.config.cluster.QueueConfiguration; 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; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.deployers.Deployer; import org.hornetq.core.deployers.DeploymentManager; import org.hornetq.core.deployers.impl.AddressSettingsDeployer; @@ -93,6 +91,8 @@ import org.hornetq.core.server.QueueFactory; import org.hornetq.core.server.ServerSession; import org.hornetq.core.server.cluster.ClusterManager; +import org.hornetq.core.server.cluster.DivertConfiguration; +import org.hornetq.core.server.cluster.QueueConfiguration; import org.hornetq.core.server.cluster.Transformer; import org.hornetq.core.server.cluster.impl.ClusterManagerImpl; import org.hornetq.core.server.group.GroupingHandler; Modified: trunk/src/main/org/hornetq/core/server/impl/ServerConsumerImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/server/impl/ServerConsumerImpl.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/src/main/org/hornetq/core/server/impl/ServerConsumerImpl.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -24,8 +24,8 @@ 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.management.ManagementHelper; import org.hornetq.api.core.management.NotificationType; -import org.hornetq.api.core.management.client.ManagementHelper; import org.hornetq.core.client.impl.ClientConsumerImpl; import org.hornetq.core.filter.Filter; import org.hornetq.core.logging.Logger; Modified: trunk/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java =================================================================== --- trunk/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/src/main/org/hornetq/core/server/impl/ServerSessionImpl.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -30,7 +30,7 @@ import org.hornetq.api.SimpleString; import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.management.client.ManagementHelper; +import org.hornetq.api.core.management.ManagementHelper; import org.hornetq.core.client.impl.ClientMessageImpl; import org.hornetq.core.filter.Filter; import org.hornetq.core.filter.impl.FilterImpl; Modified: trunk/src/main/org/hornetq/core/server/management/ManagementService.java =================================================================== --- trunk/src/main/org/hornetq/core/server/management/ManagementService.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/src/main/org/hornetq/core/server/management/ManagementService.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -19,15 +19,10 @@ import javax.management.ObjectName; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.config.Configuration; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.config.cluster.BridgeConfiguration; -import org.hornetq.api.core.config.cluster.BroadcastGroupConfiguration; -import org.hornetq.api.core.config.cluster.ClusterConnectionConfiguration; -import org.hornetq.api.core.config.cluster.DiscoveryGroupConfiguration; -import org.hornetq.api.core.config.cluster.DivertConfiguration; import org.hornetq.api.core.management.ObjectNameBuilder; import org.hornetq.core.cluster.DiscoveryGroup; +import org.hornetq.core.config.Configuration; import org.hornetq.core.management.impl.HornetQServerControlImpl; import org.hornetq.core.messagecounter.MessageCounterManager; import org.hornetq.core.paging.PagingManager; @@ -42,8 +37,13 @@ import org.hornetq.core.server.QueueFactory; import org.hornetq.core.server.ServerMessage; import org.hornetq.core.server.cluster.Bridge; +import org.hornetq.core.server.cluster.BridgeConfiguration; import org.hornetq.core.server.cluster.BroadcastGroup; +import org.hornetq.core.server.cluster.BroadcastGroupConfiguration; import org.hornetq.core.server.cluster.ClusterConnection; +import org.hornetq.core.server.cluster.ClusterConnectionConfiguration; +import org.hornetq.core.server.cluster.DiscoveryGroupConfiguration; +import org.hornetq.core.server.cluster.DivertConfiguration; import org.hornetq.core.settings.HierarchicalRepository; import org.hornetq.core.settings.impl.AddressSettings; import org.hornetq.core.transaction.ResourceManager; Modified: trunk/src/main/org/hornetq/core/server/management/NotificationService.java =================================================================== --- trunk/src/main/org/hornetq/core/server/management/NotificationService.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/src/main/org/hornetq/core/server/management/NotificationService.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -13,7 +13,7 @@ package org.hornetq.core.server.management; -import org.hornetq.api.core.management.client.ManagementHelper; +import org.hornetq.api.core.management.ManagementHelper; /** * A NotificationService 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-05 17:41:42 UTC (rev 8720) +++ trunk/src/main/org/hornetq/core/server/management/impl/ManagementServiceImpl.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -29,24 +29,19 @@ import javax.management.StandardMBean; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.config.Configuration; -import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.config.cluster.BridgeConfiguration; -import org.hornetq.api.core.config.cluster.BroadcastGroupConfiguration; -import org.hornetq.api.core.config.cluster.ClusterConnectionConfiguration; -import org.hornetq.api.core.config.cluster.DiscoveryGroupConfiguration; -import org.hornetq.api.core.config.cluster.DivertConfiguration; import org.hornetq.api.core.management.AcceptorControl; import org.hornetq.api.core.management.BridgeControl; import org.hornetq.api.core.management.BroadcastGroupControl; import org.hornetq.api.core.management.ClusterConnectionControl; import org.hornetq.api.core.management.DiscoveryGroupControl; import org.hornetq.api.core.management.DivertControl; +import org.hornetq.api.core.management.ManagementHelper; import org.hornetq.api.core.management.ObjectNameBuilder; import org.hornetq.api.core.management.ResourceNames; -import org.hornetq.api.core.management.client.ManagementHelper; import org.hornetq.core.cluster.DiscoveryGroup; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; import org.hornetq.core.management.impl.AcceptorControlImpl; import org.hornetq.core.management.impl.AddressControlImpl; @@ -71,8 +66,13 @@ import org.hornetq.core.server.QueueFactory; import org.hornetq.core.server.ServerMessage; import org.hornetq.core.server.cluster.Bridge; +import org.hornetq.core.server.cluster.BridgeConfiguration; import org.hornetq.core.server.cluster.BroadcastGroup; +import org.hornetq.core.server.cluster.BroadcastGroupConfiguration; import org.hornetq.core.server.cluster.ClusterConnection; +import org.hornetq.core.server.cluster.ClusterConnectionConfiguration; +import org.hornetq.core.server.cluster.DiscoveryGroupConfiguration; +import org.hornetq.core.server.cluster.DivertConfiguration; import org.hornetq.core.server.impl.ServerMessageImpl; import org.hornetq.core.server.management.ManagementService; import org.hornetq.core.server.management.Notification; Copied: trunk/src/main/org/hornetq/jms/bridge/ConnectionFactoryFactory.java (from rev 8720, trunk/src/main/org/hornetq/api/jms/bridge/ConnectionFactoryFactory.java) =================================================================== --- trunk/src/main/org/hornetq/jms/bridge/ConnectionFactoryFactory.java (rev 0) +++ trunk/src/main/org/hornetq/jms/bridge/ConnectionFactoryFactory.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -0,0 +1,30 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package org.hornetq.jms.bridge; + +import javax.jms.ConnectionFactory; + +/** + * A ConnectionFactoryFactory + * + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * @version <tt>$Revision$</tt> + * + * $Id$ + * + */ +public interface ConnectionFactoryFactory +{ + ConnectionFactory createConnectionFactory() throws Exception; +} Copied: trunk/src/main/org/hornetq/jms/bridge/DestinationFactory.java (from rev 8720, trunk/src/main/org/hornetq/api/jms/bridge/DestinationFactory.java) =================================================================== --- trunk/src/main/org/hornetq/jms/bridge/DestinationFactory.java (rev 0) +++ trunk/src/main/org/hornetq/jms/bridge/DestinationFactory.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -0,0 +1,29 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package org.hornetq.jms.bridge; + +import javax.jms.Destination; + +/** + * + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * @version <tt>$Revision: $</tt>10 Oct 2007 + * + * $Id: $ + * + */ +public interface DestinationFactory +{ + Destination createDestination() throws Exception; +} Copied: trunk/src/main/org/hornetq/jms/bridge/JMSBridge.java (from rev 8720, trunk/src/main/org/hornetq/api/jms/bridge/JMSBridge.java) =================================================================== --- trunk/src/main/org/hornetq/jms/bridge/JMSBridge.java (rev 0) +++ trunk/src/main/org/hornetq/jms/bridge/JMSBridge.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -0,0 +1,112 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package org.hornetq.jms.bridge; + +import javax.transaction.TransactionManager; + +import org.hornetq.core.server.HornetQComponent; + +/** + * + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> + * + * @version <tt>$Revision$</tt> + * + */ +public interface JMSBridge extends HornetQComponent +{ + void pause() throws Exception; + + void resume() throws Exception; + + DestinationFactory getSourceDestinationFactory(); + + void setSourceDestinationFactory(DestinationFactory dest); + + DestinationFactory getTargetDestinationFactory(); + + void setTargetDestinationFactory(DestinationFactory dest); + + String getSourceUsername(); + + void setSourceUsername(String name); + + String getSourcePassword(); + + void setSourcePassword(String pwd); + + String getTargetUsername(); + + void setTargetUsername(String name); + + String getTargetPassword(); + + void setTargetPassword(String pwd); + + String getSelector(); + + void setSelector(String selector); + + long getFailureRetryInterval(); + + void setFailureRetryInterval(long interval); + + int getMaxRetries(); + + void setMaxRetries(int retries); + + QualityOfServiceMode getQualityOfServiceMode(); + + void setQualityOfServiceMode(QualityOfServiceMode mode); + + int getMaxBatchSize(); + + void setMaxBatchSize(int size); + + long getMaxBatchTime(); + + void setMaxBatchTime(long time); + + String getSubscriptionName(); + + void setSubscriptionName(String subname); + + String getClientID(); + + void setClientID(String clientID); + + String getTransactionManagerLocatorClass(); + + void setTransactionManagerLocatorClass(String transactionManagerLocatorClass); + + String getTransactionManagerLocatorMethod(); + + void setTransactionManagerLocatorMethod(String transactionManagerLocatorMethod); + + boolean isAddMessageIDInHeader(); + + void setAddMessageIDInHeader(boolean value); + + boolean isPaused(); + + boolean isFailed(); + + void setSourceConnectionFactoryFactory(ConnectionFactoryFactory cff); + + void setTargetConnectionFactoryFactory(ConnectionFactoryFactory cff); + + void setTransactionManager(TransactionManager tm); + +} \ No newline at end of file Copied: trunk/src/main/org/hornetq/jms/bridge/JMSBridgeControl.java (from rev 8720, trunk/src/main/org/hornetq/api/jms/bridge/JMSBridgeControl.java) =================================================================== --- trunk/src/main/org/hornetq/jms/bridge/JMSBridgeControl.java (rev 0) +++ trunk/src/main/org/hornetq/jms/bridge/JMSBridgeControl.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -0,0 +1,94 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package org.hornetq.jms.bridge; + +import org.hornetq.api.core.management.HornetQComponentControl; + +/** + * A JMSBridgeControl + * + * @author <a href="jose(a)voxeo.com">Jose de Castro</a> + * + */ +public interface JMSBridgeControl extends HornetQComponentControl +{ + void pause() throws Exception; + + void resume() throws Exception; + + String getSourceUsername(); + + void setSourceUsername(String name); + + String getSourcePassword(); + + void setSourcePassword(String pwd); + + String getTargetUsername(); + + void setTargetUsername(String name); + + String getTargetPassword(); + + void setTargetPassword(String pwd); + + String getSelector(); + + void setSelector(String selector); + + long getFailureRetryInterval(); + + void setFailureRetryInterval(long interval); + + int getMaxRetries(); + + void setMaxRetries(int retries); + + String getQualityOfServiceMode(); + + void setQualityOfServiceMode(String mode); + + int getMaxBatchSize(); + + void setMaxBatchSize(int size); + + long getMaxBatchTime(); + + void setMaxBatchTime(long time); + + String getSubscriptionName(); + + void setSubscriptionName(String subname); + + String getClientID(); + + void setClientID(String clientID); + + String getTransactionManagerLocatorClass(); + + void setTransactionManagerLocatorClass(String transactionManagerLocatorClass); + + String getTransactionManagerLocatorMethod(); + + void setTransactionManagerLocatorMethod(String transactionManagerLocatorMethod); + + boolean isAddMessageIDInHeader(); + + void setAddMessageIDInHeader(boolean value); + + boolean isPaused(); + + boolean isFailed(); + +} Copied: trunk/src/main/org/hornetq/jms/bridge/QualityOfServiceMode.java (from rev 8720, trunk/src/main/org/hornetq/api/jms/bridge/QualityOfServiceMode.java) =================================================================== --- trunk/src/main/org/hornetq/jms/bridge/QualityOfServiceMode.java (rev 0) +++ trunk/src/main/org/hornetq/jms/bridge/QualityOfServiceMode.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -0,0 +1,102 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package org.hornetq.jms.bridge; + +/** + * <h3>Quality of server (QoS) levels</h3> + * + * <h4>QOS_AT_MOST_ONCE</h4> + * + * With this QoS mode messages will reach the destination from the source at + * most once. The messages are consumed from the source and acknowledged before + * sending to the destination. Therefore there is a possibility that if failure + * occurs between removing them from the source and them arriving at the + * destination they could be lost. Hence delivery will occur at most once. This + * mode is avilable for both persistent and non persistent messages. + * + * <h4>QOS_DUPLICATES_OK</h4> + * + * With this QoS mode, the messages are consumed from the source and then + * acknowledged after they have been successfully sent to the destination. + * Therefore there is a possibility that if failure occurs after sending to the + * destination but before acknowledging them, they could be sent again when the + * system recovers. I.e. the destination might receive duplicates after a + * failure. This mode is available for both persistent and non persistent + * messages. + * + * <h4>QOS_ONCE_AND_ONLY_ONCE</h4> + * + * This QoS mode ensures messages will reach the destination from the source + * once and only once. (Sometimes this mode is known as "exactly once"). If both + * the source and the destination are on the same HornetQ server + * instance then this can be achieved by sending and acknowledging the messages + * in the same local transaction. If the source and destination are on different + * servers this is achieved by enlisting the sending and consuming sessions in a + * JTA transaction. The JTA transaction is controlled by JBoss Transactions JTA + * implementation which is a fully recovering transaction manager, thus + * providing a very high degree of durability. If JTA is required then both + * supplied connection factories need to be XAConnectionFactory implementations. + * This mode is only available for persistent messages. This is likely to be the + * slowest mode since it requires extra persistence for the transaction logging. + * + * Note: For a specific application it may possible to provide once and only + * once semantics without using the QOS_ONCE_AND_ONLY_ONCE QoS level. This can + * be done by using the QOS_DUPLICATES_OK mode and then checking for duplicates + * at the destination and discarding them. Some JMS servers provide automatic + * duplicate message detection functionality, or this may be possible to + * implement on the application level by maintaining a cache of received message + * ids on disk and comparing received messages to them. The cache would only be + * valid for a certain period of time so this approach is not as watertight as + * using QOS_ONCE_AND_ONLY_ONCE but may be a good choice depending on your + * specific application. + * + * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> + * + * @version <tt>$Revision$</tt> + * + */ +public enum QualityOfServiceMode +{ + AT_MOST_ONCE(0), DUPLICATES_OK(1), ONCE_AND_ONLY_ONCE(2); + + private final int value; + + QualityOfServiceMode(final int value) + { + this.value = value; + } + + public int intValue() + { + return value; + } + + public static QualityOfServiceMode valueOf(final int value) + { + if (value == AT_MOST_ONCE.value) + { + return AT_MOST_ONCE; + } + if (value == DUPLICATES_OK.value) + { + return DUPLICATES_OK; + } + if (value == ONCE_AND_ONLY_ONCE.value) + { + return ONCE_AND_ONLY_ONCE; + } + throw new IllegalArgumentException("invalid QualityOfServiceMode value: " + value); + } + +} Modified: trunk/src/main/org/hornetq/jms/bridge/impl/JMSBridgeControlImpl.java =================================================================== --- trunk/src/main/org/hornetq/jms/bridge/impl/JMSBridgeControlImpl.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/src/main/org/hornetq/jms/bridge/impl/JMSBridgeControlImpl.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -15,9 +15,9 @@ import javax.management.StandardMBean; -import org.hornetq.api.jms.bridge.JMSBridge; -import org.hornetq.api.jms.bridge.JMSBridgeControl; -import org.hornetq.api.jms.bridge.QualityOfServiceMode; +import org.hornetq.jms.bridge.JMSBridge; +import org.hornetq.jms.bridge.JMSBridgeControl; +import org.hornetq.jms.bridge.QualityOfServiceMode; /** * A JMSBridgeControlImpl Copied: trunk/src/main/org/hornetq/jms/bridge/impl/JMSBridgeImpl.java (from rev 8720, trunk/src/main/org/hornetq/api/jms/bridge/JMSBridgeImpl.java) =================================================================== --- trunk/src/main/org/hornetq/jms/bridge/impl/JMSBridgeImpl.java (rev 0) +++ trunk/src/main/org/hornetq/jms/bridge/impl/JMSBridgeImpl.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -0,0 +1,2008 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package org.hornetq.jms.bridge.impl; + +import java.lang.reflect.Method; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.Map; + +import javax.jms.Connection; +import javax.jms.ConnectionFactory; +import javax.jms.Destination; +import javax.jms.ExceptionListener; +import javax.jms.JMSException; +import javax.jms.Message; +import javax.jms.MessageConsumer; +import javax.jms.MessageProducer; +import javax.jms.Session; +import javax.jms.Topic; +import javax.jms.XAConnection; +import javax.jms.XAConnectionFactory; +import javax.jms.XASession; +import javax.management.MBeanServer; +import javax.management.ObjectName; +import javax.management.StandardMBean; +import javax.transaction.Transaction; +import javax.transaction.TransactionManager; +import javax.transaction.xa.XAResource; + +import org.hornetq.api.core.client.ClientSession; +import org.hornetq.api.jms.HornetQMessageConstants; +import org.hornetq.core.logging.Logger; +import org.hornetq.core.server.HornetQComponent; +import org.hornetq.jms.bridge.ConnectionFactoryFactory; +import org.hornetq.jms.bridge.DestinationFactory; +import org.hornetq.jms.bridge.JMSBridge; +import org.hornetq.jms.bridge.JMSBridgeControl; +import org.hornetq.jms.bridge.QualityOfServiceMode; +import org.hornetq.jms.client.HornetQSession; + +/** + * + * A JMSBridge + * + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * @version <tt>$Revision:4566 $</tt> + * + * $Id:JMSBridge.java 4566 2008-06-24 08:01:35Z jmesnil $ + * + */ +public class JMSBridgeImpl implements HornetQComponent, JMSBridge +{ + private static final Logger log; + + private static boolean trace; + + static + { + log = Logger.getLogger(JMSBridgeImpl.class); + + JMSBridgeImpl.trace = JMSBridgeImpl.log.isTraceEnabled(); + } + + private static final int TEN_YEARS = 60 * 60 * 24 * 365 * 10; // in ms + + private final Object lock = new Object(); + + private String sourceUsername; + + private String sourcePassword; + + private String targetUsername; + + private String targetPassword; + + private TransactionManager tm; + + private String selector; + + private long failureRetryInterval; + + private int maxRetries; + + private QualityOfServiceMode qualityOfServiceMode; + + private int maxBatchSize; + + private long maxBatchTime; + + private String subName; + + private String clientID; + + private volatile boolean addMessageIDInHeader; + + private boolean started; + + private final LinkedList<Message> messages; + + private ConnectionFactoryFactory sourceCff; + + private ConnectionFactoryFactory targetCff; + + private DestinationFactory sourceDestinationFactory; + + private DestinationFactory targetDestinationFactory; + + private Connection sourceConn; + + private Connection targetConn; + + private Destination sourceDestination; + + private Destination targetDestination; + + private Session sourceSession; + + private Session targetSession; + + private MessageConsumer sourceConsumer; + + private MessageProducer targetProducer; + + private BatchTimeChecker timeChecker; + + private Thread checkerThread; + + private Thread sourceReceiver; + + private long batchExpiryTime; + + private boolean paused; + + private Transaction tx; + + private boolean failed; + + private int forwardMode; + + private String transactionManagerLocatorClass = "org.hornetq.integration.jboss.tm.JBoss5TransactionManagerLocator"; + + private String transactionManagerLocatorMethod = "getTm"; + + private MBeanServer mbeanServer; + + private ObjectName objectName; + + private static final int FORWARD_MODE_XA = 0; + + private static final int FORWARD_MODE_LOCALTX = 1; + + private static final int FORWARD_MODE_NONTX = 2; + + /* + * Constructor for MBean + */ + public JMSBridgeImpl() + { + messages = new LinkedList<Message>(); + } + + public JMSBridgeImpl(final ConnectionFactoryFactory sourceCff, + final ConnectionFactoryFactory targetCff, + final DestinationFactory sourceDestinationFactory, + final DestinationFactory targetDestinationFactory, + final String sourceUsername, + final String sourcePassword, + final String targetUsername, + final String targetPassword, + final String selector, + final long failureRetryInterval, + final int maxRetries, + final QualityOfServiceMode qosMode, + final int maxBatchSize, + final long maxBatchTime, + final String subName, + final String clientID, + final boolean addMessageIDInHeader) + { + + this(sourceCff, + targetCff, + sourceDestinationFactory, + targetDestinationFactory, + sourceUsername, + sourcePassword, + targetUsername, + targetPassword, + selector, + failureRetryInterval, + maxRetries, + qosMode, + maxBatchSize, + maxBatchTime, + subName, + clientID, + addMessageIDInHeader, + null, + null); + } + + public JMSBridgeImpl(final ConnectionFactoryFactory sourceCff, + final ConnectionFactoryFactory targetCff, + final DestinationFactory sourceDestinationFactory, + final DestinationFactory targetDestinationFactory, + final String sourceUsername, + final String sourcePassword, + final String targetUsername, + final String targetPassword, + final String selector, + final long failureRetryInterval, + final int maxRetries, + final QualityOfServiceMode qosMode, + final int maxBatchSize, + final long maxBatchTime, + final String subName, + final String clientID, + final boolean addMessageIDInHeader, + final MBeanServer mbeanServer, + final String objectName) + { + this(); + + this.sourceCff = sourceCff; + + this.targetCff = targetCff; + + this.sourceDestinationFactory = sourceDestinationFactory; + + this.targetDestinationFactory = targetDestinationFactory; + + this.sourceUsername = sourceUsername; + + this.sourcePassword = sourcePassword; + + this.targetUsername = targetUsername; + + this.targetPassword = targetPassword; + + this.selector = selector; + + this.failureRetryInterval = failureRetryInterval; + + this.maxRetries = maxRetries; + + qualityOfServiceMode = qosMode; + + this.maxBatchSize = maxBatchSize; + + this.maxBatchTime = maxBatchTime; + + this.subName = subName; + + this.clientID = clientID; + + this.addMessageIDInHeader = addMessageIDInHeader; + + checkParams(); + + if (mbeanServer != null) + { + if (objectName != null) + { + this.mbeanServer = mbeanServer; + + try + { + JMSBridgeControlImpl controlBean = new JMSBridgeControlImpl(this); + this.objectName = ObjectName.getInstance(objectName); + StandardMBean mbean = new StandardMBean(controlBean, JMSBridgeControl.class); + mbeanServer.registerMBean(mbean, this.objectName); + JMSBridgeImpl.log.debug("Registered JMSBridge instance as: " + this.objectName.getCanonicalName()); + } + catch (Exception e) + { + throw new IllegalStateException("Failed to register JMSBridge MBean", e); + } + } + else + { + throw new IllegalArgumentException("objectName is required when specifying an MBeanServer"); + } + } + + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace("Created " + this); + } + } + + // HornetQComponent overrides -------------------------------------------------- + + public synchronized void start() throws Exception + { + if (started) + { + JMSBridgeImpl.log.warn("Attempt to start, but is already started"); + return; + } + + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace("Starting " + this); + } + + checkParams(); + + TransactionManager tm = getTm(); + + // There may already be a JTA transaction associated to the thread + + boolean ok; + + Transaction toResume = null; + try + { + toResume = tm.suspend(); + + ok = setupJMSObjects(); + } + finally + { + if (toResume != null) + { + tm.resume(toResume); + } + } + + if (ok) + { + // start the source connection + + sourceConn.start(); + + started = true; + + if (maxBatchTime != -1) + { + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace("Starting time checker thread"); + } + + timeChecker = new BatchTimeChecker(); + + checkerThread = new Thread(timeChecker, "jmsbridge-checker-thread"); + + batchExpiryTime = System.currentTimeMillis() + maxBatchTime; + + checkerThread.start(); + + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace("Started time checker thread"); + } + } + + sourceReceiver = new SourceReceiver(); + sourceReceiver.start(); + + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace("Started " + this); + } + } + else + { + JMSBridgeImpl.log.warn("Failed to start bridge"); + handleFailureOnStartup(); + } + + } + + public synchronized void stop() throws Exception + { + if (!started) + { + JMSBridgeImpl.log.warn("Attempt to stop, but is already stopped"); + return; + } + + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace("Stopping " + this); + } + + synchronized (lock) + { + started = false; + + // This must be inside sync block + if (checkerThread != null) + { + checkerThread.interrupt(); + } + + if (sourceReceiver != null) + { + sourceReceiver.interrupt(); + } + } + + // This must be outside sync block + if (checkerThread != null) + { + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace("Waiting for checker thread to finish"); + } + + checkerThread.join(); + + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace("Checker thread has finished"); + } + } + + // This must be outside sync block + if (sourceReceiver != null) + { + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace("Waiting for source receiver thread to finish"); + } + + sourceReceiver.join(); + + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace("Source receiver thread has finished"); + } + } + + if (tx != null) + { + // Terminate any transaction + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace("Rolling back remaining tx"); + } + + try + { + tx.rollback(); + } + catch (Exception ignore) + { + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace("Failed to rollback", ignore); + } + } + + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace("Rolled back remaining tx"); + } + } + + try + { + sourceConn.close(); + } + catch (Exception ignore) + { + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace("Failed to close source conn", ignore); + } + } + + if (targetConn != null) + { + try + { + targetConn.close(); + } + catch (Exception ignore) + { + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace("Failed to close target conn", ignore); + } + } + } + + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace("Stopped " + this); + } + } + + public synchronized boolean isStarted() + { + return started; + } + + public void destroy() + { + if (mbeanServer != null && objectName != null) + { + try + { + mbeanServer.unregisterMBean(objectName); + } + catch (Exception e) + { + JMSBridgeImpl.log.warn("Failed to unregisted JMS Bridge " + objectName); + } + } + } + + // JMSBridge implementation ------------------------------------------------------------ + + public synchronized void pause() throws Exception + { + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace("Pausing " + this); + } + + synchronized (lock) + { + paused = true; + + sourceConn.stop(); + } + + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace("Paused " + this); + } + } + + public synchronized void resume() throws Exception + { + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace("Resuming " + this); + } + + synchronized (lock) + { + paused = false; + + sourceConn.start(); + } + + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace("Resumed " + this); + } + } + + public DestinationFactory getSourceDestinationFactory() + { + return sourceDestinationFactory; + } + + public void setSourceDestinationFactory(final DestinationFactory dest) + { + checkBridgeNotStarted(); + JMSBridgeImpl.checkNotNull(dest, "TargetDestinationFactory"); + + sourceDestinationFactory = dest; + } + + public DestinationFactory getTargetDestinationFactory() + { + return targetDestinationFactory; + } + + public void setTargetDestinationFactory(final DestinationFactory dest) + { + checkBridgeNotStarted(); + JMSBridgeImpl.checkNotNull(dest, "TargetDestinationFactory"); + + targetDestinationFactory = dest; + } + + public String getSourceUsername() + { + return sourceUsername; + } + + public synchronized void setSourceUsername(final String name) + { + checkBridgeNotStarted(); + + sourceUsername = name; + } + + public synchronized String getSourcePassword() + { + return sourcePassword; + } + + public synchronized void setSourcePassword(final String pwd) + { + checkBridgeNotStarted(); + + sourcePassword = pwd; + } + + public synchronized String getTargetUsername() + { + return targetUsername; + } + + public synchronized void setTargetUsername(final String name) + { + checkBridgeNotStarted(); + + targetUsername = name; + } + + public synchronized String getTargetPassword() + { + return targetPassword; + } + + public synchronized void setTargetPassword(final String pwd) + { + checkBridgeNotStarted(); + + targetPassword = pwd; + } + + public synchronized String getSelector() + { + return selector; + } + + public synchronized void setSelector(final String selector) + { + checkBridgeNotStarted(); + + this.selector = selector; + } + + public synchronized long getFailureRetryInterval() + { + return failureRetryInterval; + } + + public synchronized void setFailureRetryInterval(final long interval) + { + checkBridgeNotStarted(); + if (interval < 1) + { + throw new IllegalArgumentException("FailureRetryInterval must be >= 1"); + } + + failureRetryInterval = interval; + } + + public synchronized int getMaxRetries() + { + return maxRetries; + } + + public synchronized void setMaxRetries(final int retries) + { + checkBridgeNotStarted(); + JMSBridgeImpl.checkValidValue(retries, "MaxRetries"); + + maxRetries = retries; + } + + public synchronized QualityOfServiceMode getQualityOfServiceMode() + { + return qualityOfServiceMode; + } + + public synchronized void setQualityOfServiceMode(final QualityOfServiceMode mode) + { + checkBridgeNotStarted(); + JMSBridgeImpl.checkNotNull(mode, "QualityOfServiceMode"); + + qualityOfServiceMode = mode; + } + + public synchronized int getMaxBatchSize() + { + return maxBatchSize; + } + + public synchronized void setMaxBatchSize(final int size) + { + checkBridgeNotStarted(); + JMSBridgeImpl.checkMaxBatchSize(size); + + maxBatchSize = size; + } + + public synchronized long getMaxBatchTime() + { + return maxBatchTime; + } + + public synchronized void setMaxBatchTime(final long time) + { + checkBridgeNotStarted(); + JMSBridgeImpl.checkValidValue(time, "MaxBatchTime"); + + maxBatchTime = time; + } + + public synchronized String getSubscriptionName() + { + return subName; + } + + public synchronized void setSubscriptionName(final String subname) + { + checkBridgeNotStarted(); + subName = subname; + } + + public synchronized String getClientID() + { + return clientID; + } + + public synchronized void setClientID(final String clientID) + { + checkBridgeNotStarted(); + + this.clientID = clientID; + } + + public String getTransactionManagerLocatorClass() + { + return transactionManagerLocatorClass; + } + + public void setTransactionManagerLocatorClass(final String transactionManagerLocatorClass) + { + checkBridgeNotStarted(); + this.transactionManagerLocatorClass = transactionManagerLocatorClass; + } + + public String getTransactionManagerLocatorMethod() + { + return transactionManagerLocatorMethod; + } + + public void setTransactionManagerLocatorMethod(final String transactionManagerLocatorMethod) + { + this.transactionManagerLocatorMethod = transactionManagerLocatorMethod; + } + + public boolean isAddMessageIDInHeader() + { + return addMessageIDInHeader; + } + + public void setAddMessageIDInHeader(final boolean value) + { + addMessageIDInHeader = value; + } + + public synchronized boolean isPaused() + { + return paused; + } + + public synchronized boolean isFailed() + { + return failed; + } + + public synchronized void setSourceConnectionFactoryFactory(final ConnectionFactoryFactory cff) + { + checkBridgeNotStarted(); + JMSBridgeImpl.checkNotNull(cff, "SourceConnectionFactoryFactory"); + + sourceCff = cff; + } + + public synchronized void setTargetConnectionFactoryFactory(final ConnectionFactoryFactory cff) + { + checkBridgeNotStarted(); + JMSBridgeImpl.checkNotNull(cff, "TargetConnectionFactoryFactory"); + + targetCff = cff; + } + + public void setTransactionManager(final TransactionManager tm) + { + this.tm = tm; + } + + // Public --------------------------------------------------------------------------- + + // Private ------------------------------------------------------------------- + + private void checkParams() + { + JMSBridgeImpl.checkNotNull(sourceCff, "sourceCff"); + JMSBridgeImpl.checkNotNull(targetCff, "targetCff"); + JMSBridgeImpl.checkNotNull(sourceDestinationFactory, "sourceDestinationFactory"); + JMSBridgeImpl.checkNotNull(targetDestinationFactory, "targetDestinationFactory"); + JMSBridgeImpl.checkValidValue(failureRetryInterval, "failureRetryInterval"); + JMSBridgeImpl.checkValidValue(maxRetries, "maxRetries"); + if (failureRetryInterval == -1 && maxRetries > 0) + { + throw new IllegalArgumentException("If failureRetryInterval == -1 maxRetries must be set to -1"); + } + JMSBridgeImpl.checkMaxBatchSize(maxBatchSize); + JMSBridgeImpl.checkValidValue(maxBatchTime, "maxBatchTime"); + JMSBridgeImpl.checkNotNull(qualityOfServiceMode, "qualityOfServiceMode"); + } + + /** + * Check the object is not null + * + * @throws IllegalArgumentException if the object is null + */ + private static void checkNotNull(final Object obj, final String name) + { + if (obj == null) + { + throw new IllegalArgumentException(name + " cannot be null"); + } + } + + /** + * Check the bridge is not started + * + * @throws IllegalStateException if the bridge is started + */ + private void checkBridgeNotStarted() + { + if (started) + { + throw new IllegalStateException("Cannot set bridge attributes while it is started"); + } + } + + /** + * Check that value is either equals to -1 or greater than 0 + * + * @throws IllegalArgumentException if the value is not valid + */ + private static void checkValidValue(final long value, final String name) + { + if (!(value == -1 || value > 0)) + { + throw new IllegalArgumentException(name + " must be > 0 or -1"); + } + } + + private static void checkMaxBatchSize(final int size) + { + if (!(size >= 1)) + { + throw new IllegalArgumentException("maxBatchSize must be >= 1"); + } + } + + private void enlistResources(final Transaction tx) throws Exception + { + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace("Enlisting resources in tx"); + } + + XAResource resSource = ((XASession)sourceSession).getXAResource(); + + tx.enlistResource(resSource); + + XAResource resDest = ((XASession)targetSession).getXAResource(); + + tx.enlistResource(resDest); + + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace("Enlisted resources in tx"); + } + } + + private void delistResources(final Transaction tx) + { + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace("Delisting resources from tx"); + } + + XAResource resSource = ((XASession)sourceSession).getXAResource(); + + try + { + tx.delistResource(resSource, XAResource.TMSUCCESS); + } + catch (Exception e) + { + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace("Failed to delist source resource", e); + } + } + + XAResource resDest = ((XASession)targetSession).getXAResource(); + + try + { + tx.delistResource(resDest, XAResource.TMSUCCESS); + } + catch (Exception e) + { + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace("Failed to delist target resource", e); + } + } + + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace("Delisted resources from tx"); + } + } + + private Transaction startTx() throws Exception + { + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace("Starting JTA transaction"); + } + + TransactionManager tm = getTm(); + + // Set timeout to a large value since we do not want to time out while waiting for messages + // to arrive - 10 years should be enough + tm.setTransactionTimeout(JMSBridgeImpl.TEN_YEARS); + + tm.begin(); + + Transaction tx = tm.getTransaction(); + + // Remove the association between current thread - we don't want it + // we will be committing /rolling back directly on the transaction object + + tm.suspend(); + + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace("Started JTA transaction"); + } + + return tx; + } + + private TransactionManager getTm() + { + if (tm == null) + { + try + { + ClassLoader loader = Thread.currentThread().getContextClassLoader(); + Class aClass = loader.loadClass(transactionManagerLocatorClass); + Object o = aClass.newInstance(); + Method m = aClass.getMethod(transactionManagerLocatorMethod); + tm = (TransactionManager)m.invoke(o); + } + catch (Exception e) + { + throw new IllegalStateException("unable to create TransactionManager from " + transactionManagerLocatorClass + + "." + + transactionManagerLocatorMethod, + e); + } + + if (tm == null) + { + throw new IllegalStateException("Cannot locate a transaction manager"); + } + } + + return tm; + } + + private Connection createConnection(final String username, final String password, final ConnectionFactoryFactory cff) throws Exception + { + Connection conn; + + ConnectionFactory cf = cff.createConnectionFactory(); + + if (qualityOfServiceMode == QualityOfServiceMode.ONCE_AND_ONLY_ONCE && !(cf instanceof XAConnectionFactory)) + { + throw new IllegalArgumentException("Connection factory must be XAConnectionFactory"); + } + + if (username == null) + { + if (qualityOfServiceMode == QualityOfServiceMode.ONCE_AND_ONLY_ONCE) + { + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace("Creating an XA connection"); + } + conn = ((XAConnectionFactory)cf).createXAConnection(); + } + else + { + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace("Creating a non XA connection"); + } + conn = cf.createConnection(); + } + } + else + { + if (qualityOfServiceMode == QualityOfServiceMode.ONCE_AND_ONLY_ONCE) + { + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace("Creating an XA connection"); + } + conn = ((XAConnectionFactory)cf).createXAConnection(username, password); + } + else + { + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace("Creating a non XA connection"); + } + conn = cf.createConnection(username, password); + } + } + + return conn; + } + + /* + * Source and target on same server + * -------------------------------- + * If the source and target destinations are on the same server (same resource manager) then, + * in order to get ONCE_AND_ONLY_ONCE, we simply need to consuming and send in a single + * local JMS transaction. + * + * We actually use a single local transacted session for the other QoS modes too since this + * is more performant than using DUPS_OK_ACKNOWLEDGE or AUTO_ACKNOWLEDGE session ack modes, so effectively + * the QoS is upgraded. + * + * Source and target on different server + * ------------------------------------- + * If the source and target destinations are on a different servers (different resource managers) then: + * + * If desired QoS is ONCE_AND_ONLY_ONCE, then we start a JTA transaction and enlist the consuming and sending + * XAResources in that. + * + * If desired QoS is DUPLICATES_OK then, we use CLIENT_ACKNOWLEDGE for the consuming session and + * AUTO_ACKNOWLEDGE (this is ignored) for the sending session if the maxBatchSize == 1, otherwise we + * use a local transacted session for the sending session where maxBatchSize > 1, since this is more performant + * When bridging a batch, we make sure to manually acknowledge the consuming session, if it is CLIENT_ACKNOWLEDGE + * *after* the batch has been sent + * + * If desired QoS is AT_MOST_ONCE then, if maxBatchSize == 1, we use AUTO_ACKNOWLEDGE for the consuming session, + * and AUTO_ACKNOWLEDGE for the sending session. + * If maxBatchSize > 1, we use CLIENT_ACKNOWLEDGE for the consuming session and a local transacted session for the + * sending session. + * + * When bridging a batch, we make sure to manually acknowledge the consuming session, if it is CLIENT_ACKNOWLEDGE + * *before* the batch has been sent + * + */ + private boolean setupJMSObjects() + { + try + { + if (sourceCff == targetCff) + { + // Source and target destinations are on the server - we can get once and only once + // just using a local transacted session + // everything becomes once and only once + + forwardMode = JMSBridgeImpl.FORWARD_MODE_LOCALTX; + } + else + { + // Different servers + if (qualityOfServiceMode == QualityOfServiceMode.ONCE_AND_ONLY_ONCE) + { + // Use XA + + forwardMode = JMSBridgeImpl.FORWARD_MODE_XA; + } + else + { + forwardMode = JMSBridgeImpl.FORWARD_MODE_NONTX; + } + } + + // Lookup the destinations + sourceDestination = sourceDestinationFactory.createDestination(); + + targetDestination = targetDestinationFactory.createDestination(); + + sourceConn = createConnection(sourceUsername, sourcePassword, sourceCff); + + if (forwardMode != JMSBridgeImpl.FORWARD_MODE_LOCALTX) + { + targetConn = createConnection(targetUsername, targetPassword, targetCff); + + targetConn.setExceptionListener(new BridgeExceptionListener()); + } + + if (clientID != null) + { + sourceConn.setClientID(clientID); + } + + sourceConn.setExceptionListener(new BridgeExceptionListener()); + + Session sess; + + if (forwardMode == JMSBridgeImpl.FORWARD_MODE_LOCALTX) + { + // We simply use a single local transacted session for consuming and sending + + sourceSession = sourceConn.createSession(true, Session.SESSION_TRANSACTED); + + sess = sourceSession; + } + else + { + if (forwardMode == JMSBridgeImpl.FORWARD_MODE_XA) + { + // Create an XASession for consuming from the source + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace("Creating XA source session"); + } + + sourceSession = ((XAConnection)sourceConn).createXASession(); + + sess = ((XASession)sourceSession).getSession(); + } + else + { + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace("Creating non XA source session"); + } + + // Create a standard session for consuming from the source + + // We use ack mode client ack + + sourceSession = sourceConn.createSession(false, Session.CLIENT_ACKNOWLEDGE); + + sess = sourceSession; + } + } + + if (forwardMode == JMSBridgeImpl.FORWARD_MODE_XA && sourceSession instanceof HornetQSession) + { + HornetQSession jsession = (HornetQSession)sourceSession; + + ClientSession clientSession = jsession.getCoreSession(); + + // clientSession.setTreatAsNonTransactedWhenNotEnlisted(false); + } + + if (subName == null) + { + if (selector == null) + { + sourceConsumer = sess.createConsumer(sourceDestination); + } + else + { + sourceConsumer = sess.createConsumer(sourceDestination, selector, false); + } + } + else + { + // Durable subscription + if (selector == null) + { + sourceConsumer = sess.createDurableSubscriber((Topic)sourceDestination, subName); + } + else + { + sourceConsumer = sess.createDurableSubscriber((Topic)sourceDestination, subName, selector, false); + } + } + + // Now the sending session + + if (forwardMode != JMSBridgeImpl.FORWARD_MODE_LOCALTX) + { + if (forwardMode == JMSBridgeImpl.FORWARD_MODE_XA) + { + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace("Creating XA dest session"); + } + + // Create an XA sesion for sending to the destination + + targetSession = ((XAConnection)targetConn).createXASession(); + + sess = ((XASession)targetSession).getSession(); + } + else + { + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace("Creating non XA dest session"); + } + + // Create a standard session for sending to the target + + // If batch size > 1 we use a transacted session since is more efficient + + boolean transacted = maxBatchSize > 1; + + targetSession = targetConn.createSession(transacted, transacted ? Session.SESSION_TRANSACTED + : Session.AUTO_ACKNOWLEDGE); + + sess = targetSession; + } + } + + if (forwardMode == JMSBridgeImpl.FORWARD_MODE_XA) + { + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace("Starting JTA transaction"); + } + + tx = startTx(); + + enlistResources(tx); + } + + targetProducer = sess.createProducer(null); + + return true; + } + catch (Exception e) + { + // We shouldn't log this, as it's expected when trying to connect when target/source is not available + + // If this fails we should attempt to cleanup or we might end up in some weird state + + cleanup(); + + return false; + } + } + + private void cleanup() + { + // Stop the source connection + try + { + sourceConn.stop(); + } + catch (Throwable ignore) + { + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace("Failed to stop source connection", ignore); + } + } + + if (tx != null) + { + try + { + delistResources(tx); + } + catch (Throwable ignore) + { + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace("Failed to delist resources", ignore); + } + } + try + { + // Terminate the tx + tx.rollback(); + } + catch (Throwable ignore) + { + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace("Failed to rollback", ignore); + } + } + } + + // Close the old objects + try + { + sourceConn.close(); + } + catch (Throwable ignore) + { + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace("Failed to close source connection", ignore); + } + } + try + { + if (targetConn != null) + { + targetConn.close(); + } + } + catch (Throwable ignore) + { + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace("Failed to close target connection", ignore); + } + } + } + + private void pause(final long interval) + { + long start = System.currentTimeMillis(); + while (System.currentTimeMillis() - start < failureRetryInterval) + { + try + { + Thread.sleep(failureRetryInterval); + } + catch (InterruptedException ex) + { + } + } + } + + private boolean setupJMSObjectsWithRetry() + { + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace("Setting up connections"); + } + + int count = 0; + + while (true) + { + boolean ok = setupJMSObjects(); + + if (ok) + { + return true; + } + + count++; + + if (maxRetries != -1 && count == maxRetries) + { + break; + } + + JMSBridgeImpl.log.info("Failed to set up JMS bridge connections. Most probably the source or target servers are unavailable. Will retry after a pause of " + failureRetryInterval + + " ms"); + + pause(failureRetryInterval); + } + + // If we get here then we exceeded maxRetries + return false; + } + + private void sendBatch() + { + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace("Sending batch of " + messages.size() + " messages"); + } + + if (paused) + { + // Don't send now + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace("Paused, so not sending now"); + } + + return; + } + + if (forwardMode == JMSBridgeImpl.FORWARD_MODE_LOCALTX) + { + sendBatchLocalTx(); + } + else if (forwardMode == JMSBridgeImpl.FORWARD_MODE_XA) + { + sendBatchXA(); + } + else + { + sendBatchNonTransacted(); + } + } + + private void sendBatchNonTransacted() + { + try + { + if (qualityOfServiceMode == QualityOfServiceMode.ONCE_AND_ONLY_ONCE) + { + // We client ack before sending + + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace("Client acking source session"); + } + + ((Message)messages.getLast()).acknowledge(); + + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace("Client acked source session"); + } + } + + sendMessages(); + + if (maxBatchSize > 1) + { + // The sending session is transacted - we need to commit it + + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace("Committing target session"); + } + + targetSession.commit(); + + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace("Committed source session"); + } + } + + if (qualityOfServiceMode == QualityOfServiceMode.DUPLICATES_OK) + { + // We client ack after sending + + // Note we could actually use Session.DUPS_OK_ACKNOWLEDGE here + // For a slightly less strong delivery guarantee + + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace("Client acking source session"); + } + + messages.getLast().acknowledge(); + + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace("Client acked source session"); + } + } + + // Clear the messages + messages.clear(); + } + catch (Exception e) + { + JMSBridgeImpl.log.warn("Failed to send + acknowledge batch, closing JMS objects", e); + + handleFailureOnSend(); + } + } + + private void sendBatchXA() + { + try + { + sendMessages(); + + // Commit the JTA transaction and start another + + delistResources(tx); + + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace("Committing JTA transaction"); + } + + tx.commit(); + + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace("Committed JTA transaction"); + } + + tx = startTx(); + + enlistResources(tx); + + // Clear the messages + messages.clear(); + } + catch (Exception e) + { + JMSBridgeImpl.log.warn("Failed to send + acknowledge batch, closing JMS objects", e); + + handleFailureOnSend(); + } + } + + private void sendBatchLocalTx() + { + try + { + sendMessages(); + + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace("Committing source session"); + } + + sourceSession.commit(); + + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace("Committed source session"); + } + + // Clear the messages + messages.clear(); + } + catch (Exception e) + { + JMSBridgeImpl.log.warn("Failed to send + acknowledge batch, closing JMS objects", e); + + handleFailureOnSend(); + } + } + + private void sendMessages() throws Exception + { + Iterator iter = messages.iterator(); + + Message msg = null; + + while (iter.hasNext()) + { + msg = (Message)iter.next(); + + if (addMessageIDInHeader) + { + addMessageIDInHeader(msg); + } + + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace("Sending message " + msg); + } + + // Make sure the correct time to live gets propagated + + long timeToLive = msg.getJMSExpiration(); + + if (timeToLive != 0) + { + timeToLive -= System.currentTimeMillis(); + + if (timeToLive <= 0) + { + timeToLive = 1; // Should have already expired - set to 1 so it expires when it is consumed or delivered + } + } + + targetProducer.send(targetDestination, msg, msg.getJMSDeliveryMode(), msg.getJMSPriority(), timeToLive); + + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace("Sent message " + msg); + } + } + } + + private void handleFailureOnSend() + { + handleFailure(new FailureHandler()); + } + + private void handleFailureOnStartup() + { + handleFailure(new StartupFailureHandler()); + } + + private void handleFailure(final Runnable failureHandler) + { + failed = true; + + // Failure must be handled on a separate thread to the calling thread (either onMessage or start). + // In the case of onMessage we can't close the connection from inside the onMessage method + // since it will block waiting for onMessage to complete. In the case of start we want to return + // from the call before the connections are reestablished so that the caller is not blocked unnecessarily. + Thread t = new Thread(failureHandler, "jmsbridge-failurehandler-thread"); + + t.start(); + } + + private void addMessageIDInHeader(final Message msg) throws Exception + { + // We concatenate the old message id as a header in the message + // This allows the target to then use this as the JMSCorrelationID of any response message + // thus enabling a distributed request-response pattern. + // Each bridge (if there are more than one) in the chain can concatenate the message id + // So in the case of multiple bridges having routed the message this can be used in a multi-hop + // distributed request/response + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace("Adding old message id in Message header"); + } + + JMSBridgeImpl.copyProperties(msg); + + String val = null; + + val = msg.getStringProperty(HornetQMessageConstants.JBOSS_MESSAGING_BRIDGE_MESSAGE_ID_LIST); + + if (val == null) + { + val = msg.getJMSMessageID(); + } + else + { + StringBuffer sb = new StringBuffer(val); + + sb.append(",").append(msg.getJMSMessageID()); + + val = sb.toString(); + } + + msg.setStringProperty(HornetQMessageConstants.JBOSS_MESSAGING_BRIDGE_MESSAGE_ID_LIST, val); + } + + /* + * JMS does not let you add a property on received message without first + * calling clearProperties, so we need to save and re-add all the old properties so we + * don't lose them!! + */ + private static void copyProperties(final Message msg) throws JMSException + { + Enumeration en = msg.getPropertyNames(); + + Map<String, Object> oldProps = null; + + while (en.hasMoreElements()) + { + String propName = (String)en.nextElement(); + + if (oldProps == null) + { + oldProps = new HashMap<String, Object>(); + } + + oldProps.put(propName, msg.getObjectProperty(propName)); + } + + msg.clearProperties(); + + if (oldProps != null) + { + Iterator oldPropsIter = oldProps.entrySet().iterator(); + + while (oldPropsIter.hasNext()) + { + Map.Entry entry = (Map.Entry)oldPropsIter.next(); + + String propName = (String)entry.getKey(); + + msg.setObjectProperty(propName, entry.getValue()); + } + } + } + + // Inner classes --------------------------------------------------------------- + + /** + * We use a Thread which polls the sourceDestination instead of a MessageListener + * to ensure that message delivery does not happen concurrently with + * transaction enlistment of the XAResource (see HORNETQ-27) + * + */ + private final class SourceReceiver extends Thread + { + SourceReceiver() + { + super("jmsbridge-source-receiver-thread"); + } + + @Override + public void run() + { + while (started) + { + synchronized (lock) + { + if (paused || failed) + { + try + { + lock.wait(500); + } + catch (InterruptedException e) + { + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace(this + " thread was interrupted"); + } + } + continue; + } + + Message msg = null; + try + { + msg = sourceConsumer.receive(1000); + } + catch (JMSException jmse) + { + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace(this + " exception while receiving a message", jmse); + } + } + + if (msg == null) + { + try + { + lock.wait(500); + } + catch (InterruptedException e) + { + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace(this + " thread was interrupted"); + } + } + continue; + } + + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace(this + " received message " + msg); + } + + messages.add(msg); + + batchExpiryTime = System.currentTimeMillis() + maxBatchTime; + + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace(this + " rescheduled batchExpiryTime to " + batchExpiryTime); + } + + if (maxBatchSize != -1 && messages.size() >= maxBatchSize) + { + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace(this + " maxBatchSize has been reached so sending batch"); + } + + sendBatch(); + + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace(this + " sent batch"); + } + } + } + } + } + } + + private class FailureHandler implements Runnable + { + /** + * Start the source connection - note the source connection must not be started before + * otherwise messages will be received and ignored + */ + protected void startSourceConnection() + { + try + { + sourceConn.start(); + } + catch (JMSException e) + { + JMSBridgeImpl.log.error("Failed to start source connection", e); + } + } + + protected void succeeded() + { + JMSBridgeImpl.log.info("Succeeded in reconnecting to servers"); + + synchronized (lock) + { + failed = false; + + startSourceConnection(); + } + } + + protected void failed() + { + // We haven't managed to recreate connections or maxRetries = 0 + JMSBridgeImpl.log.warn("Unable to set up connections, bridge will be stopped"); + + try + { + stop(); + } + catch (Exception ignore) + { + } + } + + public void run() + { + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace("Failure handler running"); + } + + // Clear the messages + messages.clear(); + + cleanup(); + + boolean ok = false; + + if (maxRetries > 0 || maxRetries == -1) + { + JMSBridgeImpl.log.warn("Will retry after a pause of " + failureRetryInterval + " ms"); + + pause(failureRetryInterval); + + // Now we try + ok = setupJMSObjectsWithRetry(); + } + + if (!ok) + { + failed(); + } + else + { + succeeded(); + } + } + } + + private class StartupFailureHandler extends FailureHandler + { + protected void failed() + { + // Don't call super + JMSBridgeImpl.log.warn("Unable to set up connections, bridge will not be started"); + } + + protected void succeeded() + { + // Don't call super - a bit ugly in this case but better than taking the lock twice. + JMSBridgeImpl.log.info("Succeeded in connecting to servers"); + + synchronized (lock) + { + failed = false; + started = true; + + // Start the source connection - note the source connection must not be started before + // otherwise messages will be received and ignored + + try + { + sourceConn.start(); + } + catch (JMSException e) + { + JMSBridgeImpl.log.error("Failed to start source connection", e); + } + } + } + } + + private class BatchTimeChecker implements Runnable + { + public void run() + { + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace(this + " running"); + } + + synchronized (lock) + { + while (started) + { + long toWait = batchExpiryTime - System.currentTimeMillis(); + + if (toWait <= 0) + { + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace(this + " waited enough"); + } + + synchronized (lock) + { + if (!failed && !messages.isEmpty()) + { + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace(this + " got some messages so sending batch"); + } + + sendBatch(); + + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace(this + " sent batch"); + } + } + } + + batchExpiryTime = System.currentTimeMillis() + maxBatchTime; + } + else + { + try + { + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace(this + " waiting for " + toWait); + } + + lock.wait(toWait); + + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace(this + " woke up"); + } + } + catch (InterruptedException e) + { + // Ignore + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace(this + " thread was interrupted"); + } + } + + } + } + } + } + } + + private class BridgeExceptionListener implements ExceptionListener + { + public void onException(final JMSException e) + { + JMSBridgeImpl.log.warn("Detected failure on bridge connection"); + + synchronized (lock) + { + if (failed) + { + // The failure has already been detected and is being handled + if (JMSBridgeImpl.trace) + { + JMSBridgeImpl.log.trace("Failure recovery already in progress"); + } + } + else + { + handleFailure(new FailureHandler()); + } + } + } + } +} Copied: trunk/src/main/org/hornetq/jms/bridge/impl/JNDIConnectionFactoryFactory.java (from rev 8720, trunk/src/main/org/hornetq/api/jms/bridge/JNDIConnectionFactoryFactory.java) =================================================================== --- trunk/src/main/org/hornetq/jms/bridge/impl/JNDIConnectionFactoryFactory.java (rev 0) +++ trunk/src/main/org/hornetq/jms/bridge/impl/JNDIConnectionFactoryFactory.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -0,0 +1,44 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package org.hornetq.jms.bridge.impl; + +import java.util.Hashtable; + +import javax.jms.ConnectionFactory; + +import org.hornetq.jms.bridge.ConnectionFactoryFactory; + + +/** + * A JNDIConnectionFactoryFactory + * + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * @version <tt>$Revision:4566 $</tt> + * + * $Id:JNDIConnectionFactoryFactory.java 4566 2008-06-24 08:01:35Z jmesnil $ + * + */ +public class JNDIConnectionFactoryFactory extends JNDIFactorySupport implements ConnectionFactoryFactory +{ + public JNDIConnectionFactoryFactory(final Hashtable jndiProperties, final String lookup) + { + super(jndiProperties, lookup); + } + + public ConnectionFactory createConnectionFactory() throws Exception + { + return (ConnectionFactory)createObject(); + } + +} Copied: trunk/src/main/org/hornetq/jms/bridge/impl/JNDIDestinationFactory.java (from rev 8720, trunk/src/main/org/hornetq/api/jms/bridge/JNDIDestinationFactory.java) =================================================================== --- trunk/src/main/org/hornetq/jms/bridge/impl/JNDIDestinationFactory.java (rev 0) +++ trunk/src/main/org/hornetq/jms/bridge/impl/JNDIDestinationFactory.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -0,0 +1,42 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package org.hornetq.jms.bridge.impl; + +import java.util.Hashtable; + +import javax.jms.Destination; + +import org.hornetq.jms.bridge.DestinationFactory; + + +/** + * + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * @version <tt>$Revision: $</tt>10 Oct 2007 + * + * $Id: $ + * + */ +public class JNDIDestinationFactory extends JNDIFactorySupport implements DestinationFactory +{ + public JNDIDestinationFactory(final Hashtable jndiProperties, final String lookup) + { + super(jndiProperties, lookup); + } + + public Destination createDestination() throws Exception + { + return (Destination)createObject(); + } +} Copied: trunk/src/main/org/hornetq/jms/bridge/impl/JNDIFactorySupport.java (from rev 8720, trunk/src/main/org/hornetq/api/jms/bridge/JNDIFactorySupport.java) =================================================================== --- trunk/src/main/org/hornetq/jms/bridge/impl/JNDIFactorySupport.java (rev 0) +++ trunk/src/main/org/hornetq/jms/bridge/impl/JNDIFactorySupport.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -0,0 +1,69 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package org.hornetq.jms.bridge.impl; + +import java.util.Hashtable; + +import javax.naming.InitialContext; + +/** + * + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + * @version <tt>$Revision: $</tt>10 Oct 2007 + * + * $Id: $ + * + */ +public abstract class JNDIFactorySupport +{ + protected Hashtable jndiProperties; + + protected String lookup; + + protected JNDIFactorySupport(final Hashtable jndiProperties, final String lookup) + { + this.jndiProperties = jndiProperties; + + this.lookup = lookup; + } + + protected Object createObject() throws Exception + { + InitialContext ic = null; + + Object obj = null; + + try + { + if (jndiProperties == null) + { + ic = new InitialContext(); + } + else + { + ic = new InitialContext(jndiProperties); + } + + obj = ic.lookup(lookup); + } + finally + { + if (ic != null) + { + ic.close(); + } + } + return obj; + } +} Modified: trunk/src/main/org/hornetq/jms/management/impl/JMSServerControlImpl.java =================================================================== --- trunk/src/main/org/hornetq/jms/management/impl/JMSServerControlImpl.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/src/main/org/hornetq/jms/management/impl/JMSServerControlImpl.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -30,13 +30,13 @@ import org.hornetq.api.Pair; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.management.client.ManagementHelper; +import org.hornetq.api.core.management.ManagementHelper; import org.hornetq.api.jms.management.ConnectionFactoryControl; import org.hornetq.api.jms.management.JMSQueueControl; import org.hornetq.api.jms.management.JMSServerControl; import org.hornetq.api.jms.management.TopicControl; -import org.hornetq.api.jms.server.JMSServerManager; import org.hornetq.core.management.impl.MBeanInfoHelper; +import org.hornetq.jms.server.JMSServerManager; /** * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> Copied: trunk/src/main/org/hornetq/jms/server/JMSServerManager.java (from rev 8720, trunk/src/main/org/hornetq/api/jms/server/JMSServerManager.java) =================================================================== --- trunk/src/main/org/hornetq/jms/server/JMSServerManager.java (rev 0) +++ trunk/src/main/org/hornetq/jms/server/JMSServerManager.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -0,0 +1,230 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package org.hornetq.jms.server; + +import java.util.List; + +import javax.naming.Context; + +import org.hornetq.api.Pair; +import org.hornetq.api.core.config.TransportConfiguration; +import org.hornetq.core.server.HornetQComponent; +import org.hornetq.core.server.HornetQServer; + +/** + * The JMS Management interface. + * + * @author <a href="ataylor(a)redhat.com">Andy Taylor</a> + * @author <a href="jmesnil(a)redhat.com">Jeff Mesnil</a> + * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> + */ +public interface JMSServerManager extends HornetQComponent +{ + String getVersion(); + + /** + * Has the Server been started. + * + * @return true if the server us running + */ + boolean isStarted(); + + /** + * Creates a JMS Queue. + * + * @param queueName + * The name of the queue to create + * @param jndiBinding + * the name of the binding for JNDI + * @param selectorString + * @param durable + * @return true if the queue is created or if it existed and was added to + * JNDI + * @throws Exception + * if problems were encountered creating the queue. + */ + boolean createQueue(String queueName, String jndiBinding, String selectorString, boolean durable) throws Exception; + + /** + * Creates a JMS Topic + * + * @param topicName + * the name of the topic + * @param jndiBinding + * the name of the binding for JNDI + * @return true if the topic was created or if it existed and was added to + * JNDI + * @throws Exception + * if a problem occurred creating the topic + */ + boolean createTopic(String topicName, String jndiBinding) throws Exception; + + /** + * Remove the destination from JNDI. + * Calling this method does not destroy the destination. + * + * @param name + * the name of the destination to remove from JNDI + * @return true if removed + * @throws Exception + * if a problem occurred removing the destination + */ + boolean undeployDestination(String name) throws Exception; + + /** + * destroys a queue and removes it from JNDI + * + * @param name + * the name of the queue to destroy + * @return true if destroyed + * @throws Exception + * if a problem occurred destroying the queue + */ + boolean destroyQueue(String name) throws Exception; + + /** + * destroys a topic and removes it from JNDI + * + * @param name + * the name of the topic to destroy + * @return true if the topic was destroyed + * @throws Exception + * if a problem occurred destroying the topic + */ + boolean destroyTopic(String name) throws Exception; + + void createConnectionFactory(String name, String discoveryAddress, int discoveryPort, List<String> jndiBindings) throws Exception; + + void createConnectionFactory(String name, + List<Pair<TransportConfiguration, TransportConfiguration>> connectorConfigs, + List<String> jndiBindings) throws Exception; + + void createConnectionFactory(String name, + TransportConfiguration liveTC, + TransportConfiguration backupTC, + List<String> jndiBindings) throws Exception; + + void createConnectionFactory(String name, TransportConfiguration liveTC, List<String> jndiBindings) throws Exception; + + void createConnectionFactory(String name, + String discoveryAddress, + int discoveryPort, + String clientID, + List<String> jndiBindings) throws Exception; + + void createConnectionFactory(String name, + List<Pair<TransportConfiguration, TransportConfiguration>> connectorConfigs, + String clientID, + List<String> jndiBindings) throws Exception; + + void createConnectionFactory(String name, + TransportConfiguration liveTC, + TransportConfiguration backupTC, + String clientID, + List<String> jndiBindings) throws Exception; + + void createConnectionFactory(String name, TransportConfiguration liveTC, String clientID, List<String> jndiBindings) throws Exception; + + void createConnectionFactory(String name, + List<Pair<TransportConfiguration, TransportConfiguration>> connectorConfigs, + String clientID, + long clientFailureCheckPeriod, + long connectionTTL, + long callTimeout, + boolean cacheLargeMessagesClient, + int minLargeMessageSize, + int consumerWindowSize, + int consumerMaxRate, + int confirmationWindowSize, + int producerWindowSize, + int producerMaxRate, + boolean blockOnAcknowledge, + boolean blockOnDurableSend, + boolean blockOnNonDurableSend, + boolean autoGroup, + boolean preAcknowledge, + String loadBalancingPolicyClassName, + int transactionBatchSize, + int dupsOKBatchSize, + boolean useGlobalPools, + int scheduledThreadPoolMaxSize, + int threadPoolMaxSize, + long retryInterval, + double retryIntervalMultiplier, + long maxRetryInterval, + int reconnectAttempts, + boolean failoverOnServerShutdown, + String groupId, + List<String> jndiBindings) throws Exception; + + void createConnectionFactory(String name, + String discoveryAddress, + int discoveryPort, + String clientID, + long discoveryRefreshTimeout, + long clientFailureCheckPeriod, + long connectionTTL, + long callTimeout, + boolean cacheLargeMessagesClient, + int minLargeMessageSize, + int consumerWindowSize, + int consumerMaxRate, + int confirmationWindowSize, + int producerWindowSize, + int producerMaxRate, + boolean blockOnAcknowledge, + boolean blockOnDurableSend, + boolean blockOnNonDurableSend, + boolean autoGroup, + boolean preAcknowledge, + String loadBalancingPolicyClassName, + int transactionBatchSize, + int dupsOKBatchSize, + long initialWaitTimeout, + boolean useGlobalPools, + int scheduledThreadPoolMaxSize, + int threadPoolMaxSize, + long retryInterval, + double retryIntervalMultiplier, + long maxRetryInterval, + int reconnectAttempts, + boolean failoverOnServerShutdown, + String groupId, + List<String> jndiBindings) throws Exception; + + /** + * destroys a connection factory. + * + * @param name + * the name of the connection factory to destroy + * @return true if the connection factory was destroyed + * @throws Exception + * if a problem occurred destroying the connection factory + */ + boolean destroyConnectionFactory(String name) throws Exception; + + String[] listRemoteAddresses() throws Exception; + + String[] listRemoteAddresses(String ipAddress) throws Exception; + + boolean closeConnectionsForAddress(String ipAddress) throws Exception; + + String[] listConnectionIDs() throws Exception; + + String[] listSessions(String connectionID) throws Exception; + + void setContext(final Context context); + + HornetQServer getHornetQServer(); +} Copied: trunk/src/main/org/hornetq/jms/server/config/ConnectionFactoryConfiguration.java (from rev 8720, trunk/src/main/org/hornetq/api/jms/config/ConnectionFactoryConfiguration.java) =================================================================== --- trunk/src/main/org/hornetq/jms/server/config/ConnectionFactoryConfiguration.java (rev 0) +++ trunk/src/main/org/hornetq/jms/server/config/ConnectionFactoryConfiguration.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -0,0 +1,165 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package org.hornetq.jms.server.config; + +import java.util.List; + +import org.hornetq.api.Pair; +import org.hornetq.api.core.config.TransportConfiguration; + +/** + * A ConnectionFactoryConfiguration + * + * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> + * + * + */ +public interface ConnectionFactoryConfiguration +{ + String getName(); + + String[] getBindings(); + + String getDiscoveryAddress(); + + void setDiscoveryAddress(String discoveryAddress); + + int getDiscoveryPort(); + + void setDiscoveryPort(int discoveryPort); + + List<Pair<TransportConfiguration, TransportConfiguration>> getConnectorConfigs(); + + void setConnectorConfigs(List<Pair<TransportConfiguration, TransportConfiguration>> connectorConfigs); + + String getClientID(); + + void setClientID(String clientID); + + long getDiscoveryRefreshTimeout(); + + void setDiscoveryRefreshTimeout(long discoveryRefreshTimeout); + + long getClientFailureCheckPeriod(); + + void setClientFailureCheckPeriod(long clientFailureCheckPeriod); + + long getConnectionTTL(); + + void setConnectionTTL(long connectionTTL); + + long getCallTimeout(); + + void setCallTimeout(long callTimeout); + + boolean isCacheLargeMessagesClient(); + + void setCacheLargeMessagesClient(boolean cacheLargeMessagesClient); + + int getMinLargeMessageSize(); + + void setMinLargeMessageSize(int minLargeMessageSize); + + int getConsumerWindowSize(); + + void setConsumerWindowSize(int consumerWindowSize); + + int getConsumerMaxRate(); + + void setConsumerMaxRate(int consumerMaxRate); + + int getConfirmationWindowSize(); + + void setConfirmationWindowSize(int confirmationWindowSize); + + int getProducerWindowSize(); + + void setProducerWindowSize(int producerWindowSize); + + int getProducerMaxRate(); + + void setProducerMaxRate(int producerMaxRate); + + boolean isBlockOnAcknowledge(); + + void setBlockOnAcknowledge(boolean blockOnAcknowledge); + + boolean isBlockOnDurableSend(); + + void setBlockOnDurableSend(boolean blockOnDurableSend); + + boolean isBlockOnNonDurableSend(); + + void setBlockOnNonDurableSend(boolean blockOnNonDurableSend); + + boolean isAutoGroup(); + + void setAutoGroup(boolean autoGroup); + + boolean isPreAcknowledge(); + + void setPreAcknowledge(boolean preAcknowledge); + + String getLoadBalancingPolicyClassName(); + + void setLoadBalancingPolicyClassName(String loadBalancingPolicyClassName); + + int getTransactionBatchSize(); + + void setTransactionBatchSize(int transactionBatchSize); + + int getDupsOKBatchSize(); + + void setDupsOKBatchSize(int dupsOKBatchSize); + + long getInitialWaitTimeout(); + + void setInitialWaitTimeout(long initialWaitTimeout); + + boolean isUseGlobalPools(); + + void setUseGlobalPools(boolean useGlobalPools); + + int getScheduledThreadPoolMaxSize(); + + void setScheduledThreadPoolMaxSize(int scheduledThreadPoolMaxSize); + + int getThreadPoolMaxSize(); + + void setThreadPoolMaxSize(int threadPoolMaxSize); + + long getRetryInterval(); + + void setRetryInterval(long retryInterval); + + double getRetryIntervalMultiplier(); + + void setRetryIntervalMultiplier(double retryIntervalMultiplier); + + long getMaxRetryInterval(); + + void setMaxRetryInterval(long maxRetryInterval); + + int getReconnectAttempts(); + + void setReconnectAttempts(int reconnectAttempts); + + boolean isFailoverOnServerShutdown(); + + void setFailoverOnServerShutdown(boolean failoverOnServerShutdown); + + String getGroupID(); + + void setGroupID(String groupID); +} Copied: trunk/src/main/org/hornetq/jms/server/config/JMSConfiguration.java (from rev 8720, trunk/src/main/org/hornetq/api/jms/config/JMSConfiguration.java) =================================================================== --- trunk/src/main/org/hornetq/jms/server/config/JMSConfiguration.java (rev 0) +++ trunk/src/main/org/hornetq/jms/server/config/JMSConfiguration.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -0,0 +1,38 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package org.hornetq.jms.server.config; + +import java.util.List; + +import javax.naming.Context; + +/** + * A JMSConfiguration + * + * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> + * + * + */ +public interface JMSConfiguration +{ + void setContext(Context context); + + Context getContext(); + + List<QueueConfiguration> getQueueConfigurations(); + + List<TopicConfiguration> getTopicConfigurations(); + + List<ConnectionFactoryConfiguration> getConnectionFactoryConfigurations(); +} Copied: trunk/src/main/org/hornetq/jms/server/config/QueueConfiguration.java (from rev 8720, trunk/src/main/org/hornetq/api/jms/config/QueueConfiguration.java) =================================================================== --- trunk/src/main/org/hornetq/jms/server/config/QueueConfiguration.java (rev 0) +++ trunk/src/main/org/hornetq/jms/server/config/QueueConfiguration.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -0,0 +1,32 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package org.hornetq.jms.server.config; + +/** + * A QeueConfiguration + * + * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> + * + * + */ +public interface QueueConfiguration +{ + String getName(); + + String getSelector(); + + boolean isDurable(); + + String[] getBindings(); +} Copied: trunk/src/main/org/hornetq/jms/server/config/TopicConfiguration.java (from rev 8720, trunk/src/main/org/hornetq/api/jms/config/TopicConfiguration.java) =================================================================== --- trunk/src/main/org/hornetq/jms/server/config/TopicConfiguration.java (rev 0) +++ trunk/src/main/org/hornetq/jms/server/config/TopicConfiguration.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -0,0 +1,26 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package org.hornetq.jms.server.config; + +/** + * A TopicConfiguration + * + * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> + */ +public interface TopicConfiguration +{ + String getName(); + + String[] getBindings(); +} Copied: trunk/src/main/org/hornetq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java (from rev 8720, trunk/src/main/org/hornetq/api/jms/config/ConnectionFactoryConfigurationImpl.java) =================================================================== --- trunk/src/main/org/hornetq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java (rev 0) +++ trunk/src/main/org/hornetq/jms/server/config/impl/ConnectionFactoryConfigurationImpl.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -0,0 +1,507 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package org.hornetq.jms.server.config.impl; + +import java.util.ArrayList; +import java.util.List; + +import org.hornetq.api.Pair; +import org.hornetq.api.core.client.ClientSessionFactoryImpl; +import org.hornetq.api.core.config.TransportConfiguration; +import org.hornetq.jms.server.config.ConnectionFactoryConfiguration; + +/** + * A ConnectionFactoryConfigurationImpl + * + * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> + * + * + */ +public class ConnectionFactoryConfigurationImpl implements ConnectionFactoryConfiguration +{ + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private final String[] bindings; + + private final String name; + + private String discoveryAddress; + + private int discoveryPort; + + private List<Pair<TransportConfiguration, TransportConfiguration>> connectorConfigs; + + private String clientID = null; + + private long discoveryRefreshTimeout = ClientSessionFactoryImpl.DEFAULT_DISCOVERY_REFRESH_TIMEOUT; + + private long clientFailureCheckPeriod = ClientSessionFactoryImpl.DEFAULT_CLIENT_FAILURE_CHECK_PERIOD; + + private long connectionTTL = ClientSessionFactoryImpl.DEFAULT_CONNECTION_TTL; + + private long callTimeout = ClientSessionFactoryImpl.DEFAULT_CALL_TIMEOUT; + + private boolean cacheLargeMessagesClient = ClientSessionFactoryImpl.DEFAULT_CACHE_LARGE_MESSAGE_CLIENT; + + private int minLargeMessageSize = ClientSessionFactoryImpl.DEFAULT_MIN_LARGE_MESSAGE_SIZE; + + private int consumerWindowSize = ClientSessionFactoryImpl.DEFAULT_CONSUMER_WINDOW_SIZE; + + private int consumerMaxRate = ClientSessionFactoryImpl.DEFAULT_CONSUMER_MAX_RATE; + + private int confirmationWindowSize = ClientSessionFactoryImpl.DEFAULT_CONFIRMATION_WINDOW_SIZE; + + private int producerWindowSize = ClientSessionFactoryImpl.DEFAULT_PRODUCER_WINDOW_SIZE; + + private int producerMaxRate = ClientSessionFactoryImpl.DEFAULT_PRODUCER_MAX_RATE; + + private boolean blockOnAcknowledge = ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_ACKNOWLEDGE; + + private boolean blockOnDurableSend = ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_DURABLE_SEND; + + private boolean blockOnNonDurableSend = ClientSessionFactoryImpl.DEFAULT_BLOCK_ON_NON_DURABLE_SEND; + + private boolean autoGroup = ClientSessionFactoryImpl.DEFAULT_AUTO_GROUP; + + private boolean preAcknowledge = ClientSessionFactoryImpl.DEFAULT_PRE_ACKNOWLEDGE; + + private String loadBalancingPolicyClassName = ClientSessionFactoryImpl.DEFAULT_CONNECTION_LOAD_BALANCING_POLICY_CLASS_NAME; + + private int transactionBatchSize = ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE; + + private int dupsOKBatchSize = ClientSessionFactoryImpl.DEFAULT_ACK_BATCH_SIZE; + + private long initialWaitTimeout = ClientSessionFactoryImpl.DEFAULT_DISCOVERY_INITIAL_WAIT_TIMEOUT; + + private boolean useGlobalPools = ClientSessionFactoryImpl.DEFAULT_USE_GLOBAL_POOLS; + + private int scheduledThreadPoolMaxSize = ClientSessionFactoryImpl.DEFAULT_SCHEDULED_THREAD_POOL_MAX_SIZE; + + private int threadPoolMaxSize = ClientSessionFactoryImpl.DEFAULT_THREAD_POOL_MAX_SIZE; + + private long retryInterval = ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL; + + private double retryIntervalMultiplier = ClientSessionFactoryImpl.DEFAULT_RETRY_INTERVAL_MULTIPLIER; + + private long maxRetryInterval = ClientSessionFactoryImpl.DEFAULT_MAX_RETRY_INTERVAL; + + private int reconnectAttempts = ClientSessionFactoryImpl.DEFAULT_RECONNECT_ATTEMPTS; + + private boolean failoverOnServerShutdown = ClientSessionFactoryImpl.DEFAULT_FAILOVER_ON_SERVER_SHUTDOWN; + + private String groupID = null; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public ConnectionFactoryConfigurationImpl(final String name, + final String discoveryAddress, + final int discoveryPort, + final String... bindings) + { + this(name, bindings); + this.discoveryAddress = discoveryAddress; + this.discoveryPort = discoveryPort; + } + + public ConnectionFactoryConfigurationImpl(final String name, + final TransportConfiguration liveConfig, + final String... bindings) + { + this(name, liveConfig, null, bindings); + } + + public ConnectionFactoryConfigurationImpl(final String name, + final TransportConfiguration liveConfig, + final TransportConfiguration backupConfig, + final String... bindings) + { + this(name, bindings); + connectorConfigs = new ArrayList<Pair<TransportConfiguration, TransportConfiguration>>(); + connectorConfigs.add(new Pair<TransportConfiguration, TransportConfiguration>(liveConfig, backupConfig)); + } + + public ConnectionFactoryConfigurationImpl(final String name, + final List<Pair<TransportConfiguration, TransportConfiguration>> transportConfigs, + final TransportConfiguration backupConfig, + final String... bindings) + { + this(name, bindings); + connectorConfigs = new ArrayList<Pair<TransportConfiguration, TransportConfiguration>>(); + connectorConfigs.addAll(transportConfigs); + } + + private ConnectionFactoryConfigurationImpl(final String name, final String... bindings) + { + this.name = name; + this.bindings = new String[bindings.length]; + System.arraycopy(bindings, 0, this.bindings, 0, bindings.length); + } + + // ConnectionFactoryConfiguration implementation ----------------- + + public String[] getBindings() + { + return bindings; + } + + public String getName() + { + return name; + } + + public String getDiscoveryAddress() + { + return discoveryAddress; + } + + public void setDiscoveryAddress(final String discoveryAddress) + { + this.discoveryAddress = discoveryAddress; + } + + public int getDiscoveryPort() + { + return discoveryPort; + } + + public void setDiscoveryPort(final int discoveryPort) + { + this.discoveryPort = discoveryPort; + } + + public List<Pair<TransportConfiguration, TransportConfiguration>> getConnectorConfigs() + { + return connectorConfigs; + } + + public void setConnectorConfigs(final List<Pair<TransportConfiguration, TransportConfiguration>> connectorConfigs) + { + this.connectorConfigs = connectorConfigs; + } + + public String getClientID() + { + return clientID; + } + + public void setClientID(final String clientID) + { + this.clientID = clientID; + } + + public long getDiscoveryRefreshTimeout() + { + return discoveryRefreshTimeout; + } + + public void setDiscoveryRefreshTimeout(final long discoveryRefreshTimeout) + { + this.discoveryRefreshTimeout = discoveryRefreshTimeout; + } + + public long getClientFailureCheckPeriod() + { + return clientFailureCheckPeriod; + } + + public void setClientFailureCheckPeriod(final long clientFailureCheckPeriod) + { + this.clientFailureCheckPeriod = clientFailureCheckPeriod; + } + + public long getConnectionTTL() + { + return connectionTTL; + } + + public void setConnectionTTL(final long connectionTTL) + { + this.connectionTTL = connectionTTL; + } + + public long getCallTimeout() + { + return callTimeout; + } + + public void setCallTimeout(final long callTimeout) + { + this.callTimeout = callTimeout; + } + + public boolean isCacheLargeMessagesClient() + { + return cacheLargeMessagesClient; + } + + public void setCacheLargeMessagesClient(final boolean cacheLargeMessagesClient) + { + this.cacheLargeMessagesClient = cacheLargeMessagesClient; + } + + public int getMinLargeMessageSize() + { + return minLargeMessageSize; + } + + public void setMinLargeMessageSize(final int minLargeMessageSize) + { + this.minLargeMessageSize = minLargeMessageSize; + } + + public int getConsumerWindowSize() + { + return consumerWindowSize; + } + + public void setConsumerWindowSize(final int consumerWindowSize) + { + this.consumerWindowSize = consumerWindowSize; + } + + public int getConsumerMaxRate() + { + return consumerMaxRate; + } + + public void setConsumerMaxRate(final int consumerMaxRate) + { + this.consumerMaxRate = consumerMaxRate; + } + + public int getConfirmationWindowSize() + { + return confirmationWindowSize; + } + + public void setConfirmationWindowSize(final int confirmationWindowSize) + { + this.confirmationWindowSize = confirmationWindowSize; + } + + public int getProducerMaxRate() + { + return producerMaxRate; + } + + public void setProducerMaxRate(final int producerMaxRate) + { + this.producerMaxRate = producerMaxRate; + } + + public int getProducerWindowSize() + { + return producerWindowSize; + } + + public void setProducerWindowSize(final int producerWindowSize) + { + this.producerWindowSize = producerWindowSize; + } + + public boolean isBlockOnAcknowledge() + { + return blockOnAcknowledge; + } + + public void setBlockOnAcknowledge(final boolean blockOnAcknowledge) + { + this.blockOnAcknowledge = blockOnAcknowledge; + } + + public boolean isBlockOnDurableSend() + { + return blockOnDurableSend; + } + + public void setBlockOnDurableSend(final boolean blockOnDurableSend) + { + this.blockOnDurableSend = blockOnDurableSend; + } + + public boolean isBlockOnNonDurableSend() + { + return blockOnNonDurableSend; + } + + public void setBlockOnNonDurableSend(final boolean blockOnNonDurableSend) + { + this.blockOnNonDurableSend = blockOnNonDurableSend; + } + + public boolean isAutoGroup() + { + return autoGroup; + } + + public void setAutoGroup(final boolean autoGroup) + { + this.autoGroup = autoGroup; + } + + public boolean isPreAcknowledge() + { + return preAcknowledge; + } + + public void setPreAcknowledge(final boolean preAcknowledge) + { + this.preAcknowledge = preAcknowledge; + } + + public String getLoadBalancingPolicyClassName() + { + return loadBalancingPolicyClassName; + } + + public void setLoadBalancingPolicyClassName(final String loadBalancingPolicyClassName) + { + this.loadBalancingPolicyClassName = loadBalancingPolicyClassName; + } + + public int getTransactionBatchSize() + { + return transactionBatchSize; + } + + public void setTransactionBatchSize(final int transactionBatchSize) + { + this.transactionBatchSize = transactionBatchSize; + } + + public int getDupsOKBatchSize() + { + return dupsOKBatchSize; + } + + public void setDupsOKBatchSize(final int dupsOKBatchSize) + { + this.dupsOKBatchSize = dupsOKBatchSize; + } + + public long getInitialWaitTimeout() + { + return initialWaitTimeout; + } + + public void setInitialWaitTimeout(final long initialWaitTimeout) + { + this.initialWaitTimeout = initialWaitTimeout; + } + + public boolean isUseGlobalPools() + { + return useGlobalPools; + } + + public void setUseGlobalPools(final boolean useGlobalPools) + { + this.useGlobalPools = useGlobalPools; + } + + public int getScheduledThreadPoolMaxSize() + { + return scheduledThreadPoolMaxSize; + } + + public void setScheduledThreadPoolMaxSize(final int scheduledThreadPoolMaxSize) + { + this.scheduledThreadPoolMaxSize = scheduledThreadPoolMaxSize; + } + + public int getThreadPoolMaxSize() + { + return threadPoolMaxSize; + } + + public void setThreadPoolMaxSize(final int threadPoolMaxSize) + { + this.threadPoolMaxSize = threadPoolMaxSize; + } + + public long getRetryInterval() + { + return retryInterval; + } + + public void setRetryInterval(final long retryInterval) + { + this.retryInterval = retryInterval; + } + + public double getRetryIntervalMultiplier() + { + return retryIntervalMultiplier; + } + + public void setRetryIntervalMultiplier(final double retryIntervalMultiplier) + { + this.retryIntervalMultiplier = retryIntervalMultiplier; + } + + public long getMaxRetryInterval() + { + return maxRetryInterval; + } + + public void setMaxRetryInterval(final long maxRetryInterval) + { + this.maxRetryInterval = maxRetryInterval; + } + + public int getReconnectAttempts() + { + return reconnectAttempts; + } + + public void setReconnectAttempts(final int reconnectAttempts) + { + this.reconnectAttempts = reconnectAttempts; + } + + public boolean isFailoverOnServerShutdown() + { + return failoverOnServerShutdown; + } + + public void setFailoverOnServerShutdown(final boolean failoverOnServerShutdown) + { + this.failoverOnServerShutdown = failoverOnServerShutdown; + } + + public String getGroupID() + { + return groupID; + } + + public void setGroupID(final String groupID) + { + this.groupID = groupID; + } + + // Public -------------------------------------------------------- + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- + +} Copied: trunk/src/main/org/hornetq/jms/server/config/impl/JMSConfigurationImpl.java (from rev 8720, trunk/src/main/org/hornetq/api/jms/config/JMSConfigurationImpl.java) =================================================================== --- trunk/src/main/org/hornetq/jms/server/config/impl/JMSConfigurationImpl.java (rev 0) +++ trunk/src/main/org/hornetq/jms/server/config/impl/JMSConfigurationImpl.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -0,0 +1,103 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package org.hornetq.jms.server.config.impl; + +import java.util.ArrayList; +import java.util.List; + +import javax.naming.Context; + +import org.hornetq.jms.server.config.ConnectionFactoryConfiguration; +import org.hornetq.jms.server.config.JMSConfiguration; +import org.hornetq.jms.server.config.QueueConfiguration; +import org.hornetq.jms.server.config.TopicConfiguration; + + +/** + * A JMSConfigurationImpl + * + * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> + * + * + */ +public class JMSConfigurationImpl implements JMSConfiguration +{ + + private final List<ConnectionFactoryConfiguration> connectionFactoryConfigurations = new ArrayList<ConnectionFactoryConfiguration>(); + + private final List<QueueConfiguration> queueConfigurations = new ArrayList<QueueConfiguration>(); + + private final List<TopicConfiguration> topicConfigurations = new ArrayList<TopicConfiguration>(); + + private Context context = null; + + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public JMSConfigurationImpl() + { + } + + public JMSConfigurationImpl(final List<ConnectionFactoryConfiguration> connectionFactoryConfigurations, + final List<QueueConfiguration> queueConfigurations, + final List<TopicConfiguration> topicConfigurations) + { + this.connectionFactoryConfigurations.addAll(connectionFactoryConfigurations); + this.queueConfigurations.addAll(queueConfigurations); + this.topicConfigurations.addAll(topicConfigurations); + } + + // JMSConfiguration implementation ------------------------------- + + public List<ConnectionFactoryConfiguration> getConnectionFactoryConfigurations() + { + return connectionFactoryConfigurations; + } + + public List<QueueConfiguration> getQueueConfigurations() + { + return queueConfigurations; + } + + public List<TopicConfiguration> getTopicConfigurations() + { + return topicConfigurations; + } + + public Context getContext() + { + return context; + } + + public void setContext(final Context context) + { + this.context = context; + } + + // Public -------------------------------------------------------- + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- + +} Copied: trunk/src/main/org/hornetq/jms/server/config/impl/QueueConfigurationImpl.java (from rev 8720, trunk/src/main/org/hornetq/api/jms/config/QueueConfigurationImpl.java) =================================================================== --- trunk/src/main/org/hornetq/jms/server/config/impl/QueueConfigurationImpl.java (rev 0) +++ trunk/src/main/org/hornetq/jms/server/config/impl/QueueConfigurationImpl.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -0,0 +1,89 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package org.hornetq.jms.server.config.impl; + +import org.hornetq.jms.server.config.QueueConfiguration; + + +/** + * A QueueConfigurationImpl + * + * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> + * + * + */ +public class QueueConfigurationImpl implements QueueConfiguration +{ + + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private final String name; + + private final String selector; + + private final boolean durable; + + private final String[] bindings; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public QueueConfigurationImpl(final String name, + final String selector, + final boolean durable, + final String... bindings) + { + this.name = name; + this.selector = selector; + this.durable = durable; + this.bindings = new String[bindings.length]; + System.arraycopy(bindings, 0, this.bindings, 0, bindings.length); + } + + // QueueConfiguration implementation ----------------------------- + + public String[] getBindings() + { + return bindings; + } + + public String getName() + { + return name; + } + + public String getSelector() + { + return selector; + } + + public boolean isDurable() + { + return durable; + } + + // Public -------------------------------------------------------- + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- + +} Copied: trunk/src/main/org/hornetq/jms/server/config/impl/TopicConfigurationImpl.java (from rev 8720, trunk/src/main/org/hornetq/api/jms/config/TopicConfigurationImpl.java) =================================================================== --- trunk/src/main/org/hornetq/jms/server/config/impl/TopicConfigurationImpl.java (rev 0) +++ trunk/src/main/org/hornetq/jms/server/config/impl/TopicConfigurationImpl.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -0,0 +1,70 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package org.hornetq.jms.server.config.impl; + +import org.hornetq.jms.server.config.TopicConfiguration; + + +/** + * A TopicConfigurationImpl + * + * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> + * + * + */ +public class TopicConfigurationImpl implements TopicConfiguration +{ + + // Constants ----------------------------------------------------- + + // Attributes ---------------------------------------------------- + + private final String name; + + private final String[] bindings; + + // Static -------------------------------------------------------- + + // Constructors -------------------------------------------------- + + public TopicConfigurationImpl(final String name, final String... bindings) + { + this.name = name; + this.bindings = new String[bindings.length]; + System.arraycopy(bindings, 0, this.bindings, 0, bindings.length); + } + + // TopicConfiguration implementation ----------------------------- + + public String[] getBindings() + { + return bindings; + } + + public String getName() + { + return name; + } + + // Public -------------------------------------------------------- + + // Package protected --------------------------------------------- + + // Protected ----------------------------------------------------- + + // Private ------------------------------------------------------- + + // Inner classes ------------------------------------------------- + +} Modified: trunk/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/src/main/org/hornetq/jms/server/impl/JMSServerDeployer.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -18,14 +18,14 @@ import org.hornetq.api.Pair; import org.hornetq.api.core.client.ClientSessionFactoryImpl; -import org.hornetq.api.core.config.Configuration; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.config.cluster.DiscoveryGroupConfiguration; -import org.hornetq.api.jms.server.JMSServerManager; +import org.hornetq.core.config.Configuration; import org.hornetq.core.config.impl.Validators; import org.hornetq.core.deployers.DeploymentManager; import org.hornetq.core.deployers.impl.XmlDeployer; import org.hornetq.core.logging.Logger; +import org.hornetq.core.server.cluster.DiscoveryGroupConfiguration; +import org.hornetq.jms.server.JMSServerManager; import org.hornetq.utils.XMLConfigurationUtil; import org.w3c.dom.Element; import org.w3c.dom.NamedNodeMap; Copied: trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java (from rev 8720, trunk/src/main/org/hornetq/api/jms/server/JMSServerManagerImpl.java) =================================================================== --- trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java (rev 0) +++ trunk/src/main/org/hornetq/jms/server/impl/JMSServerManagerImpl.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -0,0 +1,862 @@ +/* + * Copyright 2009 Red Hat, Inc. + * Red Hat licenses this file to you under the Apache License, version + * 2.0 (the "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0 + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. See the License for the specific language governing + * permissions and limitations under the License. + */ + +package org.hornetq.jms.server.impl; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; + +import javax.naming.Context; +import javax.naming.InitialContext; +import javax.naming.NameNotFoundException; +import javax.naming.NamingException; + +import org.hornetq.api.Pair; +import org.hornetq.api.core.config.TransportConfiguration; +import org.hornetq.api.jms.HornetQConnectionFactory; +import org.hornetq.api.jms.HornetQQueue; +import org.hornetq.api.jms.HornetQTopic; +import org.hornetq.core.deployers.DeploymentManager; +import org.hornetq.core.deployers.impl.FileDeploymentManager; +import org.hornetq.core.deployers.impl.XmlDeployer; +import org.hornetq.core.logging.Logger; +import org.hornetq.core.server.ActivateCallback; +import org.hornetq.core.server.HornetQServer; +import org.hornetq.jms.client.SelectorTranslator; +import org.hornetq.jms.server.JMSServerManager; +import org.hornetq.jms.server.config.ConnectionFactoryConfiguration; +import org.hornetq.jms.server.config.JMSConfiguration; +import org.hornetq.jms.server.config.QueueConfiguration; +import org.hornetq.jms.server.config.TopicConfiguration; +import org.hornetq.jms.server.management.JMSManagementService; +import org.hornetq.jms.server.management.impl.JMSManagementServiceImpl; + +/** + * A Deployer used to create and add to JNDI queues, topics and connection + * factories. Typically this would only be used in an app server env. + * + * JMS Connection Factories & Destinations can be configured either + * using configuration files or using a JMSConfiguration object. + * + * If configuration files are used, JMS resources are redeployed if the + * files content is changed. + * If a JMSConfiguration object is used, the JMS resources can not be + * redeployed. + * + * @author <a href="ataylor(a)redhat.com">Andy Taylor</a> + * @author <a href="jmesnil(a)redhat.com">Jeff Mesnil</a> + * @author <a href="tim.fox(a)jboss.com">Tim Fox</a> + */ +public class JMSServerManagerImpl implements JMSServerManager, ActivateCallback +{ + private static final Logger log = Logger.getLogger(JMSServerManagerImpl.class); + + private static final String REJECT_FILTER = "__HQX=-1"; + + /** + * the context to bind to + */ + private Context context; + + private final Map<String, List<String>> destinations = new HashMap<String, List<String>>(); + + private final Map<String, HornetQConnectionFactory> connectionFactories = new HashMap<String, HornetQConnectionFactory>(); + + private final Map<String, List<String>> connectionFactoryBindings = new HashMap<String, List<String>>(); + + private final HornetQServer server; + + private JMSManagementService jmsManagementService; + + private XmlDeployer jmsDeployer; + + private boolean started; + + private boolean active; + + private DeploymentManager deploymentManager; + + private final String configFileName; + + private boolean contextSet; + + private JMSConfiguration config; + + public JMSServerManagerImpl(final HornetQServer server) throws Exception + { + this.server = server; + + configFileName = null; + } + + public JMSServerManagerImpl(final HornetQServer server, final String configFileName) throws Exception + { + this.server = server; + + this.configFileName = configFileName; + } + + public JMSServerManagerImpl(final HornetQServer server, final JMSConfiguration configuration) throws Exception + { + this.server = server; + + configFileName = null; + + config = configuration; + } + + // ActivateCallback implementation ------------------------------------- + + public synchronized void activated() + { + active = true; + + jmsManagementService = new JMSManagementServiceImpl(server.getManagementService()); + + try + { + jmsManagementService.registerJMSServer(this); + + // start the JMS deployer only if the configuration is not done using the JMSConfiguration object + if (config == null) + { + jmsDeployer = new JMSServerDeployer(this, deploymentManager, server.getConfiguration()); + + if (configFileName != null) + { + jmsDeployer.setConfigFileNames(new String[] { configFileName }); + } + + jmsDeployer.start(); + + deploymentManager.start(); + } + else + { + deploy(); + } + } + catch (Exception e) + { + JMSServerManagerImpl.log.error("Failed to start jms deployer", e); + } + } + + // HornetQComponent implementation ----------------------------------- + + public synchronized void start() throws Exception + { + if (started) + { + return; + } + + if (!contextSet) + { + context = new InitialContext(); + } + + deploymentManager = new FileDeploymentManager(server.getConfiguration().getFileDeployerScanPeriod()); + + server.registerActivateCallback(this); + + server.start(); + + started = true; + } + + public synchronized void stop() throws Exception + { + if (!started) + { + return; + } + + if (jmsDeployer != null) + { + jmsDeployer.stop(); + } + + if (deploymentManager != null) + { + deploymentManager.stop(); + } + + for (String destination : destinations.keySet()) + { + undeployDestination(destination); + } + + for (String connectionFactory : new HashSet<String>(connectionFactories.keySet())) + { + destroyConnectionFactory(connectionFactory); + } + + destinations.clear(); + connectionFactories.clear(); + connectionFactoryBindings.clear(); + + if (context != null) + { + context.close(); + } + + jmsManagementService.unregisterJMSServer(); + + jmsManagementService.stop(); + + server.stop(); + + started = false; + } + + public boolean isStarted() + { + return server.getHornetQServerControl().isStarted(); + } + + // JMSServerManager implementation ------------------------------- + + public HornetQServer getHornetQServer() + { + return server; + } + + public synchronized void setContext(final Context context) + { + this.context = context; + + contextSet = true; + } + + public synchronized String getVersion() + { + checkInitialised(); + + return server.getHornetQServerControl().getVersion(); + } + + public synchronized boolean createQueue(final String queueName, + final String jndiBinding, + final String selectorString, + final boolean durable) throws Exception + { + checkInitialised(); + HornetQQueue jBossQueue = new HornetQQueue(queueName); + + // Convert from JMS selector to core filter + String coreFilterString = null; + + if (selectorString != null) + { + coreFilterString = SelectorTranslator.convertToHornetQFilterString(selectorString); + } + + server.getHornetQServerControl().deployQueue(jBossQueue.getAddress(), + jBossQueue.getAddress(), + coreFilterString, + durable); + + boolean added = bindToJndi(jndiBinding, jBossQueue); + + if (added) + { + addToDestinationBindings(queueName, jndiBinding); + } + + jmsManagementService.registerQueue(jBossQueue, jndiBinding); + return added; + } + + public synchronized boolean createTopic(final String topicName, final String jndiBinding) throws Exception + { + checkInitialised(); + HornetQTopic jBossTopic = new HornetQTopic(topicName); + // We create a dummy subscription on the topic, that never receives messages - this is so we can perform JMS + // checks when routing messages to a topic that + // does not exist - otherwise we would not be able to distinguish from a non existent topic and one with no + // subscriptions - core has no notion of a topic + server.getHornetQServerControl().deployQueue(jBossTopic.getAddress(), + jBossTopic.getAddress(), + JMSServerManagerImpl.REJECT_FILTER, + true); + boolean added = bindToJndi(jndiBinding, jBossTopic); + if (added) + { + addToDestinationBindings(topicName, jndiBinding); + } + jmsManagementService.registerTopic(jBossTopic, jndiBinding); + return added; + } + + public synchronized boolean undeployDestination(final String name) throws Exception + { + checkInitialised(); + List<String> jndiBindings = destinations.get(name); + if (jndiBindings == null || jndiBindings.size() == 0) + { + return false; + } + if (context != null) + { + Iterator<String> iter = jndiBindings.iterator(); + while (iter.hasNext()) + { + String jndiBinding = iter.next(); + context.unbind(jndiBinding); + iter.remove(); + } + } + return true; + } + + public synchronized boolean destroyQueue(final String name) throws Exception + { + checkInitialised(); + undeployDestination(name); + + destinations.remove(name); + jmsManagementService.unregisterQueue(name); + server.getHornetQServerControl().destroyQueue(HornetQQueue.createAddressFromName(name).toString()); + + return true; + } + + public synchronized boolean destroyTopic(final String name) throws Exception + { + checkInitialised(); + undeployDestination(name); + + destinations.remove(name); + jmsManagementService.unregisterTopic(name); + server.getHornetQServerControl().destroyQueue(HornetQTopic.createAddressFromName(name).toString()); + + return true; + } + + public synchronized void createConnectionFactory(final String name, + final List<Pair<TransportConfiguration, TransportConfiguration>> connectorConfigs, + final List<String> jndiBindings) throws Exception + { + checkInitialised(); + HornetQConnectionFactory cf = connectionFactories.get(name); + if (cf == null) + { + cf = new HornetQConnectionFactory(connectorConfigs); + } + + bindConnectionFactory(cf, name, jndiBindings); + } + + public synchronized void createConnectionFactory(final String name, + final List<Pair<TransportConfiguration, TransportConfiguration>> connectorConfigs, + final String clientID, + final List<String> jndiBindings) throws Exception + { + checkInitialised(); + HornetQConnectionFactory cf = connectionFactories.get(name); + if (cf == null) + { + cf = new HornetQConnectionFactory(connectorConfigs); + cf.setClientID(clientID); + } + + bindConnectionFactory(cf, name, jndiBindings); + } + + public synchronized void createConnectionFactory(final String name, + final List<Pair<TransportConfiguration, TransportConfiguration>> connectorConfigs, + final String clientID, + final long clientFailureCheckPeriod, + final long connectionTTL, + final long callTimeout, + final boolean cacheLargeMessagesClient, + final int minLargeMessageSize, + final int consumerWindowSize, + final int consumerMaxRate, + final int confirmationWindowSize, + final int producerWindowSize, + final int producerMaxRate, + final boolean blockOnAcknowledge, + final boolean blockOnDurableSend, + final boolean blockOnNonDurableSend, + final boolean autoGroup, + final boolean preAcknowledge, + final String loadBalancingPolicyClassName, + final int transactionBatchSize, + final int dupsOKBatchSize, + final boolean useGlobalPools, + final int scheduledThreadPoolMaxSize, + final int threadPoolMaxSize, + final long retryInterval, + final double retryIntervalMultiplier, + final long maxRetryInterval, + final int reconnectAttempts, + final boolean failoverOnServerShutdown, + final String groupId, + final List<String> jndiBindings) throws Exception + { + checkInitialised(); + HornetQConnectionFactory cf = connectionFactories.get(name); + if (cf == null) + { + cf = new HornetQConnectionFactory(connectorConfigs); + cf.setClientID(clientID); + cf.setClientFailureCheckPeriod(clientFailureCheckPeriod); + cf.setConnectionTTL(connectionTTL); + cf.setCallTimeout(callTimeout); + cf.setCacheLargeMessagesClient(cacheLargeMessagesClient); + cf.setMinLargeMessageSize(minLargeMessageSize); + cf.setConsumerWindowSize(consumerWindowSize); + cf.setConsumerMaxRate(consumerMaxRate); + cf.setConfirmationWindowSize(confirmationWindowSize); + cf.setProducerWindowSize(producerWindowSize); + cf.setProducerMaxRate(producerMaxRate); + cf.setBlockOnAcknowledge(blockOnAcknowledge); + cf.setBlockOnDurableSend(blockOnDurableSend); + cf.setBlockOnNonDurableSend(blockOnNonDurableSend); + cf.setAutoGroup(autoGroup); + cf.setPreAcknowledge(preAcknowledge); + cf.setConnectionLoadBalancingPolicyClassName(loadBalancingPolicyClassName); + cf.setTransactionBatchSize(transactionBatchSize); + cf.setDupsOKBatchSize(dupsOKBatchSize); + cf.setUseGlobalPools(useGlobalPools); + cf.setScheduledThreadPoolMaxSize(scheduledThreadPoolMaxSize); + cf.setThreadPoolMaxSize(threadPoolMaxSize); + cf.setRetryInterval(retryInterval); + cf.setRetryIntervalMultiplier(retryIntervalMultiplier); + cf.setMaxRetryInterval(maxRetryInterval); + cf.setReconnectAttempts(reconnectAttempts); + cf.setFailoverOnServerShutdown(failoverOnServerShutdown); + cf.setGroupID(groupId); + } + + bindConnectionFactory(cf, name, jndiBindings); + } + + public synchronized void createConnectionFactory(final String name, + final String discoveryAddress, + final int discoveryPort, + final String clientID, + final long discoveryRefreshTimeout, + final long clientFailureCheckPeriod, + final long connectionTTL, + final long callTimeout, + final boolean cacheLargeMessagesClient, + final int minLargeMessageSize, + final int consumerWindowSize, + final int consumerMaxRate, + final int confirmationWindowSize, + final int producerWindowSize, + final int producerMaxRate, + final boolean blockOnAcknowledge, + final boolean blockOnDurableSend, + final boolean blockOnNonDurableSend, + final boolean autoGroup, + final boolean preAcknowledge, + final String loadBalancingPolicyClassName, + final int transactionBatchSize, + final int dupsOKBatchSize, + final long initialWaitTimeout, + final boolean useGlobalPools, + final int scheduledThreadPoolMaxSize, + final int threadPoolMaxSize, + final long retryInterval, + final double retryIntervalMultiplier, + final long maxRetryInterval, + final int reconnectAttempts, + final boolean failoverOnServerShutdown, + final String groupId, + final List<String> jndiBindings) throws Exception + { + checkInitialised(); + HornetQConnectionFactory cf = connectionFactories.get(name); + if (cf == null) + { + cf = new HornetQConnectionFactory(discoveryAddress, discoveryPort); + cf.setClientID(clientID); + cf.setDiscoveryRefreshTimeout(discoveryRefreshTimeout); + cf.setClientFailureCheckPeriod(clientFailureCheckPeriod); + cf.setConnectionTTL(connectionTTL); + cf.setCallTimeout(callTimeout); + cf.setCacheLargeMessagesClient(cacheLargeMessagesClient); + cf.setMinLargeMessageSize(minLargeMessageSize); + cf.setConsumerWindowSize(consumerWindowSize); + cf.setConsumerMaxRate(consumerMaxRate); + cf.setConfirmationWindowSize(confirmationWindowSize); + cf.setProducerWindowSize(producerWindowSize); + cf.setProducerMaxRate(producerMaxRate); + cf.setBlockOnAcknowledge(blockOnAcknowledge); + cf.setBlockOnDurableSend(blockOnDurableSend); + cf.setBlockOnNonDurableSend(blockOnNonDurableSend); + cf.setAutoGroup(autoGroup); + cf.setPreAcknowledge(preAcknowledge); + cf.setConnectionLoadBalancingPolicyClassName(loadBalancingPolicyClassName); + cf.setTransactionBatchSize(transactionBatchSize); + cf.setDupsOKBatchSize(dupsOKBatchSize); + cf.setDiscoveryInitialWaitTimeout(initialWaitTimeout); + cf.setUseGlobalPools(useGlobalPools); + cf.setScheduledThreadPoolMaxSize(scheduledThreadPoolMaxSize); + cf.setThreadPoolMaxSize(threadPoolMaxSize); + cf.setRetryInterval(retryInterval); + cf.setRetryIntervalMultiplier(retryIntervalMultiplier); + cf.setMaxRetryInterval(maxRetryInterval); + cf.setReconnectAttempts(reconnectAttempts); + cf.setFailoverOnServerShutdown(failoverOnServerShutdown); + } + + bindConnectionFactory(cf, name, jndiBindings); + } + + public synchronized void createConnectionFactory(final String name, + final String discoveryAddress, + final int discoveryPort, + final List<String> jndiBindings) throws Exception + { + checkInitialised(); + HornetQConnectionFactory cf = connectionFactories.get(name); + if (cf == null) + { + cf = new HornetQConnectionFactory(discoveryAddress, discoveryPort); + } + + bindConnectionFactory(cf, name, jndiBindings); + } + + public synchronized void createConnectionFactory(final String name, + final String discoveryAddress, + final int discoveryPort, + final String clientID, + final List<String> jndiBindings) throws Exception + { + checkInitialised(); + HornetQConnectionFactory cf = connectionFactories.get(name); + if (cf == null) + { + cf = new HornetQConnectionFactory(discoveryAddress, discoveryPort); + cf.setClientID(clientID); + } + + bindConnectionFactory(cf, name, jndiBindings); + } + + public synchronized void createConnectionFactory(final String name, + final TransportConfiguration liveTC, + final List<String> jndiBindings) throws Exception + { + checkInitialised(); + HornetQConnectionFactory cf = connectionFactories.get(name); + if (cf == null) + { + cf = new HornetQConnectionFactory(liveTC); + } + + bindConnectionFactory(cf, name, jndiBindings); + } + + public synchronized void createConnectionFactory(final String name, + final TransportConfiguration liveTC, + final String clientID, + final List<String> jndiBindings) throws Exception + { + checkInitialised(); + HornetQConnectionFactory cf = connectionFactories.get(name); + if (cf == null) + { + cf = new HornetQConnectionFactory(liveTC); + cf.setClientID(clientID); + } + + bindConnectionFactory(cf, name, jndiBindings); + } + + public synchronized void createConnectionFactory(final String name, + final TransportConfiguration liveTC, + final TransportConfiguration backupTC, + final List<String> jndiBindings) throws Exception + { + checkInitialised(); + HornetQConnectionFactory cf = connectionFactories.get(name); + if (cf == null) + { + cf = new HornetQConnectionFactory(liveTC, backupTC); + } + + bindConnectionFactory(cf, name, jndiBindings); + } + + public synchronized void createConnectionFactory(final String name, + final TransportConfiguration liveTC, + final TransportConfiguration backupTC, + final String clientID, + final List<String> jndiBindings) throws Exception + { + checkInitialised(); + HornetQConnectionFactory cf = connectionFactories.get(name); + if (cf == null) + { + cf = new HornetQConnectionFactory(liveTC, backupTC); + cf.setClientID(clientID); + } + + bindConnectionFactory(cf, name, jndiBindings); + } + + public synchronized boolean destroyConnectionFactory(final String name) throws Exception + { + checkInitialised(); + List<String> jndiBindings = connectionFactoryBindings.get(name); + if (jndiBindings == null || jndiBindings.size() == 0) + { + return false; + } + if (context != null) + { + for (String jndiBinding : jndiBindings) + { + try + { + context.unbind(jndiBinding); + } + catch (NameNotFoundException e) + { + // this is ok. + } + } + } + connectionFactoryBindings.remove(name); + connectionFactories.remove(name); + + jmsManagementService.unregisterConnectionFactory(name); + + return true; + } + + public String[] listRemoteAddresses() throws Exception + { + checkInitialised(); + return server.getHornetQServerControl().listRemoteAddresses(); + } + + public String[] listRemoteAddresses(final String ipAddress) throws Exception + { + checkInitialised(); + return server.getHornetQServerControl().listRemoteAddresses(ipAddress); + } + + public boolean closeConnectionsForAddress(final String ipAddress) throws Exception + { + checkInitialised(); + return server.getHornetQServerControl().closeConnectionsForAddress(ipAddress); + } + + public String[] listConnectionIDs() throws Exception + { + return server.getHornetQServerControl().listConnectionIDs(); + } + + public String[] listSessions(final String connectionID) throws Exception + { + checkInitialised(); + return server.getHornetQServerControl().listSessions(connectionID); + } + + // Public -------------------------------------------------------- + + // Private ------------------------------------------------------- + + private synchronized void checkInitialised() + { + if (!active) + { + throw new IllegalStateException("Cannot access JMS Server, core server is not yet active"); + } + } + + private void bindConnectionFactory(final HornetQConnectionFactory cf, + final String name, + final List<String> jndiBindings) throws Exception + { + for (String jndiBinding : jndiBindings) + { + bindToJndi(jndiBinding, cf); + + if (connectionFactoryBindings.get(name) == null) + { + connectionFactoryBindings.put(name, new ArrayList<String>()); + } + connectionFactoryBindings.get(name).add(jndiBinding); + } + + jmsManagementService.registerConnectionFactory(name, cf, jndiBindings); + } + + private boolean bindToJndi(final String jndiName, final Object objectToBind) throws NamingException + { + if (context != null) + { + String parentContext; + String jndiNameInContext; + int sepIndex = jndiName.lastIndexOf('/'); + if (sepIndex == -1) + { + parentContext = ""; + } + else + { + parentContext = jndiName.substring(0, sepIndex); + } + jndiNameInContext = jndiName.substring(sepIndex + 1); + try + { + context.lookup(jndiName); + + JMSServerManagerImpl.log.warn("Binding for " + jndiName + " already exists"); + return false; + } + catch (Throwable e) + { + // OK + } + + Context c = org.hornetq.utils.JNDIUtil.createContext(context, parentContext); + + c.rebind(jndiNameInContext, objectToBind); + } + return true; + } + + private void addToDestinationBindings(final String destination, final String jndiBinding) + { + if (destinations.get(destination) == null) + { + destinations.put(destination, new ArrayList<String>()); + } + destinations.get(destination).add(jndiBinding); + } + + private void deploy() throws Exception + { + if (config == null) + { + return; + } + + if (config.getContext() != null) + { + setContext(config.getContext()); + } + + List<ConnectionFactoryConfiguration> connectionFactoryConfigurations = config.getConnectionFactoryConfigurations(); + for (ConnectionFactoryConfiguration config : connectionFactoryConfigurations) + { + if (config.getDiscoveryAddress() != null) + { + createConnectionFactory(config.getName(), + config.getDiscoveryAddress(), + config.getDiscoveryPort(), + config.getClientID(), + config.getDiscoveryRefreshTimeout(), + config.getClientFailureCheckPeriod(), + config.getConnectionTTL(), + config.getCallTimeout(), + config.isCacheLargeMessagesClient(), + config.getMinLargeMessageSize(), + config.getConsumerWindowSize(), + config.getConsumerMaxRate(), + config.getConfirmationWindowSize(), + config.getProducerWindowSize(), + config.getProducerMaxRate(), + config.isBlockOnAcknowledge(), + config.isBlockOnDurableSend(), + config.isBlockOnNonDurableSend(), + config.isAutoGroup(), + config.isPreAcknowledge(), + config.getLoadBalancingPolicyClassName(), + config.getTransactionBatchSize(), + config.getDupsOKBatchSize(), + config.getInitialWaitTimeout(), + config.isUseGlobalPools(), + config.getScheduledThreadPoolMaxSize(), + config.getThreadPoolMaxSize(), + config.getRetryInterval(), + config.getRetryIntervalMultiplier(), + config.getMaxRetryInterval(), + config.getReconnectAttempts(), + config.isFailoverOnServerShutdown(), + config.getGroupID(), + Arrays.asList(config.getBindings())); + } + else + { + createConnectionFactory(config.getName(), + config.getConnectorConfigs(), + config.getClientID(), + config.getClientFailureCheckPeriod(), + config.getConnectionTTL(), + config.getCallTimeout(), + config.isCacheLargeMessagesClient(), + config.getMinLargeMessageSize(), + config.getConsumerWindowSize(), + config.getConsumerMaxRate(), + config.getConfirmationWindowSize(), + config.getProducerWindowSize(), + config.getProducerMaxRate(), + config.isBlockOnAcknowledge(), + config.isBlockOnDurableSend(), + config.isBlockOnNonDurableSend(), + config.isAutoGroup(), + config.isPreAcknowledge(), + config.getLoadBalancingPolicyClassName(), + config.getTransactionBatchSize(), + config.getDupsOKBatchSize(), + config.isUseGlobalPools(), + config.getScheduledThreadPoolMaxSize(), + config.getThreadPoolMaxSize(), + config.getRetryInterval(), + config.getRetryIntervalMultiplier(), + config.getMaxRetryInterval(), + config.getReconnectAttempts(), + config.isFailoverOnServerShutdown(), + config.getGroupID(), + Arrays.asList(config.getBindings())); + } + } + + List<QueueConfiguration> queueConfigs = config.getQueueConfigurations(); + for (QueueConfiguration config : queueConfigs) + { + String[] bindings = config.getBindings(); + for (String binding : bindings) + { + createQueue(config.getName(), binding, config.getSelector(), config.isDurable()); + } + } + + List<TopicConfiguration> topicConfigs = config.getTopicConfigurations(); + for (TopicConfiguration config : topicConfigs) + { + String[] bindings = config.getBindings(); + for (String binding : bindings) + { + createTopic(config.getName(), binding); + } + } + } + +} Modified: trunk/src/main/org/hornetq/jms/server/management/JMSManagementService.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/management/JMSManagementService.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/src/main/org/hornetq/jms/server/management/JMSManagementService.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -19,7 +19,7 @@ import org.hornetq.api.jms.HornetQQueue; import org.hornetq.api.jms.HornetQTopic; import org.hornetq.api.jms.management.JMSServerControl; -import org.hornetq.api.jms.server.JMSServerManager; +import org.hornetq.jms.server.JMSServerManager; /** * @author <a href="mailto:jmesnil@redhat.com">Jeff Mesnil</a> Modified: trunk/src/main/org/hornetq/jms/server/management/impl/JMSManagementServiceImpl.java =================================================================== --- trunk/src/main/org/hornetq/jms/server/management/impl/JMSManagementServiceImpl.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/src/main/org/hornetq/jms/server/management/impl/JMSManagementServiceImpl.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -27,7 +27,6 @@ import org.hornetq.api.jms.management.JMSQueueControl; import org.hornetq.api.jms.management.JMSServerControl; import org.hornetq.api.jms.management.TopicControl; -import org.hornetq.api.jms.server.JMSServerManager; import org.hornetq.core.messagecounter.MessageCounter; import org.hornetq.core.messagecounter.MessageCounterManager; import org.hornetq.core.server.management.ManagementService; @@ -35,6 +34,7 @@ import org.hornetq.jms.management.impl.JMSQueueControlImpl; import org.hornetq.jms.management.impl.JMSServerControlImpl; import org.hornetq.jms.management.impl.JMSTopicControlImpl; +import org.hornetq.jms.server.JMSServerManager; import org.hornetq.jms.server.management.JMSManagementService; /* Modified: trunk/src/main/org/hornetq/service/HornetQFileConfigurationService.java =================================================================== --- trunk/src/main/org/hornetq/service/HornetQFileConfigurationService.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/src/main/org/hornetq/service/HornetQFileConfigurationService.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -12,8 +12,8 @@ */ package org.hornetq.service; -import org.hornetq.api.core.config.Configuration; -import org.hornetq.api.core.config.FileConfiguration; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.impl.FileConfiguration; /** * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a> Modified: trunk/src/main/org/hornetq/service/HornetQFileConfigurationServiceMBean.java =================================================================== --- trunk/src/main/org/hornetq/service/HornetQFileConfigurationServiceMBean.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/src/main/org/hornetq/service/HornetQFileConfigurationServiceMBean.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -1,6 +1,6 @@ package org.hornetq.service; -import org.hornetq.api.core.config.Configuration; +import org.hornetq.core.config.Configuration; /** * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a> Modified: trunk/src/main/org/hornetq/service/HornetQJMSStarterService.java =================================================================== --- trunk/src/main/org/hornetq/service/HornetQJMSStarterService.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/src/main/org/hornetq/service/HornetQJMSStarterService.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -12,7 +12,7 @@ */ package org.hornetq.service; -import org.hornetq.api.jms.server.JMSServerManagerImpl; +import org.hornetq.jms.server.impl.JMSServerManagerImpl; /** * @author <a href="mailto:andy.taylor@jboss.org">Andy Taylor</a> Modified: trunk/src/main/org/hornetq/service/HornetQStarterService.java =================================================================== --- trunk/src/main/org/hornetq/service/HornetQStarterService.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/src/main/org/hornetq/service/HornetQStarterService.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -16,8 +16,8 @@ import javax.management.MBeanServer; import javax.management.ObjectName; -import org.hornetq.api.core.config.Configuration; -import org.hornetq.api.core.config.ConfigurationImpl; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.impl.HornetQServerImpl; import org.hornetq.spi.core.security.HornetQSecurityManager; Modified: trunk/tests/jms-tests/config/hornetq-beans.xml =================================================================== --- trunk/tests/jms-tests/config/hornetq-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/jms-tests/config/hornetq-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"> </bean>  @@ -49,7 +49,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/tests/jms-tests/config/test-beans.xml =================================================================== --- trunk/tests/jms-tests/config/test-beans.xml 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/jms-tests/config/test-beans.xml 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,7 +22,7 @@ </bean>  - <bean name="Configuration" class="org.hornetq.api.core.config.FileConfiguration"> + <bean name="Configuration" class="org.hornetq.core.config.impl.FileConfiguration"> </bean>  @@ -49,7 +49,7 @@ </bean>  - <bean name="JMSServerManager" class="org.hornetq.api.jms.server.JMSServerManagerImpl"> + <bean name="JMSServerManager" class="org.hornetq.jms.server.impl.JMSServerManagerImpl"> <constructor> <parameter> <inject bean="HornetQServer"/> Modified: trunk/tests/jms-tests/src/org/hornetq/jms/tests/HornetQServerTestCase.java =================================================================== --- trunk/tests/jms-tests/src/org/hornetq/jms/tests/HornetQServerTestCase.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/HornetQServerTestCase.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -35,10 +35,10 @@ import com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionManagerImple; -import org.hornetq.api.jms.server.JMSServerManager; import org.hornetq.core.logging.Logger; import org.hornetq.core.security.Role; import org.hornetq.core.server.HornetQServer; +import org.hornetq.jms.server.JMSServerManager; import org.hornetq.jms.tests.tools.ServerManagement; import org.hornetq.jms.tests.tools.container.Server; import org.hornetq.jms.tests.util.ProxyAssertSupport; Modified: trunk/tests/jms-tests/src/org/hornetq/jms/tests/tools/ConfigurationHelper.java =================================================================== --- trunk/tests/jms-tests/src/org/hornetq/jms/tests/tools/ConfigurationHelper.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/tools/ConfigurationHelper.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -17,7 +17,7 @@ import java.util.HashMap; import java.util.Hashtable; -import org.hornetq.api.core.config.Configuration; +import org.hornetq.core.config.Configuration; import org.jboss.kernel.spi.dependency.KernelControllerContext; import org.jboss.kernel.spi.dependency.KernelControllerContextAware; 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-05 17:41:42 UTC (rev 8720) +++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/tools/container/LocalTestServer.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -33,11 +33,11 @@ import org.hornetq.api.core.management.ResourceNames; import org.hornetq.api.jms.management.JMSQueueControl; import org.hornetq.api.jms.management.TopicControl; -import org.hornetq.api.jms.server.JMSServerManager; import org.hornetq.core.logging.Logger; import org.hornetq.core.security.Role; import org.hornetq.core.server.HornetQServer; import org.hornetq.integration.bootstrap.HornetQBootstrapServer; +import org.hornetq.jms.server.JMSServerManager; import org.jboss.kernel.plugins.config.property.PropertyKernelConfig; /** Modified: trunk/tests/jms-tests/src/org/hornetq/jms/tests/tools/container/Server.java =================================================================== --- trunk/tests/jms-tests/src/org/hornetq/jms/tests/tools/container/Server.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/jms-tests/src/org/hornetq/jms/tests/tools/container/Server.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -20,9 +20,9 @@ import javax.naming.InitialContext; -import org.hornetq.api.jms.server.JMSServerManager; import org.hornetq.core.security.Role; import org.hornetq.core.server.HornetQServer; +import org.hornetq.jms.server.JMSServerManager; /** * The remote interface exposed by TestServer. Modified: trunk/tests/joram-tests/src/org/hornetq/jms/HornetQAdmin.java =================================================================== --- trunk/tests/joram-tests/src/org/hornetq/jms/HornetQAdmin.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/joram-tests/src/org/hornetq/jms/HornetQAdmin.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -29,10 +29,10 @@ 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.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; +import org.hornetq.api.core.management.ManagementHelper; import org.hornetq.api.core.management.ResourceNames; -import org.hornetq.api.core.management.client.ManagementHelper; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.integration.transports.netty.NettyConnectorFactory; import org.hornetq.tests.util.SpawnedVMSupport; import org.objectweb.jtests.jms.admin.Admin; Modified: trunk/tests/joram-tests/src/org/hornetq/jms/SpawnedJMSServer.java =================================================================== --- trunk/tests/joram-tests/src/org/hornetq/jms/SpawnedJMSServer.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/joram-tests/src/org/hornetq/jms/SpawnedJMSServer.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -19,14 +19,14 @@ import javax.naming.InitialContext; -import org.hornetq.api.core.config.Configuration; -import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.server.HornetQServers; -import org.hornetq.api.jms.server.JMSServerManager; -import org.hornetq.api.jms.server.JMSServerManagerImpl; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; import org.hornetq.integration.transports.netty.NettyAcceptorFactory; +import org.hornetq.jms.server.JMSServerManager; +import org.hornetq.jms.server.impl.JMSServerManagerImpl; import org.jnp.server.Main; import org.jnp.server.NamingBeanImpl; Modified: trunk/tests/src/org/hornetq/tests/integration/DuplicateDetectionTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/DuplicateDetectionTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/DuplicateDetectionTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -25,12 +25,12 @@ 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.config.Configuration; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.message.Message; -import org.hornetq.api.core.server.HornetQServers; +import org.hornetq.core.config.Configuration; import org.hornetq.core.logging.Logger; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; import org.hornetq.core.transaction.impl.XidImpl; import org.hornetq.tests.util.ServiceTestBase; import org.hornetq.utils.UUIDGenerator; Modified: trunk/tests/src/org/hornetq/tests/integration/String64KLimitTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/String64KLimitTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/String64KLimitTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,13 +22,13 @@ 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.config.Configuration; -import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.server.HornetQServers; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; import org.hornetq.tests.util.RandomUtil; import org.hornetq.tests.util.UnitTestCase; Modified: trunk/tests/src/org/hornetq/tests/integration/client/ConsumerCloseTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/ConsumerCloseTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/client/ConsumerCloseTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,15 +22,15 @@ import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.ClientSessionFactoryImpl; import org.hornetq.api.core.client.MessageHandler; -import org.hornetq.api.core.config.Configuration; -import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.server.HornetQServers; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; import org.hornetq.tests.util.RandomUtil; import org.hornetq.tests.util.ServiceTestBase; import org.hornetq.tests.util.UnitTestCase; Modified: trunk/tests/src/org/hornetq/tests/integration/client/CoreClientTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/CoreClientTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/client/CoreClientTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -23,12 +23,12 @@ 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.config.Configuration; -import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.server.HornetQServers; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; import org.hornetq.jms.client.HornetQTextMessage; import org.hornetq.tests.util.UnitTestCase; Modified: trunk/tests/src/org/hornetq/tests/integration/client/DeadLetterAddressTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/DeadLetterAddressTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/client/DeadLetterAddressTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -24,13 +24,13 @@ 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.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; import org.hornetq.api.core.message.Message; -import org.hornetq.api.core.server.HornetQServers; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; import org.hornetq.core.server.Queue; import org.hornetq.core.settings.impl.AddressSettings; 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-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/client/ExpiryAddressTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -21,13 +21,13 @@ 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.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; import org.hornetq.api.core.message.Message; -import org.hornetq.api.core.server.HornetQServers; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; import org.hornetq.core.settings.impl.AddressSettings; import org.hornetq.tests.util.RandomUtil; import org.hornetq.tests.util.UnitTestCase; Modified: trunk/tests/src/org/hornetq/tests/integration/client/FailureDeadlockTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/FailureDeadlockTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/client/FailureDeadlockTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -17,18 +17,18 @@ import javax.jms.JMSException; import javax.jms.Session; -import org.hornetq.api.core.config.Configuration; -import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.server.HornetQServers; import org.hornetq.api.jms.HornetQConnectionFactory; -import org.hornetq.api.jms.server.JMSServerManagerImpl; import org.hornetq.core.client.impl.ClientSessionInternal; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.RemotingConnection; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; import org.hornetq.jms.client.HornetQSession; +import org.hornetq.jms.server.impl.JMSServerManagerImpl; import org.hornetq.tests.integration.jms.server.management.NullInitialContext; import org.hornetq.tests.util.UnitTestCase; Modified: trunk/tests/src/org/hornetq/tests/integration/client/HeuristicXATest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/HeuristicXATest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/client/HeuristicXATest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -28,8 +28,8 @@ 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.config.Configuration; import org.hornetq.api.core.management.HornetQServerControl; +import org.hornetq.core.config.Configuration; 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/HornetQCrashTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/HornetQCrashTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/client/HornetQCrashTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -9,13 +9,12 @@ import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.ClientSessionFactoryImpl; import org.hornetq.api.core.client.SendAcknowledgementHandler; -import org.hornetq.api.core.config.Configuration; -import org.hornetq.api.core.config.ConfigurationImpl; 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.api.core.server.HornetQServers; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.Packet; import org.hornetq.core.remoting.RemotingConnection; @@ -23,6 +22,7 @@ import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.remoting.impl.wireformat.PacketImpl; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; /** * Modified: trunk/tests/src/org/hornetq/tests/integration/client/JournalCrashTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/JournalCrashTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/client/JournalCrashTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -23,8 +23,8 @@ 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.config.Configuration; -import org.hornetq.api.core.config.ConfigurationImpl; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.journal.PreparedTransactionInfo; import org.hornetq.core.journal.RecordInfo; import org.hornetq.core.journal.impl.JournalImpl; Modified: trunk/tests/src/org/hornetq/tests/integration/client/LargeMessageTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/LargeMessageTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/client/LargeMessageTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -27,9 +27,9 @@ 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.config.Configuration; 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; import org.hornetq.core.persistence.impl.journal.JournalStorageManager; import org.hornetq.core.persistence.impl.journal.LargeServerMessageImpl; Modified: trunk/tests/src/org/hornetq/tests/integration/client/MessageGroupingConnectionFactoryTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/MessageGroupingConnectionFactoryTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/client/MessageGroupingConnectionFactoryTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -26,12 +26,12 @@ import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.ClientSessionFactoryImpl; import org.hornetq.api.core.client.MessageHandler; -import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.server.HornetQServers; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; import org.hornetq.tests.util.UnitTestCase; /** Modified: trunk/tests/src/org/hornetq/tests/integration/client/MessageGroupingTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/MessageGroupingTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/client/MessageGroupingTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -29,13 +29,13 @@ import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.ClientSessionFactoryImpl; import org.hornetq.api.core.client.MessageHandler; -import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; import org.hornetq.api.core.message.Message; -import org.hornetq.api.core.server.HornetQServers; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; import org.hornetq.core.transaction.impl.XidImpl; import org.hornetq.tests.util.UnitTestCase; Modified: trunk/tests/src/org/hornetq/tests/integration/client/MessagePriorityTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/MessagePriorityTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/client/MessagePriorityTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,13 +22,13 @@ 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.config.Configuration; -import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.server.HornetQServers; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; import org.hornetq.tests.util.RandomUtil; import org.hornetq.tests.util.UnitTestCase; Modified: trunk/tests/src/org/hornetq/tests/integration/client/NewDeadLetterAddressTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/NewDeadLetterAddressTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/client/NewDeadLetterAddressTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -21,11 +21,11 @@ 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.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.server.HornetQServers; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; import org.hornetq.core.settings.impl.AddressSettings; import org.hornetq.tests.util.UnitTestCase; Modified: trunk/tests/src/org/hornetq/tests/integration/client/PagingTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/PagingTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/client/PagingTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -27,8 +27,8 @@ 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.config.Configuration; 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; import org.hornetq.core.server.HornetQServer; Modified: trunk/tests/src/org/hornetq/tests/integration/client/ProducerCloseTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/ProducerCloseTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/client/ProducerCloseTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -18,14 +18,14 @@ 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.config.Configuration; -import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.server.HornetQServers; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; import org.hornetq.tests.util.RandomUtil; import org.hornetq.tests.util.ServiceTestBase; import org.hornetq.tests.util.UnitTestCase; Modified: trunk/tests/src/org/hornetq/tests/integration/client/ReceiveImmediateTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/ReceiveImmediateTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/client/ReceiveImmediateTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -21,11 +21,11 @@ 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.config.Configuration; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.server.HornetQServers; +import org.hornetq.core.config.Configuration; import org.hornetq.core.logging.Logger; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; import org.hornetq.core.server.Queue; 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-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/client/RedeliveryConsumerTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -21,8 +21,8 @@ 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.config.Configuration; 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; import org.hornetq.tests.util.ServiceTestBase; Modified: trunk/tests/src/org/hornetq/tests/integration/client/RequestorTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/RequestorTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/client/RequestorTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -24,15 +24,15 @@ import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.ClientSessionFactoryImpl; import org.hornetq.api.core.client.MessageHandler; -import org.hornetq.api.core.config.Configuration; -import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.server.HornetQServers; import org.hornetq.core.client.impl.ClientMessageImpl; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; import org.hornetq.tests.util.RandomUtil; import org.hornetq.tests.util.UnitTestCase; Modified: trunk/tests/src/org/hornetq/tests/integration/client/SessionCloseTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/SessionCloseTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/client/SessionCloseTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -24,14 +24,14 @@ 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.config.Configuration; -import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.server.HornetQServers; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; import org.hornetq.tests.util.RandomUtil; import org.hornetq.tests.util.UnitTestCase; Modified: trunk/tests/src/org/hornetq/tests/integration/client/SessionClosedOnRemotingConnectionFailureTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/SessionClosedOnRemotingConnectionFailureTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/client/SessionClosedOnRemotingConnectionFailureTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -20,16 +20,16 @@ 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.config.Configuration; -import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.server.HornetQServers; import org.hornetq.core.client.impl.ClientSessionInternal; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.remoting.RemotingConnection; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; import org.hornetq.tests.util.UnitTestCase; /** Modified: trunk/tests/src/org/hornetq/tests/integration/client/SessionFactoryTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/SessionFactoryTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/client/SessionFactoryTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -27,15 +27,15 @@ 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.config.Configuration; -import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.config.cluster.BroadcastGroupConfiguration; import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.server.HornetQServers; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.impl.invm.TransportConstants; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; +import org.hornetq.core.server.cluster.BroadcastGroupConfiguration; import org.hornetq.tests.util.RandomUtil; import org.hornetq.tests.util.ServiceTestBase; Modified: trunk/tests/src/org/hornetq/tests/integration/client/TemporaryQueueTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/TemporaryQueueTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/client/TemporaryQueueTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -26,11 +26,11 @@ 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.config.Configuration; 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; import org.hornetq.core.remoting.CloseListener; import org.hornetq.core.remoting.Packet; Modified: trunk/tests/src/org/hornetq/tests/integration/client/TransactionDurabilityTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/TransactionDurabilityTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/client/TransactionDurabilityTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -21,8 +21,8 @@ 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.config.Configuration; 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; import org.hornetq.tests.util.ServiceTestBase; Modified: trunk/tests/src/org/hornetq/tests/integration/client/WildCardRoutingTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/client/WildCardRoutingTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/client/WildCardRoutingTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -21,11 +21,11 @@ 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.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.server.HornetQServers; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; import org.hornetq.tests.util.UnitTestCase; /** Modified: trunk/tests/src/org/hornetq/tests/integration/clientcrash/ClientTestBase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/clientcrash/ClientTestBase.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/clientcrash/ClientTestBase.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -15,7 +15,7 @@ import junit.framework.Assert; -import org.hornetq.api.core.config.Configuration; +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/cluster/bridge/BridgeReconnectTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeReconnectTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeReconnectTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -29,8 +29,6 @@ import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.ClientSessionFactoryImpl; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.config.cluster.BridgeConfiguration; -import org.hornetq.api.core.config.cluster.QueueConfiguration; import org.hornetq.api.core.exception.HornetQException; import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.RemotingConnection; @@ -38,6 +36,8 @@ import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.cluster.Bridge; +import org.hornetq.core.server.cluster.BridgeConfiguration; +import org.hornetq.core.server.cluster.QueueConfiguration; import org.hornetq.core.server.cluster.impl.BridgeImpl; import org.hornetq.integration.transports.netty.NettyConnectorFactory; 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-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeStartTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -29,12 +29,12 @@ import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.ClientSessionFactoryImpl; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.config.cluster.BridgeConfiguration; -import org.hornetq.api.core.config.cluster.QueueConfiguration; import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.impl.invm.TransportConstants; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.cluster.Bridge; +import org.hornetq.core.server.cluster.BridgeConfiguration; +import org.hornetq.core.server.cluster.QueueConfiguration; import org.hornetq.integration.transports.netty.NettyConnectorFactory; import org.hornetq.tests.util.ServiceTestBase; 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-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -29,11 +29,11 @@ import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.ClientSessionFactoryImpl; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.config.cluster.BridgeConfiguration; -import org.hornetq.api.core.config.cluster.QueueConfiguration; import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.impl.invm.TransportConstants; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.cluster.BridgeConfiguration; +import org.hornetq.core.server.cluster.QueueConfiguration; import org.hornetq.integration.transports.netty.NettyConnectorFactory; import org.hornetq.tests.util.ServiceTestBase; import org.hornetq.tests.util.UnitTestCase; 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-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeTestBase.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -16,12 +16,12 @@ import java.util.ArrayList; import java.util.Map; -import org.hornetq.api.core.config.Configuration; -import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.server.HornetQServers; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.remoting.impl.invm.InVMConnector; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; import org.hornetq.integration.transports.netty.NettyAcceptorFactory; import org.hornetq.tests.util.UnitTestCase; 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-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/bridge/BridgeWithDiscoveryGroupStartTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -29,13 +29,13 @@ import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.ClientSessionFactoryImpl; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.config.cluster.BridgeConfiguration; -import org.hornetq.api.core.config.cluster.BroadcastGroupConfiguration; -import org.hornetq.api.core.config.cluster.DiscoveryGroupConfiguration; -import org.hornetq.api.core.config.cluster.QueueConfiguration; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.cluster.Bridge; +import org.hornetq.core.server.cluster.BridgeConfiguration; +import org.hornetq.core.server.cluster.BroadcastGroupConfiguration; +import org.hornetq.core.server.cluster.DiscoveryGroupConfiguration; +import org.hornetq.core.server.cluster.QueueConfiguration; import org.hornetq.integration.transports.netty.NettyConnectorFactory; import org.hornetq.integration.transports.netty.TransportConstants; import org.hornetq.tests.util.ServiceTestBase; 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-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusterTestBase.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -32,14 +32,10 @@ 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.config.Configuration; -import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.config.cluster.BroadcastGroupConfiguration; -import org.hornetq.api.core.config.cluster.ClusterConnectionConfiguration; -import org.hornetq.api.core.config.cluster.DiscoveryGroupConfiguration; import org.hornetq.api.core.message.Message; -import org.hornetq.api.core.server.HornetQServers; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; import org.hornetq.core.postoffice.Binding; import org.hornetq.core.postoffice.Bindings; @@ -47,8 +43,12 @@ import org.hornetq.core.postoffice.QueueBinding; import org.hornetq.core.postoffice.impl.LocalQueueBinding; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; import org.hornetq.core.server.JournalType; +import org.hornetq.core.server.cluster.BroadcastGroupConfiguration; import org.hornetq.core.server.cluster.ClusterConnection; +import org.hornetq.core.server.cluster.ClusterConnectionConfiguration; +import org.hornetq.core.server.cluster.DiscoveryGroupConfiguration; import org.hornetq.core.server.cluster.RemoteQueueBinding; import org.hornetq.core.server.group.GroupingHandler; import org.hornetq.core.server.group.impl.GroupingHandlerConfiguration; 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-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/distribution/ClusteredGroupingTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -18,8 +18,8 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; +import org.hornetq.api.core.management.ManagementHelper; import org.hornetq.api.core.management.NotificationType; -import org.hornetq.api.core.management.client.ManagementHelper; import org.hornetq.api.core.message.Message; import org.hornetq.core.server.group.GroupingHandler; import org.hornetq.core.server.group.impl.GroupBinding; 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-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/FailoverTestBase.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -20,9 +20,9 @@ import org.hornetq.api.SimpleString; import org.hornetq.api.core.client.ClientSessionFactoryImpl; -import org.hornetq.api.core.config.Configuration; 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; import org.hornetq.core.remoting.impl.invm.InVMRegistry; import org.hornetq.core.remoting.impl.invm.TransportConstants; 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-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/GroupingFailoverReplicationTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -14,12 +14,12 @@ import java.util.Map; -import org.hornetq.api.core.config.Configuration; -import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.server.HornetQServers; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; import org.hornetq.core.server.JournalType; import org.hornetq.tests.util.ServiceTestBase; 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-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/GroupingFailoverSharedServerTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -14,11 +14,11 @@ import java.util.Map; -import org.hornetq.api.core.config.Configuration; -import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.server.HornetQServers; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; import org.hornetq.core.server.JournalType; import org.hornetq.tests.util.ServiceTestBase; Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/NettyReplicatedFailoverTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/NettyReplicatedFailoverTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/NettyReplicatedFailoverTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -13,7 +13,7 @@ package org.hornetq.tests.integration.cluster.failover; -import org.hornetq.api.core.config.Configuration; +import org.hornetq.core.config.Configuration; /** * A NettyReplicatedFailoverTest 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-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/PagingFailoverTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -25,11 +25,11 @@ 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.Configuration; 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; import org.hornetq.core.remoting.RemotingConnection; import org.hornetq.core.replication.impl.ReplicationEndpointImpl; import org.hornetq.core.server.HornetQServer; Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/ReplicatedAsynchronousFailoverTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/ReplicatedAsynchronousFailoverTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/ReplicatedAsynchronousFailoverTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -13,7 +13,7 @@ package org.hornetq.tests.integration.cluster.failover; -import org.hornetq.api.core.config.Configuration; +import org.hornetq.core.config.Configuration; /** * A ReplicatedAsynchronousFailoverTest Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/ReplicatedNettyAsynchronousFailoverTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/ReplicatedNettyAsynchronousFailoverTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/ReplicatedNettyAsynchronousFailoverTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -13,7 +13,7 @@ package org.hornetq.tests.integration.cluster.failover; -import org.hornetq.api.core.config.Configuration; +import org.hornetq.core.config.Configuration; /** * A ReplicatedNettyAsynchronousFailoverTest Modified: trunk/tests/src/org/hornetq/tests/integration/cluster/failover/ReplicatedPagingFailoverTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/cluster/failover/ReplicatedPagingFailoverTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/failover/ReplicatedPagingFailoverTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -13,7 +13,7 @@ package org.hornetq.tests.integration.cluster.failover; -import org.hornetq.api.core.config.Configuration; +import org.hornetq.core.config.Configuration; /** * A ReplicatedPagingFailoverTest 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-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/MultiThreadRandomReattachTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -14,11 +14,11 @@ package org.hornetq.tests.integration.cluster.reattach; import org.hornetq.api.core.client.ClientMessage; -import org.hornetq.api.core.config.Configuration; -import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.server.HornetQServers; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; +import org.hornetq.core.server.HornetQServers; /** * 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-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/NettyMultiThreadRandomReattachTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -14,11 +14,11 @@ package org.hornetq.tests.integration.cluster.reattach; import org.hornetq.api.core.client.ClientSessionFactoryImpl; -import org.hornetq.api.core.config.Configuration; -import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.server.HornetQServers; import org.hornetq.core.client.impl.ClientSessionFactoryInternal; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.impl.ConfigurationImpl; +import org.hornetq.core.server.HornetQServers; /** * A NettyMultiThreadRandomReattachTest 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-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/cluster/reattach/RandomReattachTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -30,15 +30,15 @@ import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.ClientSessionFactoryImpl; import org.hornetq.api.core.client.MessageHandler; -import org.hornetq.api.core.config.Configuration; -import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.server.HornetQServers; import org.hornetq.core.client.impl.ClientSessionInternal; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.impl.invm.InVMRegistry; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; import org.hornetq.jms.client.HornetQTextMessage; import org.hornetq.tests.util.UnitTestCase; Modified: trunk/tests/src/org/hornetq/tests/integration/divert/DivertTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/divert/DivertTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/divert/DivertTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -25,12 +25,12 @@ 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.config.Configuration; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.config.cluster.DivertConfiguration; -import org.hornetq.api.core.server.HornetQServers; +import org.hornetq.core.config.Configuration; import org.hornetq.core.logging.Logger; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; +import org.hornetq.core.server.cluster.DivertConfiguration; import org.hornetq.tests.util.ServiceTestBase; /** Modified: trunk/tests/src/org/hornetq/tests/integration/divert/PersistentDivertTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/divert/PersistentDivertTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/divert/PersistentDivertTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -25,12 +25,12 @@ 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.config.Configuration; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.config.cluster.DivertConfiguration; -import org.hornetq.api.core.server.HornetQServers; +import org.hornetq.core.config.Configuration; import org.hornetq.core.logging.Logger; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; +import org.hornetq.core.server.cluster.DivertConfiguration; import org.hornetq.tests.util.ServiceTestBase; import org.hornetq.tests.util.UnitTestCase; Modified: trunk/tests/src/org/hornetq/tests/integration/http/CoreClientOverHttpTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/http/CoreClientOverHttpTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/http/CoreClientOverHttpTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -23,11 +23,11 @@ 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.config.Configuration; -import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.server.HornetQServers; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; import org.hornetq.integration.transports.netty.TransportConstants; import org.hornetq.jms.client.HornetQTextMessage; import org.hornetq.tests.util.UnitTestCase; Modified: trunk/tests/src/org/hornetq/tests/integration/http/NettyHttpTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/http/NettyHttpTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/http/NettyHttpTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -23,8 +23,8 @@ import junit.framework.Assert; import org.hornetq.api.core.buffers.HornetQBuffer; -import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.exception.HornetQException; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.remoting.impl.AbstractBufferHandler; import org.hornetq.integration.transports.netty.NettyAcceptor; import org.hornetq.integration.transports.netty.NettyConnector; Modified: trunk/tests/src/org/hornetq/tests/integration/jms/FloodServerTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/FloodServerTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/jms/FloodServerTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -26,16 +26,16 @@ import org.hornetq.api.Pair; import org.hornetq.api.core.client.ClientSessionFactoryImpl; -import org.hornetq.api.core.config.Configuration; -import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.server.HornetQServers; import org.hornetq.api.jms.HornetQTopic; -import org.hornetq.api.jms.server.JMSServerManagerImpl; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; import org.hornetq.integration.transports.netty.NettyAcceptorFactory; import org.hornetq.integration.transports.netty.NettyConnectorFactory; +import org.hornetq.jms.server.impl.JMSServerManagerImpl; import org.hornetq.tests.unit.util.InVMContext; import org.hornetq.tests.util.UnitTestCase; Modified: trunk/tests/src/org/hornetq/tests/integration/jms/HornetQConnectionFactoryTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/HornetQConnectionFactoryTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/jms/HornetQConnectionFactoryTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -26,15 +26,15 @@ import org.hornetq.api.Pair; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.ClientSessionFactoryImpl; -import org.hornetq.api.core.config.Configuration; -import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.config.cluster.BroadcastGroupConfiguration; -import org.hornetq.api.core.server.HornetQServers; import org.hornetq.api.jms.HornetQConnectionFactory; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.impl.invm.TransportConstants; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; +import org.hornetq.core.server.cluster.BroadcastGroupConfiguration; import org.hornetq.tests.util.RandomUtil; import org.hornetq.tests.util.UnitTestCase; Modified: trunk/tests/src/org/hornetq/tests/integration/jms/ManualReconnectionToSingleServerTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/ManualReconnectionToSingleServerTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/jms/ManualReconnectionToSingleServerTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -32,21 +32,21 @@ import junit.framework.Assert; -import org.hornetq.api.core.config.Configuration; -import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.server.HornetQServers; -import org.hornetq.api.jms.config.ConnectionFactoryConfiguration; -import org.hornetq.api.jms.config.ConnectionFactoryConfigurationImpl; -import org.hornetq.api.jms.config.JMSConfiguration; -import org.hornetq.api.jms.config.JMSConfigurationImpl; -import org.hornetq.api.jms.config.QueueConfigurationImpl; -import org.hornetq.api.jms.server.JMSServerManager; -import org.hornetq.api.jms.server.JMSServerManagerImpl; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; import org.hornetq.integration.transports.netty.NettyAcceptorFactory; import org.hornetq.integration.transports.netty.NettyConnectorFactory; +import org.hornetq.jms.server.JMSServerManager; +import org.hornetq.jms.server.config.ConnectionFactoryConfiguration; +import org.hornetq.jms.server.config.JMSConfiguration; +import org.hornetq.jms.server.config.impl.ConnectionFactoryConfigurationImpl; +import org.hornetq.jms.server.config.impl.JMSConfigurationImpl; +import org.hornetq.jms.server.config.impl.QueueConfigurationImpl; +import org.hornetq.jms.server.impl.JMSServerManagerImpl; import org.hornetq.tests.unit.util.InVMContext; import org.hornetq.tests.util.UnitTestCase; 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-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/jms/bridge/BridgeTestBase.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -34,25 +34,25 @@ import com.arjuna.ats.internal.jta.transaction.arjunacore.TransactionManagerImple; -import org.hornetq.api.core.config.Configuration; -import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.management.ResourceNames; -import org.hornetq.api.core.server.HornetQServers; import org.hornetq.api.jms.HornetQConnectionFactory; -import org.hornetq.api.jms.bridge.ConnectionFactoryFactory; -import org.hornetq.api.jms.bridge.DestinationFactory; -import org.hornetq.api.jms.bridge.QualityOfServiceMode; import org.hornetq.api.jms.management.JMSQueueControl; import org.hornetq.api.jms.management.TopicControl; -import org.hornetq.api.jms.server.JMSServerManager; -import org.hornetq.api.jms.server.JMSServerManagerImpl; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.remoting.impl.invm.TransportConstants; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; import org.hornetq.core.server.management.ManagementService; +import org.hornetq.jms.bridge.ConnectionFactoryFactory; +import org.hornetq.jms.bridge.DestinationFactory; +import org.hornetq.jms.bridge.QualityOfServiceMode; import org.hornetq.jms.client.HornetQMessage; +import org.hornetq.jms.server.JMSServerManager; +import org.hornetq.jms.server.impl.JMSServerManagerImpl; import org.hornetq.tests.unit.util.InVMContext; import org.hornetq.tests.util.UnitTestCase; Modified: trunk/tests/src/org/hornetq/tests/integration/jms/bridge/JMSBridgeReconnectionTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/bridge/JMSBridgeReconnectionTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/jms/bridge/JMSBridgeReconnectionTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -14,9 +14,9 @@ import junit.framework.Assert; -import org.hornetq.api.jms.bridge.JMSBridgeImpl; -import org.hornetq.api.jms.bridge.QualityOfServiceMode; import org.hornetq.core.logging.Logger; +import org.hornetq.jms.bridge.QualityOfServiceMode; +import org.hornetq.jms.bridge.impl.JMSBridgeImpl; /** * @author <a href="mailto:tim.fox@jboss.com">Tim Fox</a> Modified: trunk/tests/src/org/hornetq/tests/integration/jms/bridge/JMSBridgeTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/bridge/JMSBridgeTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/jms/bridge/JMSBridgeTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -32,9 +32,9 @@ import junit.framework.Assert; import org.hornetq.api.jms.HornetQMessageConstants; -import org.hornetq.api.jms.bridge.JMSBridgeImpl; -import org.hornetq.api.jms.bridge.QualityOfServiceMode; import org.hornetq.core.logging.Logger; +import org.hornetq.jms.bridge.QualityOfServiceMode; +import org.hornetq.jms.bridge.impl.JMSBridgeImpl; /** * A JMSBridgeTest 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-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSFailoverTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -31,19 +31,19 @@ import org.hornetq.api.SimpleString; import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.config.Configuration; -import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.server.HornetQServers; import org.hornetq.api.jms.HornetQConnectionFactory; import org.hornetq.api.jms.HornetQQueue; import org.hornetq.core.client.impl.ClientSessionInternal; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.RemotingConnection; import org.hornetq.core.remoting.impl.invm.InVMRegistry; import org.hornetq.core.remoting.impl.invm.TransportConstants; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; import org.hornetq.jms.client.HornetQSession; import org.hornetq.tests.util.RandomUtil; import org.hornetq.tests.util.UnitTestCase; Modified: trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSReconnectTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSReconnectTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/jms/cluster/JMSReconnectTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -30,19 +30,19 @@ import org.hornetq.api.SimpleString; import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.config.Configuration; -import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.server.HornetQServers; import org.hornetq.api.jms.HornetQConnectionFactory; import org.hornetq.api.jms.HornetQQueue; import org.hornetq.api.jms.HornetQTopic; import org.hornetq.core.client.impl.ClientSessionInternal; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.RemotingConnection; import org.hornetq.core.remoting.impl.invm.InVMRegistry; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; import org.hornetq.jms.client.HornetQSession; import org.hornetq.tests.util.RandomUtil; import org.hornetq.tests.util.UnitTestCase; 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-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/jms/connection/ExceptionListenerTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,17 +22,17 @@ import junit.framework.Assert; -import org.hornetq.api.core.config.Configuration; -import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.server.HornetQServers; import org.hornetq.api.jms.HornetQConnectionFactory; -import org.hornetq.api.jms.server.JMSServerManagerImpl; import org.hornetq.core.client.impl.ClientSessionInternal; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; import org.hornetq.jms.client.HornetQConnection; import org.hornetq.jms.client.HornetQSession; +import org.hornetq.jms.server.impl.JMSServerManagerImpl; import org.hornetq.tests.integration.jms.server.management.NullInitialContext; import org.hornetq.tests.util.UnitTestCase; 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-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/jms/divert/DivertAndACKClientTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -26,10 +26,10 @@ import org.hornetq.api.Pair; import org.hornetq.api.core.client.ClientSessionFactoryImpl; -import org.hornetq.api.core.config.Configuration; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.config.cluster.DivertConfiguration; import org.hornetq.api.jms.HornetQQueue; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.server.cluster.DivertConfiguration; import org.hornetq.tests.util.JMSTestBase; /** Modified: trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerDeployerTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerDeployerTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerDeployerTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -21,18 +21,18 @@ import junit.framework.Assert; -import org.hornetq.api.core.config.Configuration; -import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.jms.HornetQConnectionFactory; -import org.hornetq.api.jms.server.JMSServerManager; -import org.hornetq.api.jms.server.JMSServerManagerImpl; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.deployers.DeploymentManager; import org.hornetq.core.deployers.impl.FileDeploymentManager; import org.hornetq.core.logging.Logger; import org.hornetq.core.server.HornetQServer; import org.hornetq.integration.transports.netty.NettyConnectorFactory; +import org.hornetq.jms.server.JMSServerManager; import org.hornetq.jms.server.impl.JMSServerDeployer; +import org.hornetq.jms.server.impl.JMSServerManagerImpl; import org.hornetq.tests.unit.util.InVMContext; import org.hornetq.tests.util.ServiceTestBase; import org.hornetq.tests.util.UnitTestCase; 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-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/JMSServerStartStopTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,15 +22,15 @@ import junit.framework.Assert; -import org.hornetq.api.core.config.FileConfiguration; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.jms.HornetQConnectionFactory; -import org.hornetq.api.jms.server.JMSServerManager; -import org.hornetq.api.jms.server.JMSServerManagerImpl; +import org.hornetq.core.config.impl.FileConfiguration; import org.hornetq.core.logging.Logger; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.impl.HornetQServerImpl; import org.hornetq.integration.transports.netty.NettyConnectorFactory; +import org.hornetq.jms.server.JMSServerManager; +import org.hornetq.jms.server.impl.JMSServerManagerImpl; import org.hornetq.spi.core.security.HornetQSecurityManager; import org.hornetq.spi.core.security.HornetQSecurityManagerImpl; import org.hornetq.tests.util.UnitTestCase; 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-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/config/JMSConfigurationTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -21,20 +21,20 @@ import junit.framework.Assert; -import org.hornetq.api.core.config.Configuration; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.jms.config.ConnectionFactoryConfiguration; -import org.hornetq.api.jms.config.ConnectionFactoryConfigurationImpl; -import org.hornetq.api.jms.config.JMSConfiguration; -import org.hornetq.api.jms.config.JMSConfigurationImpl; -import org.hornetq.api.jms.config.QueueConfigurationImpl; -import org.hornetq.api.jms.config.TopicConfiguration; -import org.hornetq.api.jms.config.TopicConfigurationImpl; -import org.hornetq.api.jms.server.JMSServerManager; -import org.hornetq.api.jms.server.JMSServerManagerImpl; +import org.hornetq.core.config.Configuration; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.impl.HornetQServerImpl; +import org.hornetq.jms.server.JMSServerManager; +import org.hornetq.jms.server.config.ConnectionFactoryConfiguration; +import org.hornetq.jms.server.config.JMSConfiguration; +import org.hornetq.jms.server.config.TopicConfiguration; +import org.hornetq.jms.server.config.impl.ConnectionFactoryConfigurationImpl; +import org.hornetq.jms.server.config.impl.JMSConfigurationImpl; +import org.hornetq.jms.server.config.impl.QueueConfigurationImpl; +import org.hornetq.jms.server.config.impl.TopicConfigurationImpl; +import org.hornetq.jms.server.impl.JMSServerManagerImpl; import org.hornetq.tests.unit.util.InVMContext; import org.hornetq.tests.util.RandomUtil; import org.hornetq.tests.util.ServiceTestBase; 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-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSQueueControlTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -28,18 +28,18 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.config.Configuration; -import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.server.HornetQServers; import org.hornetq.api.jms.HornetQConnectionFactory; import org.hornetq.api.jms.HornetQQueue; import org.hornetq.api.jms.management.JMSQueueControl; -import org.hornetq.api.jms.server.JMSServerManagerImpl; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; import org.hornetq.core.settings.impl.AddressSettings; +import org.hornetq.jms.server.impl.JMSServerManagerImpl; import org.hornetq.tests.integration.management.ManagementControlHelper; import org.hornetq.tests.integration.management.ManagementTestBase; import org.hornetq.tests.unit.util.InVMContext; 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-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSQueueControlUsingJMSTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -19,12 +19,12 @@ import javax.jms.QueueSession; import javax.jms.Session; -import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.management.ResourceNames; import org.hornetq.api.jms.HornetQConnectionFactory; import org.hornetq.api.jms.HornetQQueue; import org.hornetq.api.jms.management.JMSQueueControl; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; /** Modified: trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControl2Test.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControl2Test.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControl2Test.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -24,18 +24,18 @@ import junit.framework.Assert; -import org.hornetq.api.core.config.Configuration; -import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.server.HornetQServers; import org.hornetq.api.jms.management.JMSServerControl; -import org.hornetq.api.jms.server.JMSServerManagerImpl; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; import org.hornetq.integration.transports.netty.NettyAcceptorFactory; import org.hornetq.integration.transports.netty.NettyConnectorFactory; +import org.hornetq.jms.server.impl.JMSServerManagerImpl; import org.hornetq.tests.integration.management.ManagementControlHelper; import org.hornetq.tests.integration.management.ManagementTestBase; import org.hornetq.tests.unit.util.InVMContext; 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-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -23,20 +23,20 @@ import junit.framework.Assert; import org.hornetq.api.core.client.ClientSessionFactoryImpl; -import org.hornetq.api.core.config.Configuration; -import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.config.cluster.DiscoveryGroupConfiguration; import org.hornetq.api.core.management.ObjectNameBuilder; -import org.hornetq.api.core.server.HornetQServers; import org.hornetq.api.jms.management.JMSServerControl; -import org.hornetq.api.jms.server.JMSServerManager; -import org.hornetq.api.jms.server.JMSServerManagerImpl; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.remoting.impl.invm.TransportConstants; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; +import org.hornetq.core.server.cluster.DiscoveryGroupConfiguration; +import org.hornetq.jms.server.JMSServerManager; +import org.hornetq.jms.server.impl.JMSServerManagerImpl; import org.hornetq.tests.integration.management.ManagementControlHelper; import org.hornetq.tests.integration.management.ManagementTestBase; import org.hornetq.tests.unit.util.InVMContext; 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-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/JMSServerControlUsingJMSTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -19,12 +19,12 @@ import javax.jms.QueueSession; import javax.jms.Session; -import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.management.ResourceNames; import org.hornetq.api.jms.HornetQConnectionFactory; import org.hornetq.api.jms.HornetQQueue; import org.hornetq.api.jms.management.JMSServerControl; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; /** Modified: trunk/tests/src/org/hornetq/tests/integration/jms/server/management/TopicControlTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/jms/server/management/TopicControlTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/TopicControlTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -21,16 +21,16 @@ import junit.framework.Assert; -import org.hornetq.api.core.config.Configuration; -import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.server.HornetQServers; import org.hornetq.api.jms.HornetQTopic; import org.hornetq.api.jms.management.SubscriptionInfo; import org.hornetq.api.jms.management.TopicControl; -import org.hornetq.api.jms.server.JMSServerManagerImpl; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; +import org.hornetq.jms.server.impl.JMSServerManagerImpl; import org.hornetq.tests.integration.management.ManagementControlHelper; import org.hornetq.tests.integration.management.ManagementTestBase; import org.hornetq.tests.util.RandomUtil; 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-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/jms/server/management/TopicControlUsingJMSTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -21,17 +21,17 @@ import junit.framework.Assert; -import org.hornetq.api.core.config.Configuration; -import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.management.ResourceNames; -import org.hornetq.api.core.server.HornetQServers; import org.hornetq.api.jms.HornetQConnectionFactory; import org.hornetq.api.jms.HornetQQueue; import org.hornetq.api.jms.HornetQTopic; -import org.hornetq.api.jms.server.JMSServerManagerImpl; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; +import org.hornetq.jms.server.impl.JMSServerManagerImpl; import org.hornetq.tests.integration.management.ManagementTestBase; import org.hornetq.tests.util.RandomUtil; Modified: trunk/tests/src/org/hornetq/tests/integration/journal/AIOJournalCompactTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/journal/AIOJournalCompactTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/journal/AIOJournalCompactTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -17,7 +17,7 @@ import junit.framework.TestSuite; -import org.hornetq.api.core.config.ConfigurationImpl; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.journal.SequentialFileFactory; import org.hornetq.core.journal.impl.AIOSequentialFileFactory; import org.hornetq.tests.util.UnitTestCase; Modified: trunk/tests/src/org/hornetq/tests/integration/journal/AIOJournalImplTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/journal/AIOJournalImplTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/journal/AIOJournalImplTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -18,8 +18,8 @@ import junit.framework.Assert; import junit.framework.TestSuite; -import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.core.asyncio.impl.AsynchronousFileImpl; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.journal.SequentialFileFactory; import org.hornetq.core.journal.impl.AIOSequentialFileFactory; import org.hornetq.core.logging.Logger; Modified: trunk/tests/src/org/hornetq/tests/integration/journal/ValidateTransactionHealthTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/journal/ValidateTransactionHealthTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/journal/ValidateTransactionHealthTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -20,8 +20,8 @@ import junit.framework.Assert; -import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.core.asyncio.impl.AsynchronousFileImpl; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.journal.Journal; import org.hornetq.core.journal.LoaderCallback; import org.hornetq.core.journal.PreparedTransactionInfo; Modified: trunk/tests/src/org/hornetq/tests/integration/logging/LogDelegateTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/logging/LogDelegateTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/logging/LogDelegateTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -15,8 +15,8 @@ import junit.framework.Assert; -import org.hornetq.api.core.config.Configuration; -import org.hornetq.api.core.config.ConfigurationImpl; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; import org.hornetq.core.logging.impl.JULLogDelegate; import org.hornetq.core.logging.impl.JULLogDelegateFactory; Modified: trunk/tests/src/org/hornetq/tests/integration/management/AcceptorControlTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/AcceptorControlTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/management/AcceptorControlTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -21,16 +21,16 @@ 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.config.Configuration; -import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.management.AcceptorControl; import org.hornetq.api.core.management.NotificationType; -import org.hornetq.api.core.server.HornetQServers; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; import org.hornetq.core.server.management.Notification; import org.hornetq.tests.integration.SimpleNotificationService; import org.hornetq.tests.util.RandomUtil; Modified: trunk/tests/src/org/hornetq/tests/integration/management/AddressControlTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/AddressControlTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/management/AddressControlTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -24,17 +24,17 @@ 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.config.Configuration; -import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.management.AddressControl; import org.hornetq.api.core.management.RoleInfo; -import org.hornetq.api.core.server.HornetQServers; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.security.CheckType; import org.hornetq.core.security.Role; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; import org.hornetq.core.settings.impl.AddressSettings; import org.hornetq.tests.util.RandomUtil; Modified: trunk/tests/src/org/hornetq/tests/integration/management/AddressControlUsingCoreTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/AddressControlUsingCoreTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/management/AddressControlUsingCoreTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,17 +22,17 @@ 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.config.Configuration; -import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.management.AddressControl; import org.hornetq.api.core.management.ResourceNames; -import org.hornetq.api.core.server.HornetQServers; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.security.CheckType; import org.hornetq.core.security.Role; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; import org.hornetq.tests.util.RandomUtil; /** Modified: trunk/tests/src/org/hornetq/tests/integration/management/BridgeControlTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/BridgeControlTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/management/BridgeControlTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -24,19 +24,19 @@ import org.hornetq.api.Pair; import org.hornetq.api.SimpleString; import org.hornetq.api.core.client.ClientSessionFactoryImpl; -import org.hornetq.api.core.config.Configuration; -import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.config.cluster.BridgeConfiguration; -import org.hornetq.api.core.config.cluster.QueueConfiguration; import org.hornetq.api.core.management.BridgeControl; import org.hornetq.api.core.management.NotificationType; import org.hornetq.api.core.management.ObjectNameBuilder; -import org.hornetq.api.core.server.HornetQServers; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.remoting.impl.invm.TransportConstants; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; +import org.hornetq.core.server.cluster.BridgeConfiguration; +import org.hornetq.core.server.cluster.QueueConfiguration; import org.hornetq.core.server.management.Notification; import org.hornetq.tests.integration.SimpleNotificationService; import org.hornetq.tests.util.RandomUtil; Modified: trunk/tests/src/org/hornetq/tests/integration/management/BridgeControlUsingCoreTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/BridgeControlUsingCoreTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/management/BridgeControlUsingCoreTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -24,18 +24,18 @@ 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.config.Configuration; -import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.config.cluster.BridgeConfiguration; -import org.hornetq.api.core.config.cluster.QueueConfiguration; import org.hornetq.api.core.management.ObjectNameBuilder; import org.hornetq.api.core.management.ResourceNames; -import org.hornetq.api.core.server.HornetQServers; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.remoting.impl.invm.TransportConstants; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; +import org.hornetq.core.server.cluster.BridgeConfiguration; +import org.hornetq.core.server.cluster.QueueConfiguration; import org.hornetq.tests.util.RandomUtil; /** Modified: trunk/tests/src/org/hornetq/tests/integration/management/BroadcastGroupControlTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/BroadcastGroupControlTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/management/BroadcastGroupControlTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -19,14 +19,14 @@ import junit.framework.Assert; import org.hornetq.api.Pair; -import org.hornetq.api.core.config.Configuration; -import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.config.cluster.BroadcastGroupConfiguration; import org.hornetq.api.core.management.BroadcastGroupControl; -import org.hornetq.api.core.server.HornetQServers; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; +import org.hornetq.core.server.cluster.BroadcastGroupConfiguration; import org.hornetq.integration.transports.netty.NettyConnectorFactory; import org.hornetq.tests.util.RandomUtil; import org.hornetq.utils.json.JSONArray; Modified: trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControl2Test.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControl2Test.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControl2Test.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -25,17 +25,17 @@ import org.hornetq.api.Pair; import org.hornetq.api.core.client.ClientSessionFactoryImpl; -import org.hornetq.api.core.config.Configuration; -import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.config.cluster.BroadcastGroupConfiguration; -import org.hornetq.api.core.config.cluster.ClusterConnectionConfiguration; -import org.hornetq.api.core.config.cluster.DiscoveryGroupConfiguration; -import org.hornetq.api.core.config.cluster.QueueConfiguration; import org.hornetq.api.core.management.ClusterConnectionControl; -import org.hornetq.api.core.server.HornetQServers; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; +import org.hornetq.core.server.cluster.BroadcastGroupConfiguration; +import org.hornetq.core.server.cluster.ClusterConnectionConfiguration; +import org.hornetq.core.server.cluster.DiscoveryGroupConfiguration; +import org.hornetq.core.server.cluster.QueueConfiguration; import org.hornetq.integration.transports.netty.NettyAcceptorFactory; import org.hornetq.integration.transports.netty.NettyConnectorFactory; import org.hornetq.integration.transports.netty.TransportConstants; Modified: trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControlTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControlTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/management/ClusterConnectionControlTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -25,19 +25,19 @@ import org.hornetq.api.Pair; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.config.Configuration; -import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.config.cluster.ClusterConnectionConfiguration; -import org.hornetq.api.core.config.cluster.QueueConfiguration; import org.hornetq.api.core.management.ClusterConnectionControl; import org.hornetq.api.core.management.NotificationType; import org.hornetq.api.core.management.ObjectNameBuilder; -import org.hornetq.api.core.server.HornetQServers; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.remoting.impl.invm.TransportConstants; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; +import org.hornetq.core.server.cluster.ClusterConnectionConfiguration; +import org.hornetq.core.server.cluster.QueueConfiguration; import org.hornetq.core.server.management.Notification; import org.hornetq.tests.integration.SimpleNotificationService; import org.hornetq.tests.util.RandomUtil; Modified: trunk/tests/src/org/hornetq/tests/integration/management/CoreMessagingProxy.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/CoreMessagingProxy.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/management/CoreMessagingProxy.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -16,8 +16,8 @@ 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.config.ConfigurationImpl; -import org.hornetq.api.core.management.client.ManagementHelper; +import org.hornetq.api.core.management.ManagementHelper; +import org.hornetq.core.config.impl.ConfigurationImpl; /** * A MBeanUsingCoreMessage Modified: trunk/tests/src/org/hornetq/tests/integration/management/DiscoveryGroupControlTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/DiscoveryGroupControlTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/management/DiscoveryGroupControlTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -15,14 +15,14 @@ import junit.framework.Assert; -import org.hornetq.api.core.config.Configuration; -import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.config.cluster.DiscoveryGroupConfiguration; import org.hornetq.api.core.management.DiscoveryGroupControl; -import org.hornetq.api.core.server.HornetQServers; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; +import org.hornetq.core.server.cluster.DiscoveryGroupConfiguration; import org.hornetq.tests.util.RandomUtil; /** Modified: trunk/tests/src/org/hornetq/tests/integration/management/DivertControlTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/DivertControlTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/management/DivertControlTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -16,17 +16,17 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.config.Configuration; -import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.config.cluster.DivertConfiguration; -import org.hornetq.api.core.config.cluster.QueueConfiguration; import org.hornetq.api.core.management.DivertControl; import org.hornetq.api.core.management.ObjectNameBuilder; -import org.hornetq.api.core.server.HornetQServers; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; +import org.hornetq.core.server.cluster.DivertConfiguration; +import org.hornetq.core.server.cluster.QueueConfiguration; import org.hornetq.tests.util.RandomUtil; /** Modified: trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -19,17 +19,17 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.config.Configuration; -import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.management.HornetQServerControl; import org.hornetq.api.core.management.ObjectNameBuilder; import org.hornetq.api.core.management.QueueControl; -import org.hornetq.api.core.server.HornetQServers; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.messagecounter.impl.MessageCounterManagerImpl; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; import org.hornetq.tests.util.RandomUtil; import org.hornetq.utils.json.JSONArray; import org.hornetq.utils.json.JSONObject; Modified: trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlUsingCoreTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlUsingCoreTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/management/HornetQServerControlUsingCoreTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -16,10 +16,10 @@ 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.config.Configuration; 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; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; /** Modified: trunk/tests/src/org/hornetq/tests/integration/management/JMXDomainTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/JMXDomainTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/management/JMXDomainTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -16,14 +16,14 @@ import java.util.HashMap; import java.util.Map; -import org.hornetq.api.core.config.Configuration; -import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.management.ObjectNameBuilder; -import org.hornetq.api.core.server.HornetQServers; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.remoting.impl.invm.TransportConstants; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; /** * A JMXDomainTest Modified: trunk/tests/src/org/hornetq/tests/integration/management/ManagementHelperTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/ManagementHelperTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/management/ManagementHelperTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -19,7 +19,7 @@ import junit.framework.Assert; import junit.framework.TestCase; -import org.hornetq.api.core.management.client.ManagementHelper; +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; Modified: trunk/tests/src/org/hornetq/tests/integration/management/ManagementServiceImplTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/ManagementServiceImplTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/management/ManagementServiceImplTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -16,16 +16,16 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.config.Configuration; -import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.management.AddressControl; +import org.hornetq.api.core.management.ManagementHelper; import org.hornetq.api.core.management.QueueControl; import org.hornetq.api.core.management.ResourceNames; -import org.hornetq.api.core.management.client.ManagementHelper; -import org.hornetq.api.core.server.HornetQServers; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; import org.hornetq.core.persistence.impl.nullpm.NullStorageManager; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; import org.hornetq.core.server.Queue; import org.hornetq.core.server.ServerMessage; import org.hornetq.core.server.impl.ServerMessageImpl; Modified: trunk/tests/src/org/hornetq/tests/integration/management/NotificationTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/NotificationTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/management/NotificationTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -25,15 +25,15 @@ 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.config.Configuration; -import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.management.client.ManagementHelper; -import org.hornetq.api.core.server.HornetQServers; +import org.hornetq.api.core.management.ManagementHelper; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; import org.hornetq.tests.util.RandomUtil; import org.hornetq.tests.util.UnitTestCase; Modified: trunk/tests/src/org/hornetq/tests/integration/management/QueueControlTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/QueueControlTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/management/QueueControlTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -24,19 +24,19 @@ 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.config.Configuration; -import org.hornetq.api.core.config.ConfigurationImpl; 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.api.core.server.HornetQServers; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.messagecounter.impl.MessageCounterManagerImpl; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; import org.hornetq.core.settings.impl.AddressSettings; import org.hornetq.tests.util.RandomUtil; import org.hornetq.utils.json.JSONArray; Modified: trunk/tests/src/org/hornetq/tests/integration/management/SecurityManagementTestBase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/SecurityManagementTestBase.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/management/SecurityManagementTestBase.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -20,10 +20,10 @@ 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.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; +import org.hornetq.api.core.management.ManagementHelper; import org.hornetq.api.core.management.ResourceNames; -import org.hornetq.api.core.management.client.ManagementHelper; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.server.HornetQServer; import org.hornetq.tests.util.UnitTestCase; Modified: trunk/tests/src/org/hornetq/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/management/SecurityManagementWithConfiguredAdminUserTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -15,13 +15,13 @@ import java.util.Set; -import org.hornetq.api.core.config.Configuration; -import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.server.HornetQServers; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.security.Role; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; import org.hornetq.core.settings.HierarchicalRepository; import org.hornetq.spi.core.security.HornetQSecurityManagerImpl; Modified: trunk/tests/src/org/hornetq/tests/integration/management/SecurityManagementWithDefaultConfigurationTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/SecurityManagementWithDefaultConfigurationTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/management/SecurityManagementWithDefaultConfigurationTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -13,12 +13,12 @@ package org.hornetq.tests.integration.management; -import org.hornetq.api.core.config.Configuration; -import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.server.HornetQServers; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; /** * A SecurityManagementTest Modified: trunk/tests/src/org/hornetq/tests/integration/management/SecurityManagementWithModifiedConfigurationTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/SecurityManagementWithModifiedConfigurationTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/management/SecurityManagementWithModifiedConfigurationTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -13,11 +13,11 @@ package org.hornetq.tests.integration.management; -import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.server.HornetQServers; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; /** * A SecurityManagementTest Modified: trunk/tests/src/org/hornetq/tests/integration/management/SecurityNotificationTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/management/SecurityNotificationTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/management/SecurityNotificationTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -27,17 +27,17 @@ 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.config.Configuration; -import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.management.client.ManagementHelper; -import org.hornetq.api.core.server.HornetQServers; +import org.hornetq.api.core.management.ManagementHelper; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.security.CheckType; import org.hornetq.core.security.Role; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; import org.hornetq.spi.core.security.HornetQSecurityManager; import org.hornetq.tests.util.RandomUtil; import org.hornetq.tests.util.UnitTestCase; Modified: trunk/tests/src/org/hornetq/tests/integration/paging/PageCrashTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/paging/PageCrashTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/paging/PageCrashTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -29,7 +29,7 @@ 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.config.Configuration; +import org.hornetq.core.config.Configuration; import org.hornetq.core.paging.Page; import org.hornetq.core.paging.PagedMessage; import org.hornetq.core.paging.PagingManager; Modified: trunk/tests/src/org/hornetq/tests/integration/persistence/RestartSMTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/persistence/RestartSMTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/persistence/RestartSMTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -21,7 +21,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; -import org.hornetq.api.core.config.Configuration; +import org.hornetq.core.config.Configuration; import org.hornetq.core.logging.Logger; import org.hornetq.core.persistence.GroupingInfo; import org.hornetq.core.persistence.QueueBindingInfo; Modified: trunk/tests/src/org/hornetq/tests/integration/remoting/NetworkAddressTestBase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/remoting/NetworkAddressTestBase.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/remoting/NetworkAddressTestBase.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -29,8 +29,8 @@ 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.config.Configuration; 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-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/remoting/PingTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -23,12 +23,12 @@ import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.ClientSessionFactoryImpl; import org.hornetq.api.core.client.SessionFailureListener; -import org.hornetq.api.core.config.Configuration; 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; import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.CloseListener; import org.hornetq.core.remoting.Packet; Modified: trunk/tests/src/org/hornetq/tests/integration/remoting/SynchronousCloseTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/remoting/SynchronousCloseTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/remoting/SynchronousCloseTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -18,8 +18,8 @@ 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.config.Configuration; 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; import org.hornetq.core.server.HornetQServer; Modified: trunk/tests/src/org/hornetq/tests/integration/replication/ReplicationTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/replication/ReplicationTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/replication/ReplicationTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -33,12 +33,12 @@ import org.hornetq.api.core.buffers.HornetQBuffers; import org.hornetq.api.core.client.ClientSessionFactory; import org.hornetq.api.core.client.ClientSessionFactoryImpl; -import org.hornetq.api.core.config.Configuration; 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; import org.hornetq.core.journal.EncodingSupport; import org.hornetq.core.journal.IOAsyncTask; import org.hornetq.core.journal.IOCompletion; Modified: trunk/tests/src/org/hornetq/tests/integration/scheduling/DelayedMessageTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/scheduling/DelayedMessageTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/scheduling/DelayedMessageTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -19,7 +19,7 @@ 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.config.Configuration; +import org.hornetq.core.config.Configuration; import org.hornetq.core.logging.Logger; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.settings.impl.AddressSettings; Modified: trunk/tests/src/org/hornetq/tests/integration/scheduling/ScheduledMessageTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/scheduling/ScheduledMessageTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/scheduling/ScheduledMessageTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -23,8 +23,8 @@ 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.config.Configuration; 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; import org.hornetq.core.settings.impl.AddressSettings; Modified: trunk/tests/src/org/hornetq/tests/integration/security/NettySecurityClientTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/security/NettySecurityClientTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/security/NettySecurityClientTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -19,11 +19,11 @@ import junit.framework.Assert; -import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.server.HornetQServers; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; import org.hornetq.integration.transports.netty.NettyAcceptorFactory; import org.hornetq.integration.transports.netty.NettyConnectorFactory; import org.hornetq.tests.util.SpawnedVMSupport; Modified: trunk/tests/src/org/hornetq/tests/integration/security/SecurityTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/security/SecurityTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/security/SecurityTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -37,8 +37,8 @@ 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.config.Configuration; 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; import org.hornetq.core.server.Queue; Modified: trunk/tests/src/org/hornetq/tests/integration/server/ExpiryRunnerTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/server/ExpiryRunnerTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/server/ExpiryRunnerTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -29,11 +29,11 @@ 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.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.server.HornetQServers; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; import org.hornetq.core.server.Queue; import org.hornetq.core.settings.impl.AddressSettings; import org.hornetq.tests.util.UnitTestCase; Modified: trunk/tests/src/org/hornetq/tests/integration/server/LVQRecoveryTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/server/LVQRecoveryTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/server/LVQRecoveryTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -24,10 +24,10 @@ 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.config.Configuration; 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; import org.hornetq.core.transaction.impl.XidImpl; Modified: trunk/tests/src/org/hornetq/tests/integration/server/LVQTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/server/LVQTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/server/LVQTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -21,13 +21,13 @@ 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.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; import org.hornetq.api.core.message.Message; -import org.hornetq.api.core.server.HornetQServers; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; import org.hornetq.core.settings.impl.AddressSettings; import org.hornetq.tests.util.UnitTestCase; Modified: trunk/tests/src/org/hornetq/tests/integration/server/PredefinedQueueTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/server/PredefinedQueueTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/server/PredefinedQueueTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -25,14 +25,14 @@ 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.config.Configuration; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.config.cluster.QueueConfiguration; import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.server.HornetQServers; +import org.hornetq.core.config.Configuration; import org.hornetq.core.logging.Logger; import org.hornetq.core.postoffice.Bindings; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; +import org.hornetq.core.server.cluster.QueueConfiguration; import org.hornetq.tests.util.ServiceTestBase; /** Modified: trunk/tests/src/org/hornetq/tests/integration/ssl/CoreClientOverSSLTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/ssl/CoreClientOverSSLTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/ssl/CoreClientOverSSLTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -25,13 +25,13 @@ 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.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; import org.hornetq.api.core.message.Message; -import org.hornetq.api.core.server.HornetQServers; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; import org.hornetq.integration.transports.netty.NettyAcceptorFactory; import org.hornetq.integration.transports.netty.NettyConnectorFactory; import org.hornetq.integration.transports.netty.TransportConstants; Modified: trunk/tests/src/org/hornetq/tests/integration/xa/BasicXaRecoveryTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/xa/BasicXaRecoveryTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/xa/BasicXaRecoveryTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -27,8 +27,8 @@ 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.config.Configuration; 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; import org.hornetq.core.settings.impl.AddressSettings; Modified: trunk/tests/src/org/hornetq/tests/integration/xa/BasicXaTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/xa/BasicXaTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/xa/BasicXaTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -30,8 +30,8 @@ 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.config.Configuration; 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; import org.hornetq.core.settings.impl.AddressSettings; Modified: trunk/tests/src/org/hornetq/tests/integration/xa/XaTimeoutTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/integration/xa/XaTimeoutTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/integration/xa/XaTimeoutTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -32,11 +32,11 @@ 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.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; import org.hornetq.api.core.exception.HornetQException; -import org.hornetq.api.core.server.HornetQServers; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; import org.hornetq.core.server.Queue; import org.hornetq.core.settings.impl.AddressSettings; import org.hornetq.core.transaction.Transaction; Modified: trunk/tests/src/org/hornetq/tests/opt/SendTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/opt/SendTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/opt/SendTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -28,15 +28,15 @@ import javax.jms.TextMessage; import org.hornetq.api.core.client.ClientSession; -import org.hornetq.api.core.config.Configuration; -import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.server.HornetQServers; import org.hornetq.api.jms.HornetQConnectionFactory; import org.hornetq.api.jms.HornetQQueue; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; import org.hornetq.core.server.JournalType; import org.hornetq.integration.transports.netty.NettyAcceptorFactory; import org.hornetq.integration.transports.netty.NettyConnectorFactory; Modified: trunk/tests/src/org/hornetq/tests/performance/paging/MeasurePagingMultiThreadTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/performance/paging/MeasurePagingMultiThreadTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/performance/paging/MeasurePagingMultiThreadTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -21,8 +21,8 @@ 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.config.Configuration; 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; import org.hornetq.tests.util.ServiceTestBase; Modified: trunk/tests/src/org/hornetq/tests/stress/journal/CompactingStressTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/stress/journal/CompactingStressTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/stress/journal/CompactingStressTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -23,11 +23,11 @@ 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.config.Configuration; -import org.hornetq.api.core.config.ConfigurationImpl; 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; import org.hornetq.core.server.HornetQServer; import org.hornetq.core.server.JournalType; import org.hornetq.tests.util.ServiceTestBase; Modified: trunk/tests/src/org/hornetq/tests/stress/journal/LargeJournalStressTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/stress/journal/LargeJournalStressTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/stress/journal/LargeJournalStressTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -23,9 +23,9 @@ 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.config.Configuration; -import org.hornetq.api.core.config.ConfigurationImpl; 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; import org.hornetq.core.server.JournalType; import org.hornetq.tests.util.ServiceTestBase; Modified: trunk/tests/src/org/hornetq/tests/stress/journal/MultiThreadConsumerStressTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/stress/journal/MultiThreadConsumerStressTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/stress/journal/MultiThreadConsumerStressTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -24,9 +24,9 @@ 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.config.Configuration; -import org.hornetq.api.core.config.ConfigurationImpl; 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; import org.hornetq.core.server.JournalType; import org.hornetq.tests.util.ServiceTestBase; Modified: trunk/tests/src/org/hornetq/tests/stress/journal/NIOMultiThreadCompactorStressTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/stress/journal/NIOMultiThreadCompactorStressTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/stress/journal/NIOMultiThreadCompactorStressTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -29,10 +29,10 @@ 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.config.Configuration; -import org.hornetq.api.core.config.ConfigurationImpl; 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; import org.hornetq.core.journal.PreparedTransactionInfo; import org.hornetq.core.journal.RecordInfo; import org.hornetq.core.journal.impl.JournalImpl; Modified: trunk/tests/src/org/hornetq/tests/stress/paging/PageStressTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/stress/paging/PageStressTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/stress/paging/PageStressTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -23,8 +23,8 @@ 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.config.Configuration; 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; import org.hornetq.core.settings.impl.AddressSettings; Modified: trunk/tests/src/org/hornetq/tests/stress/remote/PingStressTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/stress/remote/PingStressTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/stress/remote/PingStressTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -18,10 +18,10 @@ 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.config.Configuration; 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; import org.hornetq.core.remoting.RemotingConnection; 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-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/timing/jms/bridge/impl/JMSBridgeImplTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -40,21 +40,21 @@ import junit.framework.Assert; -import org.hornetq.api.core.config.Configuration; -import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.server.HornetQServers; import org.hornetq.api.jms.HornetQConnectionFactory; import org.hornetq.api.jms.HornetQQueue; -import org.hornetq.api.jms.bridge.ConnectionFactoryFactory; -import org.hornetq.api.jms.bridge.DestinationFactory; -import org.hornetq.api.jms.bridge.JMSBridgeImpl; -import org.hornetq.api.jms.bridge.QualityOfServiceMode; -import org.hornetq.api.jms.server.JMSServerManager; -import org.hornetq.api.jms.server.JMSServerManagerImpl; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; +import org.hornetq.core.server.HornetQServers; +import org.hornetq.jms.bridge.ConnectionFactoryFactory; +import org.hornetq.jms.bridge.DestinationFactory; +import org.hornetq.jms.bridge.QualityOfServiceMode; +import org.hornetq.jms.bridge.impl.JMSBridgeImpl; +import org.hornetq.jms.server.JMSServerManager; +import org.hornetq.jms.server.impl.JMSServerManagerImpl; import org.hornetq.tests.unit.util.InVMContext; import org.hornetq.tests.util.RandomUtil; import org.hornetq.tests.util.UnitTestCase; Modified: trunk/tests/src/org/hornetq/tests/unit/core/config/impl/ConfigurationImplTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/config/impl/ConfigurationImplTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/unit/core/config/impl/ConfigurationImplTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -21,8 +21,8 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.config.Configuration; -import org.hornetq.api.core.config.ConfigurationImpl; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.server.JournalType; import org.hornetq.tests.util.RandomUtil; import org.hornetq.tests.util.UnitTestCase; Modified: trunk/tests/src/org/hornetq/tests/unit/core/config/impl/ConfigurationValidationTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/config/impl/ConfigurationValidationTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/unit/core/config/impl/ConfigurationValidationTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -15,7 +15,7 @@ import junit.framework.Assert; -import org.hornetq.api.core.config.FileConfiguration; +import org.hornetq.core.config.impl.FileConfiguration; import org.hornetq.tests.util.UnitTestCase; import org.hornetq.utils.XMLUtil; import org.w3c.dom.Element; Modified: trunk/tests/src/org/hornetq/tests/unit/core/config/impl/DefaultsFileConfigurationTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/config/impl/DefaultsFileConfigurationTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/unit/core/config/impl/DefaultsFileConfigurationTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -17,9 +17,9 @@ import junit.framework.Assert; -import org.hornetq.api.core.config.Configuration; -import org.hornetq.api.core.config.ConfigurationImpl; -import org.hornetq.api.core.config.FileConfiguration; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.impl.ConfigurationImpl; +import org.hornetq.core.config.impl.FileConfiguration; /** * 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-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/unit/core/config/impl/FileConfigurationTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -16,15 +16,15 @@ import junit.framework.Assert; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.config.Configuration; -import org.hornetq.api.core.config.FileConfiguration; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.config.cluster.BridgeConfiguration; -import org.hornetq.api.core.config.cluster.BroadcastGroupConfiguration; -import org.hornetq.api.core.config.cluster.ClusterConnectionConfiguration; -import org.hornetq.api.core.config.cluster.DiscoveryGroupConfiguration; -import org.hornetq.api.core.config.cluster.DivertConfiguration; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.impl.FileConfiguration; import org.hornetq.core.server.JournalType; +import org.hornetq.core.server.cluster.BridgeConfiguration; +import org.hornetq.core.server.cluster.BroadcastGroupConfiguration; +import org.hornetq.core.server.cluster.ClusterConnectionConfiguration; +import org.hornetq.core.server.cluster.DiscoveryGroupConfiguration; +import org.hornetq.core.server.cluster.DivertConfiguration; /** * @author <a href="ataylor(a)redhat.com">Andy Taylor</a> Modified: trunk/tests/src/org/hornetq/tests/unit/core/deployers/impl/QueueDeployerTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/deployers/impl/QueueDeployerTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/unit/core/deployers/impl/QueueDeployerTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -18,11 +18,11 @@ import junit.framework.Assert; -import org.hornetq.api.core.config.Configuration; -import org.hornetq.api.core.config.cluster.QueueConfiguration; import org.hornetq.api.core.management.HornetQServerControl; +import org.hornetq.core.config.Configuration; import org.hornetq.core.deployers.DeploymentManager; import org.hornetq.core.deployers.impl.QueueDeployer; +import org.hornetq.core.server.cluster.QueueConfiguration; import org.hornetq.tests.util.UnitTestCase; import org.w3c.dom.Element; import org.w3c.dom.NodeList; Modified: trunk/tests/src/org/hornetq/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/unit/core/postoffice/impl/DuplicateDetectionUnitTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -25,8 +25,8 @@ import org.hornetq.api.Pair; import org.hornetq.api.SimpleString; -import org.hornetq.api.core.config.Configuration; -import org.hornetq.api.core.config.ConfigurationImpl; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.paging.PageTransactionInfo; import org.hornetq.core.paging.PagingManager; import org.hornetq.core.paging.PagingStore; 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-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyAcceptorFactoryTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -19,8 +19,8 @@ import junit.framework.Assert; import org.hornetq.api.core.buffers.HornetQBuffer; -import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.exception.HornetQException; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.remoting.impl.AbstractBufferHandler; import org.hornetq.integration.transports.netty.NettyAcceptor; import org.hornetq.integration.transports.netty.NettyAcceptorFactory; 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-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/unit/core/remoting/impl/netty/NettyAcceptorTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -20,8 +20,8 @@ import junit.framework.Assert; import org.hornetq.api.core.buffers.HornetQBuffer; -import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.exception.HornetQException; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.remoting.impl.AbstractBufferHandler; import org.hornetq.integration.transports.netty.NettyAcceptor; import org.hornetq.integration.transports.netty.TransportConstants; Modified: trunk/tests/src/org/hornetq/tests/unit/jms/misc/ManifestTest.java =================================================================== --- trunk/tests/src/org/hornetq/tests/unit/jms/misc/ManifestTest.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/unit/jms/misc/ManifestTest.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -24,10 +24,10 @@ import junit.framework.Assert; -import org.hornetq.api.core.config.ConfigurationImpl; -import org.hornetq.api.core.server.HornetQServers; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; import org.hornetq.jms.client.HornetQConnectionMetaData; import org.hornetq.tests.util.UnitTestCase; Modified: trunk/tests/src/org/hornetq/tests/util/JMSTestBase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/util/JMSTestBase.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/util/JMSTestBase.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -22,13 +22,13 @@ import org.hornetq.api.Pair; import org.hornetq.api.core.client.ClientSessionFactoryImpl; -import org.hornetq.api.core.config.Configuration; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.server.HornetQServers; -import org.hornetq.api.jms.server.JMSServerManagerImpl; +import org.hornetq.core.config.Configuration; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; import org.hornetq.integration.transports.netty.NettyAcceptorFactory; import org.hornetq.integration.transports.netty.NettyConnectorFactory; +import org.hornetq.jms.server.impl.JMSServerManagerImpl; import org.hornetq.tests.unit.util.InVMContext; /** Modified: trunk/tests/src/org/hornetq/tests/util/ListJournal.java =================================================================== --- trunk/tests/src/org/hornetq/tests/util/ListJournal.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/util/ListJournal.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -15,7 +15,7 @@ import java.util.ArrayList; -import org.hornetq.api.core.config.FileConfiguration; +import org.hornetq.core.config.impl.FileConfiguration; import org.hornetq.core.journal.PreparedTransactionInfo; import org.hornetq.core.journal.RecordInfo; import org.hornetq.core.journal.impl.JournalImpl; Modified: trunk/tests/src/org/hornetq/tests/util/ServiceTestBase.java =================================================================== --- trunk/tests/src/org/hornetq/tests/util/ServiceTestBase.java 2010-01-05 17:41:42 UTC (rev 8720) +++ trunk/tests/src/org/hornetq/tests/util/ServiceTestBase.java 2010-01-05 19:49:35 UTC (rev 8721) @@ -25,14 +25,14 @@ 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.config.Configuration; -import org.hornetq.api.core.config.ConfigurationImpl; import org.hornetq.api.core.config.TransportConfiguration; -import org.hornetq.api.core.server.HornetQServers; +import org.hornetq.core.config.Configuration; +import org.hornetq.core.config.impl.ConfigurationImpl; import org.hornetq.core.logging.Logger; import org.hornetq.core.remoting.impl.invm.InVMAcceptorFactory; import org.hornetq.core.remoting.impl.invm.InVMConnectorFactory; import org.hornetq.core.server.HornetQServer; +import org.hornetq.core.server.HornetQServers; import org.hornetq.core.server.JournalType; import org.hornetq.core.settings.impl.AddressSettings; import org.hornetq.integration.transports.netty.NettyAcceptorFactory;

14 years, 11 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

hornetq-commits January 2010