[jboss-cvs] JBoss Messaging SVN: r2868 - in trunk: docs/examples/common/src/org/jboss/example/jms/common/bean and 70 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Tue Jul 10 16:22:18 EDT 2007


Author: timfox
Date: 2007-07-10 16:22:16 -0400 (Tue, 10 Jul 2007)
New Revision: 2868

Added:
   trunk/tests/src/org/jboss/test/messaging/jms/clustering/DistributedQueueTestBase.java
Removed:
   trunk/tests/src/org/jboss/test/messaging/jms/clustering/DistributedQueueTest.java
Modified:
   trunk/docs/examples/common/src/org/jboss/example/jms/common/ExampleSupport.java
   trunk/docs/examples/common/src/org/jboss/example/jms/common/Util.java
   trunk/docs/examples/common/src/org/jboss/example/jms/common/bean/Management.java
   trunk/docs/examples/common/src/org/jboss/example/jms/common/bean/ManagementBean.java
   trunk/docs/examples/common/src/org/jboss/example/jms/common/bean/ManagementHome.java
   trunk/docs/examples/distributed-queue/src/org/jboss/example/jms/distributedqueue/DistributedQueueExample.java
   trunk/docs/examples/distributed-queue/src/org/jboss/example/jms/distributedqueue/ExampleListener.java
   trunk/docs/examples/distributed-topic/src/org/jboss/example/jms/distributedtopic/DistributedTopicExample.java
   trunk/docs/examples/distributed-topic/src/org/jboss/example/jms/distributedtopic/ExampleListener.java
   trunk/docs/examples/ejb3mdb/src/org/jboss/example/jms/ejb3mdb/EJB3MDBExample.java
   trunk/docs/examples/ejb3mdb/src/org/jboss/example/jms/ejb3mdb/Sender.java
   trunk/docs/examples/http/src/org/jboss/example/jms/http/HttpExample.java
   trunk/docs/examples/mdb-failure/src/org/jboss/example/jms/mdbfailure/MDBFailureExample.java
   trunk/docs/examples/mdb-failure/src/org/jboss/example/jms/mdbfailure/Sender.java
   trunk/docs/examples/mdb/src/org/jboss/example/jms/mdb/MDBExample.java
   trunk/docs/examples/mdb/src/org/jboss/example/jms/mdb/Sender.java
   trunk/docs/examples/queue-failover/src/org/jboss/example/jms/failover/QueueFailoverExample.java
   trunk/docs/examples/queue/src/org/jboss/example/jms/queue/QueueExample.java
   trunk/docs/examples/secure-socket/src/org/jboss/example/jms/securesocket/SecureSocketExample.java
   trunk/docs/examples/stateless-clustered/src/org/jboss/example/jms/statelessclustered/bean/StatelessClusteredSessionExample.java
   trunk/docs/examples/stateless-clustered/src/org/jboss/example/jms/statelessclustered/bean/StatelessClusteredSessionExampleBean.java
   trunk/docs/examples/stateless-clustered/src/org/jboss/example/jms/statelessclustered/bean/StatelessClusteredSessionExampleHome.java
   trunk/docs/examples/stateless-clustered/src/org/jboss/example/jms/statelessclustered/client/Client.java
   trunk/docs/examples/stateless/src/org/jboss/example/jms/stateless/bean/StatelessSessionExample.java
   trunk/docs/examples/stateless/src/org/jboss/example/jms/stateless/bean/StatelessSessionExampleBean.java
   trunk/docs/examples/stateless/src/org/jboss/example/jms/stateless/bean/StatelessSessionExampleHome.java
   trunk/docs/examples/stateless/src/org/jboss/example/jms/stateless/client/Client.java
   trunk/docs/examples/topic/src/org/jboss/example/jms/topic/ExampleListener.java
   trunk/docs/examples/topic/src/org/jboss/example/jms/topic/TopicExample.java
   trunk/src/main/org/jboss/jms/client/ClientAOPStackLoader.java
   trunk/src/main/org/jboss/jms/client/Closeable.java
   trunk/src/main/org/jboss/jms/client/FailoverCommandCenter.java
   trunk/src/main/org/jboss/jms/client/FailoverEvent.java
   trunk/src/main/org/jboss/jms/client/FailoverListener.java
   trunk/src/main/org/jboss/jms/client/FailureDetector.java
   trunk/src/main/org/jboss/jms/client/JBossConnection.java
   trunk/src/main/org/jboss/jms/client/JBossConnectionConsumer.java
   trunk/src/main/org/jboss/jms/client/JBossConnectionFactory.java
   trunk/src/main/org/jboss/jms/client/JBossConnectionMetaData.java
   trunk/src/main/org/jboss/jms/client/JBossMessageConsumer.java
   trunk/src/main/org/jboss/jms/client/JBossMessageProducer.java
   trunk/src/main/org/jboss/jms/client/JBossSession.java
   trunk/src/main/org/jboss/jms/client/container/ClientConsumer.java
   trunk/src/main/org/jboss/jms/client/container/ClientLogInterceptor.java
   trunk/src/main/org/jboss/jms/client/container/ClosedInterceptor.java
   trunk/src/main/org/jboss/jms/client/container/ClusteringAspect.java
   trunk/src/main/org/jboss/jms/client/container/ConnectionAspect.java
   trunk/src/main/org/jboss/jms/client/container/ConnectionFailureListener.java
   trunk/src/main/org/jboss/jms/client/container/ConsumerAspect.java
   trunk/src/main/org/jboss/jms/client/container/DelegateIdentity.java
   trunk/src/main/org/jboss/jms/client/container/ExceptionInterceptor.java
   trunk/src/main/org/jboss/jms/client/container/FailoverValveInterceptor.java
   trunk/src/main/org/jboss/jms/client/container/SessionAspect.java
   trunk/src/main/org/jboss/jms/client/container/StateCreationAspect.java
   trunk/src/main/org/jboss/jms/client/delegate/ClientBrowserDelegate.java
   trunk/src/main/org/jboss/jms/client/delegate/ClientClusteredConnectionFactoryDelegate.java
   trunk/src/main/org/jboss/jms/client/delegate/ClientConnectionDelegate.java
   trunk/src/main/org/jboss/jms/client/delegate/ClientConnectionFactoryDelegate.java
   trunk/src/main/org/jboss/jms/client/delegate/ClientConsumerDelegate.java
   trunk/src/main/org/jboss/jms/client/delegate/ClientProducerDelegate.java
   trunk/src/main/org/jboss/jms/client/delegate/ClientSessionDelegate.java
   trunk/src/main/org/jboss/jms/client/delegate/DelegateSupport.java
   trunk/src/main/org/jboss/jms/client/plugin/LoadBalancingPolicy.java
   trunk/src/main/org/jboss/jms/client/plugin/RoundRobinLoadBalancingPolicy.java
   trunk/src/main/org/jboss/jms/client/remoting/CallbackManager.java
   trunk/src/main/org/jboss/jms/client/remoting/ConsolidatedRemotingConnectionListener.java
   trunk/src/main/org/jboss/jms/client/remoting/JMSRemotingConnection.java
   trunk/src/main/org/jboss/jms/client/state/BrowserState.java
   trunk/src/main/org/jboss/jms/client/state/ConnectionState.java
   trunk/src/main/org/jboss/jms/client/state/ConsumerState.java
   trunk/src/main/org/jboss/jms/client/state/HierarchicalState.java
   trunk/src/main/org/jboss/jms/client/state/HierarchicalStateSupport.java
   trunk/src/main/org/jboss/jms/client/state/ProducerState.java
   trunk/src/main/org/jboss/jms/client/state/SessionState.java
   trunk/src/main/org/jboss/jms/delegate/BrowserEndpoint.java
   trunk/src/main/org/jboss/jms/delegate/ConnectionDelegate.java
   trunk/src/main/org/jboss/jms/delegate/ConnectionFactoryDelegate.java
   trunk/src/main/org/jboss/jms/delegate/ConnectionFactoryEndpoint.java
   trunk/src/main/org/jboss/jms/delegate/ConsumerDelegate.java
   trunk/src/main/org/jboss/jms/delegate/ConsumerEndpoint.java
   trunk/src/main/org/jboss/jms/delegate/DeliveryInfo.java
   trunk/src/main/org/jboss/jms/delegate/ProducerDelegate.java
   trunk/src/main/org/jboss/jms/delegate/SessionDelegate.java
   trunk/src/main/org/jboss/jms/delegate/SessionEndpoint.java
   trunk/src/main/org/jboss/jms/destination/JBossDestination.java
   trunk/src/main/org/jboss/jms/destination/JBossQueue.java
   trunk/src/main/org/jboss/jms/destination/JBossTopic.java
   trunk/src/main/org/jboss/jms/exception/MessagingJMSException.java
   trunk/src/main/org/jboss/jms/message/JBossBytesMessage.java
   trunk/src/main/org/jboss/jms/message/JBossMapMessage.java
   trunk/src/main/org/jboss/jms/message/JBossMessage.java
   trunk/src/main/org/jboss/jms/message/JBossObjectMessage.java
   trunk/src/main/org/jboss/jms/message/JBossStreamMessage.java
   trunk/src/main/org/jboss/jms/message/JBossTextMessage.java
   trunk/src/main/org/jboss/jms/message/MessageIdGenerator.java
   trunk/src/main/org/jboss/jms/server/Bootstrap.java
   trunk/src/main/org/jboss/jms/server/ConnectionFactoryManager.java
   trunk/src/main/org/jboss/jms/server/ConnectionManager.java
   trunk/src/main/org/jboss/jms/server/DestinationJNDIMapper.java
   trunk/src/main/org/jboss/jms/server/DestinationManager.java
   trunk/src/main/org/jboss/jms/server/SecurityManager.java
   trunk/src/main/org/jboss/jms/server/ServerPeer.java
   trunk/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactory.java
   trunk/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactoryJNDIMapper.java
   trunk/src/main/org/jboss/jms/server/connectionfactory/JNDIBindings.java
   trunk/src/main/org/jboss/jms/server/connectionmanager/SimpleConnectionManager.java
   trunk/src/main/org/jboss/jms/server/container/SecurityAspect.java
   trunk/src/main/org/jboss/jms/server/container/ServerLogInterceptor.java
   trunk/src/main/org/jboss/jms/server/destination/DestinationServiceSupport.java
   trunk/src/main/org/jboss/jms/server/destination/ManagedQueue.java
   trunk/src/main/org/jboss/jms/server/destination/ManagedTopic.java
   trunk/src/main/org/jboss/jms/server/destination/QueueService.java
   trunk/src/main/org/jboss/jms/server/destination/TopicService.java
   trunk/src/main/org/jboss/jms/server/endpoint/ServerBrowserEndpoint.java
   trunk/src/main/org/jboss/jms/server/endpoint/ServerConnectionEndpoint.java
   trunk/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java
   trunk/src/main/org/jboss/jms/server/endpoint/ServerConsumerEndpoint.java
   trunk/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java
   trunk/src/main/org/jboss/jms/server/endpoint/advised/BrowserAdvised.java
   trunk/src/main/org/jboss/jms/server/endpoint/advised/ConnectionAdvised.java
   trunk/src/main/org/jboss/jms/server/endpoint/advised/ConnectionFactoryAdvised.java
   trunk/src/main/org/jboss/jms/server/endpoint/advised/ConsumerAdvised.java
   trunk/src/main/org/jboss/jms/server/endpoint/advised/SessionAdvised.java
   trunk/src/main/org/jboss/jms/server/remoting/DirectThreadPool.java
   trunk/src/main/org/jboss/jms/server/remoting/JMSServerInvocationHandler.java
   trunk/src/main/org/jboss/jms/server/security/SecurityMetadataStore.java
   trunk/src/main/org/jboss/jms/tx/MessagingXAResource.java
   trunk/src/main/org/jboss/jms/tx/TransactionRequest.java
   trunk/src/main/org/jboss/jms/wireformat/BrowserResetRequest.java
   trunk/src/main/org/jboss/jms/wireformat/ClientDelivery.java
   trunk/src/main/org/jboss/jms/wireformat/JMSWireFormat.java
   trunk/src/main/org/jboss/messaging/core/contract/Channel.java
   trunk/src/main/org/jboss/messaging/core/contract/Delivery.java
   trunk/src/main/org/jboss/messaging/core/contract/DeliveryObserver.java
   trunk/src/main/org/jboss/messaging/core/contract/Distributor.java
   trunk/src/main/org/jboss/messaging/core/contract/Filter.java
   trunk/src/main/org/jboss/messaging/core/contract/Message.java
   trunk/src/main/org/jboss/messaging/core/contract/MessageReference.java
   trunk/src/main/org/jboss/messaging/core/contract/MessageStore.java
   trunk/src/main/org/jboss/messaging/core/contract/PersistenceManager.java
   trunk/src/main/org/jboss/messaging/core/contract/PostOffice.java
   trunk/src/main/org/jboss/messaging/core/contract/Receiver.java
   trunk/src/main/org/jboss/messaging/core/contract/Replicator.java
   trunk/src/main/org/jboss/messaging/core/impl/ChannelSupport.java
   trunk/src/main/org/jboss/messaging/core/impl/FailoverWaiter.java
   trunk/src/main/org/jboss/messaging/core/impl/FirstReceiverDistributor.java
   trunk/src/main/org/jboss/messaging/core/impl/IDManager.java
   trunk/src/main/org/jboss/messaging/core/impl/JDBCPersistenceManager.java
   trunk/src/main/org/jboss/messaging/core/impl/MessagingQueue.java
   trunk/src/main/org/jboss/messaging/core/impl/RoundRobinDistributor.java
   trunk/src/main/org/jboss/messaging/core/impl/SimpleDelivery.java
   trunk/src/main/org/jboss/messaging/core/impl/clusterconnection/MessageSucker.java
   trunk/src/main/org/jboss/messaging/core/impl/message/CoreMessage.java
   trunk/src/main/org/jboss/messaging/core/impl/message/MessageFactory.java
   trunk/src/main/org/jboss/messaging/core/impl/message/MessageSupport.java
   trunk/src/main/org/jboss/messaging/core/impl/message/SimpleMessageStore.java
   trunk/src/main/org/jboss/messaging/core/impl/postoffice/AckAllReplicatedDeliveriesMessage.java
   trunk/src/main/org/jboss/messaging/core/impl/postoffice/AddAllReplicatedDeliveriesMessage.java
   trunk/src/main/org/jboss/messaging/core/impl/postoffice/ClusterRequest.java
   trunk/src/main/org/jboss/messaging/core/impl/postoffice/GroupMember.java
   trunk/src/main/org/jboss/messaging/core/impl/postoffice/LeaveClusterRequest.java
   trunk/src/main/org/jboss/messaging/core/impl/postoffice/MappingInfo.java
   trunk/src/main/org/jboss/messaging/core/impl/postoffice/MessageRequest.java
   trunk/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java
   trunk/src/main/org/jboss/messaging/core/impl/postoffice/PutReplicantRequest.java
   trunk/src/main/org/jboss/messaging/core/impl/postoffice/ReplicateAckMessage.java
   trunk/src/main/org/jboss/messaging/core/impl/postoffice/ReplicateDeliveryMessage.java
   trunk/src/main/org/jboss/messaging/core/impl/postoffice/RequestTarget.java
   trunk/src/main/org/jboss/messaging/core/impl/tx/Transaction.java
   trunk/src/main/org/jboss/messaging/core/jmx/MessagingPostOfficeService.java
   trunk/src/main/org/jboss/messaging/util/JDBCUtil.java
   trunk/src/main/org/jboss/messaging/util/JNDIUtil.java
   trunk/src/main/org/jboss/messaging/util/NotYetImplementedException.java
   trunk/src/main/org/jboss/messaging/util/Util.java
   trunk/src/main/org/jboss/messaging/util/Version.java
   trunk/src/main/org/jboss/messaging/util/XMLUtil.java
   trunk/tests/src/org/jboss/test/messaging/MessagingTestCase.java
   trunk/tests/src/org/jboss/test/messaging/core/BrokenReceiver.java
   trunk/tests/src/org/jboss/test/messaging/core/JDBCUtilTest.java
   trunk/tests/src/org/jboss/test/messaging/core/MessageStoreTestBase.java
   trunk/tests/src/org/jboss/test/messaging/core/MessagingQueueTestBase.java
   trunk/tests/src/org/jboss/test/messaging/core/NonRecoverableMessagingQueueTest.java
   trunk/tests/src/org/jboss/test/messaging/core/PostOfficeTestBase.java
   trunk/tests/src/org/jboss/test/messaging/core/RecoverableMessagingQueueTest.java
   trunk/tests/src/org/jboss/test/messaging/core/RoundRobinDistributorTest.java
   trunk/tests/src/org/jboss/test/messaging/core/SimpleChannel.java
   trunk/tests/src/org/jboss/test/messaging/core/SimpleDeliveryObserver.java
   trunk/tests/src/org/jboss/test/messaging/core/SimpleMessageStoreTest.java
   trunk/tests/src/org/jboss/test/messaging/core/SimpleReceiver.java
   trunk/tests/src/org/jboss/test/messaging/core/message/CoreMessageTest.java
   trunk/tests/src/org/jboss/test/messaging/core/message/JBossMessageTest.java
   trunk/tests/src/org/jboss/test/messaging/core/message/MessageSupportTestBase.java
   trunk/tests/src/org/jboss/test/messaging/core/paging/PagingTest.java
   trunk/tests/src/org/jboss/test/messaging/core/postoffice/ClusteredPersistenceServiceConfigFileJChannelFactory.java
   trunk/tests/src/org/jboss/test/messaging/jms/AOPStackInitializationTest.java
   trunk/tests/src/org/jboss/test/messaging/jms/BrowserTest.java
   trunk/tests/src/org/jboss/test/messaging/jms/CTSMiscellaneousTest.java
   trunk/tests/src/org/jboss/test/messaging/jms/ClientExitTest.java
   trunk/tests/src/org/jboss/test/messaging/jms/ClientInRestrictedSecurityEnvironmentTest.java
   trunk/tests/src/org/jboss/test/messaging/jms/ConnectionClosedTest.java
   trunk/tests/src/org/jboss/test/messaging/jms/ConnectionFactoryTest.java
   trunk/tests/src/org/jboss/test/messaging/jms/ConnectionTest.java
   trunk/tests/src/org/jboss/test/messaging/jms/ConsumerClosedTest.java
   trunk/tests/src/org/jboss/test/messaging/jms/DurableSubscriptionTest.java
   trunk/tests/src/org/jboss/test/messaging/jms/GracefulClient.java
   trunk/tests/src/org/jboss/test/messaging/jms/HTTPTransportTest.java
   trunk/tests/src/org/jboss/test/messaging/jms/JCAWrapperTest.java
   trunk/tests/src/org/jboss/test/messaging/jms/JMSTest.java
   trunk/tests/src/org/jboss/test/messaging/jms/JMSTestBase.java
   trunk/tests/src/org/jboss/test/messaging/jms/MessageConsumerTest.java
   trunk/tests/src/org/jboss/test/messaging/jms/MessageProducerTest.java
   trunk/tests/src/org/jboss/test/messaging/jms/MiscellaneousTest.java
   trunk/tests/src/org/jboss/test/messaging/jms/NonDurableSubscriberTest.java
   trunk/tests/src/org/jboss/test/messaging/jms/QueueTest.java
   trunk/tests/src/org/jboss/test/messaging/jms/RemotingConnectionConfigurationTest.java
   trunk/tests/src/org/jboss/test/messaging/jms/SecurityTest.java
   trunk/tests/src/org/jboss/test/messaging/jms/SessionTest.java
   trunk/tests/src/org/jboss/test/messaging/jms/TemporaryDestinationTest.java
   trunk/tests/src/org/jboss/test/messaging/jms/TopicTest.java
   trunk/tests/src/org/jboss/test/messaging/jms/clustering/ChangeFailoverNodeTest.java
   trunk/tests/src/org/jboss/test/messaging/jms/clustering/ClusterEventNotificationListener.java
   trunk/tests/src/org/jboss/test/messaging/jms/clustering/ClusteringTestBase.java
   trunk/tests/src/org/jboss/test/messaging/jms/clustering/FailoverTest.java
   trunk/tests/src/org/jboss/test/messaging/jms/clustering/GroupManagementTest.java
   trunk/tests/src/org/jboss/test/messaging/jms/clustering/HATest.java
   trunk/tests/src/org/jboss/test/messaging/jms/clustering/LargeClusterTest.java
   trunk/tests/src/org/jboss/test/messaging/jms/clustering/LoadBalancingTest.java
   trunk/tests/src/org/jboss/test/messaging/jms/clustering/MultipleFailoverTest.java
   trunk/tests/src/org/jboss/test/messaging/jms/clustering/RecoverDeliveriesTest.java
   trunk/tests/src/org/jboss/test/messaging/jms/clustering/ServerManagementTest.java
   trunk/tests/src/org/jboss/test/messaging/jms/clustering/TemporaryDestinationTest.java
   trunk/tests/src/org/jboss/test/messaging/jms/message/BytesMessageTest.java
   trunk/tests/src/org/jboss/test/messaging/jms/message/ExpiredMessageTest.java
   trunk/tests/src/org/jboss/test/messaging/jms/message/JMSDeliveryModeHeaderTest.java
   trunk/tests/src/org/jboss/test/messaging/jms/message/JMSDestinationHeaderTest.java
   trunk/tests/src/org/jboss/test/messaging/jms/message/JMSExpirationHeaderTest.java
   trunk/tests/src/org/jboss/test/messaging/jms/message/JMSMessageIDHeaderTest.java
   trunk/tests/src/org/jboss/test/messaging/jms/message/JMSTimestampHeaderTest.java
   trunk/tests/src/org/jboss/test/messaging/jms/message/MapMessageTest.java
   trunk/tests/src/org/jboss/test/messaging/jms/message/MessageTest.java
   trunk/tests/src/org/jboss/test/messaging/jms/message/MessageTestBase.java
   trunk/tests/src/org/jboss/test/messaging/jms/message/ObjectMessageTest.java
   trunk/tests/src/org/jboss/test/messaging/jms/message/SimpleJMSBytesMessage.java
   trunk/tests/src/org/jboss/test/messaging/jms/message/SimpleJMSMapMessage.java
   trunk/tests/src/org/jboss/test/messaging/jms/message/SimpleJMSMessage.java
   trunk/tests/src/org/jboss/test/messaging/jms/message/SimpleJMSObjectMessage.java
   trunk/tests/src/org/jboss/test/messaging/jms/message/SimpleJMSStreamMessage.java
   trunk/tests/src/org/jboss/test/messaging/jms/message/SimpleJMSTextMessage.java
   trunk/tests/src/org/jboss/test/messaging/jms/message/StreamMessageTest.java
   trunk/tests/src/org/jboss/test/messaging/jms/message/TextMessageTest.java
   trunk/tests/src/org/jboss/test/messaging/jms/selector/SelectorTest.java
   trunk/tests/src/org/jboss/test/messaging/jms/server/DestinationManagerTest.java
   trunk/tests/src/org/jboss/test/messaging/jms/server/ServerPeerTest.java
   trunk/tests/src/org/jboss/test/messaging/jms/server/connectionfactory/ConnectionFactoryTest.java
   trunk/tests/src/org/jboss/test/messaging/jms/server/connectionfactory/JNDIBindingsTest.java
   trunk/tests/src/org/jboss/test/messaging/jms/server/destination/QueueManagementTest.java
   trunk/tests/src/org/jboss/test/messaging/jms/server/destination/TopicManagementTest.java
   trunk/tests/src/org/jboss/test/messaging/jms/server/destination/base/DestinationManagementTestBase.java
   trunk/tests/src/org/jboss/test/messaging/jms/stress/CorruptMessageStressTest.java
   trunk/tests/src/org/jboss/test/messaging/tools/ServerManagement.java
   trunk/tests/src/org/jboss/test/messaging/tools/ant/DisplayWarningsAndErrors.java
   trunk/tests/src/org/jboss/test/messaging/tools/ant/FailOnSerializationDebugOutput.java
   trunk/tests/src/org/jboss/test/messaging/tools/ant/GenerateSmokeReport.java
   trunk/tests/src/org/jboss/test/messaging/tools/ant/JUnitTestSuiteListener.java
   trunk/tests/src/org/jboss/test/messaging/tools/aop/PoisonInterceptor.java
   trunk/tests/src/org/jboss/test/messaging/tools/jboss/MBeanConfigurationElement.java
   trunk/tests/src/org/jboss/test/messaging/tools/jboss/ServiceDeploymentDescriptor.java
   trunk/tests/src/org/jboss/test/messaging/tools/jmx/ClassLoaderJMXWrapper.java
   trunk/tests/src/org/jboss/test/messaging/tools/jmx/ClassLoaderJMXWrapperMBean.java
   trunk/tests/src/org/jboss/test/messaging/tools/jmx/Example.java
   trunk/tests/src/org/jboss/test/messaging/tools/jmx/MBeanServerBuilder.java
   trunk/tests/src/org/jboss/test/messaging/tools/jmx/ManagedConnectionFactoryJMXWrapper.java
   trunk/tests/src/org/jboss/test/messaging/tools/jmx/ManagedConnectionFactoryJMXWrapperMBean.java
   trunk/tests/src/org/jboss/test/messaging/tools/jmx/MockJBossSecurityManager.java
   trunk/tests/src/org/jboss/test/messaging/tools/jmx/NoopInvoker.java
   trunk/tests/src/org/jboss/test/messaging/tools/jmx/RemotingJMXWrapper.java
   trunk/tests/src/org/jboss/test/messaging/tools/jmx/RemotingJMXWrapperMBean.java
   trunk/tests/src/org/jboss/test/messaging/tools/jmx/ServiceAttributeOverrides.java
   trunk/tests/src/org/jboss/test/messaging/tools/jmx/ServiceContainer.java
   trunk/tests/src/org/jboss/test/messaging/tools/jmx/ServiceContainerConfiguration.java
   trunk/tests/src/org/jboss/test/messaging/tools/jmx/TransactionManagerJMXWrapper.java
   trunk/tests/src/org/jboss/test/messaging/tools/jmx/TransactionManagerJMXWrapperMBean.java
   trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/LocalTestServer.java
   trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/NamingDelegate.java
   trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/NotificationListenerID.java
   trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/ProxyNotificationListener.java
   trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/RMINamingDelegate.java
   trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/RMITestServer.java
   trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/RemoteTestServer.java
   trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/Server.java
   trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/StopRMIServer.java
   trunk/tests/src/org/jboss/test/messaging/tools/jndi/Constants.java
   trunk/tests/src/org/jboss/test/messaging/tools/jndi/InVMContext.java
   trunk/tests/src/org/jboss/test/messaging/tools/jndi/InVMInitialContextFactory.java
   trunk/tests/src/org/jboss/test/messaging/tools/jndi/InVMInitialContextFactoryBuilder.java
   trunk/tests/src/org/jboss/test/messaging/tools/jndi/InVMNameParser.java
   trunk/tests/src/org/jboss/test/messaging/tools/jndi/RemoteContext.java
   trunk/tests/src/org/jboss/test/messaging/tools/jndi/RemoteInitialContextFactory.java
   trunk/tests/src/org/jboss/test/messaging/tools/junit/SelectiveTestRunner.java
   trunk/tests/src/org/jboss/test/messaging/tools/junit/SelectiveTestSuite.java
   trunk/tests/src/org/jboss/test/messaging/tools/misc/ConfigurableSecurityManager.java
   trunk/tests/src/org/jboss/test/messaging/util/CoreMessageFactory.java
   trunk/tests/src/org/jboss/test/messaging/util/JNDITest.java
   trunk/tests/src/org/jboss/test/messaging/util/JNDITesterService.java
   trunk/tests/src/org/jboss/test/messaging/util/JNDITesterServiceMBean.java
   trunk/tests/src/org/jboss/test/messaging/util/JNDIUtilTest.java
   trunk/tests/src/org/jboss/test/messaging/util/MBeanConfigurationElementTest.java
   trunk/tests/src/org/jboss/test/messaging/util/ServiceContainerTest.java
   trunk/tests/src/org/jboss/test/messaging/util/ServiceDeploymentDescriptorTest.java
   trunk/tests/src/org/jboss/test/messaging/util/UtilTest.java
   trunk/tests/src/org/jboss/test/messaging/util/XMLUtilTest.java
   trunk/tests/src/org/jboss/test/thirdparty/jbosssx/SecurityAssociationTest.java
   trunk/tests/src/org/jboss/test/thirdparty/remoting/ClientInvokerTimeoutTest.java
   trunk/tests/src/org/jboss/test/thirdparty/remoting/DaemonThreadTest.java
   trunk/tests/src/org/jboss/test/thirdparty/remoting/LazySubsystem.java
   trunk/tests/src/org/jboss/test/thirdparty/remoting/ManualConnectionValidatorTest.java
   trunk/tests/src/org/jboss/test/thirdparty/remoting/PureAsynchronousCallTest.java
   trunk/tests/src/org/jboss/test/thirdparty/remoting/RemotingConnectionFailureTest.java
   trunk/tests/src/org/jboss/test/thirdparty/remoting/RemotingTest.java
   trunk/tests/src/org/jboss/test/thirdparty/remoting/util/OnewayCallbackTrigger.java
   trunk/tests/src/org/jboss/test/thirdparty/remoting/util/RemotingTestSubsystem.java
   trunk/tests/src/org/jboss/test/thirdparty/remoting/util/RemotingTestSubsystemService.java
   trunk/tests/src/org/jboss/test/thirdparty/remoting/util/RemotingTestSubsystemServiceMBean.java
   trunk/tests/src/org/jboss/test/thirdparty/remoting/util/SimpleConnectionListener.java
   trunk/tests/src/org/jboss/test/thirdparty/remoting/util/TestableSubsystem.java
Log:
Get clustering tests running + update author email


Modified: trunk/docs/examples/common/src/org/jboss/example/jms/common/ExampleSupport.java
===================================================================
--- trunk/docs/examples/common/src/org/jboss/example/jms/common/ExampleSupport.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/docs/examples/common/src/org/jboss/example/jms/common/ExampleSupport.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -17,7 +17,7 @@
 import org.jboss.jms.client.state.ConnectionState;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/docs/examples/common/src/org/jboss/example/jms/common/Util.java
===================================================================
--- trunk/docs/examples/common/src/org/jboss/example/jms/common/Util.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/docs/examples/common/src/org/jboss/example/jms/common/Util.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -28,7 +28,7 @@
 import javax.naming.NameNotFoundException;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/docs/examples/common/src/org/jboss/example/jms/common/bean/Management.java
===================================================================
--- trunk/docs/examples/common/src/org/jboss/example/jms/common/bean/Management.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/docs/examples/common/src/org/jboss/example/jms/common/bean/Management.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -11,7 +11,7 @@
 import javax.ejb.EJBObject;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision: 1766 $</tt>
 
  * $Id: StatelessSessionExample.java 1766 2006-12-11 22:29:27Z ovidiu.feodorov at jboss.com $

Modified: trunk/docs/examples/common/src/org/jboss/example/jms/common/bean/ManagementBean.java
===================================================================
--- trunk/docs/examples/common/src/org/jboss/example/jms/common/bean/ManagementBean.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/docs/examples/common/src/org/jboss/example/jms/common/bean/ManagementBean.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -13,7 +13,7 @@
 import javax.ejb.SessionContext;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision: 1766 $</tt>
 
  * $Id: StatelessSessionExampleBean.java 1766 2006-12-11 22:29:27Z ovidiu.feodorov at jboss.com $

Modified: trunk/docs/examples/common/src/org/jboss/example/jms/common/bean/ManagementHome.java
===================================================================
--- trunk/docs/examples/common/src/org/jboss/example/jms/common/bean/ManagementHome.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/docs/examples/common/src/org/jboss/example/jms/common/bean/ManagementHome.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -12,7 +12,7 @@
 import javax.ejb.EJBHome;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision: 563 $</tt>
 
  * $Id: StatelessSessionExampleHome.java 563 2005-12-30 22:04:19Z ovidiu $

Modified: trunk/docs/examples/distributed-queue/src/org/jboss/example/jms/distributedqueue/DistributedQueueExample.java
===================================================================
--- trunk/docs/examples/distributed-queue/src/org/jboss/example/jms/distributedqueue/DistributedQueueExample.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/docs/examples/distributed-queue/src/org/jboss/example/jms/distributedqueue/DistributedQueueExample.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -40,7 +40,7 @@
  * Since this example is also used as a smoke test, it is essential that the VM exits with exit
  * code 0 in case of successful execution and a non-zero value on failure.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision: 1001 $</tt>
  *
  * $Id: TopicExample.java 1001 2006-06-24 09:05:40Z timfox $

Modified: trunk/docs/examples/distributed-queue/src/org/jboss/example/jms/distributedqueue/ExampleListener.java
===================================================================
--- trunk/docs/examples/distributed-queue/src/org/jboss/example/jms/distributedqueue/ExampleListener.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/docs/examples/distributed-queue/src/org/jboss/example/jms/distributedqueue/ExampleListener.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -10,7 +10,7 @@
 import javax.jms.MessageListener;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:clebert.suconic at jboss.org">Clebert Suconic</a>
  * @version <tt>$Revision: 536 $</tt>
 

Modified: trunk/docs/examples/distributed-topic/src/org/jboss/example/jms/distributedtopic/DistributedTopicExample.java
===================================================================
--- trunk/docs/examples/distributed-topic/src/org/jboss/example/jms/distributedtopic/DistributedTopicExample.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/docs/examples/distributed-topic/src/org/jboss/example/jms/distributedtopic/DistributedTopicExample.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -40,7 +40,7 @@
  * Since this example is also used as a smoke test, it is essential that the VM exits with exit
  * code 0 in case of successful execution and a non-zero value on failure.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/docs/examples/distributed-topic/src/org/jboss/example/jms/distributedtopic/ExampleListener.java
===================================================================
--- trunk/docs/examples/distributed-topic/src/org/jboss/example/jms/distributedtopic/ExampleListener.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/docs/examples/distributed-topic/src/org/jboss/example/jms/distributedtopic/ExampleListener.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -10,7 +10,7 @@
 import javax.jms.MessageListener;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:clebert.suconic at jboss.org">Clebert Suconic</a>
  * @version <tt>$Revision$</tt>
 

Modified: trunk/docs/examples/ejb3mdb/src/org/jboss/example/jms/ejb3mdb/EJB3MDBExample.java
===================================================================
--- trunk/docs/examples/ejb3mdb/src/org/jboss/example/jms/ejb3mdb/EJB3MDBExample.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/docs/examples/ejb3mdb/src/org/jboss/example/jms/ejb3mdb/EJB3MDBExample.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -22,7 +22,7 @@
 /**
  * A MDB3 EJB example.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
 
  * $Id$

Modified: trunk/docs/examples/ejb3mdb/src/org/jboss/example/jms/ejb3mdb/Sender.java
===================================================================
--- trunk/docs/examples/ejb3mdb/src/org/jboss/example/jms/ejb3mdb/Sender.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/docs/examples/ejb3mdb/src/org/jboss/example/jms/ejb3mdb/Sender.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -41,7 +41,7 @@
  * Since this example is also used by the smoke test, it is essential that the VM exits with exit
  * code 0 in case of successful execution and a non-zero value on failure.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/docs/examples/http/src/org/jboss/example/jms/http/HttpExample.java
===================================================================
--- trunk/docs/examples/http/src/org/jboss/example/jms/http/HttpExample.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/docs/examples/http/src/org/jboss/example/jms/http/HttpExample.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -42,7 +42,7 @@
  * Since this example is also used by the smoke test, it is essential that the VM exits with exit
  * code 0 in case of successful execution and a non-zero value on failure.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @version <tt>$Revision$</tt>
  *

Modified: trunk/docs/examples/mdb/src/org/jboss/example/jms/mdb/MDBExample.java
===================================================================
--- trunk/docs/examples/mdb/src/org/jboss/example/jms/mdb/MDBExample.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/docs/examples/mdb/src/org/jboss/example/jms/mdb/MDBExample.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -21,7 +21,7 @@
 import javax.naming.InitialContext;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  
  * $Id$

Modified: trunk/docs/examples/mdb/src/org/jboss/example/jms/mdb/Sender.java
===================================================================
--- trunk/docs/examples/mdb/src/org/jboss/example/jms/mdb/Sender.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/docs/examples/mdb/src/org/jboss/example/jms/mdb/Sender.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -41,7 +41,7 @@
  * Since this example is also used by the smoke test, it is essential that the VM exits with exit
  * code 0 in case of successful execution and a non-zero value on failure.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/docs/examples/mdb-failure/src/org/jboss/example/jms/mdbfailure/MDBFailureExample.java
===================================================================
--- trunk/docs/examples/mdb-failure/src/org/jboss/example/jms/mdbfailure/MDBFailureExample.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/docs/examples/mdb-failure/src/org/jboss/example/jms/mdbfailure/MDBFailureExample.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -15,7 +15,7 @@
 import java.util.HashSet;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision: 849 $</tt>
 
  * $Id: MDBFailureExample.java 849 2006-03-31 17:17:09Z ltexier $

Modified: trunk/docs/examples/mdb-failure/src/org/jboss/example/jms/mdbfailure/Sender.java
===================================================================
--- trunk/docs/examples/mdb-failure/src/org/jboss/example/jms/mdbfailure/Sender.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/docs/examples/mdb-failure/src/org/jboss/example/jms/mdbfailure/Sender.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -49,7 +49,7 @@
  * Since this example is also used by the smoke test, it is essential that the VM exits with exit
  * code 0 in case of successful execution and a non-zero value on failure.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision: 884 $</tt>
  *
  * $Id: Sender.java 884 2006-04-12 01:04:10Z ovidiu $

Modified: trunk/docs/examples/queue/src/org/jboss/example/jms/queue/QueueExample.java
===================================================================
--- trunk/docs/examples/queue/src/org/jboss/example/jms/queue/QueueExample.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/docs/examples/queue/src/org/jboss/example/jms/queue/QueueExample.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -43,7 +43,7 @@
  * Since this example is also used by the smoke test, it is essential that the VM exits with exit
  * code 0 in case of successful execution and a non-zero value on failure.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:luc.texier at jboss.org">Luc Texier</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @version <tt>$Revision$</tt>

Modified: trunk/docs/examples/queue-failover/src/org/jboss/example/jms/failover/QueueFailoverExample.java
===================================================================
--- trunk/docs/examples/queue-failover/src/org/jboss/example/jms/failover/QueueFailoverExample.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/docs/examples/queue-failover/src/org/jboss/example/jms/failover/QueueFailoverExample.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -42,7 +42,7 @@
  * Since this example is also used as a smoke test, it is essential that the VM exits with exit
  * code 0 in case of successful execution and a non-zero value on failure.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision: 1001 $</tt>
  *
  * $Id: TopicExample.java 1001 2006-06-24 09:05:40Z timfox $

Modified: trunk/docs/examples/secure-socket/src/org/jboss/example/jms/securesocket/SecureSocketExample.java
===================================================================
--- trunk/docs/examples/secure-socket/src/org/jboss/example/jms/securesocket/SecureSocketExample.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/docs/examples/secure-socket/src/org/jboss/example/jms/securesocket/SecureSocketExample.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -41,7 +41,7 @@
  * Since this example is also used by the smoke test, it is essential that the VM exits with exit
  * code 0 in case of successful execution and a non-zero value on failure.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @version <tt>$Revision$</tt>
  *

Modified: trunk/docs/examples/stateless/src/org/jboss/example/jms/stateless/bean/StatelessSessionExample.java
===================================================================
--- trunk/docs/examples/stateless/src/org/jboss/example/jms/stateless/bean/StatelessSessionExample.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/docs/examples/stateless/src/org/jboss/example/jms/stateless/bean/StatelessSessionExample.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -11,7 +11,7 @@
 import javax.ejb.EJBObject;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
 
  * $Id$

Modified: trunk/docs/examples/stateless/src/org/jboss/example/jms/stateless/bean/StatelessSessionExampleBean.java
===================================================================
--- trunk/docs/examples/stateless/src/org/jboss/example/jms/stateless/bean/StatelessSessionExampleBean.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/docs/examples/stateless/src/org/jboss/example/jms/stateless/bean/StatelessSessionExampleBean.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -26,7 +26,7 @@
 import javax.naming.InitialContext;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  
  * $Id$

Modified: trunk/docs/examples/stateless/src/org/jboss/example/jms/stateless/bean/StatelessSessionExampleHome.java
===================================================================
--- trunk/docs/examples/stateless/src/org/jboss/example/jms/stateless/bean/StatelessSessionExampleHome.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/docs/examples/stateless/src/org/jboss/example/jms/stateless/bean/StatelessSessionExampleHome.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -11,7 +11,7 @@
 import javax.ejb.CreateException;
 import javax.ejb.EJBHome;
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
 
  * $Id$

Modified: trunk/docs/examples/stateless/src/org/jboss/example/jms/stateless/client/Client.java
===================================================================
--- trunk/docs/examples/stateless/src/org/jboss/example/jms/stateless/client/Client.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/docs/examples/stateless/src/org/jboss/example/jms/stateless/client/Client.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -33,7 +33,7 @@
  * Since this example is also used by the smoke test, it is essential that the VM exits with exit
  * code 0 in case of successful execution and a non-zero value on failure.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/docs/examples/stateless-clustered/src/org/jboss/example/jms/statelessclustered/bean/StatelessClusteredSessionExample.java
===================================================================
--- trunk/docs/examples/stateless-clustered/src/org/jboss/example/jms/statelessclustered/bean/StatelessClusteredSessionExample.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/docs/examples/stateless-clustered/src/org/jboss/example/jms/statelessclustered/bean/StatelessClusteredSessionExample.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -11,7 +11,7 @@
 import javax.ejb.EJBObject;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
 
  * $Id$

Modified: trunk/docs/examples/stateless-clustered/src/org/jboss/example/jms/statelessclustered/bean/StatelessClusteredSessionExampleBean.java
===================================================================
--- trunk/docs/examples/stateless-clustered/src/org/jboss/example/jms/statelessclustered/bean/StatelessClusteredSessionExampleBean.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/docs/examples/stateless-clustered/src/org/jboss/example/jms/statelessclustered/bean/StatelessClusteredSessionExampleBean.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -26,7 +26,7 @@
 import javax.naming.InitialContext;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  
  * $Id$

Modified: trunk/docs/examples/stateless-clustered/src/org/jboss/example/jms/statelessclustered/bean/StatelessClusteredSessionExampleHome.java
===================================================================
--- trunk/docs/examples/stateless-clustered/src/org/jboss/example/jms/statelessclustered/bean/StatelessClusteredSessionExampleHome.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/docs/examples/stateless-clustered/src/org/jboss/example/jms/statelessclustered/bean/StatelessClusteredSessionExampleHome.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -11,7 +11,7 @@
 import javax.ejb.CreateException;
 import javax.ejb.EJBHome;
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
 
  * $Id$

Modified: trunk/docs/examples/stateless-clustered/src/org/jboss/example/jms/statelessclustered/client/Client.java
===================================================================
--- trunk/docs/examples/stateless-clustered/src/org/jboss/example/jms/statelessclustered/client/Client.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/docs/examples/stateless-clustered/src/org/jboss/example/jms/statelessclustered/client/Client.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -40,7 +40,7 @@
  * Since this example is also used by the smoke test, it is essential that the VM exits with exit
  * code 0 in case of successful execution and a non-zero value on failure.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/docs/examples/topic/src/org/jboss/example/jms/topic/ExampleListener.java
===================================================================
--- trunk/docs/examples/topic/src/org/jboss/example/jms/topic/ExampleListener.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/docs/examples/topic/src/org/jboss/example/jms/topic/ExampleListener.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -10,7 +10,7 @@
 import javax.jms.MessageListener;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  
  * $Id$

Modified: trunk/docs/examples/topic/src/org/jboss/example/jms/topic/TopicExample.java
===================================================================
--- trunk/docs/examples/topic/src/org/jboss/example/jms/topic/TopicExample.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/docs/examples/topic/src/org/jboss/example/jms/topic/TopicExample.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -40,7 +40,7 @@
  * Since this example is also used by the smoke test, it is essential that the VM exits with exit
  * code 0 in case of successful execution and a non-zero value on failure.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:luc.texier at jboss.org">Luc Texier</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @version <tt>$Revision$</tt>

Modified: trunk/src/main/org/jboss/jms/client/ClientAOPStackLoader.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/ClientAOPStackLoader.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/client/ClientAOPStackLoader.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -12,7 +12,7 @@
 /**
  * A static singleton that insures the client-side AOP stack is loaded.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/src/main/org/jboss/jms/client/Closeable.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/Closeable.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/client/Closeable.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -28,7 +28,7 @@
  * Implemented by JMS classes that can be closed
  * 
  * @author <a href="mailto:adrian at jboss.org>Adrian Brock</a>
- * @author <a href="mailto:ovidiu at jboss.org>Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com>Ovidiu Feodorov</a>
  *
  * @version $Revision$
  */

Modified: trunk/src/main/org/jboss/jms/client/FailoverCommandCenter.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/FailoverCommandCenter.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/client/FailoverCommandCenter.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -20,7 +20,7 @@
 /**
  * The class in charge with performing the failover.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/src/main/org/jboss/jms/client/FailoverEvent.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/FailoverEvent.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/client/FailoverEvent.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -9,7 +9,7 @@
 import java.util.EventObject;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  * $Id$
  */

Modified: trunk/src/main/org/jboss/jms/client/FailoverListener.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/FailoverListener.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/client/FailoverListener.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -7,7 +7,7 @@
 package org.jboss.jms.client;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/src/main/org/jboss/jms/client/FailureDetector.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/FailureDetector.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/client/FailureDetector.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -7,7 +7,7 @@
 package org.jboss.jms.client;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  * 
  * $Id$

Modified: trunk/src/main/org/jboss/jms/client/JBossConnection.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/JBossConnection.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/client/JBossConnection.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -51,7 +51,7 @@
 import org.jboss.jms.delegate.SessionDelegate;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @version <tt>$Revision$</tt>
  *

Modified: trunk/src/main/org/jboss/jms/client/JBossConnectionConsumer.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/JBossConnectionConsumer.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/client/JBossConnectionConsumer.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -48,7 +48,7 @@
  * This class implements javax.jms.ConnectionConsumer
  * 
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * 
  * Partially based on JBossMQ version by:
  * 

Modified: trunk/src/main/org/jboss/jms/client/JBossConnectionFactory.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/JBossConnectionFactory.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/client/JBossConnectionFactory.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -45,7 +45,7 @@
 import org.jboss.logging.Logger;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @version <tt>$Revision$</tt>
  *

Modified: trunk/src/main/org/jboss/jms/client/JBossConnectionMetaData.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/JBossConnectionMetaData.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/client/JBossConnectionMetaData.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -34,7 +34,7 @@
  * Connection metadata
  *
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  *
  * $Id$
  */

Modified: trunk/src/main/org/jboss/jms/client/JBossMessageConsumer.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/JBossMessageConsumer.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/client/JBossMessageConsumer.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -35,7 +35,7 @@
 import org.jboss.jms.delegate.ConsumerDelegate;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/src/main/org/jboss/jms/client/JBossMessageProducer.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/JBossMessageProducer.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/client/JBossMessageProducer.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -38,7 +38,7 @@
 import org.jboss.logging.Logger;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @version <tt>$Revision$</tt>
  *

Modified: trunk/src/main/org/jboss/jms/client/JBossSession.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/JBossSession.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/client/JBossSession.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -68,7 +68,7 @@
 import org.jboss.logging.Logger;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * 
  * @version <tt>$Revision$</tt>

Modified: trunk/src/main/org/jboss/jms/client/container/ClientConsumer.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/container/ClientConsumer.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/client/container/ClientConsumer.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -45,7 +45,7 @@
 import EDU.oswego.cs.dl.util.concurrent.QueuedExecutor;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox/a>
  * @version <tt>$Revision: 2774 $</tt>
  *

Modified: trunk/src/main/org/jboss/jms/client/container/ClientLogInterceptor.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/container/ClientLogInterceptor.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/client/container/ClientLogInterceptor.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -29,7 +29,7 @@
 import java.lang.reflect.Method;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @version <tt>$Revision$</tt>
  *

Modified: trunk/src/main/org/jboss/jms/client/container/ClosedInterceptor.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/container/ClosedInterceptor.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/client/container/ClosedInterceptor.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -44,7 +44,7 @@
  * 
  * @author <a href="mailto:adrian at jboss.org>Adrian Brock</a>
  * @author <a href="mailto:tim.fox at jboss.com>Tim Fox</a>
- * @author <a href="mailto:ovidiu at jboss.com>Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com>Ovidiu Feodorov</a>
  *
  * $Id$
  */

Modified: trunk/src/main/org/jboss/jms/client/container/ClusteringAspect.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/container/ClusteringAspect.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/client/container/ClusteringAspect.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -36,7 +36,7 @@
  *
  * It's a PER_INSTANCE aspect (one of these per each clustered ConnectionFactory instance)
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @author <a href="mailto:clebert.suconic at jboss.com">Clebert Suconic</a>
  *

Modified: trunk/src/main/org/jboss/jms/client/container/ConnectionAspect.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/container/ConnectionAspect.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/client/container/ConnectionAspect.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -40,7 +40,7 @@
  *
  * This aspect is PER_INSTANCE.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @author <a href="mailto:clebert.suconic at jboss.com">Clebert Suconic</a>
  * @version <tt>$Revision$</tt>

Modified: trunk/src/main/org/jboss/jms/client/container/ConnectionFailureListener.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/container/ConnectionFailureListener.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/client/container/ConnectionFailureListener.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -16,7 +16,7 @@
  * The listener that detects a connection failure and initiates the failover process. Each physical
  * connection created under the supervision of ClusteredAspect has one of these.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @version <tt>$Revision$</tt>
  *

Modified: trunk/src/main/org/jboss/jms/client/container/ConsumerAspect.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/container/ConsumerAspect.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/client/container/ConsumerAspect.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -43,7 +43,7 @@
  * 
  * This aspect is PER_VM.
  * 
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @version <tt>$Revision$</tt>
  *

Modified: trunk/src/main/org/jboss/jms/client/container/DelegateIdentity.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/container/DelegateIdentity.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/client/container/DelegateIdentity.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -10,7 +10,7 @@
 import org.jboss.jms.client.delegate.DelegateSupport;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  * $Id$
  */

Modified: trunk/src/main/org/jboss/jms/client/container/ExceptionInterceptor.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/container/ExceptionInterceptor.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/client/container/ExceptionInterceptor.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -35,7 +35,7 @@
  * TODO: This interceptor seem a bit useless. For logging, we can use the ClientLoggingInterceptor.
  *       Remove it?
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @version <tt>$Revision$</tt>
  *

Modified: trunk/src/main/org/jboss/jms/client/container/FailoverValveInterceptor.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/container/FailoverValveInterceptor.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/client/container/FailoverValveInterceptor.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -33,7 +33,7 @@
  * An instance of this interceptor must guard access to each connection, session, producer, consumer
  * and queue browser delegate.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:clebert.suconic at jboss.org">Clebert Suconic</a>
  * @version <tt>$Revision$</tt>
  * $Id$

Modified: trunk/src/main/org/jboss/jms/client/container/SessionAspect.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/container/SessionAspect.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/client/container/SessionAspect.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -69,7 +69,7 @@
  *
  * @author <a href="mailto:tim.fox at jboss.com>Tim Fox</a>
  * @author <a href="mailto:clebert.suconic at jboss.com>Clebert Suconic</a>
- * @author <a href="mailto:ovidiu at jboss.com>Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com>Ovidiu Feodorov</a>
  *
  * $Id$
  */

Modified: trunk/src/main/org/jboss/jms/client/container/StateCreationAspect.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/container/StateCreationAspect.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/client/container/StateCreationAspect.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -57,7 +57,7 @@
  * This interceptor is PER_VM.
  * 
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:clebert.suconic at jboss.org">Clebert Suconic</a>
  *
  * $Id$

Modified: trunk/src/main/org/jboss/jms/client/delegate/ClientBrowserDelegate.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/delegate/ClientBrowserDelegate.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/client/delegate/ClientBrowserDelegate.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -42,7 +42,7 @@
  * The client-side Browser delegate class.
  *
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  *
  * @version <tt>$Revision$</tt>
  *

Modified: trunk/src/main/org/jboss/jms/client/delegate/ClientClusteredConnectionFactoryDelegate.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/delegate/ClientClusteredConnectionFactoryDelegate.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/client/delegate/ClientClusteredConnectionFactoryDelegate.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -40,7 +40,7 @@
  * there is no corresponding enpoint on the server, there's no ID, etc. This is just a "shallow"
  * delegate, that in turn delegates to its sub-delegates (ClientConnectionFactoryDelegate instances)
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:clebert.suconic at jboss.org">Clebert Suconic</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  *

Modified: trunk/src/main/org/jboss/jms/client/delegate/ClientConnectionDelegate.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/delegate/ClientConnectionDelegate.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/client/delegate/ClientConnectionDelegate.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -59,7 +59,7 @@
  * The client-side Connection delegate class.
  *
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:clebert.suconic at jboss.org">Clebert Suconic</a>
  *
  * @version <tt>$Revision$</tt>

Modified: trunk/src/main/org/jboss/jms/client/delegate/ClientConnectionFactoryDelegate.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/delegate/ClientConnectionFactoryDelegate.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/client/delegate/ClientConnectionFactoryDelegate.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -47,7 +47,7 @@
  * The client-side ConnectionFactory delegate class.
  *
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  *
  * @version <tt>$Revision$</tt>
  *

Modified: trunk/src/main/org/jboss/jms/client/delegate/ClientConsumerDelegate.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/delegate/ClientConsumerDelegate.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/client/delegate/ClientConsumerDelegate.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -42,7 +42,7 @@
  * The client-side Consumer delegate class.
  *
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  *
  * @version <tt>$Revision$</tt>
  *

Modified: trunk/src/main/org/jboss/jms/client/delegate/ClientProducerDelegate.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/delegate/ClientProducerDelegate.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/client/delegate/ClientProducerDelegate.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -32,7 +32,7 @@
  * The client-side Producer delegate class.
  *
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  *
  * @version <tt>$Revision$</tt>
  *

Modified: trunk/src/main/org/jboss/jms/client/delegate/ClientSessionDelegate.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/delegate/ClientSessionDelegate.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/client/delegate/ClientSessionDelegate.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -71,7 +71,7 @@
  * The client-side Session delegate class.
  *
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:clebert.suconic at jboss.org">Clebert Suconic</a>
  *
  * @version <tt>$Revision$</tt>

Modified: trunk/src/main/org/jboss/jms/client/delegate/DelegateSupport.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/delegate/DelegateSupport.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/client/delegate/DelegateSupport.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -52,7 +52,7 @@
  * class.
  *
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  *
  * @version <tt>$Revision$</tt>
  *

Modified: trunk/src/main/org/jboss/jms/client/plugin/LoadBalancingPolicy.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/plugin/LoadBalancingPolicy.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/client/plugin/LoadBalancingPolicy.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -13,7 +13,7 @@
 /**
  * The interface that must be implemented by any load balancing policy plugin.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  * $Id$
  */

Modified: trunk/src/main/org/jboss/jms/client/plugin/RoundRobinLoadBalancingPolicy.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/plugin/RoundRobinLoadBalancingPolicy.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/client/plugin/RoundRobinLoadBalancingPolicy.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -11,7 +11,7 @@
 import org.jboss.jms.delegate.ConnectionFactoryDelegate;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/src/main/org/jboss/jms/client/remoting/CallbackManager.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/remoting/CallbackManager.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/client/remoting/CallbackManager.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -45,7 +45,7 @@
  * therefore there is no need to add the server id to the key when doing look ups.
  * 
  * @author <a href="tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/src/main/org/jboss/jms/client/remoting/ConsolidatedRemotingConnectionListener.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/remoting/ConsolidatedRemotingConnectionListener.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/client/remoting/ConsolidatedRemotingConnectionListener.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -22,7 +22,7 @@
  * and the HA's connection failure detector) are registered with this consolidated listener and not
  * with the remoting connection directly.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/src/main/org/jboss/jms/client/remoting/JMSRemotingConnection.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/remoting/JMSRemotingConnection.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/client/remoting/JMSRemotingConnection.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -45,7 +45,7 @@
  * Each JMS connection maintains a single Client instance for invoking on the server.
  *
  * @author <a href="tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  * $Id$
  */

Modified: trunk/src/main/org/jboss/jms/client/state/BrowserState.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/state/BrowserState.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/client/state/BrowserState.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -31,7 +31,7 @@
  * 
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @author <a href="mailto:clebert.suconic at jboss.com">Clebert Suconic</a>
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  *
  * @version <tt>$Revision$</tt>
  *

Modified: trunk/src/main/org/jboss/jms/client/state/ConnectionState.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/state/ConnectionState.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/client/state/ConnectionState.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -45,7 +45,7 @@
  * 
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @author <a href="mailto:clebert.suconic at jboss.com">Clebert Suconic</a>
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  *
  * @version <tt>$Revision$</tt>
  *

Modified: trunk/src/main/org/jboss/jms/client/state/ConsumerState.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/state/ConsumerState.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/client/state/ConsumerState.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -37,7 +37,7 @@
  * 
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @author <a href="mailto:clebert.suconic at jboss.com">Clebert Suconic</a>
- * @author <a href="mailto:ovidiu at jboss.org">Clebert Suconic</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Clebert Suconic</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/src/main/org/jboss/jms/client/state/HierarchicalState.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/state/HierarchicalState.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/client/state/HierarchicalState.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -32,7 +32,7 @@
  * 
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @author <a href="mailto:clebert.suconic at jboss.com">Clebert Suconic</a>
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/src/main/org/jboss/jms/client/state/HierarchicalStateSupport.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/state/HierarchicalStateSupport.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/client/state/HierarchicalStateSupport.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -35,7 +35,7 @@
  * 
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @author <a href="mailto:clebert.suconic at jboss.com">Clebert Suconic</a>
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  *
  * @version <tt>$Revision$</tt>
  *

Modified: trunk/src/main/org/jboss/jms/client/state/ProducerState.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/state/ProducerState.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/client/state/ProducerState.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -35,7 +35,7 @@
  * 
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @author <a href="mailto:clebert.suconic at jboss.com">Clebert Suconic</a>
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodoorv</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodoorv</a>
  *
  * @version <tt>$Revision$</tt>
  *

Modified: trunk/src/main/org/jboss/jms/client/state/SessionState.java
===================================================================
--- trunk/src/main/org/jboss/jms/client/state/SessionState.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/client/state/SessionState.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -57,7 +57,7 @@
  * 
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @author <a href="mailto:clebert.suconic at jboss.com">Clebert Suconic</a>
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/src/main/org/jboss/jms/delegate/BrowserEndpoint.java
===================================================================
--- trunk/src/main/org/jboss/jms/delegate/BrowserEndpoint.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/delegate/BrowserEndpoint.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -31,7 +31,7 @@
  * of the methods are handled in the advice stack.
  * 
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/src/main/org/jboss/jms/delegate/ConnectionDelegate.java
===================================================================
--- trunk/src/main/org/jboss/jms/delegate/ConnectionDelegate.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/delegate/ConnectionDelegate.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -34,7 +34,7 @@
  * Represents the minimal set of operations to provide connection functionality.
  * Some of the methods may be implemented on the server, others will be handled in the advice stack.
  * 
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @version <tt>$Revision$</tt>
  *

Modified: trunk/src/main/org/jboss/jms/delegate/ConnectionFactoryDelegate.java
===================================================================
--- trunk/src/main/org/jboss/jms/delegate/ConnectionFactoryDelegate.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/delegate/ConnectionFactoryDelegate.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -26,7 +26,7 @@
  * Represents the minimal set of operations to provide connection factory functionality. Some of the
  * methods may be implemented on the server, others will be handled in the advice stack.
  * 
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @version <tt>$Revision$</tt>
  */

Modified: trunk/src/main/org/jboss/jms/delegate/ConnectionFactoryEndpoint.java
===================================================================
--- trunk/src/main/org/jboss/jms/delegate/ConnectionFactoryEndpoint.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/delegate/ConnectionFactoryEndpoint.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -28,7 +28,7 @@
  * The rest of the methods are handled in the advice stack.
  * 
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/src/main/org/jboss/jms/delegate/ConsumerDelegate.java
===================================================================
--- trunk/src/main/org/jboss/jms/delegate/ConsumerDelegate.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/delegate/ConsumerDelegate.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -33,7 +33,7 @@
  * Some of the methods may be implemented on the server, others
  * will be handled in the advice stack.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @version <tt>$Revision$</tt>
  *

Modified: trunk/src/main/org/jboss/jms/delegate/ConsumerEndpoint.java
===================================================================
--- trunk/src/main/org/jboss/jms/delegate/ConsumerEndpoint.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/delegate/ConsumerEndpoint.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -30,7 +30,7 @@
  * The rest of the methods are handled in the advice stack.
  *
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  *
  * @version <tt>$Revision$</tt>
  *

Modified: trunk/src/main/org/jboss/jms/delegate/DeliveryInfo.java
===================================================================
--- trunk/src/main/org/jboss/jms/delegate/DeliveryInfo.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/delegate/DeliveryInfo.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -29,7 +29,7 @@
  * on the client side - this is never passed to the server
  * 
  * @author <a href="mailto:tim.fox at jboss.com>Tim Fox </a>
- * @author <a href="mailto:ovidiu at jboss.com>Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com>Ovidiu Feodorov</a>
  *
  * $Id: AckInfo.java 1770 2006-12-12 10:49:42Z timfox $
  */

Modified: trunk/src/main/org/jboss/jms/delegate/ProducerDelegate.java
===================================================================
--- trunk/src/main/org/jboss/jms/delegate/ProducerDelegate.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/delegate/ProducerDelegate.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -30,7 +30,7 @@
 /**
  * Represents the minimal set of operations to provide producer functionality.
  * 
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @version <tt>$Revision$</tt>
  */

Modified: trunk/src/main/org/jboss/jms/delegate/SessionDelegate.java
===================================================================
--- trunk/src/main/org/jboss/jms/delegate/SessionDelegate.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/delegate/SessionDelegate.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -40,7 +40,7 @@
  * Represents the minimal set of operations to provide session functionality.
  * Some of the methods may be implemented on the server, others will be handled in the advice stack.
  * 
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @version <tt>$Revision$</tt>
  *

Modified: trunk/src/main/org/jboss/jms/delegate/SessionEndpoint.java
===================================================================
--- trunk/src/main/org/jboss/jms/delegate/SessionEndpoint.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/delegate/SessionEndpoint.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -36,7 +36,7 @@
 
 /**
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:clebert.suconic at jboss.org">Clebert Suconic</a>
    *
  * @version <tt>$Revision$</tt>

Modified: trunk/src/main/org/jboss/jms/destination/JBossDestination.java
===================================================================
--- trunk/src/main/org/jboss/jms/destination/JBossDestination.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/destination/JBossDestination.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -33,7 +33,7 @@
 import org.jboss.jms.referenceable.SerializableObjectRefAddr;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @version <tt>$Revision$</tt>
  *

Modified: trunk/src/main/org/jboss/jms/destination/JBossQueue.java
===================================================================
--- trunk/src/main/org/jboss/jms/destination/JBossQueue.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/destination/JBossQueue.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -25,7 +25,7 @@
 import javax.jms.JMSException;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/src/main/org/jboss/jms/destination/JBossTopic.java
===================================================================
--- trunk/src/main/org/jboss/jms/destination/JBossTopic.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/destination/JBossTopic.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -25,7 +25,7 @@
 import javax.jms.JMSException;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/src/main/org/jboss/jms/exception/MessagingJMSException.java
===================================================================
--- trunk/src/main/org/jboss/jms/exception/MessagingJMSException.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/exception/MessagingJMSException.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -24,7 +24,7 @@
 import javax.jms.JMSException;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>1.1</tt>
  *
  * MessagingJMSException.java,v 1.1 2006/03/28 14:26:17 timfox Exp

Modified: trunk/src/main/org/jboss/jms/message/JBossBytesMessage.java
===================================================================
--- trunk/src/main/org/jboss/jms/message/JBossBytesMessage.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/message/JBossBytesMessage.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -43,7 +43,7 @@
  * @author Norbert Lataille (Norbert.Lataille at m4x.org)
  * @author <a href="mailto:adrian at jboss.org">Adrian Brock</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * 
  * @version $Revision$
  *

Modified: trunk/src/main/org/jboss/jms/message/JBossMapMessage.java
===================================================================
--- trunk/src/main/org/jboss/jms/message/JBossMapMessage.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/message/JBossMapMessage.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -41,7 +41,7 @@
  * @author Norbert Lataille (Norbert.Lataille at m4x.org)
  * @author <a href="mailto:adrian at jboss.org">Adrian Brock</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * 
  * @version $Revision$
  *

Modified: trunk/src/main/org/jboss/jms/message/JBossMessage.java
===================================================================
--- trunk/src/main/org/jboss/jms/message/JBossMessage.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/message/JBossMessage.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -59,7 +59,7 @@
  * Java serialization is not used to serialize messages between client and server
  * in normal JMS operations
  * 
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @author <a href="mailto:bershath at yahoo.com">Tyronne Wickramarathne</a>
  * 

Modified: trunk/src/main/org/jboss/jms/message/JBossObjectMessage.java
===================================================================
--- trunk/src/main/org/jboss/jms/message/JBossObjectMessage.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/message/JBossObjectMessage.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -31,7 +31,7 @@
  * This class implements javax.jms.ObjectMessage
  * 
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * 
  * @version $Revision$
  *

Modified: trunk/src/main/org/jboss/jms/message/JBossStreamMessage.java
===================================================================
--- trunk/src/main/org/jboss/jms/message/JBossStreamMessage.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/message/JBossStreamMessage.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -41,7 +41,7 @@
  * @author Norbert Lataille (Norbert.Lataille at m4x.org)
  * @author <a href="mailto:adrian at jboss.org">Adrian Brock</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * 
  * @version $Revision$
  *

Modified: trunk/src/main/org/jboss/jms/message/JBossTextMessage.java
===================================================================
--- trunk/src/main/org/jboss/jms/message/JBossTextMessage.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/message/JBossTextMessage.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -37,7 +37,7 @@
  * @author <a href="mailto:jason at planet57.com">Jason Dillon</a>
  * @author <a href="mailto:adrian at jboss.org">Adrian Brock</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * 
  * @version $Revision$
  *

Modified: trunk/src/main/org/jboss/jms/message/MessageIdGenerator.java
===================================================================
--- trunk/src/main/org/jboss/jms/message/MessageIdGenerator.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/message/MessageIdGenerator.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -32,7 +32,7 @@
  * A MessageIdGenerator.
  * 
  * @author <a href="tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/src/main/org/jboss/jms/server/Bootstrap.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/Bootstrap.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/server/Bootstrap.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -26,7 +26,7 @@
 /**
  * A bootstrap for a scoped deployment.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/src/main/org/jboss/jms/server/ConnectionFactoryManager.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/ConnectionFactoryManager.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/server/ConnectionFactoryManager.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -26,7 +26,7 @@
 import org.jboss.messaging.core.contract.MessagingComponent;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @version <tt>$Revision$</tt>
  *          <p/>

Modified: trunk/src/main/org/jboss/jms/server/ConnectionManager.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/ConnectionManager.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/server/ConnectionManager.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -31,7 +31,7 @@
  * An interface that allows management of ConnectionEnpoints and their association with remoting
  * clients.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @version <tt>$Revision$</tt>
  *

Modified: trunk/src/main/org/jboss/jms/server/DestinationJNDIMapper.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/DestinationJNDIMapper.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/server/DestinationJNDIMapper.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -46,7 +46,7 @@
  * Keeps track of destinations - including temporary destinations
  * Also manages the mapping of non temporary destinations to JNDI context
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @version <tt>$Revision$</tt>
  *

Modified: trunk/src/main/org/jboss/jms/server/DestinationManager.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/DestinationManager.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/server/DestinationManager.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -27,7 +27,7 @@
 import org.jboss.messaging.core.contract.MessagingComponent;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @version <tt>$Revision$</tt>
  *

Modified: trunk/src/main/org/jboss/jms/server/SecurityManager.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/SecurityManager.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/server/SecurityManager.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -30,7 +30,7 @@
 import org.w3c.dom.Element;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/src/main/org/jboss/jms/server/ServerPeer.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/ServerPeer.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/server/ServerPeer.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -86,7 +86,7 @@
 /**
  * A JMS server peer.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @author <a href="mailto:juha at jboss.org">Juha Lindfors</a>
  * 
@@ -208,7 +208,7 @@
          
          if (serverPeerID < 0)
          {
-            throw new IllegalStateException(" ServerPeerID not set");
+            throw new IllegalStateException("ServerPeerID not set");
          }
 
          log.debug(this + " starting");

Modified: trunk/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactory.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactory.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactory.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -25,7 +25,7 @@
  * automatic failover.
  * 
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @version <tt>$Revision$</tt>
  *

Modified: trunk/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactoryJNDIMapper.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactoryJNDIMapper.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/server/connectionfactory/ConnectionFactoryJNDIMapper.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -56,7 +56,7 @@
 import org.jboss.messaging.util.Version;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @author <a href="mailto:clebert.suconic at jboss.com">Clebert Suconic</a>
  * @version <tt>$Revision$</tt>

Modified: trunk/src/main/org/jboss/jms/server/connectionfactory/JNDIBindings.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/connectionfactory/JNDIBindings.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/server/connectionfactory/JNDIBindings.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -32,7 +32,7 @@
 import org.w3c.dom.NodeList;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/src/main/org/jboss/jms/server/connectionmanager/SimpleConnectionManager.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/connectionmanager/SimpleConnectionManager.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/server/connectionmanager/SimpleConnectionManager.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -45,7 +45,7 @@
 
 /**
  * @author <a href="tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/src/main/org/jboss/jms/server/container/SecurityAspect.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/container/SecurityAspect.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/server/container/SecurityAspect.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -54,7 +54,7 @@
  * milliseconds later.
  * 
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision 1.1 $</tt>
  *
  * $Id$

Modified: trunk/src/main/org/jboss/jms/server/container/ServerLogInterceptor.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/container/ServerLogInterceptor.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/server/container/ServerLogInterceptor.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -29,7 +29,7 @@
 import java.lang.reflect.Method;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  */
 public class ServerLogInterceptor implements Interceptor

Modified: trunk/src/main/org/jboss/jms/server/destination/DestinationServiceSupport.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/destination/DestinationServiceSupport.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/server/destination/DestinationServiceSupport.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -22,7 +22,7 @@
  * The base of a JBoss Messaging destination service. Both deployed or programatically created
  * destinations will eventually get one of these.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @author <a href="mailto:alex.fu at novell.com">Alex Fu</a>
  * 

Modified: trunk/src/main/org/jboss/jms/server/destination/ManagedQueue.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/destination/ManagedQueue.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/server/destination/ManagedQueue.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -35,7 +35,7 @@
  * A ManagedQueue
  *
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:alex.fu at novell.com">Alex Fu</a>
  * @version <tt>$Revision$</tt>
  *

Modified: trunk/src/main/org/jboss/jms/server/destination/ManagedTopic.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/destination/ManagedTopic.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/server/destination/ManagedTopic.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -38,7 +38,7 @@
  * A ManagedTopic
  *
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:alex.fu at novell.com">Alex Fu</a>
  * @version <tt>$Revision$</tt>
  *

Modified: trunk/src/main/org/jboss/jms/server/destination/QueueService.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/destination/QueueService.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/server/destination/QueueService.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -24,7 +24,7 @@
 /**
  * MBean wrapper around a ManagedQueue
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @author <a href="mailto:alex.fu at novell.com">Alex Fu</a>
  * @version <tt>$Revision$</tt>

Modified: trunk/src/main/org/jboss/jms/server/destination/TopicService.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/destination/TopicService.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/server/destination/TopicService.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -23,7 +23,7 @@
 /**
  * A deployable JBoss Messaging topic.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @author <a href="mailto:alex.fu at novell.com">Alex Fu</a>
  * @author <a href="mailto:juha at jboss.org">Juha Lindfors</a>

Modified: trunk/src/main/org/jboss/jms/server/endpoint/ServerBrowserEndpoint.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/endpoint/ServerBrowserEndpoint.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/server/endpoint/ServerBrowserEndpoint.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -41,7 +41,7 @@
  * Concrete implementation of BrowserEndpoint.
  * 
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/src/main/org/jboss/jms/server/endpoint/ServerConnectionEndpoint.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/endpoint/ServerConnectionEndpoint.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/server/endpoint/ServerConnectionEndpoint.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -71,7 +71,7 @@
 /**
  * Concrete implementation of ConnectionEndpoint.
  * 
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @version <tt>$Revision$</tt>
  *

Modified: trunk/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/server/endpoint/ServerConnectionFactoryEndpoint.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -46,7 +46,7 @@
 /**
  * Concrete implementation of ConnectionFactoryEndpoint
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @version <tt>$Revision$</tt>
  *

Modified: trunk/src/main/org/jboss/jms/server/endpoint/ServerConsumerEndpoint.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/endpoint/ServerConsumerEndpoint.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/server/endpoint/ServerConsumerEndpoint.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -51,7 +51,7 @@
  * Concrete implementation of ConsumerEndpoint. Lives on the boundary between Messaging Core and the
  * JMS Facade. Handles delivery of messages from the server to the client side consumer.
  * 
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @version <tt>$Revision$</tt> $Id$
  */

Modified: trunk/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/server/endpoint/ServerSessionEndpoint.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -108,7 +108,7 @@
  * different threads, but the acks/cancels/etc will end up back here on the connection consumer
  * session instance.
  * 
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @author <a href="mailto:clebert.suconic at jboss.com">Clebert Suconic</a>
  * @version <tt>$Revision$</tt>
@@ -126,8 +126,7 @@
    static final String TEMP_QUEUE_MESSAGECOUNTER_PREFIX = "TempQueue.";
    
    private static final long CLOSE_TIMEOUT = 10 * 10000;
-   
-   
+      
    // Static ---------------------------------------------------------------------------------------
 
    // Attributes -----------------------------------------------------------------------------------
@@ -936,14 +935,14 @@
       rec.del.cancel();
    }
    
-   public void collectDeliveries(Map map, boolean firstNode) throws Exception
+   public void deliverAnyWaitingDeliveries(String queueName) throws Exception
    {
-   	if (trace) { log.trace("Collecting deliveries"); }
-   	   	
-   	//First deliver any waiting deliveries
+   	//	First deliver any waiting deliveries
    	
    	if (trace) { log.trace("Delivering any waiting deliveries"); }
    	
+   	List toAddBack = null;
+   	
    	while (true)
    	{
    		DeliveryRecord dr = (DeliveryRecord)toDeliver.poll(0);
@@ -953,13 +952,42 @@
    			break;
    		}
    		
-   		performDelivery(dr.del.getReference(), dr.deliveryID, dr.getConsumer()); 
-			
-	   	dr.waitingForResponse = false;
+   		if (dr.queueName == null || dr.queueName.equals(queueName))
+   		{   		
+	   		performDelivery(dr.del.getReference(), dr.deliveryID, dr.getConsumer()); 
+				
+		   	dr.waitingForResponse = false;
+   		}
+   		else
+   		{
+   			if (toAddBack == null)
+   			{
+   				toAddBack = new ArrayList();
+   			}
+   			
+   			toAddBack.add(dr);
+   		}
    	}
    	
+   	if (toAddBack != null)
+   	{
+   		Iterator iter = toAddBack.iterator();
+   		
+   		while (iter.hasNext())
+   		{
+   			toDeliver.put(iter.next());
+   		}
+   	}
+   	
    	if (trace) { log.trace("Done delivering"); }
-   		
+   }
+   
+   public boolean collectDeliveries(Map map, boolean firstNode, String queueName) throws Exception
+   {
+   	if (trace) { log.trace("Collecting deliveries"); }
+   	
+   	boolean gotSome = false;
+   	   	
    	if (!firstNode)
    	{	   	
 	   	if (trace) { log.trace("Now collecting"); }
@@ -976,7 +1004,7 @@
 	   		
 	   		DeliveryRecord rec = (DeliveryRecord)entry.getValue();
 	   		
-	   		if (rec.replicating)
+	   		if (rec.replicating && (queueName == null || rec.queueName.equals(queueName)))
 	   		{
 	   			Map ids = (Map)map.get(rec.queueName);
 	   			
@@ -989,6 +1017,8 @@
 	   			
 	   			ids.put(new Long(rec.del.getReference().getMessage().getMessageID()), id);
 	   			
+	   			gotSome = true;
+	   			
 	   			if (rec.waitingForResponse)
 	   			{
 	   				//Do the delivery now
@@ -1007,6 +1037,8 @@
    	}
    	
    	if (trace) { log.trace("Collected " + map.size() + " deliveries"); }
+   	
+   	return gotSome;
    }
    
    public synchronized void replicateDeliveryResponseReceived(long deliveryID) throws Exception
@@ -1165,6 +1197,7 @@
        	try
        	{
        		//This basically just releases the memory reference
+       		
        		delivery.acknowledge(null);
        	}
        	catch (Throwable t)
@@ -1560,7 +1593,6 @@
       
       if (rec.replicating)
       {
-      	//this.sendReplicateAckMessage(rec.del.getReference().getMessage().getMessageID());
       	postOffice.sendReplicateAckMessage(rec.queueName, rec.del.getReference().getMessage().getMessageID());
       }
       
@@ -1660,7 +1692,7 @@
       
       if (mDest == null)
       {
-         throw new InvalidDestinationException("No such destination: " + jmsDestination);
+         throw new InvalidDestinationException("No such destination: " + jmsDestination + " has it been deployed?");
       }
       
       if (jmsDestination.isTemporary())
@@ -1900,13 +1932,10 @@
           
       long redeliveryDelayToUse = mDest.getRedeliveryDelay() == -1 ? defaultRedeliveryDelay : mDest.getRedeliveryDelay();
       
-      //Is the consumer going to have its session state replicated onto a backup node?
-      //We don't replicate temp destinations or non durable topic subscribers
-      boolean replicating = supportsFailover && !jmsDestination.isTemporary() &&
-                            ((jmsDestination.isTopic() && subscriptionName != null) ||
-                             jmsDestination.isQueue()) &&
-                            mDest.isClustered(); 
-                                 
+      //Is the consumer going to have its session state replicated onto a backup node?      
+      
+      boolean replicating = supportsFailover && queue.isClustered() && !(jmsDestination.isTopic() && !queue.isRecoverable());
+      
       ServerConsumerEndpoint ep =
          new ServerConsumerEndpoint(consumerID, queue,
                                     queue.getName(), this, selectorString, noLocal,

Modified: trunk/src/main/org/jboss/jms/server/endpoint/advised/BrowserAdvised.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/endpoint/advised/BrowserAdvised.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/server/endpoint/advised/BrowserAdvised.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -31,7 +31,7 @@
  * Dispatcher's map.
  *
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/src/main/org/jboss/jms/server/endpoint/advised/ConnectionAdvised.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/endpoint/advised/ConnectionAdvised.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/server/endpoint/advised/ConnectionAdvised.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -34,7 +34,7 @@
  * Dispatcher's map.
  * 
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/src/main/org/jboss/jms/server/endpoint/advised/ConnectionFactoryAdvised.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/endpoint/advised/ConnectionFactoryAdvised.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/server/endpoint/advised/ConnectionFactoryAdvised.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -32,7 +32,7 @@
 /**
  *
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>1.5</tt>
  *
  * ConnectionFactoryAdvised.java,v 1.3 2006/03/01 22:56:51 ovidiu Exp

Modified: trunk/src/main/org/jboss/jms/server/endpoint/advised/ConsumerAdvised.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/endpoint/advised/ConsumerAdvised.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/server/endpoint/advised/ConsumerAdvised.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -30,7 +30,7 @@
  * Dispatcher's map.
  *
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/src/main/org/jboss/jms/server/endpoint/advised/SessionAdvised.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/endpoint/advised/SessionAdvised.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/server/endpoint/advised/SessionAdvised.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -40,7 +40,7 @@
  * Dispatcher's map.
  *
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:clebert.suconic at jboss.org">Clebert Suconic</a>
  * @version <tt>$Revision$</tt>
  *

Modified: trunk/src/main/org/jboss/jms/server/remoting/DirectThreadPool.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/remoting/DirectThreadPool.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/server/remoting/DirectThreadPool.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -14,7 +14,7 @@
  * A "noop" thread pool that just forwards the invocations, without doing any kind of pooling.
  * We use it for the "socket" remoting callback server.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  * $Id$
  */

Modified: trunk/src/main/org/jboss/jms/server/remoting/JMSServerInvocationHandler.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/remoting/JMSServerInvocationHandler.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/server/remoting/JMSServerInvocationHandler.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -43,7 +43,7 @@
 import EDU.oswego.cs.dl.util.concurrent.WriterPreferenceReadWriteLock;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @version <tt>$Revision$</tt>
  *

Modified: trunk/src/main/org/jboss/jms/server/security/SecurityMetadataStore.java
===================================================================
--- trunk/src/main/org/jboss/jms/server/security/SecurityMetadataStore.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/server/security/SecurityMetadataStore.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -46,7 +46,7 @@
  * @author Peter Antman
  * @author <a href="mailto:Scott.Stark at jboss.org">Scott Stark</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version $Revision$
  *
  * $Id$

Modified: trunk/src/main/org/jboss/jms/tx/MessagingXAResource.java
===================================================================
--- trunk/src/main/org/jboss/jms/tx/MessagingXAResource.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/tx/MessagingXAResource.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -38,7 +38,7 @@
  * It mainly delegates to the resource manager.
  * 
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:juha at jboss.org">Juha Lindfors</a>
  * 
  * Parts based on JBoss MQ XAResource implementation by:

Modified: trunk/src/main/org/jboss/jms/tx/TransactionRequest.java
===================================================================
--- trunk/src/main/org/jboss/jms/tx/TransactionRequest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/tx/TransactionRequest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -40,7 +40,7 @@
  * @author <a href="mailto:David.Maplesden at orion.co.nz">David Maplesden</a>
  * @author <a href="mailto:adrian at jboss.org">Adrian Brock</a>
  * @author <a href="mailto:daniel.ramagem at gmail.com">Daniel Bloomfield Ramagem</a>
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version $Revision$
  *
  * $Id$

Modified: trunk/src/main/org/jboss/jms/wireformat/BrowserResetRequest.java
===================================================================
--- trunk/src/main/org/jboss/jms/wireformat/BrowserResetRequest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/wireformat/BrowserResetRequest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -12,7 +12,7 @@
 import org.jboss.jms.delegate.BrowserEndpoint;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  * $Id$
  */

Modified: trunk/src/main/org/jboss/jms/wireformat/ClientDelivery.java
===================================================================
--- trunk/src/main/org/jboss/jms/wireformat/ClientDelivery.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/wireformat/ClientDelivery.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -32,7 +32,7 @@
  * A ClientDelivery
  *
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/src/main/org/jboss/jms/wireformat/JMSWireFormat.java
===================================================================
--- trunk/src/main/org/jboss/jms/wireformat/JMSWireFormat.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/jms/wireformat/JMSWireFormat.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -51,7 +51,7 @@
  * object whose type is only known at run-time. In this case we use serialization.
  * 
  * @author <a href="tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/src/main/org/jboss/messaging/core/contract/Channel.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/contract/Channel.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/messaging/core/contract/Channel.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -27,7 +27,7 @@
  * A Channel is a transactional, reliable message delivery mechanism that forwards a message from a
  * sender to one or more receivers.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @version <tt>$Revision$</tt>
  *

Modified: trunk/src/main/org/jboss/messaging/core/contract/Delivery.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/contract/Delivery.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/messaging/core/contract/Delivery.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -26,7 +26,7 @@
 /**
  * A message delivery. It can be "done" or active.
  * 
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @version <tt>$Revision$</tt>
  *

Modified: trunk/src/main/org/jboss/messaging/core/contract/DeliveryObserver.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/contract/DeliveryObserver.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/messaging/core/contract/DeliveryObserver.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -24,7 +24,7 @@
 import org.jboss.messaging.core.impl.tx.Transaction;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @version <tt>$Revision$</tt>
  * $Id$

Modified: trunk/src/main/org/jboss/messaging/core/contract/Distributor.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/contract/Distributor.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/messaging/core/contract/Distributor.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -27,7 +27,7 @@
 /**
  * A Distributor takes a message and distributes it to one or more Receivers
  * 
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * 
  * $Id$

Modified: trunk/src/main/org/jboss/messaging/core/contract/Filter.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/contract/Filter.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/messaging/core/contract/Filter.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -27,7 +27,7 @@
  * browsing to restrict the messages browsed, or when routing messages.
  *
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/src/main/org/jboss/messaging/core/contract/Message.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/contract/Message.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/messaging/core/contract/Message.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -29,7 +29,7 @@
  * A message is a routable instance that has a payload.
  * The payload is opaque to the messaging system.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox"jboss.com">Tim Fox</a>
  * @version <tt>$Revision$</tt>
  *

Modified: trunk/src/main/org/jboss/messaging/core/contract/MessageReference.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/contract/MessageReference.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/messaging/core/contract/MessageReference.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -28,7 +28,7 @@
  * 
  * If many channels have contain the same reference this makes a lot of sense
  * 
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @version <tt>$Revision$</tt>
  *

Modified: trunk/src/main/org/jboss/messaging/core/contract/MessageStore.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/contract/MessageStore.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/messaging/core/contract/MessageStore.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -10,7 +10,7 @@
 /**
  * An interface to a referencing/dereferencing message store.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @version <tt>$Revision$</ttH>
  *

Modified: trunk/src/main/org/jboss/messaging/core/contract/PersistenceManager.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/contract/PersistenceManager.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/messaging/core/contract/PersistenceManager.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -28,7 +28,7 @@
 /**
  * The interface to the persistence manager.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @author <a href="mailto:Konda.Madhu at uk.mizuho-sc.com">Madhu Konda</a>
  * @author <a href="mailto:juha at jboss.org">Juha Lindfors</a>

Modified: trunk/src/main/org/jboss/messaging/core/contract/PostOffice.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/contract/PostOffice.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/messaging/core/contract/PostOffice.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -40,7 +40,7 @@
  * 
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @author <a href="mailto:clebert.suconic at jboss.com">Clebert Suconic</a>
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/src/main/org/jboss/messaging/core/contract/Receiver.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/contract/Receiver.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/messaging/core/contract/Receiver.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -30,7 +30,7 @@
  * 
  * Handling can be done transactionally or non transactionally
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @version <tt>$Revision$</tt>
  *

Modified: trunk/src/main/org/jboss/messaging/core/contract/Replicator.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/contract/Replicator.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/messaging/core/contract/Replicator.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -36,7 +36,7 @@
  * Then, for that key, there is an entry for each node id.
  *
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/src/main/org/jboss/messaging/core/impl/ChannelSupport.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/impl/ChannelSupport.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/messaging/core/impl/ChannelSupport.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -54,7 +54,7 @@
  * 
  * This partial implementation supports atomicity, isolation and recoverability for reliable messages.
  * 
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @version <tt>$Revision$</tt> $Id: ChannelSupport.java,v 1.65
  *          2006/06/27 19:44:39 timfox Exp $

Modified: trunk/src/main/org/jboss/messaging/core/impl/FailoverWaiter.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/impl/FailoverWaiter.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/messaging/core/impl/FailoverWaiter.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -38,9 +38,9 @@
 {
    private static final Logger log = Logger.getLogger(FailoverWaiter.class);
 	
-	private int failingOverFor;
+	private int failingOverFor = -1;
 	
-	private int failedOverFor;
+	private int failedOverFor = -1;
 	
    private Object failoverStatusLock;
    
@@ -70,7 +70,10 @@
     * Wait for failover from the specified node to complete.
     */
    public int waitForFailover(int failedNodeID) throws Exception
-   {
+   {   	
+   	log.trace("Waiting for failover for " + failedNodeID +
+   			    " failingOverFor: " + failingOverFor + " failedOverFor: " + failedOverFor);   	
+   	
       // This node may be failing over for another node - in which case we must wait for that to be
       // complete.
    	

Modified: trunk/src/main/org/jboss/messaging/core/impl/FirstReceiverDistributor.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/impl/FirstReceiverDistributor.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/messaging/core/impl/FirstReceiverDistributor.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -40,7 +40,7 @@
  * If the router has several receivers (e.g. the case of multiple consumers on a queue)
  * then if the consumers are fast then the first receiver will tend to get most or all of the references
  * 
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @version <tt>$Revision: 1174 $</tt>
  * $Id: PointToPointRouter.java 1174 2006-08-02 14:14:32Z timfox $

Modified: trunk/src/main/org/jboss/messaging/core/impl/IDManager.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/impl/IDManager.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/messaging/core/impl/IDManager.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -31,7 +31,7 @@
  * A IDManager.
  * 
  * @author <a href="tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision: 2686 $</tt>
  *
  * $Id: IDManager.java 2686 2007-05-15 08:47:20Z timfox $

Modified: trunk/src/main/org/jboss/messaging/core/impl/JDBCPersistenceManager.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/impl/JDBCPersistenceManager.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/messaging/core/impl/JDBCPersistenceManager.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -1025,7 +1025,6 @@
    
    public void updatePageOrder(long channelID, List references) throws Exception
    {
-      log.info("updatePageOrder", new Exception());
       Connection conn = null;
       PreparedStatement psUpdateReference = null;  
       TransactionWrapper wrap = new TransactionWrapper();

Modified: trunk/src/main/org/jboss/messaging/core/impl/MessagingQueue.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/impl/MessagingQueue.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/messaging/core/impl/MessagingQueue.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -57,7 +57,7 @@
  * 
  * Can be used to implement a point to point queue, or a subscription fed from a topic
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @version <tt>$Revision: 1295 $</tt>
  *
@@ -219,8 +219,6 @@
             
          if (trace) { log.trace("Loaded " + ili.getRefInfos().size() + " refs"); }            
 
-         log.info("Merging, there are already " + messageRefs.size() + " refs in queue");
-         
          doLoad(ili);         
          
          Map toRecover = (Map)recoveryArea.remove(new Integer(nodeID));

Modified: trunk/src/main/org/jboss/messaging/core/impl/RoundRobinDistributor.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/impl/RoundRobinDistributor.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/messaging/core/impl/RoundRobinDistributor.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -40,7 +40,7 @@
  * consumers rather than in contiguous blocks.
  *  
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision: 1 $</tt>
  * $Id: $
  */

Modified: trunk/src/main/org/jboss/messaging/core/impl/SimpleDelivery.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/impl/SimpleDelivery.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/messaging/core/impl/SimpleDelivery.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -30,7 +30,7 @@
 /**
  * A simple Delivery implementation.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @version <tt>$Revision$</tt>
  * 

Modified: trunk/src/main/org/jboss/messaging/core/impl/clusterconnection/MessageSucker.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/impl/clusterconnection/MessageSucker.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/messaging/core/impl/clusterconnection/MessageSucker.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -89,6 +89,8 @@
 	MessageSucker(Queue localQueue, JBossConnection sourceConnection, JBossConnection localConnection,
 			        boolean xa, boolean preserveOrdering)
 	{	
+		if (trace) { log.trace("Creating message sucker, localQueue:" + localQueue + " xa:" + xa + " preserveOrdering:" + preserveOrdering); }
+		
 		this.localQueue = localQueue;
 		
 		this.sourceConnection = sourceConnection;
@@ -298,7 +300,7 @@
 			{
 				msg.acknowledge();
 				
-				if (trace) { log.trace("Acnowledged message"); }
+				if (trace) { log.trace("Acknowledged message"); }
 			}
 			
 			//if (queue.)

Modified: trunk/src/main/org/jboss/messaging/core/impl/message/CoreMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/impl/message/CoreMessage.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/messaging/core/impl/message/CoreMessage.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -24,7 +24,7 @@
 import java.util.Map;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @version <tt>$Revision: 2202 $</tt>
  *

Modified: trunk/src/main/org/jboss/messaging/core/impl/message/MessageFactory.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/impl/message/MessageFactory.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/messaging/core/impl/message/MessageFactory.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -32,7 +32,7 @@
 import org.jboss.messaging.core.contract.Message;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>  
  * @version <tt>$Revision: 2284 $</tt>
  * 

Modified: trunk/src/main/org/jboss/messaging/core/impl/message/MessageSupport.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/impl/message/MessageSupport.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/messaging/core/impl/message/MessageSupport.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -36,7 +36,7 @@
 /**
  * A message base.
  * 
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @version <tt>$Revision: 2740 $</tt>
  * 

Modified: trunk/src/main/org/jboss/messaging/core/impl/message/SimpleMessageStore.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/impl/message/SimpleMessageStore.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/messaging/core/impl/message/SimpleMessageStore.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -34,7 +34,7 @@
 /**
  * A MessageStore implementation.
  * 
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @version <tt>$Revision: 2202 $</tt>
  *

Modified: trunk/src/main/org/jboss/messaging/core/impl/postoffice/AckAllReplicatedDeliveriesMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/impl/postoffice/AckAllReplicatedDeliveriesMessage.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/messaging/core/impl/postoffice/AckAllReplicatedDeliveriesMessage.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -49,7 +49,7 @@
 	{		
 		office.handleAckAllReplicatedDeliveries(nodeID);
 		
-		return "ok";
+		return null;
 	}
 
 	byte getType()

Modified: trunk/src/main/org/jboss/messaging/core/impl/postoffice/AddAllReplicatedDeliveriesMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/impl/postoffice/AddAllReplicatedDeliveriesMessage.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/messaging/core/impl/postoffice/AddAllReplicatedDeliveriesMessage.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -26,7 +26,6 @@
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
-import java.util.Set;
 
 import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
 
@@ -57,9 +56,9 @@
 		
 	Object execute(RequestTarget office) throws Throwable
 	{		
-		office.handleAddAllReplicatedDeliveries(deliveries, nodeID);
+		office.handleAddAllReplicatedDeliveries(nodeID, deliveries);
 		
-		return "ok";
+		return null;
 	}
 
 	byte getType()
@@ -132,5 +131,4 @@
 			}
 		}
 	}
-
 }

Modified: trunk/src/main/org/jboss/messaging/core/impl/postoffice/ClusterRequest.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/impl/postoffice/ClusterRequest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/messaging/core/impl/postoffice/ClusterRequest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -63,8 +63,14 @@
 	public static final int ACK_ALL_REPLICATED_DELIVERIES_REQUEST = 11;
 	
 	public static final int ADD_ALL_REPLICATED_DELIVERIES_REQUEST = 12;
+	
+	public static final int GET_REPLICATED_DELIVERIES_REQUEST = 13;
 		
 	
+	protected static final int NULL = 0;
+	
+	protected static final int NOT_NULL = 1;
+	
    /*
     * Factory method
     */
@@ -137,6 +143,11 @@
          	request = new AddAllReplicatedDeliveriesMessage();
          	break;
          }
+         case GET_REPLICATED_DELIVERIES_REQUEST:
+         {
+         	request = new GetReplicatedDeliveriesRequest();
+         	break;
+         }
          default:
          {
             throw new IllegalArgumentException("Invalid type: " + type);

Modified: trunk/src/main/org/jboss/messaging/core/impl/postoffice/GroupMember.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/impl/postoffice/GroupMember.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/messaging/core/impl/postoffice/GroupMember.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -514,7 +514,7 @@
 
       public void receive(Message message)
       {
-         if (trace) { log.trace(this + " received " + message + " on the ASYNC channel"); }
+         if (trace) { log.trace(this + " received " + message + " on the data channel"); }
 
          try
          {

Modified: trunk/src/main/org/jboss/messaging/core/impl/postoffice/LeaveClusterRequest.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/impl/postoffice/LeaveClusterRequest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/messaging/core/impl/postoffice/LeaveClusterRequest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -26,7 +26,7 @@
 
    LeaveClusterRequest(int nodeId)
    {
-      this.nodeId=nodeId;
+      this.nodeId = nodeId;
    }
 
    /**

Modified: trunk/src/main/org/jboss/messaging/core/impl/postoffice/MappingInfo.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/impl/postoffice/MappingInfo.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/messaging/core/impl/postoffice/MappingInfo.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -32,7 +32,7 @@
  * A MappingInfo
  *
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  *
  * @version <tt>$Revision: 2421 $</tt>
  *

Modified: trunk/src/main/org/jboss/messaging/core/impl/postoffice/MessageRequest.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/impl/postoffice/MessageRequest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/messaging/core/impl/postoffice/MessageRequest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -43,10 +43,6 @@
  */
 class MessageRequest extends ClusterRequest
 {
-   private static final byte NULL = 0;
-   
-   private static final byte NOT_NULL = 1;
-	
    private String routingConditionText;   
    
    private Message message;

Modified: trunk/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/messaging/core/impl/postoffice/MessagingPostOffice.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -89,7 +89,7 @@
 
 /**
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:clebert.suconic at jboss.com">Clebert Suconic</a>
  * @version <tt>$Revision: 2782 $</tt>
  *
@@ -417,7 +417,8 @@
    {
    	return officeName;
    }
-  
+    
+   
    public boolean addBinding(Binding binding, boolean allNodes) throws Exception
    {
    	if (allNodes && !binding.queue.isClustered())
@@ -435,6 +436,46 @@
    		waitForBindUnbind(binding.queue.getName(), true);
    	}
    	
+   	if (added && !firstNode && supportsFailover && clustered && binding.queue.isClustered())
+   	{
+   		//reverse lookup in failover map
+   		
+   		Integer masterNodeID = getMasterForFailoverNodeID(thisNodeID);
+   		   		   		
+   		if (masterNodeID != null)
+   		{
+   			Map nameMap = (Map)nameMaps.get(masterNodeID);
+   			
+   			if (nameMap != null)
+   			{
+   				Binding b = (Binding)nameMap.get(binding.queue.getName());
+   				
+   				if (b != null)
+   				{
+   					//Already deployed on master node - tell the master to send us the deliveries
+   					//This copes with the case when queues were deployed on the failover before being deployed on the master
+   					
+   					if (trace) { log.trace("Telling master to send us deliveries"); }
+   					
+   					PostOfficeAddressInfo info = (PostOfficeAddressInfo)nodeIDAddressMap.get(new Integer(thisNodeID));
+   		   		
+   		   		Address replyAddress = info.getControlChannelAddress();
+   					
+   					ClusterRequest request = new GetReplicatedDeliveriesRequest(binding.queue.getName(), replyAddress);
+   					
+   				   info = (PostOfficeAddressInfo)nodeIDAddressMap.get(masterNodeID);
+   				   
+   				   Address address = info.getControlChannelAddress();
+   				   	
+   				   if (address != null)
+   				   {	   
+   				   	groupMember.unicastControl(request, address, false);
+   				   }
+   				}
+   			}
+   		}
+   	}
+   	
    	return added;
    }
           
@@ -612,15 +653,16 @@
    		replyAddress = info.getControlChannelAddress();
    	}
    	
-   	ClusterRequest request = new ReplicateDeliveryMessage(queueName, sessionID, messageID, deliveryID, replyAddress, thisNodeID);
+   	ClusterRequest request = new ReplicateDeliveryMessage(thisNodeID, queueName, sessionID, messageID, deliveryID, replyAddress);
    	
    	if (trace) { log.trace(this + " sending replicate delivery message " + queueName + " " + sessionID + " " + messageID); }
 			   
-	   Address address = getFailoverNodeControlChannelAddress();
+   	//TODO could be optimised too
+	   Address address = getFailoverNodeForControlChannelAddress();
 	   	
 	   if (address != null)
 	   {	   
-	      groupMember.unicastControl(request, address, false);
+	   	groupMember.unicastControl(request, address, false);
 	   }
    }
 
@@ -629,13 +671,13 @@
 		//There is no need to lock this while failover node change is occuring since the receiving node is tolerant to duplicate
 		//adds or acks
 	
-	   ClusterRequest request = new ReplicateAckMessage(queueName, messageID, thisNodeID);		   
+	   ClusterRequest request = new ReplicateAckMessage(thisNodeID, queueName, messageID);		   
    	
-	   Address address = getFailoverNodeControlChannelAddress();
+	   Address address = getFailoverNodeForControlChannelAddress();
 	   	
 	   if (address != null)
 	   {	   
-	      groupMember.unicastControl(request, address, false);
+	   	groupMember.unicastControl(request, address, false);
 	   }
 	}
 	
@@ -907,7 +949,7 @@
       {
       	//Failover node for this node has changed
       	
-      	failoverNodeChanged(oldFailoverNodeID, firstNode);      	
+      	failoverNodeChanged(oldFailoverNodeID, firstNode, false);      	
       }
       
       sendJMXNotification(VIEW_CHANGED_NOTIFICATION);
@@ -1036,6 +1078,9 @@
    	
    	calculateFailoverMap();
    	
+   	//Note - when a node joins, we DO NOT send it replicated data - this is because it won't have deployed it's queues
+   	//the data is requested by the new node when it deploys its queues      
+   	
    	if (!wasFirstNode && oldFailoverNodeID != this.failoverNodeID)
    	{
    		//Need to execute this on it's own thread since it uses the MessageDispatcher
@@ -1046,7 +1091,7 @@
 	   			{
 	   				try
 	   				{
-	   					failoverNodeChanged(oldFailoverNodeID, firstNode);
+	   					failoverNodeChanged(oldFailoverNodeID, firstNode, true);
 	   				}
 	   				catch (Exception e)
 	   				{
@@ -1055,7 +1100,7 @@
 	   			}
 	   		}).start();   		   		
    	}
-      
+   	
       // Send a notification
       
       ClusterNotification notification = new ClusterNotification(ClusterNotification.TYPE_NODE_JOIN, nodeId, null);
@@ -1158,8 +1203,8 @@
       
    //TODO - these do not belong here
    
-   public void handleReplicateDelivery(String queueName, String sessionID, long messageID,
-   		                              long deliveryID, final Address replyAddress, int nodeID) throws Exception
+   public void handleReplicateDelivery(int nodeID, String queueName, String sessionID, long messageID,
+   		                              long deliveryID, final Address replyAddress) throws Exception
    {
    	if (trace) { log.trace(this + " handleReplicateDelivery for queue " + queueName + " session " + sessionID + " message " + messageID); }
    	
@@ -1202,23 +1247,29 @@
 		   		}
 		   	});	   		   	   
    	}
-   }
-   
-   private Address getFailoverNodeControlChannelAddress()
+   } 
+
+   public void handleGetReplicatedDeliveries(String queueName, Address returnAddress) throws Exception
    {
-   	PostOfficeAddressInfo info = (PostOfficeAddressInfo)nodeIDAddressMap.get(new Integer(failoverNodeID));
-   	
-   	if (info == null)
+   	if (trace) { log.trace(this + " handleGetReplicateDelivery for queue " + queueName); }
+
+   	Binding binding = getBindingForQueueName(queueName);
+
+   	if (binding == null)
    	{
-   		return null;
+   		//This is ok -the queue might have been undeployed since we thought it was deployed and sent the request
+   		
+   		if (trace) { log.trace("Binding has not been deployed"); }
    	}
-   	
-   	Address address = info.getControlChannelAddress();
-   	
-   	return address;
-   }
+   	else
+   	{
+	   	//Needs to be executed on a different thread
+	  
+	   	replyExecutor.execute(new SendReplicatedDeliveriesRunnable(queueName, returnAddress));
+   	}
+   }          
    
-   public void handleReplicateAck(String queueName, long messageID, int nodeID) throws Exception
+   public void handleReplicateAck(int nodeID, String queueName, long messageID) throws Exception
    {
       Binding binding = getBindingForQueueName(queueName);
    	
@@ -1287,7 +1338,7 @@
    	}   	
    }
    
-   public void handleAddAllReplicatedDeliveries(Map deliveries, int nodeID) throws Exception
+   public void handleAddAllReplicatedDeliveries(int nodeID, Map deliveries) throws Exception
    {
    	if (trace) { log.trace(this + " handleAddAllReplicatedDeliveries " + nodeID); }
    	
@@ -1295,8 +1346,6 @@
    	
    	try
    	{
-   		log.info("local name map is " + localNameMap);
-   		
    		if (localNameMap == null)
    		{
    			throw new IllegalStateException("Cannot add all replicated deliveries since there are no bindings - probably the queues aren't deployed");
@@ -1305,8 +1354,7 @@
    		if (localNameMap != null)
    		{
    			Iterator iter = deliveries.entrySet().iterator();
-   			log.info("deliveries is " + deliveries);
-   			
+
    			while (iter.hasNext())
    			{
    				Map.Entry entry = (Map.Entry)iter.next();
@@ -1315,8 +1363,7 @@
    				
    				Map ids = (Map)entry.getValue();
    				
-   				log.info("queue;" + queueName + " ids: " + ids.size());
-   				
+		
    				Binding binding = (Binding)localNameMap.get(queueName);
    				
    				if (binding == null)
@@ -1324,9 +1371,7 @@
    					throw new IllegalStateException("Cannot find binding with name " + queueName + " maybe it hasn't been deployed");
    				}
    				
-   				log.info("adding");
    				binding.queue.addAllToRecoveryArea(nodeID, ids);
-   				log.info("added");
    			}   			   			
    		}
    	}
@@ -1546,7 +1591,7 @@
       {
       	replicatedData = new HashMap();
 
-         failoverMap = new HashMap();
+         failoverMap = new ConcurrentHashMap();
 
          leftSet = new ConcurrentHashSet();
       }
@@ -1575,6 +1620,47 @@
    	
    	replyExecutor.shutdownNow();   	
    }
+   
+   private Integer getMasterForFailoverNodeID(long failoverNodeID)
+   {
+   	//reverse lookup of master node id given failover node id
+   	
+   	Iterator iter = failoverMap.entrySet().iterator();
+		
+		Integer nodeID = null;
+		
+		while (iter.hasNext())
+		{
+			Map.Entry entry = (Map.Entry)iter.next();
+			
+			Integer fnodeID = (Integer)entry.getValue();
+			
+			nodeID = (Integer)entry.getKey();
+			
+			if (fnodeID.intValue() == failoverNodeID)
+			{
+				//We are the failover node for another node
+				
+				break;
+			}
+		}
+		
+   	return nodeID;
+   }
+   
+   private Address getFailoverNodeForControlChannelAddress()
+   {
+   	PostOfficeAddressInfo info = (PostOfficeAddressInfo)nodeIDAddressMap.get(new Integer(failoverNodeID));
+   	
+   	if (info == null)
+   	{
+   		return null;
+   	}
+   	
+   	Address address = info.getControlChannelAddress();
+   	
+   	return address;
+   }
 
    
    private void waitForBindUnbind(String queueName, boolean bind) throws Exception
@@ -2651,7 +2737,7 @@
    	}     	
    }
    
-   private void failoverNodeChanged(int oldFailoverNodeID, boolean firstNode) throws Exception
+   private void failoverNodeChanged(int oldFailoverNodeID, boolean firstNode, boolean joined) throws Exception
    {   	   	
    	//The failover node has changed - we need to move our replicated deliveries
    	
@@ -2669,67 +2755,72 @@
 	   		
 	   		ClusterRequest request = new AckAllReplicatedDeliveriesMessage(thisNodeID);
 	   		
-	   		groupMember.unicastControl(request, info.getControlChannelAddress(), true);
+	   		groupMember.unicastControl(request, info.getControlChannelAddress(), false);
 	   		
 	   		if (trace) { log.trace("Sent AckAllReplicatedDeliveriesMessage"); }
 	   	}
    	}
    	
-   	//Now send the deliveries to the new node
+   	//Now send the deliveries to the new node - we only do this if the new failover node came about by
+   	//another node LEAVING, we DON'T do this if the new failover node has just joined - this is because it won't have deployed
+   	//it's queues yet - the new failover node will request its replicated data when it deploys its queues
    	
-   	//We must lock any responses to delivery adds coming in in this period - otherwise we could end up with the same
-   	//message being delivered more than once
-   	
-   	replicateDeliveryLock.writeLock().acquire();
-   	
-   	try
-   	{	   	
-	   	if (localNameMap != null)
-	   	{
-	   		Map deliveries = new HashMap();
-	   		
-				//FIXME - this is ugly
-				//Find a better way of getting the sessions
-	   		//We shouldn't know abou the server peer
-	   		
-	   		if (serverPeer != null)
-	   		{
-					
-					Collection sessions = serverPeer.getSessions();
-					
-					Iterator iter2 = sessions.iterator();
-					
-					while (iter2.hasNext())
-					{
-						ServerSessionEndpoint session = (ServerSessionEndpoint)iter2.next();
+   	if (!joined)
+   	{
+	   	//We must lock any responses to delivery adds coming in in this period - otherwise we could end up with the same
+	   	//message being delivered more than once
+	   	
+	   	replicateDeliveryLock.writeLock().acquire();
+	   	
+	   	try
+	   	{	   	
+		   	if (localNameMap != null)
+		   	{
+		   		Map deliveries = new HashMap();
+		   		
+					//FIXME - this is ugly
+					//Find a better way of getting the sessions
+		   		//We shouldn't know abou the server peer
+		   		
+		   		if (serverPeer != null)
+		   		{
 						
-						session.collectDeliveries(deliveries, firstNode);				
-					}   				  
-					
-					if (!firstNode)
-					{			
-			   		PostOfficeAddressInfo info = (PostOfficeAddressInfo)nodeIDAddressMap.get(new Integer(failoverNodeID));
-			   		
-			   		if (info == null)
-			   		{
-			   			throw new IllegalStateException("Cannot find address for failover node " + failoverNodeID);
-			   		}		   		
+						Collection sessions = serverPeer.getSessions();
 						
-						ClusterRequest request = new AddAllReplicatedDeliveriesMessage(thisNodeID, deliveries);
+						Iterator iter2 = sessions.iterator();
 						
-						//send sync
+						while (iter2.hasNext())
+						{
+							ServerSessionEndpoint session = (ServerSessionEndpoint)iter2.next();
+							
+							session.deliverAnyWaitingDeliveries(null);
+							
+							session.collectDeliveries(deliveries, firstNode, null);				
+						}   				  
 						
-						groupMember.unicastControl(request, info.getControlChannelAddress(), true);
-			   		
-			   		if (trace) { log.trace("Sent AddAllReplicatedDeliveriesMessage"); }
-					}
-	   		}
+						if (!firstNode)
+						{			
+				   		PostOfficeAddressInfo info = (PostOfficeAddressInfo)nodeIDAddressMap.get(new Integer(failoverNodeID));
+				   		
+				   		if (info == null)
+				   		{
+				   			throw new IllegalStateException("Cannot find address for failover node " + failoverNodeID);
+				   		}		   		
+							
+							ClusterRequest request = new AddAllReplicatedDeliveriesMessage(thisNodeID, deliveries);
+							
+							groupMember.unicastControl(request, info.getControlChannelAddress(), false);
+				   		
+				   		if (trace) { log.trace("Sent AddAllReplicatedDeliveriesMessage"); }
+						}
+		   		}
+		   	}
 	   	}
+	   	finally
+	   	{
+	   		replicateDeliveryLock.writeLock().release();
+	   	}   	
    	}
-   	finally
-   	{
-   		replicateDeliveryLock.writeLock().release();
-   	}   	
    }
    
 
@@ -2888,6 +2979,61 @@
 
    // Inner classes --------------------------------------------------------------------------------
    
+   private class SendReplicatedDeliveriesRunnable implements Runnable
+   {
+   	private String queueName;
+   	
+   	private Address address;
+   	
+   	SendReplicatedDeliveriesRunnable(String queueName, Address address)
+   	{
+   		this.queueName = queueName;
+   		
+   		this.address = address;
+   	}
+   	
+   	public void run()
+   	{
+			try
+			{
+      		if (serverPeer != null)
+      		{			
+      			Collection sessions = serverPeer.getSessions();
+      			
+      			Iterator iter = sessions.iterator();
+      			
+      			Map dels = new HashMap();			
+      			
+      			boolean gotSome = false;
+      			
+      			while (iter.hasNext())
+      			{
+      				ServerSessionEndpoint session = (ServerSessionEndpoint)iter.next();
+      				
+      				session.deliverAnyWaitingDeliveries(queueName);
+      				
+      				if (session.collectDeliveries(dels, firstNode, queueName))
+      				{
+      					gotSome = true;
+      				}
+      			}   				  
+      			
+      			if (gotSome)
+      			{
+   	   			ClusterRequest req = new AddAllReplicatedDeliveriesMessage(thisNodeID, dels);
+   	   			
+   	   			groupMember.unicastControl(req, address, false);
+      			}
+      			   			
+      		}
+			}
+			catch (Exception e)
+			{
+				log.error("Failed to collect and send request", e);
+			}
+   	}	
+   }
+   
    private class CastMessageCallback implements TxCallback
    {
    	private Integer nodeID;

Modified: trunk/src/main/org/jboss/messaging/core/impl/postoffice/PutReplicantRequest.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/impl/postoffice/PutReplicantRequest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/messaging/core/impl/postoffice/PutReplicantRequest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -47,7 +47,9 @@
    // Attributes ----------------------------------------------------
 
    private int nodeId;
+   
    private Serializable key;
+   
    private Serializable replicant;
 
    // Constructors --------------------------------------------------

Modified: trunk/src/main/org/jboss/messaging/core/impl/postoffice/ReplicateAckMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/impl/postoffice/ReplicateAckMessage.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/messaging/core/impl/postoffice/ReplicateAckMessage.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -34,28 +34,28 @@
  */
 public class ReplicateAckMessage extends ClusterRequest
 {
+	private int nodeID;
+		
 	private String queueName;
 	
 	private long messageID;
 	
-	private int nodeID;
-	
 	public ReplicateAckMessage()
 	{		
 	}
 	
-	public ReplicateAckMessage(String queueName, long messageID, int nodeID)
+	public ReplicateAckMessage(int nodeID, String queueName, long messageID)
 	{
+		this.nodeID = nodeID;
+		
 		this.queueName = queueName;
 		
-		this.messageID = messageID;
-		
-		this.nodeID = nodeID;
+		this.messageID = messageID;	
 	}
 	
 	Object execute(RequestTarget office) throws Throwable
 	{
-		office.handleReplicateAck(queueName, messageID, nodeID);
+		office.handleReplicateAck(nodeID, queueName, messageID);
 		
 		return null;
 	}
@@ -66,21 +66,21 @@
 	}
 
 	public void read(DataInputStream in) throws Exception
-	{
+	{		
+		nodeID = in.readInt();
+		
 		queueName = in.readUTF();
 		
 		messageID = in.readLong();
-		
-		nodeID = in.readInt();
 	}
 
 	public void write(DataOutputStream out) throws Exception
-	{
+	{		
+		out.writeInt(nodeID);
+		
 		out.writeUTF(queueName);
 		
 		out.writeLong(messageID);
-		
-		out.writeInt(nodeID);
 	}
 
 }

Modified: trunk/src/main/org/jboss/messaging/core/impl/postoffice/ReplicateDeliveryMessage.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/impl/postoffice/ReplicateDeliveryMessage.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/messaging/core/impl/postoffice/ReplicateDeliveryMessage.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -37,6 +37,8 @@
  */
 public class ReplicateDeliveryMessage extends ClusterRequest
 {
+	private int nodeID;
+	
 	private String queueName;
 	
 	private String sessionID;
@@ -45,21 +47,17 @@
 	
 	private long deliveryID;
 	
-	private Address replyAddress;
+	private Address returnAddress;
 	
-	private int nodeID;
-	
-	private static final int NULL = 0;
-	
-	private static final int NOT_NULL = 1;
-	
 	public ReplicateDeliveryMessage()
 	{		
 	}
 	
-	public ReplicateDeliveryMessage(String queueName, String sessionID, long messageID, long deliveryID,
-			                          Address replyAddress, int nodeID)
-	{
+	public ReplicateDeliveryMessage(int nodeID, String queueName, String sessionID, long messageID, long deliveryID,
+			                          Address returnAddress)
+	{		
+		this.nodeID = nodeID;
+		
 		this.queueName = queueName;
 		
 		this.sessionID = sessionID;
@@ -68,16 +66,14 @@
 		
 		this.deliveryID = deliveryID;
 		
-		this.replyAddress = replyAddress;
-		
-		this.nodeID = nodeID;
+		this.returnAddress = returnAddress;
 	}
 		
 	Object execute(RequestTarget office) throws Throwable
 	{		
-		office.handleReplicateDelivery(queueName, sessionID, messageID, deliveryID, replyAddress, nodeID);
+		office.handleReplicateDelivery(nodeID, queueName, sessionID, messageID, deliveryID, returnAddress);
 		
-		return "ok";
+		return null;
 	}
 
 	byte getType()
@@ -86,7 +82,9 @@
 	}
 
 	public void read(DataInputStream in) throws Exception
-	{
+	{		
+		nodeID = in.readInt();
+		
 		queueName = in.readUTF();
 		
 		sessionID = in.readUTF();
@@ -99,16 +97,16 @@
 		
 		if (b != NULL)
 		{
-			replyAddress = new IpAddress();
+			returnAddress = new IpAddress();
 			
-			replyAddress.readFrom(in);
+			returnAddress.readFrom(in);
 		}
-		
-		nodeID = in.readInt();
 	}
 
 	public void write(DataOutputStream out) throws Exception
 	{
+		out.writeInt(nodeID);
+		
 		out.writeUTF(queueName);
 		
 		out.writeUTF(sessionID);
@@ -117,7 +115,7 @@
 		
 		out.writeLong(deliveryID);
 		
-		if (replyAddress == null)
+		if (returnAddress == null)
 		{
 			out.writeByte(NULL);
 		}
@@ -125,15 +123,13 @@
 		{
 			out.writeByte(NOT_NULL);
 			
-			if (!(replyAddress instanceof IpAddress))
+			if (!(returnAddress instanceof IpAddress))
 	      {
 	         throw new IllegalStateException("Address must be IpAddress");
 	      }
 
-	      replyAddress.writeTo(out);
-		}
-		
-		out.writeInt(nodeID);
+	      returnAddress.writeTo(out);
+		}				
 	}
 
 }

Modified: trunk/src/main/org/jboss/messaging/core/impl/postoffice/RequestTarget.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/impl/postoffice/RequestTarget.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/messaging/core/impl/postoffice/RequestTarget.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -56,14 +56,16 @@
    
    //TODO - these don't belong here
    
-   void handleReplicateDelivery(String queueName, String sessionID, long messageID,
-   		                       long deliveryID, Address replyAddress, int nodeID) throws Exception;
+   void handleReplicateDelivery(int nodeID, String queueName, String sessionID, long messageID,
+   		                       long deliveryID, Address replyAddress) throws Exception;
    
-   void handleReplicateAck(String queueName, long messageID, int nodeID) throws Exception;
+   void handleReplicateAck(int nodeID, String queueName, long messageID) throws Exception;
    
    void handleReplicateDeliveryAck(String sessionID, long deliveryID) throws Exception;
    
    void handleAckAllReplicatedDeliveries(int nodeID) throws Exception;
    
-   void handleAddAllReplicatedDeliveries(Map deliveries, int nodeID) throws Exception;
+   void handleAddAllReplicatedDeliveries(int nodeID, Map deliveries) throws Exception;
+   
+   void handleGetReplicatedDeliveries(String queueName, Address returnAddress) throws Exception;
 }

Modified: trunk/src/main/org/jboss/messaging/core/impl/tx/Transaction.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/impl/tx/Transaction.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/messaging/core/impl/tx/Transaction.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -36,7 +36,7 @@
  * A JMS Server local transaction
  * 
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:ovidiu at jboss.com">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * 
  * @version $Revision 1.1$
  *

Modified: trunk/src/main/org/jboss/messaging/core/jmx/MessagingPostOfficeService.java
===================================================================
--- trunk/src/main/org/jboss/messaging/core/jmx/MessagingPostOfficeService.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/messaging/core/jmx/MessagingPostOfficeService.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -54,7 +54,7 @@
  * MBean wrapper for a messaging post office
  *
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision: 2684 $</tt>
  *
  * $Id: ClusteredPostOfficeService.java 2684 2007-05-15 07:31:30Z timfox $

Modified: trunk/src/main/org/jboss/messaging/util/JDBCUtil.java
===================================================================
--- trunk/src/main/org/jboss/messaging/util/JDBCUtil.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/messaging/util/JDBCUtil.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -22,7 +22,7 @@
 package org.jboss.messaging.util;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a> 
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a> 
  * @version <tt>$Revision$</tt>
  * $Id$
  */

Modified: trunk/src/main/org/jboss/messaging/util/JNDIUtil.java
===================================================================
--- trunk/src/main/org/jboss/messaging/util/JNDIUtil.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/messaging/util/JNDIUtil.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -30,7 +30,7 @@
 import javax.naming.NamingException;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/src/main/org/jboss/messaging/util/NotYetImplementedException.java
===================================================================
--- trunk/src/main/org/jboss/messaging/util/NotYetImplementedException.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/messaging/util/NotYetImplementedException.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -22,7 +22,7 @@
 package org.jboss.messaging.util;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/src/main/org/jboss/messaging/util/Util.java
===================================================================
--- trunk/src/main/org/jboss/messaging/util/Util.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/messaging/util/Util.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -35,7 +35,7 @@
 import org.xml.sax.InputSource;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/src/main/org/jboss/messaging/util/Version.java
===================================================================
--- trunk/src/main/org/jboss/messaging/util/Version.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/messaging/util/Version.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -15,7 +15,7 @@
 import org.jboss.logging.Logger;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @version <tt>$Revision$</tt>
  *

Modified: trunk/src/main/org/jboss/messaging/util/XMLUtil.java
===================================================================
--- trunk/src/main/org/jboss/messaging/util/XMLUtil.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/src/main/org/jboss/messaging/util/XMLUtil.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -26,7 +26,7 @@
 import org.xml.sax.InputSource;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  * $Id$
  */

Modified: trunk/tests/src/org/jboss/test/messaging/MessagingTestCase.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/MessagingTestCase.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/MessagingTestCase.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -48,7 +48,7 @@
  * The base case for messaging tests.
  *
  * @author <a href="mailto:adrian at jboss.org">Adrian Brock</a>
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.org">Tim Fox</a>
  * @author <a href="mailto:juha at jboss.org">Juha Lindfors</a>
  *

Modified: trunk/tests/src/org/jboss/test/messaging/core/BrokenReceiver.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/BrokenReceiver.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/core/BrokenReceiver.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -36,7 +36,7 @@
 /**
  * A simple Receiver that "breaks" after the
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @version <tt>$Revision$</tt>
  *

Modified: trunk/tests/src/org/jboss/test/messaging/core/JDBCUtilTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/JDBCUtilTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/core/JDBCUtilTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -26,7 +26,7 @@
 
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  */
 public class JDBCUtilTest extends MessagingTestCase

Modified: trunk/tests/src/org/jboss/test/messaging/core/MessageStoreTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/MessageStoreTestBase.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/core/MessageStoreTestBase.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -47,7 +47,7 @@
  * 3. One or more strong references may be maintain for the same MessageReference.
  * 4. A recoverable message store may be forcibly crashed and tested if it recovers.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @version <tt>$Revision$</tt>
  *

Modified: trunk/tests/src/org/jboss/test/messaging/core/MessagingQueueTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/MessagingQueueTestBase.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/core/MessagingQueueTestBase.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -64,7 +64,7 @@
  *
  * This test base also tests the Distributor interface.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @version <tt>$Revision: 1019 $</tt>
  *

Modified: trunk/tests/src/org/jboss/test/messaging/core/NonRecoverableMessagingQueueTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/NonRecoverableMessagingQueueTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/core/NonRecoverableMessagingQueueTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -24,7 +24,7 @@
 import org.jboss.messaging.core.impl.MessagingQueue;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @version <tt>$Revision: 2386 $</tt>
  *

Modified: trunk/tests/src/org/jboss/test/messaging/core/PostOfficeTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/PostOfficeTestBase.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/core/PostOfficeTestBase.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -53,7 +53,7 @@
  * A PostOfficeTestBase
  *
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/messaging/core/RecoverableMessagingQueueTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/RecoverableMessagingQueueTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/core/RecoverableMessagingQueueTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -24,7 +24,7 @@
 import org.jboss.messaging.core.impl.MessagingQueue;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @version <tt>$Revision: 1019 $</tt>
  *

Modified: trunk/tests/src/org/jboss/test/messaging/core/RoundRobinDistributorTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/RoundRobinDistributorTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/core/RoundRobinDistributorTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -37,7 +37,7 @@
 
 /**
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision: 1 $</tt>
  * $Id: $
  */

Modified: trunk/tests/src/org/jboss/test/messaging/core/SimpleChannel.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/SimpleChannel.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/core/SimpleChannel.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -24,7 +24,7 @@
 /**
  * A test Channel implementation.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @version <tt>$Revision$</tt>
  *

Modified: trunk/tests/src/org/jboss/test/messaging/core/SimpleDeliveryObserver.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/SimpleDeliveryObserver.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/core/SimpleDeliveryObserver.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -27,7 +27,7 @@
 import org.jboss.logging.Logger;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  * $Id$
  */

Modified: trunk/tests/src/org/jboss/test/messaging/core/SimpleMessageStoreTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/SimpleMessageStoreTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/core/SimpleMessageStoreTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -25,7 +25,7 @@
 import org.jboss.messaging.core.impl.message.SimpleMessageStore;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @version <tt>$Revision: 731 $</tt>
  *

Modified: trunk/tests/src/org/jboss/test/messaging/core/SimpleReceiver.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/SimpleReceiver.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/core/SimpleReceiver.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -42,7 +42,7 @@
  * testing. The receiver can be configured to immediately return a "done" delivery (ACKING),
  * an "active" delivery (NACKING) undelivered, or throw unchecked exceptions.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @version <tt>$Revision$</tt>
  *

Modified: trunk/tests/src/org/jboss/test/messaging/core/message/CoreMessageTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/message/CoreMessageTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/core/message/CoreMessageTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -25,7 +25,7 @@
 
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/messaging/core/message/JBossMessageTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/message/JBossMessageTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/core/message/JBossMessageTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -27,7 +27,7 @@
 
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/messaging/core/message/MessageSupportTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/message/MessageSupportTestBase.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/core/message/MessageSupportTestBase.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -26,7 +26,7 @@
 
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision: 2202 $</tt>
  *
  * $Id: RoutableSupportTestBase.java 2202 2007-02-08 10:50:26Z timfox $

Modified: trunk/tests/src/org/jboss/test/messaging/core/paging/PagingTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/paging/PagingTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/core/paging/PagingTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -33,7 +33,7 @@
 
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/messaging/core/postoffice/ClusteredPersistenceServiceConfigFileJChannelFactory.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/core/postoffice/ClusteredPersistenceServiceConfigFileJChannelFactory.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/core/postoffice/ClusteredPersistenceServiceConfigFileJChannelFactory.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -24,7 +24,7 @@
  * Messaging-style clustered persistence service configuration file (usually shipped with a
  * Messaging installation). The idea is to test with priority whatever we ship.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/messaging/jms/AOPStackInitializationTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/AOPStackInitializationTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/jms/AOPStackInitializationTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -16,7 +16,7 @@
 /**
  * Tests the very first server invocation, when the client-side AOP stack is initialized.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision: 1843 $</tt>
  *
  * $Id: JMSTest.java 1843 2006-12-21 23:41:19Z timfox $

Modified: trunk/tests/src/org/jboss/test/messaging/jms/BrowserTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/BrowserTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/jms/BrowserTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -43,7 +43,7 @@
 
 /**
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/messaging/jms/CTSMiscellaneousTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/CTSMiscellaneousTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/jms/CTSMiscellaneousTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -51,7 +51,7 @@
 /**
  * Safeguards for previously detected TCK failures.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/messaging/jms/ClientExitTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/ClientExitTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/jms/ClientExitTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -45,7 +45,7 @@
  * This is not technically a crash test, but it uses the same type of topology as the crash tests
  * (local server, remote VM client).
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version 1.1
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/messaging/jms/ClientInRestrictedSecurityEnvironmentTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/ClientInRestrictedSecurityEnvironmentTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/jms/ClientInRestrictedSecurityEnvironmentTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -41,7 +41,7 @@
  * This test runs the JMS client in a restricted security environments.
  *
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision: 1.1 $</tt>
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/messaging/jms/ConnectionClosedTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/ConnectionClosedTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/jms/ConnectionClosedTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -44,7 +44,7 @@
 /**
  * All tests related to closing a Connection.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @version <tt>$Revision$</tt>
  *

Modified: trunk/tests/src/org/jboss/test/messaging/jms/ConnectionFactoryTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/ConnectionFactoryTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/jms/ConnectionFactoryTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -40,7 +40,7 @@
 import org.jboss.test.messaging.tools.jmx.ServiceContainer;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @version <tt>$Revision$</tt>
  *

Modified: trunk/tests/src/org/jboss/test/messaging/jms/ConnectionTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/ConnectionTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/jms/ConnectionTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -52,7 +52,7 @@
  * Connection tests. Contains all connection tests, except tests relating to closing a connection,
  * which go to ConnectionClosedTest.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @version <tt>$Revision$</tt>
  *

Modified: trunk/tests/src/org/jboss/test/messaging/jms/ConsumerClosedTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/ConsumerClosedTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/jms/ConsumerClosedTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -19,7 +19,7 @@
 import javax.management.ObjectName;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/messaging/jms/DurableSubscriptionTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/DurableSubscriptionTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/jms/DurableSubscriptionTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -50,7 +50,7 @@
  * Tests focused on durable subscription behavior. More durable subscription tests can be found in
  * MessageConsumerTest.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  *
  * $Id: DurableSubscriberTest.java 1319 2006-09-19 17:17:53Z ovidiu.feodorov at jboss.com $

Modified: trunk/tests/src/org/jboss/test/messaging/jms/GracefulClient.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/GracefulClient.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/jms/GracefulClient.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -33,7 +33,7 @@
 /**
  * Code to be run in an external VM, via main().
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/messaging/jms/HTTPTransportTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/HTTPTransportTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/jms/HTTPTransportTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -24,7 +24,7 @@
  * This class contain tests that only make sense for a HTTP transport. They will be ignored for
  * any other kind of transport.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  * $Id$
  */

Modified: trunk/tests/src/org/jboss/test/messaging/jms/JCAWrapperTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/JCAWrapperTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/jms/JCAWrapperTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -37,7 +37,7 @@
 import org.jboss.tm.TransactionManagerLocator;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  *
  * $Id: JCAWrapperTest.java 1019 2006-07-17 17:15:04Z timfox $
  */

Modified: trunk/tests/src/org/jboss/test/messaging/jms/JMSTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/JMSTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/jms/JMSTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -42,7 +42,7 @@
 /**
  * The most comprehensive, yet simple, unit test.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/messaging/jms/JMSTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/JMSTestBase.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/jms/JMSTestBase.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -35,7 +35,7 @@
 import javax.naming.InitialContext;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/messaging/jms/MessageConsumerTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/MessageConsumerTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/jms/MessageConsumerTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -55,7 +55,7 @@
 import EDU.oswego.cs.dl.util.concurrent.SynchronizedInt;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @author <a href="mailto:clebert.suconic at jboss.com">Clebert Suconic</a>
  * @version <tt>$Revision$</tt>

Modified: trunk/tests/src/org/jboss/test/messaging/jms/MessageProducerTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/MessageProducerTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/jms/MessageProducerTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -37,7 +37,7 @@
 import org.jboss.test.messaging.tools.ServerManagement;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @version <tt>$Revision$</tt>
  *

Modified: trunk/tests/src/org/jboss/test/messaging/jms/MiscellaneousTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/MiscellaneousTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/jms/MiscellaneousTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -43,7 +43,7 @@
 /**
  * Various use cases, added here while trying things or fixing forum issues.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/messaging/jms/NonDurableSubscriberTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/NonDurableSubscriberTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/jms/NonDurableSubscriberTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -34,7 +34,7 @@
 /**
  * Non-durable subscriber tests.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  *
  * $Id$
  */

Modified: trunk/tests/src/org/jboss/test/messaging/jms/QueueTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/QueueTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/jms/QueueTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -39,7 +39,7 @@
 import org.jboss.test.messaging.tools.ServerManagement;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/messaging/jms/RemotingConnectionConfigurationTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/RemotingConnectionConfigurationTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/jms/RemotingConnectionConfigurationTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -45,7 +45,7 @@
 /**
  *  
  * @author <a href="ron.sigal at jboss.com">Ron Sigal</a>
- * @author <a href="ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="ovidiu at feodorov.com">Ovidiu Feodorov</a>
  *
  * $Id$
  */

Modified: trunk/tests/src/org/jboss/test/messaging/jms/SecurityTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/SecurityTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/jms/SecurityTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -46,7 +46,7 @@
  * This test must be run with the Test security config. on the server
  * 
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * 
  * Much of the basic idea of the tests come from SecurityUnitTestCase.java in JBossMQ by:
  * @author <a href="pra at tim.se">Peter Antman</a>

Modified: trunk/tests/src/org/jboss/test/messaging/jms/SessionTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/SessionTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/jms/SessionTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -50,7 +50,7 @@
 
 /**
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/messaging/jms/TemporaryDestinationTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/TemporaryDestinationTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/jms/TemporaryDestinationTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -40,7 +40,7 @@
 
 /**
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/messaging/jms/TopicTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/TopicTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/jms/TopicTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -41,7 +41,7 @@
 import org.jboss.test.messaging.tools.ServerManagement;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/messaging/jms/clustering/ChangeFailoverNodeTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/clustering/ChangeFailoverNodeTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/jms/clustering/ChangeFailoverNodeTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -88,26 +88,168 @@
    {
    	this.addNodeToGetNewFailoverNode(false);
    }
+
+   public void testAddNodeToGetNewFailoverNodeTransactional() throws Exception
+   {
+   	this.addNodeToGetNewFailoverNode(true);
+   }
    
-   public void testkillTwoFailoverNodesNonTransactional() throws Exception
+   public void testKillTwoFailoverNodesNonTransactional() throws Exception
    {
    	this.killTwoFailoverNodes(false);
    }
    
-   public void testkillTwoFailoverNodesTransactional() throws Exception
+   public void testKillTwoFailoverNodesTransactional() throws Exception
    {
    	this.killTwoFailoverNodes(true);
    }
    
-   public void testKillAllTooOneAndBackAgainNonTransactional() throws Exception
+   public void testKillAllToOneAndBackAgainNonTransactional() throws Exception
    {
-   	this.killAllTooOneAndBackAgain(false);
+   	this.killAllToOneAndBackAgain(false);
    }
    
-   public void testKillAllTooOneAndBackAgainTransactional() throws Exception
+   public void testKillAllToOneAndBackAgainTransactional() throws Exception
    {
-   	this.killAllTooOneAndBackAgain(true);
+   	this.killAllToOneAndBackAgain(true);
    }
+   
+   public void testFailoverToNodeWithNoQueueDeployed() throws Exception
+   {
+   	JBossConnectionFactory factory = (JBossConnectionFactory) ic[0].lookup("/ClusteredConnectionFactory");
+
+      Connection conn3 = createConnectionOnServer(factory, 3);
+ 
+      try
+      {
+      	SimpleFailoverListener failoverListener = new SimpleFailoverListener();
+         ((JBossConnection)conn3).registerFailoverListener(failoverListener);
+      	
+         Session sessSend = conn3.createSession(false, Session.AUTO_ACKNOWLEDGE);
+      		
+      	MessageProducer prod2 = sessSend.createProducer(queue[2]);
+      	
+      	final int numMessages = 10;
+      	
+      	for (int i = 0; i < numMessages; i++)
+      	{
+      		TextMessage tm = sessSend.createTextMessage("message" + i);
+      		
+      		prod2.send(tm);      		
+      	}
+      	
+      	Session sess3 = conn3.createSession(false, Session.CLIENT_ACKNOWLEDGE);
+      	
+      	MessageConsumer cons3 = sess3.createConsumer(queue[3]);
+            	
+      	conn3.start();
+      	
+      	TextMessage tm = null;
+      	
+      	for (int i = 0; i < numMessages; i++)
+      	{
+      		tm = (TextMessage)cons3.receive(2000);
+      		
+      		assertNotNull(tm);
+      		
+      		assertEquals("message" + i, tm.getText());
+      	}
+      	
+      	//Don't ack
+      	
+      	int failoverNodeId = this.getFailoverNodeForNode(factory, 3);
+      	
+      	log.info("Failover node for node 3 is " + failoverNodeId);
+      	
+      	dumpFailoverMap(ServerManagement.getServer(3).getFailoverMap());
+      	
+      	//We now add a new node - this should cause the failover node to change
+      	
+         ServerManagement.start(4, "all", false);
+         
+         //DO NOT deploy the queue on it
+         
+         Thread.sleep(5000);
+         
+         dumpFailoverMap(ServerManagement.getServer(3).getFailoverMap());
+      	
+         int newFailoverNodeId = this.getFailoverNodeForNode(factory, 3);
+         
+         log.info("New failover node is " + newFailoverNodeId);
+         
+         assertTrue(failoverNodeId != newFailoverNodeId);
+         
+         //Now kill the node
+      	
+         // The queue does not exist on the new node so it tests the case where queue merging DOES NOT occur
+         
+         ServerManagement.kill(3);
+
+         log.info("########");
+         log.info("######## KILLED NODE 3");
+         log.info("########");
+
+         // wait for the client-side failover to complete
+
+         log.info("Waiting for failover to complete");
+         
+         while(true)
+         {
+            FailoverEvent event = failoverListener.getEvent(120000);
+            if (event != null && FailoverEvent.FAILOVER_COMPLETED == event.getType())
+            {
+               break;
+            }
+            if (event == null)
+            {
+               fail("Did not get expected FAILOVER_COMPLETED event");
+            }
+         }
+         
+         log.info("Failover completed");
+         
+         assertEquals(newFailoverNodeId, getServerId(conn3));
+                  
+         //Now ack
+         
+         tm.acknowledge();
+         
+         
+         log.info("acked");
+         
+         sess3.close();
+         
+         log.info("closed");
+         
+	      sess3 = conn3.createSession(false, Session.AUTO_ACKNOWLEDGE);
+	      
+	      log.info("created new session");
+      	
+      	cons3 = sess3.createConsumer(queue[3]);
+      	
+      	log.info("Created consumer");
+      	
+         //Messages should be gone
+      	
+         tm = (TextMessage)cons3.receive(5000);
+      		
+      	assertNull(tm);      		
+      }
+      finally
+      {
+         if (conn3 != null)
+         {
+            conn3.close();
+         }
+         
+         try
+         {
+         	ServerManagement.stop(4);
+         }
+         catch (Exception e)
+         {}
+      }
+   }
   
    
    // Package protected ---------------------------------------------
@@ -130,7 +272,7 @@
    
    // Private -------------------------------------------------------
 
-   private void killAllTooOneAndBackAgain(boolean transactional) throws Exception
+   private void killAllToOneAndBackAgain(boolean transactional) throws Exception
    {
    	JBossConnectionFactory factory = (JBossConnectionFactory) ic[0].lookup("/ClusteredConnectionFactory");
 
@@ -154,6 +296,8 @@
       		prod0.send(tm);      		
       	}
       	
+      	sessSend.close();
+      	
       	Session sess0 = conn0.createSession(transactional, transactional ? Session.SESSION_TRANSACTED : Session.CLIENT_ACKNOWLEDGE);
       	
       	MessageConsumer cons0 = sess0.createConsumer(queue[0]);
@@ -178,6 +322,13 @@
       	
       	log.info("Failover node for node 0 is " + failoverNodeId);
       	
+      	int recoveryMapSize = ServerManagement.getServer(failoverNodeId).getRecoveryMapSize(queue[failoverNodeId].getQueueName());
+      	assertEquals(0, recoveryMapSize);
+      	Map recoveryArea = ServerManagement.getServer(failoverNodeId).getRecoveryArea(queue[failoverNodeId].getQueueName());
+      	Map ids = (Map)recoveryArea.get(new Integer(0));
+      	assertNotNull(ids);
+      	assertEquals(numMessages, ids.size());
+      	
       	//Now kill the failover node
       	
       	log.info("killing node " + failoverNodeId);
@@ -187,6 +338,13 @@
       	
       	int newFailoverNodeId = this.getFailoverNodeForNode(factory, 0);      	    
       	
+      	recoveryMapSize = ServerManagement.getServer(newFailoverNodeId).getRecoveryMapSize(queue[newFailoverNodeId].getQueueName());
+      	assertEquals(0, recoveryMapSize);
+      	recoveryArea = ServerManagement.getServer(newFailoverNodeId).getRecoveryArea(queue[newFailoverNodeId].getQueueName());
+      	ids = (Map)recoveryArea.get(new Integer(0));
+      	assertNotNull(ids);
+      	assertEquals(numMessages, ids.size());
+      	
       	//Now kill the second failover node
       	
       	log.info("killing node " + newFailoverNodeId);
@@ -196,6 +354,13 @@
       	
       	int evennewerFailoverNodeId = this.getFailoverNodeForNode(factory, 0);
       	
+      	recoveryMapSize = ServerManagement.getServer(evennewerFailoverNodeId).getRecoveryMapSize(queue[evennewerFailoverNodeId].getQueueName());
+      	assertEquals(0, recoveryMapSize);
+      	recoveryArea = ServerManagement.getServer(evennewerFailoverNodeId).getRecoveryArea(queue[evennewerFailoverNodeId].getQueueName());
+      	ids = (Map)recoveryArea.get(new Integer(0));
+      	assertNotNull(ids);
+      	assertEquals(numMessages, ids.size());
+      	
       	//Now kill the third failover node
       	
       	log.info("killing node " + evennewerFailoverNodeId);
@@ -203,12 +368,31 @@
       	
       	//This just leaves the current node
       	
+      	Thread.sleep(5000);
+      	
+      	int evenevennewerFailoverNodeId = this.getFailoverNodeForNode(factory, 0);
+      	
+      	assertEquals(0, evenevennewerFailoverNodeId);
+      	
       	//Add a node
       	
       	ServerManagement.start(1, "all", false);
       	
+      	ServerManagement.deployQueue("testDistributedQueue", 1);
+      	
+      	Thread.sleep(5000);
+      	
       	log.info("started node 1");
       	
+      	int evenevenevennewerFailoverNodeId = this.getFailoverNodeForNode(factory, 0);
+      	
+      	recoveryMapSize = ServerManagement.getServer(evenevenevennewerFailoverNodeId).getRecoveryMapSize(queue[evenevenevennewerFailoverNodeId].getQueueName());
+      	assertEquals(0, recoveryMapSize);
+      	recoveryArea = ServerManagement.getServer(evenevenevennewerFailoverNodeId).getRecoveryArea(queue[evenevenevennewerFailoverNodeId].getQueueName());
+      	ids = (Map)recoveryArea.get(new Integer(0));
+      	assertNotNull(ids);
+      	assertEquals(numMessages, ids.size());
+      	
          //Now kill the node itself
       	
       	ServerManagement.kill(0);
@@ -236,7 +420,8 @@
          
          log.info("Failover completed");
          
-         assertEquals(1, getServerId(conn0));
+         assertEquals(evenevenevennewerFailoverNodeId, getServerId(conn0));
+         
                             
          //Now ack
          if (transactional)
@@ -267,6 +452,12 @@
       	tm = (TextMessage)cons0.receive(5000);
       	
       	assertNull(tm); 	
+      	
+         recoveryMapSize = ServerManagement.getServer(evenevenevennewerFailoverNodeId).getRecoveryMapSize(queue[evenevenevennewerFailoverNodeId].getQueueName());
+      	assertEquals(0, recoveryMapSize);
+      	recoveryArea = ServerManagement.getServer(evenevenevennewerFailoverNodeId).getRecoveryArea(queue[evenevenevennewerFailoverNodeId].getQueueName());
+      	ids = (Map)recoveryArea.get(new Integer(0));
+      	assertNull(ids);
       }
       finally
       {
@@ -305,8 +496,7 @@
       	Session sess0 = conn0.createSession(transactional, transactional ? Session.SESSION_TRANSACTED : Session.CLIENT_ACKNOWLEDGE);
       	
       	MessageConsumer cons0 = sess0.createConsumer(queue[0]);
-      
-      	
+            	
       	conn0.start();
       	
       	TextMessage tm = null;
@@ -346,7 +536,7 @@
       	
       	log.info("New Failover node for node 0 is " + newFailoverNodeId);
       	
-      	recoveryMapSize = ServerManagement.getServer(failoverNodeId).getRecoveryMapSize(queue[failoverNodeId].getQueueName());
+      	recoveryMapSize = ServerManagement.getServer(newFailoverNodeId).getRecoveryMapSize(queue[newFailoverNodeId].getQueueName());
       	assertEquals(0, recoveryMapSize);
       	recoveryArea = ServerManagement.getServer(newFailoverNodeId).getRecoveryArea(queue[newFailoverNodeId].getQueueName());
       	ids = (Map)recoveryArea.get(new Integer(0));
@@ -362,7 +552,7 @@
       	
       	int evennewerFailoverNodeId = this.getFailoverNodeForNode(factory, 0);
       	
-      	recoveryMapSize = ServerManagement.getServer(failoverNodeId).getRecoveryMapSize(queue[failoverNodeId].getQueueName());
+      	recoveryMapSize = ServerManagement.getServer(evennewerFailoverNodeId).getRecoveryMapSize(queue[evennewerFailoverNodeId].getQueueName());
       	assertEquals(0, recoveryMapSize);
       	recoveryArea = ServerManagement.getServer(evennewerFailoverNodeId).getRecoveryArea(queue[evennewerFailoverNodeId].getQueueName());
       	ids = (Map)recoveryArea.get(new Integer(0));
@@ -400,14 +590,12 @@
          
          assertEquals(evennewerFailoverNodeId, getServerId(conn0));
          
-         recoveryMapSize = ServerManagement.getServer(failoverNodeId).getRecoveryMapSize(queue[failoverNodeId].getQueueName());
+         recoveryMapSize = ServerManagement.getServer(evennewerFailoverNodeId).getRecoveryMapSize(queue[evennewerFailoverNodeId].getQueueName());
       	assertEquals(0, recoveryMapSize);
       	recoveryArea = ServerManagement.getServer(evennewerFailoverNodeId).getRecoveryArea(queue[evennewerFailoverNodeId].getQueueName());
-      	ids = (Map)recoveryArea.get(new Integer(3));
+      	ids = (Map)recoveryArea.get(new Integer(0));
       	assertNull(ids);
-                           
-         
-                  
+                                                      
          //Now ack
          if (transactional)
          {
@@ -528,7 +716,11 @@
       	
          int newFailoverNodeId = this.getFailoverNodeForNode(factory, 3);
          
-         recoveryMapSize = ServerManagement.getServer(failoverNodeId).getRecoveryMapSize(queue[failoverNodeId].getQueueName());
+         assertTrue(failoverNodeId != newFailoverNodeId);
+         
+         log.info("New failover node is " + newFailoverNodeId);
+         
+         recoveryMapSize = ServerManagement.getServer(newFailoverNodeId).getRecoveryMapSize(queue[3].getQueueName());
       	assertEquals(0, recoveryMapSize);
       	recoveryArea = ServerManagement.getServer(newFailoverNodeId).getRecoveryArea(queue[3].getQueueName());
       	ids = (Map)recoveryArea.get(new Integer(3));
@@ -536,10 +728,7 @@
       	assertEquals(numMessages, ids.size());
          
          
-         log.info("New failover node is " + newFailoverNodeId);
          
-         assertTrue(failoverNodeId != newFailoverNodeId);
-         
          //Now kill the node
       	
       	ServerManagement.kill(3);
@@ -569,13 +758,11 @@
          
          assertEquals(newFailoverNodeId, getServerId(conn3));
          
-         recoveryMapSize = ServerManagement.getServer(failoverNodeId).getRecoveryMapSize(queue[failoverNodeId].getQueueName());
+         recoveryMapSize = ServerManagement.getServer(failoverNodeId).getRecoveryMapSize(queue[3].getQueueName());
       	assertEquals(0, recoveryMapSize);
       	recoveryArea = ServerManagement.getServer(newFailoverNodeId).getRecoveryArea(queue[3].getQueueName());
       	ids = (Map)recoveryArea.get(new Integer(3));
-      	assertNull(ids);
-                           
-         
+      	assertNull(ids);                                    
                   
          //Now ack
          if (transactional)
@@ -623,144 +810,8 @@
       }
    }
    
-   public void testFailoverToNodeWithNoQueueDeployed() throws Exception
-   {
-   	JBossConnectionFactory factory = (JBossConnectionFactory) ic[0].lookup("/ClusteredConnectionFactory");
-
-      Connection conn3 = createConnectionOnServer(factory, 3);
- 
-      try
-      {
-      	SimpleFailoverListener failoverListener = new SimpleFailoverListener();
-         ((JBossConnection)conn3).registerFailoverListener(failoverListener);
-      	
-         Session sessSend = conn3.createSession(false, Session.AUTO_ACKNOWLEDGE);
-      		
-      	MessageProducer prod2 = sessSend.createProducer(queue[2]);
-      	
-      	final int numMessages = 10;
-      	
-      	for (int i = 0; i < numMessages; i++)
-      	{
-      		TextMessage tm = sessSend.createTextMessage("message" + i);
-      		
-      		prod2.send(tm);      		
-      	}
-      	
-      	Session sess3 = conn3.createSession(false, Session.CLIENT_ACKNOWLEDGE);
-      	
-      	MessageConsumer cons3 = sess3.createConsumer(queue[3]);
-      
-      	
-      	conn3.start();
-      	
-      	TextMessage tm = null;
-      	
-      	for (int i = 0; i < numMessages; i++)
-      	{
-      		tm = (TextMessage)cons3.receive(2000);
-      		
-      		assertNotNull(tm);
-      		
-      		assertEquals("message" + i, tm.getText());
-      	}
-      	
-      	//Don't ack
-      	
-      	int failoverNodeId = this.getFailoverNodeForNode(factory, 3);
-      	
-      	log.info("Failover node for node 3 is " + failoverNodeId);
-      	
-      	dumpFailoverMap(ServerManagement.getServer(3).getFailoverMap());
-      	
-      	//We now add a new node - this should cause the failover node to change
-      	
-         ServerManagement.start(4, "all", false);
-         
-         //DO NOT deploy the queue on it
-         
-         Thread.sleep(5000);
-         
-         dumpFailoverMap(ServerManagement.getServer(3).getFailoverMap());
-      	
-         int newFailoverNodeId = this.getFailoverNodeForNode(factory, 3);
-         
-         log.info("New failover node is " + newFailoverNodeId);
-         
-         assertTrue(failoverNodeId != newFailoverNodeId);
-         
-         //Now kill the node
-      	
-         // The queue does not exist on the new node so it tests the case where queue merging DOES NOT occur
-         
-         ServerManagement.kill(3);
-
-         log.info("########");
-         log.info("######## KILLED NODE 3");
-         log.info("########");
-
-         // wait for the client-side failover to complete
-
-         log.info("Waiting for failover to complete");
-         
-         while(true)
-         {
-            FailoverEvent event = failoverListener.getEvent(120000);
-            if (event != null && FailoverEvent.FAILOVER_COMPLETED == event.getType())
-            {
-               break;
-            }
-            if (event == null)
-            {
-               fail("Did not get expected FAILOVER_COMPLETED event");
-            }
-         }
-         
-         log.info("Failover completed");
-         
-         assertEquals(newFailoverNodeId, getServerId(conn3));
-                  
-         //Now ack
-         
-         tm.acknowledge();
-         
-         
-         log.info("acked");
-         
-         sess3.close();
-         
-         log.info("closed");
-         
-	      sess3 = conn3.createSession(false, Session.AUTO_ACKNOWLEDGE);
-	      
-	      log.info("created new session");
-      	
-      	cons3 = sess3.createConsumer(queue[3]);
-      	
-      	log.info("Created consumer");
-      	
-         //Messages should be gone
-      	
-         tm = (TextMessage)cons3.receive(5000);
-      		
-      	assertNull(tm);      		
-      }
-      finally
-      {
-         if (conn3 != null)
-         {
-            conn3.close();
-         }
-         
-         try
-         {
-         	ServerManagement.stop(4);
-         }
-         catch (Exception e)
-         {}
-      }
-   }
    
+   
    private void dumpFailoverMap(Map map)
    {
    	Iterator iter = map.entrySet().iterator();
@@ -949,15 +1000,31 @@
       	
       	//Don't ack
       	
-      	//We kill the failover node for node 1
+      	//We stop the failover node for node 1
       	int failoverNodeId = this.getFailoverNodeForNode(factory, 1);
       	
+      	int recoveryMapSize = ServerManagement.getServer(failoverNodeId).getRecoveryMapSize(queue[failoverNodeId].getQueueName());
+      	assertEquals(0, recoveryMapSize);
+      	Map recoveryArea = ServerManagement.getServer(failoverNodeId).getRecoveryArea(queue[failoverNodeId].getQueueName());
+      	Map ids = (Map)recoveryArea.get(new Integer(1));
+      	assertNotNull(ids);
+      	assertEquals(numMessages, ids.size());
+      	
       	log.info("Killing failover node:" + failoverNodeId);
       	
       	ServerManagement.stop(failoverNodeId);
       	
       	log.info("Killed failover node");
       	
+      	int newfailoverNode = this.getFailoverNodeForNode(factory, 1);
+      	
+      	recoveryMapSize = ServerManagement.getServer(newfailoverNode).getRecoveryMapSize(queue[newfailoverNode].getQueueName());
+      	assertEquals(0, recoveryMapSize);
+      	recoveryArea = ServerManagement.getServer(newfailoverNode).getRecoveryArea(queue[newfailoverNode].getQueueName());
+      	ids = (Map)recoveryArea.get(new Integer(1));
+      	assertNotNull(ids);
+      	assertEquals(numMessages, ids.size());
+      	
       	Thread.sleep(5000);
       	
       	//Now kill node 1
@@ -991,7 +1058,14 @@
          
          log.info("Failover completed");
          
-         assertEquals(failoverNodeId, getServerId(conn1));
+         assertEquals(newfailoverNode, getServerId(conn1));
+         
+         recoveryMapSize = ServerManagement.getServer(newfailoverNode).getRecoveryMapSize(queue[newfailoverNode].getQueueName());
+      	assertEquals(0, recoveryMapSize);
+      	recoveryArea = ServerManagement.getServer(newfailoverNode).getRecoveryArea(queue[newfailoverNode].getQueueName());
+      	ids = (Map)recoveryArea.get(new Integer(1));
+      	assertNull(ids);
+
                   
          //Now ack
          if (transactional)

Modified: trunk/tests/src/org/jboss/test/messaging/jms/clustering/ClusterEventNotificationListener.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/clustering/ClusterEventNotificationListener.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/jms/clustering/ClusterEventNotificationListener.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -15,7 +15,7 @@
 import EDU.oswego.cs.dl.util.concurrent.Slot;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  * $Id$
  */

Modified: trunk/tests/src/org/jboss/test/messaging/jms/clustering/ClusteringTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/clustering/ClusteringTestBase.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/jms/clustering/ClusteringTestBase.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -48,7 +48,7 @@
 /**
  * @author <a href="mailto:tim.fox at jboss.org">Tim Fox</a>
  * @author <a href="mailto:clebert.suconic at jboss.org">Clebert Suconic</a>
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  * $Id$
  */

Deleted: trunk/tests/src/org/jboss/test/messaging/jms/clustering/DistributedQueueTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/clustering/DistributedQueueTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/jms/clustering/DistributedQueueTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -1,1190 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2005, JBoss Inc., and individual contributors as indicated
- * by the @authors tag. See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.jboss.test.messaging.jms.clustering;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import javax.jms.Connection;
-import javax.jms.DeliveryMode;
-import javax.jms.Message;
-import javax.jms.MessageConsumer;
-import javax.jms.MessageProducer;
-import javax.jms.Queue;
-import javax.jms.Session;
-import javax.jms.TextMessage;
-
-import org.jboss.jms.client.JBossConnectionFactory;
-import org.jboss.test.messaging.tools.ServerManagement;
-
-
-/**
- * 
- * A DistributedQueueTest
- * 
- * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @version <tt>$Revision: 2796 $</tt>
- *
- * $Id: DistributedDestinationsTest.java 2796 2007-06-25 22:24:41Z timfox $
- *
- */
-public class DistributedQueueTest extends ClusteringTestBase
-{
-
-   // Constants -----------------------------------------------------
-
-   // Static --------------------------------------------------------
-
-   // Attributes ----------------------------------------------------
-
-   // Constructors --------------------------------------------------
-
-   public DistributedQueueTest(String name)
-   {
-      super(name);
-   }
-
-   // Public --------------------------------------------------------
-   
-   public void testMessagePropertiesPreservedOnSuckPersistent() throws Exception
-   {
-   	this.messagePropertiesPreservedOnSuck(true);
-   }
-   
-   public void testMessagePropertiesPreservedOnSuckNonPersistent() throws Exception
-   {
-   	this.messagePropertiesPreservedOnSuck(false);
-   }
-
-   public void testClusteredQueueNonPersistent() throws Exception
-   {
-      clusteredQueue(false);
-   }
-
-   public void testClusteredQueuePersistent() throws Exception
-   {
-      clusteredQueue(true);
-   }
-   
-   public void testLocalNonPersistent() throws Exception
-   {
-      localQueue(false);
-   }
-
-   public void testLocalPersistent() throws Exception
-   {
-      localQueue(true);
-   }   
-   
-   public void testWithConnectionsOnAllNodesClientAck() throws Exception
-   {
-   	JBossConnectionFactory factory = (JBossConnectionFactory) ic[0].lookup("/ClusteredConnectionFactory");
-
-      Connection conn0 = createConnectionOnServer(factory, 0);
-      
-      Connection conn1 = createConnectionOnServer(factory, 1);
-      
-      Connection conn2 = createConnectionOnServer(factory, 2);
-      
-      try
-      {
-      	conn0.start();
-      	
-      	conn1.start();
-      	
-      	conn2.start();
-      	
-      	//Send a load of messages on node 0
-      	      	         
-      	Session sess0_1 = conn0.createSession(false, Session.CLIENT_ACKNOWLEDGE);
-      	
-      	MessageConsumer cons0_1 = sess0_1.createConsumer(queue[0]);
-      	
-      	MessageProducer prod0 = sess0_1.createProducer(queue[0]);
-      	
-      	Set msgIds = new HashSet();
-      	
-      	final int numMessages = 60;
-      	      	      	 
-      	for (int i = 0; i < numMessages; i++)
-      	{
-      		TextMessage tm = sess0_1.createTextMessage("message-" + i);
-      		
-      		prod0.send(tm);      		
-      	}
-      		
-      	TextMessage tm0_1 = null;
-      	
-      	for (int i = 0; i < numMessages / 6; i++)
-      	{
-      		tm0_1 = (TextMessage)cons0_1.receive(5000000);
-      		
-      		assertNotNull(tm0_1);
-      		
-      		msgIds.add(tm0_1.getText());
-      	}
-      	
-      	cons0_1.close();
-      	
-      	Session sess0_2 = conn0.createSession(false, Session.CLIENT_ACKNOWLEDGE);
-      	
-      	MessageConsumer cons0_2 = sess0_2.createConsumer(queue[0]);
-      	
-      	TextMessage tm0_2 = null;
-      	
-      	for (int i = 0; i < numMessages / 6; i++)
-      	{
-      		tm0_2 = (TextMessage)cons0_2.receive(5000000);
-      		
-      		assertNotNull(tm0_2);
-      		
-      		msgIds.add(tm0_2.getText());
-      	}
-      	
-      	cons0_2.close();
-      	
-      	
-      	//Two on node 1
-      	
-      	Session sess1_1 = conn1.createSession(false, Session.CLIENT_ACKNOWLEDGE);
-      	
-      	MessageConsumer cons1_1 = sess1_1.createConsumer(queue[1]);      	
-      	
-      	TextMessage tm1_1 = null;
-      	
-      	for (int i = 0; i < numMessages / 6; i++)
-      	{
-      		tm1_1 = (TextMessage)cons1_1.receive(5000000);
-      		
-      		assertNotNull(tm1_1);
-      		
-      		msgIds.add(tm1_1.getText());
-      	}
-      	
-      	cons1_1.close();
-     
-      	Session sess1_2 = conn1.createSession(false, Session.CLIENT_ACKNOWLEDGE);
-      	
-      	MessageConsumer cons1_2 = sess1_2.createConsumer(queue[1]);
-      	
-      	TextMessage tm1_2 = null;
-      	
-      	for (int i = 0; i < numMessages / 6; i++)
-      	{
-      		tm1_2 = (TextMessage)cons1_2.receive(5000000);
-      		      		      		
-      		assertNotNull(tm1_2);
-      		
-      		msgIds.add(tm1_2.getText());
-      	}
-      	
-      	cons1_2.close();
-      	
-      	
-      	//Two on node 2
-      	
-      	Session sess2_1 = conn2.createSession(false, Session.CLIENT_ACKNOWLEDGE);
-      	
-      	MessageConsumer cons2_1 = sess2_1.createConsumer(queue[2]);
-      	
-      	TextMessage tm2_1 = null;
-      	
-      	for (int i = 0; i < numMessages / 6; i++)
-      	{
-      		tm2_1 = (TextMessage)cons2_1.receive(5000000);
-      		
-      		assertNotNull(tm2_1);
-      		
-      		msgIds.add(tm2_1.getText());
-      	}
-      	
-      	cons2_1.close();
-      	
-      	Session sess2_2 = conn2.createSession(false, Session.CLIENT_ACKNOWLEDGE);
-      	
-      	MessageConsumer cons2_2 = sess2_2.createConsumer(queue[2]);
-      	
-      	TextMessage tm2_2 = null;
-      	
-      	for (int i = 0; i < numMessages / 6; i++)
-      	{
-      		tm2_2 = (TextMessage)cons2_2.receive(5000000);
-      		
-      		assertNotNull(tm2_2);
-      		
-      		msgIds.add(tm2_2.getText());
-      	}
-      	
-      	cons2_2.close();
-      	
-      	assertEquals(numMessages, msgIds.size());
-      	
-      	for (int i = 0; i < numMessages; i++)
-      	{
-      		assertTrue(msgIds.contains("message-" + i));
-      	}      	      
-      }
-      finally
-      {
-         if (conn0 != null)
-         {
-            conn0.close();
-         }
-         
-         if (conn1 != null)
-         {
-            conn1.close();
-         }
-         
-         if (conn2 != null)
-         {
-            conn2.close();
-         }
-      }
-   }
-   
-   public void testMixedSuck() throws Exception
-   {
-      Connection conn0 = null;
-      Connection conn1 = null;
-      Connection conn2 = null;
-
-      try
-      {
-
-         conn0 = this.createConnectionOnServer(cf, 0);
-         conn1 = this.createConnectionOnServer(cf, 1);
-         conn2 = this.createConnectionOnServer(cf, 2);
-         
-         checkConnectionsDifferentServers(new Connection[] {conn0, conn1, conn2});
-
-         Session sess0 = conn0.createSession(false, Session.AUTO_ACKNOWLEDGE);
-         Session sess2 = conn2.createSession(false, Session.AUTO_ACKNOWLEDGE);
-         
-         MessageConsumer cons2 = sess2.createConsumer(queue[2]);
-         
-         conn0.start();
-         conn2.start();
-
-         final int NUM_MESSAGES = 300;
-
-         
-         // Send at node 0
-
-         MessageProducer prod0 = sess0.createProducer(queue[0]);
-
-         MessageProducer prod2 = sess2.createProducer(queue[2]);
-
-         //Send more messages at node 0 and node 2
-         
-         boolean persistent = false;
-         for (int i = 0; i < NUM_MESSAGES / 2 ; i++)
-         {
-            TextMessage tm = sess0.createTextMessage("message4-" + i);
-
-            prod0.setDeliveryMode(persistent ? DeliveryMode.PERSISTENT : DeliveryMode.NON_PERSISTENT);
-            
-            prod0.send(tm);
-            
-            persistent = !persistent;
-         }
-         
-         for (int i = NUM_MESSAGES / 2; i < NUM_MESSAGES; i++)
-         {
-            TextMessage tm = sess2.createTextMessage("message4-" + i);
-
-            prod2.setDeliveryMode(persistent ? DeliveryMode.PERSISTENT : DeliveryMode.NON_PERSISTENT);
-                        
-            prod2.send(tm);
-            
-            persistent = !persistent;
-         }
-         
-         //consume them on node 2 - we will get messages from both nodes so the order is undefined
-         
-         Set msgs = new HashSet();
-         
-         TextMessage tm = null;
-         
-         do
-         {
-            tm = (TextMessage)cons2.receive(1000);
-            
-            if (tm != null)
-            {                     
-	            msgs.add(tm.getText());
-            }
-         }           
-         while (tm != null);
-
-         for (int i = 0; i < NUM_MESSAGES; i++)
-         {
-         	assertTrue(msgs.contains("message4-" + i));
-         }
-         
-         assertEquals(NUM_MESSAGES, msgs.size());
-                
-         cons2.close();
-         
-         sess2.close();
-         
-         sess2 = conn2.createSession(false, Session.CLIENT_ACKNOWLEDGE);
-         
-         cons2 = sess2.createConsumer(queue[2]);
-                  
-         Message msg = cons2.receive(5000);
-         
-         assertNull(msg);                            
-      }
-      finally
-      {
-         if (conn0 != null)
-         {
-            conn0.close();
-         }
-
-         if (conn1 != null)
-         {
-            conn1.close();
-         }
-
-         if (conn2 != null)
-         {
-            conn2.close();
-         }
-      }
-   }
-
-   // Package private ---------------------------------------------
-   
-   // protected ----------------------------------------------------
-   
-   protected void setUp() throws Exception
-   {
-      nodeCount = 3;
-
-      super.setUp();
-
-      log.debug("setup done");
-   }
-
-   protected void tearDown() throws Exception
-   {
-      super.tearDown();
-   }
-
-   // private -----------------------------------------------------
-
-
-   private void clusteredQueue(boolean persistent) throws Exception
-   {
-      Connection conn0 = null;
-      Connection conn1 = null;
-      Connection conn2 = null;
-
-      try
-      {
-         //This will create 3 different connection on 3 different nodes, since
-         //the cf is clustered
-         conn0 = this.createConnectionOnServer(cf, 0);
-         conn1 = this.createConnectionOnServer(cf, 1);
-         conn2 = this.createConnectionOnServer(cf, 2);
-         
-         checkConnectionsDifferentServers(new Connection[] {conn0, conn1, conn2});
-
-         Session sess0 = conn0.createSession(false, Session.AUTO_ACKNOWLEDGE);
-         Session sess1 = conn1.createSession(false, Session.AUTO_ACKNOWLEDGE);
-         Session sess2 = conn2.createSession(false, Session.AUTO_ACKNOWLEDGE);
-         
-         MessageConsumer cons0 = sess0.createConsumer(queue[0]);
-         MessageConsumer cons1 = sess1.createConsumer(queue[1]);
-         MessageConsumer cons2 = sess2.createConsumer(queue[2]);
-         
-         conn0.start();
-         conn1.start();
-         conn2.start();
-
-         // Send at node 0
-
-         MessageProducer prod0 = sess0.createProducer(queue[0]);
-
-         prod0.setDeliveryMode(persistent ? DeliveryMode.PERSISTENT : DeliveryMode.NON_PERSISTENT);
-
-         final int NUM_MESSAGES = 100;
-
-         for (int i = 0; i < NUM_MESSAGES; i++)
-         {
-            TextMessage tm = sess0.createTextMessage("message0-" + i);
-
-            prod0.send(tm);
-         }
-         
-         for (int i = 0; i < NUM_MESSAGES; i++)
-         {
-            TextMessage tm = (TextMessage)cons0.receive(1000);
-
-            assertNotNull(tm);
-            
-            assertEquals("message0-" + i, tm.getText());
-         }                 
-
-         Message m = cons0.receive(2000);
-
-         assertNull(m);
-         
-         m = cons1.receive(2000);
-
-         assertNull(m);
-
-         m = cons2.receive(2000);
-
-         assertNull(m);
-
-         // Send at node 1
-
-         MessageProducer prod1 = sess1.createProducer(queue[1]);
-
-         prod1.setDeliveryMode(persistent ? DeliveryMode.PERSISTENT : DeliveryMode.NON_PERSISTENT);
-
-         for (int i = 0; i < NUM_MESSAGES; i++)
-         {
-            TextMessage tm = sess1.createTextMessage("message1-" + i);
-
-            prod1.send(tm);
-         }
-
-         for (int i = 0; i < NUM_MESSAGES; i++)
-         {
-            TextMessage tm = (TextMessage)cons1.receive(1000);
-
-            assertNotNull(tm);
-
-            assertEquals("message1-" + i, tm.getText());
-         }
-
-         m = cons0.receive(2000);
-
-         assertNull(m);
-         
-         m = cons1.receive(2000);
-
-         assertNull(m);
-
-         m = cons2.receive(2000);
-
-         assertNull(m);
-
-         // Send at node 2
-         
-         MessageProducer prod2 = sess2.createProducer(queue[2]);
-
-         prod2.setDeliveryMode(persistent ? DeliveryMode.PERSISTENT : DeliveryMode.NON_PERSISTENT);
-
-         for (int i = 0; i < NUM_MESSAGES; i++)
-         {
-            TextMessage tm = sess2.createTextMessage("message2-" + i);
-
-            prod2.send(tm);
-         }
-
-         for (int i = 0; i < NUM_MESSAGES; i++)
-         {
-            TextMessage tm = (TextMessage)cons2.receive(1000);
-
-            assertNotNull(tm);
-
-            assertEquals("message2-" + i, tm.getText());
-         }
-
-         m = cons0.receive(2000);
-
-         assertNull(m);
-         
-         m = cons1.receive(2000);
-
-         assertNull(m);
-
-         m = cons2.receive(2000);
-
-         assertNull(m);
-         
-         
-         //Now close the consumers at node 0 and node 1
-         
-         cons0.close();
-         
-         cons1.close();
-         
-         //Send more messages at node 0
-         
-         for (int i = 0; i < NUM_MESSAGES; i++)
-         {
-            TextMessage tm = sess0.createTextMessage("message3-" + i);
-
-            prod0.send(tm);
-         }
-              
-         // consume them on node2
-
-         for (int i = 0; i < NUM_MESSAGES; i++)
-         {
-            TextMessage tm = (TextMessage)cons2.receive(1000);
-                  
-            assertNotNull(tm);
-            
-            assertEquals("message3-" + i, tm.getText());
-         }                 
-
-         m = cons2.receive(2000);
-
-         assertNull(m);
-         
-         //Send more messages at node 0 and node 1
-         
-         for (int i = 0; i < NUM_MESSAGES / 2; i++)
-         {
-            TextMessage tm = sess0.createTextMessage("message4-" + i);
-
-            prod0.send(tm);
-         }
-         
-         for (int i = NUM_MESSAGES / 2; i < NUM_MESSAGES; i++)
-         {
-            TextMessage tm = sess2.createTextMessage("message4-" + i);
-
-            prod2.send(tm);
-         }
-         
-         //consume them on node 2 - we will get messages from both nodes so the order is undefined
-         
-         Set msgs = new HashSet();
-         
-         TextMessage tm = null;
-         
-         do
-         {
-            tm = (TextMessage)cons2.receive(1000);
-            
-            if (tm != null)
-            {                     
-	            msgs.add(tm.getText());
-            }
-         }           
-         while (tm != null);
-
-         for (int i = 0; i < NUM_MESSAGES; i++)
-         {
-         	assertTrue(msgs.contains("message4-" + i));
-         }
-         
-         assertEquals(NUM_MESSAGES, msgs.size());
-         
-         msgs.clear();
-         
-         // Now repeat but this time creating the consumer after send
-         
-         cons2.close();
-         
-         //	Send more messages at node 0 and node 1
-         
-         for (int i = 0; i < NUM_MESSAGES / 2; i++)
-         {
-            tm = sess0.createTextMessage("message5-" + i);
-
-            prod0.send(tm);
-         }
-         
-         for (int i = NUM_MESSAGES / 2; i < NUM_MESSAGES; i++)
-         {
-            tm = sess1.createTextMessage("message5-" + i);
-
-            prod2.send(tm);
-         }
-         
-         cons2 = sess2.createConsumer(queue[2]);
-         
-         //consume them on node 2 - we will get messages from both nodes so the order is undefined
-         
-         msgs = new HashSet();
-         
-         do
-         {
-            tm = (TextMessage)cons2.receive(1000);
-            
-            if (tm != null)
-            {            
-	            msgs.add(tm.getText());
-            }
-         }     
-         while (tm != null);
-
-         for (int i = 0; i < NUM_MESSAGES; i++)
-         {
-         	assertTrue(msgs.contains("message5-" + i));
-         }
-         
-         assertEquals(NUM_MESSAGES, msgs.size());
-         
-         msgs.clear();
-         
-         
-         //Now send messages at node 0 - but consume from node 1 AND node 2
-         
-         //order is undefined
-         
-         cons2.close();
-         
-         cons1 = sess1.createConsumer(queue[1]);
-         
-         cons2 = sess2.createConsumer(queue[2]);
-         
-         for (int i = 0; i < NUM_MESSAGES; i++)
-         {
-            tm = sess0.createTextMessage("message6-" + i);
-
-            prod0.send(tm);
-         }
-         
-         msgs = new HashSet();
-         
-         int count = 0;
-         
-         do
-         {
-            tm = (TextMessage)cons1.receive(1000);
-            
-            if (tm != null)
-            {                
-	            msgs.add(tm.getText());
-	            
-	            count++;
-            }
-         }
-         while (tm != null);
-         
-         do
-         {
-            tm = (TextMessage)cons2.receive(1000);
-            
-            if (tm != null)
-            {            
-	            msgs.add(tm.getText());
-	            
-	            count++;
-            }
-         } 
-         while (tm != null);
-         
-         for (int i = 0; i < NUM_MESSAGES; i++)
-         {
-         	assertTrue(msgs.contains("message6-" + i));
-         }
-         
-         assertEquals(NUM_MESSAGES, count);
-         
-         msgs.clear();
-         
-         //as above but start consumers AFTER sending
-         
-         cons1.close();
-         
-         cons2.close();
-         
-         for (int i = 0; i < NUM_MESSAGES; i++)
-         {
-            tm = sess0.createTextMessage("message7-" + i);
-
-            prod0.send(tm);
-         }
-         
-         cons1 = sess1.createConsumer(queue[1]);
-         
-         cons2 = sess2.createConsumer(queue[2]);
-         
-         
-         msgs = new HashSet();
-         
-         count = 0;
-         
-         do
-         {
-            tm = (TextMessage)cons1.receive(1000);
-            
-            if (tm != null)
-            {            
-	            msgs.add(tm.getText());
-	            
-	            count++;
-            }
-         }
-         while (tm != null);
-         
-         do
-         {
-            tm = (TextMessage)cons2.receive(1000);
-            
-            if (tm != null)
-            {
-	            msgs.add(tm.getText());
-	            
-	            count++;
-            }
-         } 
-         while (tm != null);
-         
-         for (int i = 0; i < NUM_MESSAGES; i++)
-         {
-         	assertTrue(msgs.contains("message7-" + i));
-         }
-         
-         assertEquals(NUM_MESSAGES, count);         
-         
-         msgs.clear();
-         
-         
-         // Now send message on node 0, consume on node2, then cancel, consume on node1, cancel, consume on node 0
-         
-         cons1.close();
-         
-         cons2.close();
-         
-         sess2.close();
-         
-         sess2 = conn2.createSession(false, Session.CLIENT_ACKNOWLEDGE);
-         
-         cons2 = sess2.createConsumer(queue[2]);
-         
-         for (int i = 0; i < NUM_MESSAGES; i++)
-         {
-            tm = sess0.createTextMessage("message8-" + i);
-
-            prod0.send(tm);
-         }
-         
-         for (int i = 0; i < NUM_MESSAGES; i++)
-         {
-            tm = (TextMessage)cons2.receive(1000);
-            
-            assertNotNull(tm);
-               
-            assertEquals("message8-" + i, tm.getText());
-         } 
-         
-         sess2.close(); // messages should go back on queue
-         
-         //Now try on node 1
-         
-         sess1.close();
-         
-         sess1 = conn1.createSession(false, Session.CLIENT_ACKNOWLEDGE);
-         
-         cons1 = sess1.createConsumer(queue[1]);
-         
-         for (int i = 0; i < NUM_MESSAGES; i++)
-         {
-            tm = (TextMessage)cons1.receive(1000);
-            
-            assertNotNull(tm);
-               
-            assertEquals("message8-" + i, tm.getText());
-         } 
-         
-         sess1.close(); // messages should go back on queue
-         
-         //Now try on node 0
-         
-         cons0 = sess0.createConsumer(queue[0]);
-         
-         for (int i = 0; i < NUM_MESSAGES; i++)
-         {
-            tm = (TextMessage)cons0.receive(1000);
-            
-            assertNotNull(tm);
-               
-            assertEquals("message8-" + i, tm.getText());
-         }     
-         
-         Message msg = cons0.receive(5000);
-         
-         assertNull(msg);                          
-      }
-      finally
-      {
-         if (conn0 != null)
-         {
-            conn0.close();
-         }
-
-         if (conn1 != null)
-         {
-            conn1.close();
-         }
-
-         if (conn2 != null)
-         {
-            conn2.close();
-         }
-      }
-   }
-   
-   private void messagePropertiesPreservedOnSuck(boolean persistent) throws Exception
-   {
-      Connection conn0 = null;
-      Connection conn1 = null;
-      Connection conn2 = null;
-
-      try
-      {
-
-         conn0 = this.createConnectionOnServer(cf, 0);
-         conn1 = this.createConnectionOnServer(cf, 1);
-         conn2 = this.createConnectionOnServer(cf, 2);
-         
-         checkConnectionsDifferentServers(new Connection[] {conn0, conn1, conn2});
-
-         Session sess0 = conn0.createSession(false, Session.AUTO_ACKNOWLEDGE);
-         Session sess2 = conn2.createSession(false, Session.AUTO_ACKNOWLEDGE);
-         
-         MessageConsumer cons2 = sess2.createConsumer(queue[2]);
-         
-         conn0.start();
-         conn2.start();
-
-         // Send at node 0
-
-         MessageProducer prod0 = sess0.createProducer(queue[0]);
-
-         prod0.setDeliveryMode(persistent ? DeliveryMode.PERSISTENT : DeliveryMode.NON_PERSISTENT);
-         
-
-
-         TextMessage tm = sess0.createTextMessage("blahmessage");
-            
-         prod0.setPriority(7);
-         
-         prod0.setTimeToLive(1 * 60 * 60 * 1000);
-
-         prod0.send(tm);
-         
-         long expiration = tm.getJMSExpiration();
-         
-         assertEquals(persistent ? DeliveryMode.PERSISTENT : DeliveryMode.NON_PERSISTENT, tm.getJMSDeliveryMode());
-         
-                         
-
-         tm = (TextMessage)cons2.receive(1000);
-         
-         assertNotNull(tm);
-         
-         assertEquals("blahmessage", tm.getText());
-
-         assertEquals(persistent ? DeliveryMode.PERSISTENT : DeliveryMode.NON_PERSISTENT, tm.getJMSDeliveryMode());
-         
-         assertEquals(7, tm.getJMSPriority());
-        
-         assertTrue(Math.abs(expiration - tm.getJMSExpiration()) < 100);
-                  
-         Message m = cons2.receive(5000);
-         
-         assertNull(m);
-         
-         
-         //Now do one with expiration = 0
-         
-         
-         tm = sess0.createTextMessage("blahmessage2");
-         
-         prod0.setPriority(7);
-         
-         prod0.setTimeToLive(0);
-
-         prod0.send(tm);
-         
-         assertEquals(persistent ? DeliveryMode.PERSISTENT : DeliveryMode.NON_PERSISTENT, tm.getJMSDeliveryMode());
-         
-                         
-
-         tm = (TextMessage)cons2.receive(1000);
-         
-         assertNotNull(tm);
-         
-         assertEquals("blahmessage2", tm.getText());
-
-         assertEquals(persistent ? DeliveryMode.PERSISTENT : DeliveryMode.NON_PERSISTENT, tm.getJMSDeliveryMode());
-         
-         assertEquals(7, tm.getJMSPriority());
-        
-         assertEquals(0, tm.getJMSExpiration());
-                  
-         m = cons2.receive(5000);
-         
-         assertNull(m);                          
-      }
-      finally
-      {
-         if (conn0 != null)
-         {
-            conn0.close();
-         }
-
-         if (conn1 != null)
-         {
-            conn1.close();
-         }
-
-         if (conn2 != null)
-         {
-            conn2.close();
-         }
-      }
-   }
-   
-   
-   /* Check that non clustered queues behave properly when deployed on a cluster */
-   private void localQueue(boolean persistent) throws Exception
-   {
-   	Connection conn0 = null;
-      Connection conn1 = null;
-      Connection conn2 = null;
-      
-      //Deploy three non clustered queues with same name on different nodes
-          
-      try
-      {
-         ServerManagement.deployQueue("nonClusteredQueue", "nonClusteredQueue", 200000, 2000, 2000, 0, false);
-         
-         ServerManagement.deployQueue("nonClusteredQueue", "nonClusteredQueue", 200000, 2000, 2000, 1, false);
-         
-         ServerManagement.deployQueue("nonClusteredQueue", "nonClusteredQueue", 200000, 2000, 2000, 2, false);
-         
-         Queue queue0 = (Queue)ic[0].lookup("/nonClusteredQueue");
-         Queue queue1 = (Queue)ic[1].lookup("/nonClusteredQueue");
-         Queue queue2 = (Queue)ic[2].lookup("/nonClusteredQueue");
-      	
-         //This will create 3 different connection on 3 different nodes, since
-         //the cf is clustered
-         conn0 = this.createConnectionOnServer(cf, 0);
-         conn1 = this.createConnectionOnServer(cf, 1);
-         conn2 = this.createConnectionOnServer(cf, 2);
-         
-         checkConnectionsDifferentServers(new Connection[] {conn0, conn1, conn2});
-
-         Session sess0 = conn0.createSession(false, Session.AUTO_ACKNOWLEDGE);
-         Session sess1 = conn1.createSession(false, Session.AUTO_ACKNOWLEDGE);
-         Session sess2 = conn2.createSession(false, Session.AUTO_ACKNOWLEDGE);
-         
-         conn0.start();
-         conn1.start();
-         conn2.start();
-
-         // ==============
-         // Send at node 0
-
-         MessageProducer prod0 = sess0.createProducer(queue0);
-
-         prod0.setDeliveryMode(persistent ? DeliveryMode.PERSISTENT : DeliveryMode.NON_PERSISTENT);
-
-         final int NUM_MESSAGES = 100;
-
-         for (int i = 0; i < NUM_MESSAGES; i++)
-         {
-            TextMessage tm = sess0.createTextMessage("message" + i);
-
-            prod0.send(tm);
-         }
-         
-         // Try and consume at node 1
-         
-         MessageConsumer cons1 = sess1.createConsumer(queue1);
-         
-         Message m = cons1.receive(2000);
-
-         assertNull(m);
-         
-         cons1.close();
-         
-         //And at node 2
-         
-         MessageConsumer cons2 = sess2.createConsumer(queue2);
-         
-         m = cons2.receive(2000);
-
-         assertNull(m);
-         
-         cons2.close();
-         
-         // Now consume at node 0
-         
-         MessageConsumer cons0 = sess0.createConsumer(queue0);
-          
-         for (int i = 0; i < NUM_MESSAGES; i++)
-         {
-            TextMessage tm = (TextMessage)cons0.receive(1000);
-
-            assertNotNull(tm);
-            
-            assertEquals("message" + i, tm.getText());
-         }                 
-
-         m = cons0.receive(2000);
-
-         assertNull(m);
-         
-         cons0.close();
-         
-         // ==============
-         // Send at node 1
-
-         MessageProducer prod1 = sess1.createProducer(queue1);
-
-         prod1.setDeliveryMode(persistent ? DeliveryMode.PERSISTENT : DeliveryMode.NON_PERSISTENT);
-
-         for (int i = 0; i < NUM_MESSAGES; i++)
-         {
-            TextMessage tm = sess1.createTextMessage("message" + i);
-
-            prod1.send(tm);
-         }
-         
-         // Try and consume at node 0
-         
-         cons0 = sess0.createConsumer(queue0);
-         
-         m = cons0.receive(2000);
-
-         assertNull(m);
-         
-         cons0.close();
-         
-         //And at node 2
-         
-         cons2 = sess2.createConsumer(queue2);
-         
-         m = cons2.receive(2000);
-
-         assertNull(m);
-         
-         cons2.close();
-         
-         // Now consume at node 1
-         
-         cons1 = sess1.createConsumer(queue1);
-          
-         for (int i = 0; i < NUM_MESSAGES; i++)
-         {
-            TextMessage tm = (TextMessage)cons1.receive(1000);
-
-            assertNotNull(tm);
-            
-            assertEquals("message" + i, tm.getText());
-         }                 
-
-         m = cons1.receive(2000);
-
-         assertNull(m);
-         
-         cons1.close();
-         
-         // ==============
-         // Send at node 2
-
-         MessageProducer prod2 = sess2.createProducer(queue2);
-
-         prod2.setDeliveryMode(persistent ? DeliveryMode.PERSISTENT : DeliveryMode.NON_PERSISTENT);
-
-         for (int i = 0; i < NUM_MESSAGES; i++)
-         {
-            TextMessage tm = sess2.createTextMessage("message" + i);
-
-            prod2.send(tm);
-         }
-         
-         // Try and consume at node 0
-         
-         cons0 = sess0.createConsumer(queue0);
-         
-         m = cons0.receive(2000);
-
-         assertNull(m);
-         
-         cons0.close();
-         
-         //And at node 1
-         
-         cons1 = sess1.createConsumer(queue1);
-         
-         m = cons1.receive(2000);
-
-         assertNull(m);
-         
-         cons1.close();
-         
-         // Now consume at node 2
-         
-         cons2 = sess2.createConsumer(queue2);
-          
-         for (int i = 0; i < NUM_MESSAGES; i++)
-         {
-            TextMessage tm = (TextMessage)cons2.receive(1000);
-
-            assertNotNull(tm);
-            
-            assertEquals("message" + i, tm.getText());
-         }                 
-
-         m = cons2.receive(2000);
-
-         assertNull(m);
-         
-         cons2.close();
-           
-      }
-      finally
-      {
-         if (conn0 != null)
-         {
-            conn0.close();
-         }
-
-         if (conn1 != null)
-         {
-            conn1.close();
-         }
-
-         if (conn2 != null)
-         {
-            conn2.close();
-         }
-         
-         ServerManagement.undeployQueue("nonClusteredQueue", 0);
-         
-         ServerManagement.undeployQueue("nonClusteredQueue", 1);
-         
-         ServerManagement.undeployQueue("nonClusteredQueue", 2);
-      }
-   }
-
-   // Private -------------------------------------------------------
-
-   // Inner classes -------------------------------------------------
-   
-}

Added: trunk/tests/src/org/jboss/test/messaging/jms/clustering/DistributedQueueTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/clustering/DistributedQueueTestBase.java	                        (rev 0)
+++ trunk/tests/src/org/jboss/test/messaging/jms/clustering/DistributedQueueTestBase.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -0,0 +1,1190 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2005, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.test.messaging.jms.clustering;
+
+import java.util.HashSet;
+import java.util.Set;
+
+import javax.jms.Connection;
+import javax.jms.DeliveryMode;
+import javax.jms.Message;
+import javax.jms.MessageConsumer;
+import javax.jms.MessageProducer;
+import javax.jms.Queue;
+import javax.jms.Session;
+import javax.jms.TextMessage;
+
+import org.jboss.jms.client.JBossConnectionFactory;
+import org.jboss.test.messaging.tools.ServerManagement;
+
+
+/**
+ * 
+ * A DistributedQueueTest
+ * 
+ * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
+ * @version <tt>$Revision: 2796 $</tt>
+ *
+ * $Id: DistributedDestinationsTest.java 2796 2007-06-25 22:24:41Z timfox $
+ *
+ */
+public abstract class DistributedQueueTestBase extends ClusteringTestBase
+{
+
+   // Constants -----------------------------------------------------
+
+   // Static --------------------------------------------------------
+
+   // Attributes ----------------------------------------------------
+
+   // Constructors --------------------------------------------------
+
+   public DistributedQueueTestBase(String name)
+   {
+      super(name);
+   }
+
+   // Public --------------------------------------------------------
+   
+   public void testMessagePropertiesPreservedOnSuckPersistent() throws Exception
+   {
+   	this.messagePropertiesPreservedOnSuck(true);
+   }
+   
+   public void testMessagePropertiesPreservedOnSuckNonPersistent() throws Exception
+   {
+   	this.messagePropertiesPreservedOnSuck(false);
+   }
+
+   public void testClusteredQueueNonPersistent() throws Exception
+   {
+      clusteredQueue(false);
+   }
+
+   public void testClusteredQueuePersistent() throws Exception
+   {
+      clusteredQueue(true);
+   }
+   
+   public void testLocalNonPersistent() throws Exception
+   {
+      localQueue(false);
+   }
+
+   public void testLocalPersistent() throws Exception
+   {
+      localQueue(true);
+   }   
+   
+   public void testWithConnectionsOnAllNodesClientAck() throws Exception
+   {
+   	JBossConnectionFactory factory = (JBossConnectionFactory) ic[0].lookup("/ClusteredConnectionFactory");
+
+      Connection conn0 = createConnectionOnServer(factory, 0);
+      
+      Connection conn1 = createConnectionOnServer(factory, 1);
+      
+      Connection conn2 = createConnectionOnServer(factory, 2);
+      
+      try
+      {
+      	conn0.start();
+      	
+      	conn1.start();
+      	
+      	conn2.start();
+      	
+      	//Send a load of messages on node 0
+      	      	         
+      	Session sess0_1 = conn0.createSession(false, Session.CLIENT_ACKNOWLEDGE);
+      	
+      	MessageConsumer cons0_1 = sess0_1.createConsumer(queue[0]);
+      	
+      	MessageProducer prod0 = sess0_1.createProducer(queue[0]);
+      	
+      	Set msgIds = new HashSet();
+      	
+      	final int numMessages = 60;
+      	      	      	 
+      	for (int i = 0; i < numMessages; i++)
+      	{
+      		TextMessage tm = sess0_1.createTextMessage("message-" + i);
+      		
+      		prod0.send(tm);      		
+      	}
+      		
+      	TextMessage tm0_1 = null;
+      	
+      	for (int i = 0; i < numMessages / 6; i++)
+      	{
+      		tm0_1 = (TextMessage)cons0_1.receive(5000000);
+      		
+      		assertNotNull(tm0_1);
+      		
+      		msgIds.add(tm0_1.getText());
+      	}
+      	
+      	cons0_1.close();
+      	
+      	Session sess0_2 = conn0.createSession(false, Session.CLIENT_ACKNOWLEDGE);
+      	
+      	MessageConsumer cons0_2 = sess0_2.createConsumer(queue[0]);
+      	
+      	TextMessage tm0_2 = null;
+      	
+      	for (int i = 0; i < numMessages / 6; i++)
+      	{
+      		tm0_2 = (TextMessage)cons0_2.receive(5000000);
+      		
+      		assertNotNull(tm0_2);
+      		
+      		msgIds.add(tm0_2.getText());
+      	}
+      	
+      	cons0_2.close();
+      	
+      	
+      	//Two on node 1
+      	
+      	Session sess1_1 = conn1.createSession(false, Session.CLIENT_ACKNOWLEDGE);
+      	
+      	MessageConsumer cons1_1 = sess1_1.createConsumer(queue[1]);      	
+      	
+      	TextMessage tm1_1 = null;
+      	
+      	for (int i = 0; i < numMessages / 6; i++)
+      	{
+      		tm1_1 = (TextMessage)cons1_1.receive(5000000);
+      		
+      		assertNotNull(tm1_1);
+      		
+      		msgIds.add(tm1_1.getText());
+      	}
+      	
+      	cons1_1.close();
+     
+      	Session sess1_2 = conn1.createSession(false, Session.CLIENT_ACKNOWLEDGE);
+      	
+      	MessageConsumer cons1_2 = sess1_2.createConsumer(queue[1]);
+      	
+      	TextMessage tm1_2 = null;
+      	
+      	for (int i = 0; i < numMessages / 6; i++)
+      	{
+      		tm1_2 = (TextMessage)cons1_2.receive(5000000);
+      		      		      		
+      		assertNotNull(tm1_2);
+      		
+      		msgIds.add(tm1_2.getText());
+      	}
+      	
+      	cons1_2.close();
+      	
+      	
+      	//Two on node 2
+      	
+      	Session sess2_1 = conn2.createSession(false, Session.CLIENT_ACKNOWLEDGE);
+      	
+      	MessageConsumer cons2_1 = sess2_1.createConsumer(queue[2]);
+      	
+      	TextMessage tm2_1 = null;
+      	
+      	for (int i = 0; i < numMessages / 6; i++)
+      	{
+      		tm2_1 = (TextMessage)cons2_1.receive(5000000);
+      		
+      		assertNotNull(tm2_1);
+      		
+      		msgIds.add(tm2_1.getText());
+      	}
+      	
+      	cons2_1.close();
+      	
+      	Session sess2_2 = conn2.createSession(false, Session.CLIENT_ACKNOWLEDGE);
+      	
+      	MessageConsumer cons2_2 = sess2_2.createConsumer(queue[2]);
+      	
+      	TextMessage tm2_2 = null;
+      	
+      	for (int i = 0; i < numMessages / 6; i++)
+      	{
+      		tm2_2 = (TextMessage)cons2_2.receive(5000000);
+      		
+      		assertNotNull(tm2_2);
+      		
+      		msgIds.add(tm2_2.getText());
+      	}
+      	
+      	cons2_2.close();
+      	
+      	assertEquals(numMessages, msgIds.size());
+      	
+      	for (int i = 0; i < numMessages; i++)
+      	{
+      		assertTrue(msgIds.contains("message-" + i));
+      	}      	      
+      }
+      finally
+      {
+         if (conn0 != null)
+         {
+            conn0.close();
+         }
+         
+         if (conn1 != null)
+         {
+            conn1.close();
+         }
+         
+         if (conn2 != null)
+         {
+            conn2.close();
+         }
+      }
+   }
+   
+   public void testMixedSuck() throws Exception
+   {
+      Connection conn0 = null;
+      Connection conn1 = null;
+      Connection conn2 = null;
+
+      try
+      {
+
+         conn0 = this.createConnectionOnServer(cf, 0);
+         conn1 = this.createConnectionOnServer(cf, 1);
+         conn2 = this.createConnectionOnServer(cf, 2);
+         
+         checkConnectionsDifferentServers(new Connection[] {conn0, conn1, conn2});
+
+         Session sess0 = conn0.createSession(false, Session.AUTO_ACKNOWLEDGE);
+         Session sess2 = conn2.createSession(false, Session.AUTO_ACKNOWLEDGE);
+         
+         MessageConsumer cons2 = sess2.createConsumer(queue[2]);
+         
+         conn0.start();
+         conn2.start();
+
+         final int NUM_MESSAGES = 300;
+
+         
+         // Send at node 0
+
+         MessageProducer prod0 = sess0.createProducer(queue[0]);
+
+         MessageProducer prod2 = sess2.createProducer(queue[2]);
+
+         //Send more messages at node 0 and node 2
+         
+         boolean persistent = false;
+         for (int i = 0; i < NUM_MESSAGES / 2 ; i++)
+         {
+            TextMessage tm = sess0.createTextMessage("message4-" + i);
+
+            prod0.setDeliveryMode(persistent ? DeliveryMode.PERSISTENT : DeliveryMode.NON_PERSISTENT);
+            
+            prod0.send(tm);
+            
+            persistent = !persistent;
+         }
+         
+         for (int i = NUM_MESSAGES / 2; i < NUM_MESSAGES; i++)
+         {
+            TextMessage tm = sess2.createTextMessage("message4-" + i);
+
+            prod2.setDeliveryMode(persistent ? DeliveryMode.PERSISTENT : DeliveryMode.NON_PERSISTENT);
+                        
+            prod2.send(tm);
+            
+            persistent = !persistent;
+         }
+         
+         //consume them on node 2 - we will get messages from both nodes so the order is undefined
+         
+         Set msgs = new HashSet();
+         
+         TextMessage tm = null;
+         
+         do
+         {
+            tm = (TextMessage)cons2.receive(1000);
+            
+            if (tm != null)
+            {                     
+	            msgs.add(tm.getText());
+            }
+         }           
+         while (tm != null);
+
+         for (int i = 0; i < NUM_MESSAGES; i++)
+         {
+         	assertTrue(msgs.contains("message4-" + i));
+         }
+         
+         assertEquals(NUM_MESSAGES, msgs.size());
+                
+         cons2.close();
+         
+         sess2.close();
+         
+         sess2 = conn2.createSession(false, Session.CLIENT_ACKNOWLEDGE);
+         
+         cons2 = sess2.createConsumer(queue[2]);
+                  
+         Message msg = cons2.receive(5000);
+         
+         assertNull(msg);                            
+      }
+      finally
+      {
+         if (conn0 != null)
+         {
+            conn0.close();
+         }
+
+         if (conn1 != null)
+         {
+            conn1.close();
+         }
+
+         if (conn2 != null)
+         {
+            conn2.close();
+         }
+      }
+   }
+
+   // Package private ---------------------------------------------
+   
+   // protected ----------------------------------------------------
+   
+   protected void setUp() throws Exception
+   {
+      nodeCount = 3;
+
+      super.setUp();
+
+      log.debug("setup done");
+   }
+
+   protected void tearDown() throws Exception
+   {
+      super.tearDown();
+   }
+
+   // private -----------------------------------------------------
+
+
+   private void clusteredQueue(boolean persistent) throws Exception
+   {
+      Connection conn0 = null;
+      Connection conn1 = null;
+      Connection conn2 = null;
+
+      try
+      {
+         //This will create 3 different connection on 3 different nodes, since
+         //the cf is clustered
+         conn0 = this.createConnectionOnServer(cf, 0);
+         conn1 = this.createConnectionOnServer(cf, 1);
+         conn2 = this.createConnectionOnServer(cf, 2);
+         
+         checkConnectionsDifferentServers(new Connection[] {conn0, conn1, conn2});
+
+         Session sess0 = conn0.createSession(false, Session.AUTO_ACKNOWLEDGE);
+         Session sess1 = conn1.createSession(false, Session.AUTO_ACKNOWLEDGE);
+         Session sess2 = conn2.createSession(false, Session.AUTO_ACKNOWLEDGE);
+         
+         MessageConsumer cons0 = sess0.createConsumer(queue[0]);
+         MessageConsumer cons1 = sess1.createConsumer(queue[1]);
+         MessageConsumer cons2 = sess2.createConsumer(queue[2]);
+         
+         conn0.start();
+         conn1.start();
+         conn2.start();
+
+         // Send at node 0
+
+         MessageProducer prod0 = sess0.createProducer(queue[0]);
+
+         prod0.setDeliveryMode(persistent ? DeliveryMode.PERSISTENT : DeliveryMode.NON_PERSISTENT);
+
+         final int NUM_MESSAGES = 100;
+
+         for (int i = 0; i < NUM_MESSAGES; i++)
+         {
+            TextMessage tm = sess0.createTextMessage("message0-" + i);
+
+            prod0.send(tm);
+         }
+         
+         for (int i = 0; i < NUM_MESSAGES; i++)
+         {
+            TextMessage tm = (TextMessage)cons0.receive(1000);
+
+            assertNotNull(tm);
+            
+            assertEquals("message0-" + i, tm.getText());
+         }                 
+
+         Message m = cons0.receive(2000);
+
+         assertNull(m);
+         
+         m = cons1.receive(2000);
+
+         assertNull(m);
+
+         m = cons2.receive(2000);
+
+         assertNull(m);
+
+         // Send at node 1
+
+         MessageProducer prod1 = sess1.createProducer(queue[1]);
+
+         prod1.setDeliveryMode(persistent ? DeliveryMode.PERSISTENT : DeliveryMode.NON_PERSISTENT);
+
+         for (int i = 0; i < NUM_MESSAGES; i++)
+         {
+            TextMessage tm = sess1.createTextMessage("message1-" + i);
+
+            prod1.send(tm);
+         }
+
+         for (int i = 0; i < NUM_MESSAGES; i++)
+         {
+            TextMessage tm = (TextMessage)cons1.receive(1000);
+
+            assertNotNull(tm);
+
+            assertEquals("message1-" + i, tm.getText());
+         }
+
+         m = cons0.receive(2000);
+
+         assertNull(m);
+         
+         m = cons1.receive(2000);
+
+         assertNull(m);
+
+         m = cons2.receive(2000);
+
+         assertNull(m);
+
+         // Send at node 2
+         
+         MessageProducer prod2 = sess2.createProducer(queue[2]);
+
+         prod2.setDeliveryMode(persistent ? DeliveryMode.PERSISTENT : DeliveryMode.NON_PERSISTENT);
+
+         for (int i = 0; i < NUM_MESSAGES; i++)
+         {
+            TextMessage tm = sess2.createTextMessage("message2-" + i);
+
+            prod2.send(tm);
+         }
+
+         for (int i = 0; i < NUM_MESSAGES; i++)
+         {
+            TextMessage tm = (TextMessage)cons2.receive(1000);
+
+            assertNotNull(tm);
+
+            assertEquals("message2-" + i, tm.getText());
+         }
+
+         m = cons0.receive(2000);
+
+         assertNull(m);
+         
+         m = cons1.receive(2000);
+
+         assertNull(m);
+
+         m = cons2.receive(2000);
+
+         assertNull(m);
+         
+         
+         //Now close the consumers at node 0 and node 1
+         
+         cons0.close();
+         
+         cons1.close();
+         
+         //Send more messages at node 0
+         
+         for (int i = 0; i < NUM_MESSAGES; i++)
+         {
+            TextMessage tm = sess0.createTextMessage("message3-" + i);
+
+            prod0.send(tm);
+         }
+              
+         // consume them on node2
+
+         for (int i = 0; i < NUM_MESSAGES; i++)
+         {
+            TextMessage tm = (TextMessage)cons2.receive(1000);
+                  
+            assertNotNull(tm);
+            
+            assertEquals("message3-" + i, tm.getText());
+         }                 
+
+         m = cons2.receive(2000);
+
+         assertNull(m);
+         
+         //Send more messages at node 0 and node 1
+         
+         for (int i = 0; i < NUM_MESSAGES / 2; i++)
+         {
+            TextMessage tm = sess0.createTextMessage("message4-" + i);
+
+            prod0.send(tm);
+         }
+         
+         for (int i = NUM_MESSAGES / 2; i < NUM_MESSAGES; i++)
+         {
+            TextMessage tm = sess2.createTextMessage("message4-" + i);
+
+            prod2.send(tm);
+         }
+         
+         //consume them on node 2 - we will get messages from both nodes so the order is undefined
+         
+         Set msgs = new HashSet();
+         
+         TextMessage tm = null;
+         
+         do
+         {
+            tm = (TextMessage)cons2.receive(1000);
+            
+            if (tm != null)
+            {                     
+	            msgs.add(tm.getText());
+            }
+         }           
+         while (tm != null);
+
+         for (int i = 0; i < NUM_MESSAGES; i++)
+         {
+         	assertTrue(msgs.contains("message4-" + i));
+         }
+         
+         assertEquals(NUM_MESSAGES, msgs.size());
+         
+         msgs.clear();
+         
+         // Now repeat but this time creating the consumer after send
+         
+         cons2.close();
+         
+         //	Send more messages at node 0 and node 1
+         
+         for (int i = 0; i < NUM_MESSAGES / 2; i++)
+         {
+            tm = sess0.createTextMessage("message5-" + i);
+
+            prod0.send(tm);
+         }
+         
+         for (int i = NUM_MESSAGES / 2; i < NUM_MESSAGES; i++)
+         {
+            tm = sess1.createTextMessage("message5-" + i);
+
+            prod2.send(tm);
+         }
+         
+         cons2 = sess2.createConsumer(queue[2]);
+         
+         //consume them on node 2 - we will get messages from both nodes so the order is undefined
+         
+         msgs = new HashSet();
+         
+         do
+         {
+            tm = (TextMessage)cons2.receive(1000);
+            
+            if (tm != null)
+            {            
+	            msgs.add(tm.getText());
+            }
+         }     
+         while (tm != null);
+
+         for (int i = 0; i < NUM_MESSAGES; i++)
+         {
+         	assertTrue(msgs.contains("message5-" + i));
+         }
+         
+         assertEquals(NUM_MESSAGES, msgs.size());
+         
+         msgs.clear();
+         
+         
+         //Now send messages at node 0 - but consume from node 1 AND node 2
+         
+         //order is undefined
+         
+         cons2.close();
+         
+         cons1 = sess1.createConsumer(queue[1]);
+         
+         cons2 = sess2.createConsumer(queue[2]);
+         
+         for (int i = 0; i < NUM_MESSAGES; i++)
+         {
+            tm = sess0.createTextMessage("message6-" + i);
+
+            prod0.send(tm);
+         }
+         
+         msgs = new HashSet();
+         
+         int count = 0;
+         
+         do
+         {
+            tm = (TextMessage)cons1.receive(1000);
+            
+            if (tm != null)
+            {                
+	            msgs.add(tm.getText());
+	            
+	            count++;
+            }
+         }
+         while (tm != null);
+         
+         do
+         {
+            tm = (TextMessage)cons2.receive(1000);
+            
+            if (tm != null)
+            {            
+	            msgs.add(tm.getText());
+	            
+	            count++;
+            }
+         } 
+         while (tm != null);
+         
+         for (int i = 0; i < NUM_MESSAGES; i++)
+         {
+         	assertTrue(msgs.contains("message6-" + i));
+         }
+         
+         assertEquals(NUM_MESSAGES, count);
+         
+         msgs.clear();
+         
+         //as above but start consumers AFTER sending
+         
+         cons1.close();
+         
+         cons2.close();
+         
+         for (int i = 0; i < NUM_MESSAGES; i++)
+         {
+            tm = sess0.createTextMessage("message7-" + i);
+
+            prod0.send(tm);
+         }
+         
+         cons1 = sess1.createConsumer(queue[1]);
+         
+         cons2 = sess2.createConsumer(queue[2]);
+         
+         
+         msgs = new HashSet();
+         
+         count = 0;
+         
+         do
+         {
+            tm = (TextMessage)cons1.receive(1000);
+            
+            if (tm != null)
+            {            
+	            msgs.add(tm.getText());
+	            
+	            count++;
+            }
+         }
+         while (tm != null);
+         
+         do
+         {
+            tm = (TextMessage)cons2.receive(1000);
+            
+            if (tm != null)
+            {
+	            msgs.add(tm.getText());
+	            
+	            count++;
+            }
+         } 
+         while (tm != null);
+         
+         for (int i = 0; i < NUM_MESSAGES; i++)
+         {
+         	assertTrue(msgs.contains("message7-" + i));
+         }
+         
+         assertEquals(NUM_MESSAGES, count);         
+         
+         msgs.clear();
+         
+         
+         // Now send message on node 0, consume on node2, then cancel, consume on node1, cancel, consume on node 0
+         
+         cons1.close();
+         
+         cons2.close();
+         
+         sess2.close();
+         
+         sess2 = conn2.createSession(false, Session.CLIENT_ACKNOWLEDGE);
+         
+         cons2 = sess2.createConsumer(queue[2]);
+         
+         for (int i = 0; i < NUM_MESSAGES; i++)
+         {
+            tm = sess0.createTextMessage("message8-" + i);
+
+            prod0.send(tm);
+         }
+         
+         for (int i = 0; i < NUM_MESSAGES; i++)
+         {
+            tm = (TextMessage)cons2.receive(1000);
+            
+            assertNotNull(tm);
+               
+            assertEquals("message8-" + i, tm.getText());
+         } 
+         
+         sess2.close(); // messages should go back on queue
+         
+         //Now try on node 1
+         
+         sess1.close();
+         
+         sess1 = conn1.createSession(false, Session.CLIENT_ACKNOWLEDGE);
+         
+         cons1 = sess1.createConsumer(queue[1]);
+         
+         for (int i = 0; i < NUM_MESSAGES; i++)
+         {
+            tm = (TextMessage)cons1.receive(1000);
+            
+            assertNotNull(tm);
+               
+            assertEquals("message8-" + i, tm.getText());
+         } 
+         
+         sess1.close(); // messages should go back on queue
+         
+         //Now try on node 0
+         
+         cons0 = sess0.createConsumer(queue[0]);
+         
+         for (int i = 0; i < NUM_MESSAGES; i++)
+         {
+            tm = (TextMessage)cons0.receive(1000);
+            
+            assertNotNull(tm);
+               
+            assertEquals("message8-" + i, tm.getText());
+         }     
+         
+         Message msg = cons0.receive(5000);
+         
+         assertNull(msg);                          
+      }
+      finally
+      {
+         if (conn0 != null)
+         {
+            conn0.close();
+         }
+
+         if (conn1 != null)
+         {
+            conn1.close();
+         }
+
+         if (conn2 != null)
+         {
+            conn2.close();
+         }
+      }
+   }
+   
+   private void messagePropertiesPreservedOnSuck(boolean persistent) throws Exception
+   {
+      Connection conn0 = null;
+      Connection conn1 = null;
+      Connection conn2 = null;
+
+      try
+      {
+
+         conn0 = this.createConnectionOnServer(cf, 0);
+         conn1 = this.createConnectionOnServer(cf, 1);
+         conn2 = this.createConnectionOnServer(cf, 2);
+         
+         checkConnectionsDifferentServers(new Connection[] {conn0, conn1, conn2});
+
+         Session sess0 = conn0.createSession(false, Session.AUTO_ACKNOWLEDGE);
+         Session sess2 = conn2.createSession(false, Session.AUTO_ACKNOWLEDGE);
+         
+         MessageConsumer cons2 = sess2.createConsumer(queue[2]);
+         
+         conn0.start();
+         conn2.start();
+
+         // Send at node 0
+
+         MessageProducer prod0 = sess0.createProducer(queue[0]);
+
+         prod0.setDeliveryMode(persistent ? DeliveryMode.PERSISTENT : DeliveryMode.NON_PERSISTENT);
+         
+
+
+         TextMessage tm = sess0.createTextMessage("blahmessage");
+            
+         prod0.setPriority(7);
+         
+         prod0.setTimeToLive(1 * 60 * 60 * 1000);
+
+         prod0.send(tm);
+         
+         long expiration = tm.getJMSExpiration();
+         
+         assertEquals(persistent ? DeliveryMode.PERSISTENT : DeliveryMode.NON_PERSISTENT, tm.getJMSDeliveryMode());
+         
+                         
+
+         tm = (TextMessage)cons2.receive(1000);
+         
+         assertNotNull(tm);
+         
+         assertEquals("blahmessage", tm.getText());
+
+         assertEquals(persistent ? DeliveryMode.PERSISTENT : DeliveryMode.NON_PERSISTENT, tm.getJMSDeliveryMode());
+         
+         assertEquals(7, tm.getJMSPriority());
+        
+         assertTrue(Math.abs(expiration - tm.getJMSExpiration()) < 100);
+                  
+         Message m = cons2.receive(5000);
+         
+         assertNull(m);
+         
+         
+         //Now do one with expiration = 0
+         
+         
+         tm = sess0.createTextMessage("blahmessage2");
+         
+         prod0.setPriority(7);
+         
+         prod0.setTimeToLive(0);
+
+         prod0.send(tm);
+         
+         assertEquals(persistent ? DeliveryMode.PERSISTENT : DeliveryMode.NON_PERSISTENT, tm.getJMSDeliveryMode());
+         
+                         
+
+         tm = (TextMessage)cons2.receive(1000);
+         
+         assertNotNull(tm);
+         
+         assertEquals("blahmessage2", tm.getText());
+
+         assertEquals(persistent ? DeliveryMode.PERSISTENT : DeliveryMode.NON_PERSISTENT, tm.getJMSDeliveryMode());
+         
+         assertEquals(7, tm.getJMSPriority());
+        
+         assertEquals(0, tm.getJMSExpiration());
+                  
+         m = cons2.receive(5000);
+         
+         assertNull(m);                          
+      }
+      finally
+      {
+         if (conn0 != null)
+         {
+            conn0.close();
+         }
+
+         if (conn1 != null)
+         {
+            conn1.close();
+         }
+
+         if (conn2 != null)
+         {
+            conn2.close();
+         }
+      }
+   }
+   
+   
+   /* Check that non clustered queues behave properly when deployed on a cluster */
+   private void localQueue(boolean persistent) throws Exception
+   {
+   	Connection conn0 = null;
+      Connection conn1 = null;
+      Connection conn2 = null;
+      
+      //Deploy three non clustered queues with same name on different nodes
+          
+      try
+      {
+         ServerManagement.deployQueue("nonClusteredQueue", "nonClusteredQueue", 200000, 2000, 2000, 0, false);
+         
+         ServerManagement.deployQueue("nonClusteredQueue", "nonClusteredQueue", 200000, 2000, 2000, 1, false);
+         
+         ServerManagement.deployQueue("nonClusteredQueue", "nonClusteredQueue", 200000, 2000, 2000, 2, false);
+         
+         Queue queue0 = (Queue)ic[0].lookup("/nonClusteredQueue");
+         Queue queue1 = (Queue)ic[1].lookup("/nonClusteredQueue");
+         Queue queue2 = (Queue)ic[2].lookup("/nonClusteredQueue");
+      	
+         //This will create 3 different connection on 3 different nodes, since
+         //the cf is clustered
+         conn0 = this.createConnectionOnServer(cf, 0);
+         conn1 = this.createConnectionOnServer(cf, 1);
+         conn2 = this.createConnectionOnServer(cf, 2);
+         
+         checkConnectionsDifferentServers(new Connection[] {conn0, conn1, conn2});
+
+         Session sess0 = conn0.createSession(false, Session.AUTO_ACKNOWLEDGE);
+         Session sess1 = conn1.createSession(false, Session.AUTO_ACKNOWLEDGE);
+         Session sess2 = conn2.createSession(false, Session.AUTO_ACKNOWLEDGE);
+         
+         conn0.start();
+         conn1.start();
+         conn2.start();
+
+         // ==============
+         // Send at node 0
+
+         MessageProducer prod0 = sess0.createProducer(queue0);
+
+         prod0.setDeliveryMode(persistent ? DeliveryMode.PERSISTENT : DeliveryMode.NON_PERSISTENT);
+
+         final int NUM_MESSAGES = 100;
+
+         for (int i = 0; i < NUM_MESSAGES; i++)
+         {
+            TextMessage tm = sess0.createTextMessage("message" + i);
+
+            prod0.send(tm);
+         }
+         
+         // Try and consume at node 1
+         
+         MessageConsumer cons1 = sess1.createConsumer(queue1);
+         
+         Message m = cons1.receive(2000);
+
+         assertNull(m);
+         
+         cons1.close();
+         
+         //And at node 2
+         
+         MessageConsumer cons2 = sess2.createConsumer(queue2);
+         
+         m = cons2.receive(2000);
+
+         assertNull(m);
+         
+         cons2.close();
+         
+         // Now consume at node 0
+         
+         MessageConsumer cons0 = sess0.createConsumer(queue0);
+          
+         for (int i = 0; i < NUM_MESSAGES; i++)
+         {
+            TextMessage tm = (TextMessage)cons0.receive(1000);
+
+            assertNotNull(tm);
+            
+            assertEquals("message" + i, tm.getText());
+         }                 
+
+         m = cons0.receive(2000);
+
+         assertNull(m);
+         
+         cons0.close();
+         
+         // ==============
+         // Send at node 1
+
+         MessageProducer prod1 = sess1.createProducer(queue1);
+
+         prod1.setDeliveryMode(persistent ? DeliveryMode.PERSISTENT : DeliveryMode.NON_PERSISTENT);
+
+         for (int i = 0; i < NUM_MESSAGES; i++)
+         {
+            TextMessage tm = sess1.createTextMessage("message" + i);
+
+            prod1.send(tm);
+         }
+         
+         // Try and consume at node 0
+         
+         cons0 = sess0.createConsumer(queue0);
+         
+         m = cons0.receive(2000);
+
+         assertNull(m);
+         
+         cons0.close();
+         
+         //And at node 2
+         
+         cons2 = sess2.createConsumer(queue2);
+         
+         m = cons2.receive(2000);
+
+         assertNull(m);
+         
+         cons2.close();
+         
+         // Now consume at node 1
+         
+         cons1 = sess1.createConsumer(queue1);
+          
+         for (int i = 0; i < NUM_MESSAGES; i++)
+         {
+            TextMessage tm = (TextMessage)cons1.receive(1000);
+
+            assertNotNull(tm);
+            
+            assertEquals("message" + i, tm.getText());
+         }                 
+
+         m = cons1.receive(2000);
+
+         assertNull(m);
+         
+         cons1.close();
+         
+         // ==============
+         // Send at node 2
+
+         MessageProducer prod2 = sess2.createProducer(queue2);
+
+         prod2.setDeliveryMode(persistent ? DeliveryMode.PERSISTENT : DeliveryMode.NON_PERSISTENT);
+
+         for (int i = 0; i < NUM_MESSAGES; i++)
+         {
+            TextMessage tm = sess2.createTextMessage("message" + i);
+
+            prod2.send(tm);
+         }
+         
+         // Try and consume at node 0
+         
+         cons0 = sess0.createConsumer(queue0);
+         
+         m = cons0.receive(2000);
+
+         assertNull(m);
+         
+         cons0.close();
+         
+         //And at node 1
+         
+         cons1 = sess1.createConsumer(queue1);
+         
+         m = cons1.receive(2000);
+
+         assertNull(m);
+         
+         cons1.close();
+         
+         // Now consume at node 2
+         
+         cons2 = sess2.createConsumer(queue2);
+          
+         for (int i = 0; i < NUM_MESSAGES; i++)
+         {
+            TextMessage tm = (TextMessage)cons2.receive(1000);
+
+            assertNotNull(tm);
+            
+            assertEquals("message" + i, tm.getText());
+         }                 
+
+         m = cons2.receive(2000);
+
+         assertNull(m);
+         
+         cons2.close();
+           
+      }
+      finally
+      {
+         if (conn0 != null)
+         {
+            conn0.close();
+         }
+
+         if (conn1 != null)
+         {
+            conn1.close();
+         }
+
+         if (conn2 != null)
+         {
+            conn2.close();
+         }
+         
+         ServerManagement.undeployQueue("nonClusteredQueue", 0);
+         
+         ServerManagement.undeployQueue("nonClusteredQueue", 1);
+         
+         ServerManagement.undeployQueue("nonClusteredQueue", 2);
+      }
+   }
+
+   // Private -------------------------------------------------------
+
+   // Inner classes -------------------------------------------------
+   
+}

Modified: trunk/tests/src/org/jboss/test/messaging/jms/clustering/FailoverTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/clustering/FailoverTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/jms/clustering/FailoverTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -27,7 +27,7 @@
 import org.jboss.test.messaging.tools.aop.PoisonInterceptor;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/messaging/jms/clustering/GroupManagementTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/clustering/GroupManagementTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/jms/clustering/GroupManagementTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -12,7 +12,7 @@
 import java.util.Set;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/messaging/jms/clustering/HATest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/clustering/HATest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/jms/clustering/HATest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -52,7 +52,7 @@
 /**
  * @author <a href="mailto:clebert.suconic at jboss.org">Clebert Suconic</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/messaging/jms/clustering/LargeClusterTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/clustering/LargeClusterTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/jms/clustering/LargeClusterTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -22,7 +22,7 @@
 import java.util.Set;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/messaging/jms/clustering/LoadBalancingTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/clustering/LoadBalancingTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/jms/clustering/LoadBalancingTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -26,7 +26,7 @@
  * This test DOESN'T extend ClusteringTestBase because I want to have control over first invocations
  * to the server (which are outside of of my control if I use ClusteringTestBase).
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/messaging/jms/clustering/MultipleFailoverTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/clustering/MultipleFailoverTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/jms/clustering/MultipleFailoverTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -36,13 +36,11 @@
 
 import org.jboss.test.messaging.tools.ServerManagement;
 
-import EDU.oswego.cs.dl.util.concurrent.Latch;
-
 /**
  * A test where we kill multiple nodes and make sure the failover works correctly in these condtions
  * too.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$
@@ -212,9 +210,7 @@
 
          MessageConsumer cons = sessCons.createConsumer(queue[0]);
 
-         Latch latch = new Latch();
-         
-         MyListener list = new MyListener(latch);
+         MyListener list = new MyListener();
 
          cons.setMessageListener(list);
 
@@ -260,11 +256,13 @@
          conn.close();
          conn = null;
          
-         fail("this test is BS - it doesn't check it receives all the messages");
-         
+         if (!list.waitFor(count))
+         {
+         	fail("Timed out waiting for message");
+         }
+                  
+         count = 0;
          Iterator iter = list.msgs.iterator();
-         
-         count = 0;
          while (iter.hasNext())
          {
             Integer i = (Integer)iter.next();
@@ -273,10 +271,9 @@
             {
                fail("Missing message " + i);
             }
-            
             count++;
          }
-             
+         
          if (list.failed)
          {
             fail();
@@ -417,18 +414,37 @@
    class MyListener implements MessageListener
    {
       int count = 0;
-      
-      Latch latch;
-      
+          
       volatile boolean failed;
       
       Set msgs = new TreeSet();
       
-      MyListener(Latch latch)
+      int maxcnt = 0;
+      
+      private Object obj = new Object();
+      
+      boolean waitFor(int i)
       {
-         this.latch = latch;
+      	synchronized (obj)
+      	{
+      		long toWait = 30000;
+      		while (maxcnt < i && toWait > 0)
+      		{
+      			long start = System.currentTimeMillis();
+      			try
+      			{      				
+      				obj.wait(30000);
+      			}
+      			catch (InterruptedException e)
+      			{}
+      			if (i <= maxcnt)
+      			{
+      				toWait -= System.currentTimeMillis() - start;
+      			}            			      
+      		}
+      		return maxcnt < i;
+      	}
       }
-      
    
       public void onMessage(Message msg)
       {
@@ -466,9 +482,15 @@
             Therefore we only count that the total messages were received
             */      
             
-            msgs.add(new Integer(msg.getIntProperty("cnt")));
+            int cnt = msg.getIntProperty("cnt");
             
+            msgs.add(new Integer(cnt));
             
+            maxcnt = Math.max(maxcnt, cnt);
+            synchronized (obj)
+            {
+            	obj.notify();
+            }                        
          }
          catch (Exception e)
          {

Modified: trunk/tests/src/org/jboss/test/messaging/jms/clustering/RecoverDeliveriesTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/clustering/RecoverDeliveriesTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/jms/clustering/RecoverDeliveriesTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -95,16 +95,6 @@
    	this.simple(false);
    }
    
-   public void testTempQueueTransactional() throws Exception
-   {
-   	this.temporaryQueue(true);
-   }
-   
-   public void testTempQueueNonTransactional() throws Exception
-   {
-   	this.temporaryQueue(false);
-   }
-      
    public void testWithConnectionOnNewNodeTransactional() throws Exception
    {
    	connectionOnNewNode(true);
@@ -444,134 +434,7 @@
    }
    
   
-   private void temporaryQueue(boolean transactional) throws Exception
-   {
-   	JBossConnectionFactory factory = (JBossConnectionFactory) ic[0].lookup("/ClusteredConnectionFactory");
-
-      Connection conn1 = createConnectionOnServer(factory,1);
- 
-      try
-      {
-      	SimpleFailoverListener failoverListener = new SimpleFailoverListener();
-         ((JBossConnection)conn1).registerFailoverListener(failoverListener);
-      	
-         Session sessSend = conn1.createSession(false, Session.AUTO_ACKNOWLEDGE);
-         
-         Queue tempQueue1 = sessSend.createTemporaryQueue();
-      		
-      	MessageProducer prod1 = sessSend.createProducer(tempQueue1);
-      	
-      	final int numMessages = 10;
-      	
-      	for (int i = 0; i < numMessages; i++)
-      	{
-      		TextMessage tm = sessSend.createTextMessage("message" + i);
-      		
-      		prod1.send(tm);      		
-      	}
-      	
-      	Session sess1 = conn1.createSession(transactional, transactional ? Session.SESSION_TRANSACTED : Session.CLIENT_ACKNOWLEDGE);
-      	
-      	MessageConsumer cons1 = sess1.createConsumer(tempQueue1);
-      
-      	
-      	conn1.start();
-      	
-      	TextMessage tm = null;
-      	
-      	for (int i = 0; i < numMessages; i++)
-      	{
-      		tm = (TextMessage)cons1.receive(2000);
-      		
-      		assertNotNull(tm);
-      		
-      		assertEquals("message" + i, tm.getText());
-      	}
-      	
-      	//Don't ack
-      	
-      	//Now kill server
-      	
-      	int failoverNodeId = this.getFailoverNodeForNode(factory, 1);
-      	
-      	int recoveryMapSize = ServerManagement.getServer(failoverNodeId).getRecoveryMapSize(tempQueue1.getQueueName());
-      	assertEquals(0, recoveryMapSize);
-      	Map recoveryArea = ServerManagement.getServer(failoverNodeId).getRecoveryArea(tempQueue1.getQueueName());
-      	Map ids = (Map)recoveryArea.get(new Integer(1));
-      	assertNotNull(ids);
-      	assertEquals(numMessages, ids.size());
-      	
-      	ServerManagement.kill(1);
-
-         log.info("########");
-         log.info("######## KILLED NODE 1");
-         log.info("########");
-
-         // wait for the client-side failover to complete
-
-         log.info("Waiting for failover to complete");
-         
-         while(true)
-         {
-            FailoverEvent event = failoverListener.getEvent(120000);
-            if (event != null && FailoverEvent.FAILOVER_COMPLETED == event.getType())
-            {
-               break;
-            }
-            if (event == null)
-            {
-               fail("Did not get expected FAILOVER_COMPLETED event");
-            }
-         }
-         
-         log.info("Failover completed");
-         
-         assertEquals(failoverNodeId, getServerId(conn1));
-                  
-         //Now ack
-         if (transactional)
-         {
-         	sess1.commit();
-         }
-         else
-         {
-         	tm.acknowledge();
-         }
-         
-         recoveryMapSize = ServerManagement.getServer(failoverNodeId).getRecoveryMapSize(tempQueue1.getQueueName());
-      	assertEquals(0, recoveryMapSize);
-      	recoveryArea = ServerManagement.getServer(failoverNodeId).getRecoveryArea(tempQueue1.getQueueName());
-      	ids = (Map)recoveryArea.get(new Integer(1));
-      	assertNull(ids);
-         
-         log.info("acked");
-         
-         sess1.close();
-         
-         log.info("closed");
-         
-	      sess1 = conn1.createSession(false, Session.AUTO_ACKNOWLEDGE);
-	      
-	      log.info("created new session");
-      	
-      	cons1 = sess1.createConsumer(tempQueue1);
-      	
-      	log.info("Created consumer");
-      	
-         //Messages should be gone
-      	
-         tm = (TextMessage)cons1.receive(5000);
-      		
-      	assertNull(tm);      		
-      }
-      finally
-      {
-         if (conn1 != null)
-         {
-            conn1.close();
-         }
-      }
-   }
+  
    
    private void durableSub(boolean transactional) throws Exception
    {
@@ -586,28 +449,34 @@
       	
       	SimpleFailoverListener failoverListener = new SimpleFailoverListener();
          ((JBossConnection)conn1).registerFailoverListener(failoverListener);
+         
+         Session sess1 = conn1.createSession(transactional, transactional ? Session.SESSION_TRANSACTED : Session.CLIENT_ACKNOWLEDGE);
       	
-         Session sessSend = conn1.createSession(false, Session.AUTO_ACKNOWLEDGE);
-               		
          String subName = "ooooooooo matron!!";
+               	
+         MessageConsumer sub = sess1.createDurableSubscriber(topic[1], subName);
+      	
+      	final int numMessages = 10;
+      	         
+         {         
+	         Session sessSend = conn1.createSession(false, Session.AUTO_ACKNOWLEDGE);
+	               		
+	      	MessageProducer prod1 = sessSend.createProducer(topic[1]);
+	      	
+	      	for (int i = 0; i < numMessages; i++)
+	      	{
+	      		TextMessage tm = sessSend.createTextMessage("message" + i);
+	      		
+	      		prod1.send(tm);      		
+	      	}
+	      	
+	      	sessSend.close();      	
+         }      	      	      	      	
          
-         MessageConsumer sub = sessSend.createDurableSubscriber(topic[1], subName);
-         
          String queueName = MessageQueueNameHelper.createSubscriptionName(clientID, subName);
          
-      	MessageProducer prod1 = sessSend.createProducer(topic[1]);
-      	
-      	final int numMessages = 10;
-      	
-      	for (int i = 0; i < numMessages; i++)
-      	{
-      		TextMessage tm = sessSend.createTextMessage("message" + i);
-      		
-      		prod1.send(tm);      		
-      	}
-      	
-      	Session sess1 = conn1.createSession(transactional, transactional ? Session.SESSION_TRANSACTED : Session.CLIENT_ACKNOWLEDGE);
-      	
+         log.info("queuename is:" + queueName);
+               	
       	conn1.start();
       	
       	TextMessage tm = null;
@@ -627,6 +496,10 @@
       	
       	int failoverNodeId = this.getFailoverNodeForNode(factory, 1);
       	
+      	log.info("Failover node is " + failoverNodeId);
+      	
+      	Thread.sleep(5000);
+      	
       	int recoveryMapSize = ServerManagement.getServer(failoverNodeId).getRecoveryMapSize(queueName);
       	assertEquals(0, recoveryMapSize);
       	Map recoveryArea = ServerManagement.getServer(failoverNodeId).getRecoveryArea(queueName);
@@ -1114,7 +987,13 @@
          log.info("Failover completed");
                            
          assertEquals(failoverNodeId, getServerId(conn1));
-                  
+         
+         int recoveryMapSize = ServerManagement.getServer(failoverNodeId).getRecoveryMapSize(queue[failoverNodeId].getQueueName());
+      	assertEquals(0, recoveryMapSize);
+      	Map recoveryArea = ServerManagement.getServer(failoverNodeId).getRecoveryArea(queue[failoverNodeId].getQueueName());
+      	Map ids = (Map)recoveryArea.get(new Integer(1));
+      	assertNull(ids);
+          
          //Now ack
          if (transactional)
          {

Modified: trunk/tests/src/org/jboss/test/messaging/jms/clustering/ServerManagementTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/clustering/ServerManagementTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/jms/clustering/ServerManagementTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -18,7 +18,7 @@
  *
  * DO NOT extend ClusteringTestBase, I need direct control over start()/stop()!
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/messaging/jms/clustering/TemporaryDestinationTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/clustering/TemporaryDestinationTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/jms/clustering/TemporaryDestinationTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -34,7 +34,7 @@
  * A test for temporary destinations in a clustered enviroment.
  * See http://jira.jboss.org/jira/browse/JBMESSAGING-841.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @version <tt>$Revision$</tt>
  *

Modified: trunk/tests/src/org/jboss/test/messaging/jms/message/BytesMessageTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/message/BytesMessageTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/jms/message/BytesMessageTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -29,7 +29,7 @@
 /**
  * A test that sends/receives bytes messages to the JMS provider and verifies their integrity.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/messaging/jms/message/ExpiredMessageTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/message/ExpiredMessageTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/jms/message/ExpiredMessageTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -20,7 +20,7 @@
 import org.jboss.test.messaging.tools.ServerManagement;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  * $Id$
  */

Modified: trunk/tests/src/org/jboss/test/messaging/jms/message/JMSDeliveryModeHeaderTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/message/JMSDeliveryModeHeaderTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/jms/message/JMSDeliveryModeHeaderTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -25,7 +25,7 @@
 import javax.jms.DeliveryMode;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  */
 public class JMSDeliveryModeHeaderTest extends MessageTest

Modified: trunk/tests/src/org/jboss/test/messaging/jms/message/JMSDestinationHeaderTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/message/JMSDestinationHeaderTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/jms/message/JMSDestinationHeaderTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -24,7 +24,7 @@
 import javax.jms.Message;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  */
 public class JMSDestinationHeaderTest extends MessageTest

Modified: trunk/tests/src/org/jboss/test/messaging/jms/message/JMSExpirationHeaderTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/message/JMSExpirationHeaderTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/jms/message/JMSExpirationHeaderTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -35,7 +35,7 @@
 import EDU.oswego.cs.dl.util.concurrent.Latch;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @version <tt>$Revision$</tt>
  *

Modified: trunk/tests/src/org/jboss/test/messaging/jms/message/JMSMessageIDHeaderTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/message/JMSMessageIDHeaderTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/jms/message/JMSMessageIDHeaderTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -24,7 +24,7 @@
 import javax.jms.Message;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  */
 public class JMSMessageIDHeaderTest extends MessageTest

Modified: trunk/tests/src/org/jboss/test/messaging/jms/message/JMSTimestampHeaderTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/message/JMSTimestampHeaderTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/jms/message/JMSTimestampHeaderTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -24,7 +24,7 @@
 import javax.jms.Message;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  */
 public class JMSTimestampHeaderTest extends MessageTest

Modified: trunk/tests/src/org/jboss/test/messaging/jms/message/MapMessageTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/message/MapMessageTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/jms/message/MapMessageTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -29,7 +29,7 @@
 /**
  * A test that sends/receives map messages to the JMS provider and verifies their integrity.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/messaging/jms/message/MessageTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/message/MessageTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/jms/message/MessageTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -59,7 +59,7 @@
 /**
  * Base class for all tests concerning message headers, properties, etc.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @version <tt>$Revision$</tt>
  *

Modified: trunk/tests/src/org/jboss/test/messaging/jms/message/MessageTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/message/MessageTestBase.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/jms/message/MessageTestBase.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -28,7 +28,7 @@
 import org.jboss.test.messaging.jms.JMSTestBase;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/messaging/jms/message/ObjectMessageTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/message/ObjectMessageTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/jms/message/ObjectMessageTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -35,7 +35,7 @@
 /**
  * A test that sends/receives object messages to the JMS provider and verifies their integrity.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:clebert.suconic at jboss.org">Clebert Suconic</a>
  * @version <tt>$Revision$</tt>
  *

Modified: trunk/tests/src/org/jboss/test/messaging/jms/message/SimpleJMSBytesMessage.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/message/SimpleJMSBytesMessage.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/jms/message/SimpleJMSBytesMessage.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -36,7 +36,7 @@
 import javax.jms.MessageNotWriteableException;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version $Revision$
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/messaging/jms/message/SimpleJMSMapMessage.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/message/SimpleJMSMapMessage.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/jms/message/SimpleJMSMapMessage.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -34,7 +34,7 @@
 import org.jboss.util.Primitives;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version $Revision$
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/messaging/jms/message/SimpleJMSMessage.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/message/SimpleJMSMessage.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/jms/message/SimpleJMSMessage.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -34,7 +34,7 @@
 /**
  * Foreign message implementation. Used for testing only.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/messaging/jms/message/SimpleJMSObjectMessage.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/message/SimpleJMSObjectMessage.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/jms/message/SimpleJMSObjectMessage.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -27,7 +27,7 @@
 import javax.jms.ObjectMessage;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/messaging/jms/message/SimpleJMSStreamMessage.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/message/SimpleJMSStreamMessage.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/jms/message/SimpleJMSStreamMessage.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -34,7 +34,7 @@
 import org.jboss.util.Primitives;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version $Revision$
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/messaging/jms/message/SimpleJMSTextMessage.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/message/SimpleJMSTextMessage.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/jms/message/SimpleJMSTextMessage.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -25,7 +25,7 @@
 import javax.jms.JMSException;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/messaging/jms/message/StreamMessageTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/message/StreamMessageTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/jms/message/StreamMessageTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -29,7 +29,7 @@
 /**
  * A test that sends/receives stream messages to the JMS provider and verifies their integrity.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/messaging/jms/message/TextMessageTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/message/TextMessageTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/jms/message/TextMessageTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -29,7 +29,7 @@
 /**
  * A test that sends/receives text messages to the JMS provider and verifies their integrity.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/messaging/jms/selector/SelectorTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/selector/SelectorTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/jms/selector/SelectorTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -41,7 +41,7 @@
 import EDU.oswego.cs.dl.util.concurrent.Latch;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/messaging/jms/server/DestinationManagerTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/server/DestinationManagerTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/jms/server/DestinationManagerTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -34,7 +34,7 @@
 import org.jboss.test.messaging.tools.ServerManagement;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/messaging/jms/server/ServerPeerTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/server/ServerPeerTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/jms/server/ServerPeerTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -52,7 +52,7 @@
 import org.jboss.test.messaging.tools.ServerManagement;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/messaging/jms/server/connectionfactory/ConnectionFactoryTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/server/connectionfactory/ConnectionFactoryTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/jms/server/connectionfactory/ConnectionFactoryTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -41,7 +41,7 @@
 /**
  * Tests a deployed ConnectionFactory service.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/messaging/jms/server/connectionfactory/JNDIBindingsTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/server/connectionfactory/JNDIBindingsTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/jms/server/connectionfactory/JNDIBindingsTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -31,7 +31,7 @@
 import org.w3c.dom.Element;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/messaging/jms/server/destination/QueueManagementTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/server/destination/QueueManagementTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/jms/server/destination/QueueManagementTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -47,7 +47,7 @@
 /**
  * Tests a queue's management interface.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @version <tt>$Revision$</tt>
  *

Modified: trunk/tests/src/org/jboss/test/messaging/jms/server/destination/TopicManagementTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/server/destination/TopicManagementTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/jms/server/destination/TopicManagementTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -46,7 +46,7 @@
 /**
  * Tests a topic's management interface.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @version <tt>$Revision$</tt>
  *

Modified: trunk/tests/src/org/jboss/test/messaging/jms/server/destination/base/DestinationManagementTestBase.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/server/destination/base/DestinationManagementTestBase.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/jms/server/destination/base/DestinationManagementTestBase.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -51,7 +51,7 @@
 /**
  * Exercises a destinatio's management interface after deployment.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @version <tt>$Revision$</tt>
  *

Modified: trunk/tests/src/org/jboss/test/messaging/jms/stress/CorruptMessageStressTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/jms/stress/CorruptMessageStressTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/jms/stress/CorruptMessageStressTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -22,7 +22,7 @@
 /**
  * A stress test written to investigate http://jira.jboss.org/jira/browse/JBMESSAGING-362
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  * $Id$
  */

Modified: trunk/tests/src/org/jboss/test/messaging/tools/ServerManagement.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/ServerManagement.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/tools/ServerManagement.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -54,7 +54,7 @@
  * Collection of static methods to use to start/stop and interact with the in-memory JMS server. It
  * is also use to start/stop a remote server.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @version <tt>$Revision$</tt>
  *

Modified: trunk/tests/src/org/jboss/test/messaging/tools/ant/DisplayWarningsAndErrors.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/ant/DisplayWarningsAndErrors.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/tools/ant/DisplayWarningsAndErrors.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -32,7 +32,7 @@
 /**
  * Greps fror WARN and ERROR entries in the specified file.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  *
  * $Id$
  */

Modified: trunk/tests/src/org/jboss/test/messaging/tools/ant/FailOnSerializationDebugOutput.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/ant/FailOnSerializationDebugOutput.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/tools/ant/FailOnSerializationDebugOutput.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -29,7 +29,7 @@
 /**
  * Throws an exception if it finds a jboss-serialization DEBUG output in the given file
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  *
  * $Id$
  */

Modified: trunk/tests/src/org/jboss/test/messaging/tools/ant/GenerateSmokeReport.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/ant/GenerateSmokeReport.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/tools/ant/GenerateSmokeReport.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -42,7 +42,7 @@
 /**
  * Generates a HTML smoke test report based on raw smoke run data.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  *
  * $Id$
  */

Modified: trunk/tests/src/org/jboss/test/messaging/tools/ant/JUnitTestSuiteListener.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/ant/JUnitTestSuiteListener.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/tools/ant/JUnitTestSuiteListener.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -26,7 +26,7 @@
  * notified on a endTestSuite() event. Very important, it is run in the same address space as the
  * tests themselves.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  * $Id$
  */

Modified: trunk/tests/src/org/jboss/test/messaging/tools/aop/PoisonInterceptor.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/aop/PoisonInterceptor.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/tools/aop/PoisonInterceptor.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -26,7 +26,7 @@
 /**
  * Used to force a "poisoned" server to do all sorts of bad things. Used for testing.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  * $Id$
  */

Modified: trunk/tests/src/org/jboss/test/messaging/tools/jboss/MBeanConfigurationElement.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/jboss/MBeanConfigurationElement.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/tools/jboss/MBeanConfigurationElement.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -25,7 +25,7 @@
 /**
  * The convenience object model of a JBoss <mbean> service descriptor configuration element.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  * 
  * $Id$

Modified: trunk/tests/src/org/jboss/test/messaging/tools/jboss/ServiceDeploymentDescriptor.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/jboss/ServiceDeploymentDescriptor.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/tools/jboss/ServiceDeploymentDescriptor.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -24,7 +24,7 @@
 /**
  * The convenience object model of a JBoss service deployment descriptor (<server>).
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/messaging/tools/jmx/ClassLoaderJMXWrapper.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/jmx/ClassLoaderJMXWrapper.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/tools/jmx/ClassLoaderJMXWrapper.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -30,7 +30,7 @@
  * (in this case): "Tried to add non-URLClassLoader. Ignored". Extending ClassLoader would be fine
  * otherwise.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/messaging/tools/jmx/ClassLoaderJMXWrapperMBean.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/jmx/ClassLoaderJMXWrapperMBean.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/tools/jmx/ClassLoaderJMXWrapperMBean.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -22,7 +22,7 @@
 package org.jboss.test.messaging.tools.jmx;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/messaging/tools/jmx/Example.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/jmx/Example.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/tools/jmx/Example.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -30,7 +30,7 @@
 /**
  * An example how to use ServiceContainer to get access to an in-memory database.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/messaging/tools/jmx/MBeanServerBuilder.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/jmx/MBeanServerBuilder.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/tools/jmx/MBeanServerBuilder.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -12,7 +12,7 @@
 import javax.management.MBeanServerDelegate;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/messaging/tools/jmx/ManagedConnectionFactoryJMXWrapper.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/jmx/ManagedConnectionFactoryJMXWrapper.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/tools/jmx/ManagedConnectionFactoryJMXWrapper.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -31,7 +31,7 @@
 import java.util.ArrayList;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/messaging/tools/jmx/ManagedConnectionFactoryJMXWrapperMBean.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/jmx/ManagedConnectionFactoryJMXWrapperMBean.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/tools/jmx/ManagedConnectionFactoryJMXWrapperMBean.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -25,7 +25,7 @@
 
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/messaging/tools/jmx/MockJBossSecurityManager.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/jmx/MockJBossSecurityManager.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/tools/jmx/MockJBossSecurityManager.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -43,7 +43,7 @@
  * Mock Security manager for testing JMS security.
  *
  * @author <a href="tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * 
  */
 public class MockJBossSecurityManager implements AuthenticationManager, RealmMapping

Modified: trunk/tests/src/org/jboss/test/messaging/tools/jmx/NoopInvoker.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/jmx/NoopInvoker.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/tools/jmx/NoopInvoker.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -27,7 +27,7 @@
 import org.jboss.invocation.Invoker;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/messaging/tools/jmx/RemotingJMXWrapper.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/jmx/RemotingJMXWrapper.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/tools/jmx/RemotingJMXWrapper.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -33,7 +33,7 @@
 
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/messaging/tools/jmx/RemotingJMXWrapperMBean.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/jmx/RemotingJMXWrapperMBean.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/tools/jmx/RemotingJMXWrapperMBean.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -33,7 +33,7 @@
  *       should have a Connector.getSubsystemNames() or similar), but it doesn't, so I have to do
  *       this by myself.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/messaging/tools/jmx/ServiceAttributeOverrides.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/jmx/ServiceAttributeOverrides.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/tools/jmx/ServiceAttributeOverrides.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -13,7 +13,7 @@
 import java.io.Serializable;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  * 
  * $Id$

Modified: trunk/tests/src/org/jboss/test/messaging/tools/jmx/ServiceContainer.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/jmx/ServiceContainer.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/tools/jmx/ServiceContainer.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -97,7 +97,7 @@
  * An MBeanServer and a configurable set of services (TransactionManager, Remoting, etc) available
  * for testing.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/messaging/tools/jmx/ServiceContainerConfiguration.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/jmx/ServiceContainerConfiguration.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/tools/jmx/ServiceContainerConfiguration.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -20,7 +20,7 @@
 import org.w3c.dom.NodeList;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/messaging/tools/jmx/TransactionManagerJMXWrapper.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/jmx/TransactionManagerJMXWrapper.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/tools/jmx/TransactionManagerJMXWrapper.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -25,7 +25,7 @@
 
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/messaging/tools/jmx/TransactionManagerJMXWrapperMBean.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/jmx/TransactionManagerJMXWrapperMBean.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/tools/jmx/TransactionManagerJMXWrapperMBean.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -24,7 +24,7 @@
 import javax.transaction.TransactionManager;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/LocalTestServer.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/LocalTestServer.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/LocalTestServer.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -56,7 +56,7 @@
 import org.w3c.dom.Element;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @version <tt>1.1</tt>
  *

Modified: trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/NamingDelegate.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/NamingDelegate.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/NamingDelegate.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -26,7 +26,7 @@
 /**
  * The remote naming interface.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/NotificationListenerID.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/NotificationListenerID.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/NotificationListenerID.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -11,7 +11,7 @@
 import java.io.Serializable;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  * $Id$
  */

Modified: trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/ProxyNotificationListener.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/ProxyNotificationListener.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/ProxyNotificationListener.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -15,7 +15,7 @@
 /**
  * Stores notifications until they're transferred to the remote client.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  * $Id$
  */

Modified: trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/RMINamingDelegate.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/RMINamingDelegate.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/RMINamingDelegate.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -29,7 +29,7 @@
 import java.rmi.server.UnicastRemoteObject;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/RMITestServer.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/RMITestServer.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/RMITestServer.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -45,7 +45,7 @@
 /**
  * An RMI wrapper to access the ServiceContainer from a different address space.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com>Tim Fox</a>
  * @version <tt>1.1</tt>
  *

Modified: trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/RemoteTestServer.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/RemoteTestServer.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/RemoteTestServer.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -26,7 +26,7 @@
 import org.jboss.messaging.core.contract.PersistenceManager;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>
  * @version <tt>1.1</tt>
  *

Modified: trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/Server.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/Server.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/Server.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -40,7 +40,7 @@
 /**
  * The remote interface exposed by TestServer.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/StopRMIServer.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/StopRMIServer.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/tools/jmx/rmi/StopRMIServer.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -30,7 +30,7 @@
 /**
  * A utility to stop runaway rmi servers.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/messaging/tools/jndi/Constants.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/jndi/Constants.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/tools/jndi/Constants.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -7,7 +7,7 @@
 package org.jboss.test.messaging.tools.jndi;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/messaging/tools/jndi/InVMContext.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/jndi/InVMContext.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/tools/jndi/InVMContext.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -45,7 +45,7 @@
 
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/messaging/tools/jndi/InVMInitialContextFactory.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/jndi/InVMInitialContextFactory.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/tools/jndi/InVMInitialContextFactory.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -31,7 +31,7 @@
 /**
  * An in-VM JNDI InitialContextFactory. Lightweight JNDI implementation used for testing.
 
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/messaging/tools/jndi/InVMInitialContextFactoryBuilder.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/jndi/InVMInitialContextFactoryBuilder.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/tools/jndi/InVMInitialContextFactoryBuilder.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -29,7 +29,7 @@
 import java.util.Hashtable;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  *
  * @version <tt>$Revision$</tt>
  *

Modified: trunk/tests/src/org/jboss/test/messaging/tools/jndi/InVMNameParser.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/jndi/InVMNameParser.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/tools/jndi/InVMNameParser.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -29,7 +29,7 @@
 import java.io.Serializable;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/messaging/tools/jndi/RemoteContext.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/jndi/RemoteContext.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/tools/jndi/RemoteContext.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -31,7 +31,7 @@
 
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/messaging/tools/jndi/RemoteInitialContextFactory.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/jndi/RemoteInitialContextFactory.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/tools/jndi/RemoteInitialContextFactory.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -28,7 +28,7 @@
 import org.jboss.logging.Logger;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/messaging/tools/junit/SelectiveTestRunner.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/junit/SelectiveTestRunner.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/tools/junit/SelectiveTestRunner.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -33,7 +33,7 @@
 /**
  * A text TestRunner than runs only test methods specified on command line with "-t".
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/messaging/tools/junit/SelectiveTestSuite.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/junit/SelectiveTestSuite.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/tools/junit/SelectiveTestSuite.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -35,7 +35,7 @@
 /**
  * A TestSuite that filters tests.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/messaging/tools/misc/ConfigurableSecurityManager.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/misc/ConfigurableSecurityManager.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/tools/misc/ConfigurableSecurityManager.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -32,7 +32,7 @@
  * A configurable SecurityManager, that, once installed, can selectively allow or disallow various
  * permissions.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  * $Id$
  */

Modified: trunk/tests/src/org/jboss/test/messaging/util/CoreMessageFactory.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/util/CoreMessageFactory.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/util/CoreMessageFactory.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -27,7 +27,7 @@
 import org.jboss.messaging.core.impl.message.CoreMessage;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @author <a href="mailto:tim.fox at jboss.com">Tim Fox</a>  
  * @version <tt>$Revision: 764 $</tt>
  * 

Modified: trunk/tests/src/org/jboss/test/messaging/util/JNDITest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/util/JNDITest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/util/JNDITest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -15,7 +15,7 @@
 import java.util.Hashtable;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  *
  * @version <tt>$Revision$</tt>
  *

Modified: trunk/tests/src/org/jboss/test/messaging/util/JNDITesterService.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/util/JNDITesterService.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/util/JNDITesterService.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -10,7 +10,7 @@
 import java.util.Hashtable;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  * $Id$
  */

Modified: trunk/tests/src/org/jboss/test/messaging/util/JNDITesterServiceMBean.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/util/JNDITesterServiceMBean.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/util/JNDITesterServiceMBean.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -9,7 +9,7 @@
 import java.util.Hashtable;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  * $Id$
  */

Modified: trunk/tests/src/org/jboss/test/messaging/util/JNDIUtilTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/util/JNDIUtilTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/util/JNDIUtilTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -30,7 +30,7 @@
 
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  */
 public class JNDIUtilTest extends MessagingTestCase

Modified: trunk/tests/src/org/jboss/test/messaging/util/MBeanConfigurationElementTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/util/MBeanConfigurationElementTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/util/MBeanConfigurationElementTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -33,7 +33,7 @@
 import org.w3c.dom.NodeList;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/messaging/util/ServiceContainerTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/util/ServiceContainerTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/util/ServiceContainerTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -18,7 +18,7 @@
 import org.jboss.test.messaging.tools.ServerManagement;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  * $Id$
  */

Modified: trunk/tests/src/org/jboss/test/messaging/util/ServiceDeploymentDescriptorTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/util/ServiceDeploymentDescriptorTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/util/ServiceDeploymentDescriptorTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -28,7 +28,7 @@
 import org.jboss.test.messaging.tools.jboss.ServiceDeploymentDescriptor;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/messaging/util/UtilTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/util/UtilTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/util/UtilTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -27,7 +27,7 @@
 
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  */
 public class UtilTest extends MessagingTestCase

Modified: trunk/tests/src/org/jboss/test/messaging/util/XMLUtilTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/util/XMLUtilTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/messaging/util/XMLUtilTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -30,7 +30,7 @@
 
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  */
 public class XMLUtilTest extends MessagingTestCase

Modified: trunk/tests/src/org/jboss/test/thirdparty/jbosssx/SecurityAssociationTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/thirdparty/jbosssx/SecurityAssociationTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/thirdparty/jbosssx/SecurityAssociationTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -48,7 +48,7 @@
  *
  * Tests contained by this class are supposed to run only in local environment.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  * $Id$
  */

Modified: trunk/tests/src/org/jboss/test/thirdparty/remoting/ClientInvokerTimeoutTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/thirdparty/remoting/ClientInvokerTimeoutTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/thirdparty/remoting/ClientInvokerTimeoutTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -22,7 +22,7 @@
  * http://jira.jboss.org/jira/browse/JBREM-691. Test written entirely at the Remoting level. If
  * fails with Remoting 2.2.0.Alpha6.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  *
  * @version <tt>$Revision$</tt>
  *

Modified: trunk/tests/src/org/jboss/test/thirdparty/remoting/DaemonThreadTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/thirdparty/remoting/DaemonThreadTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/thirdparty/remoting/DaemonThreadTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -12,7 +12,7 @@
  * This test makes sure that all client-side threads employed by Messaging are well behaved and
  * don't prevent a client from exiting cleanly.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/thirdparty/remoting/LazySubsystem.java
===================================================================
--- trunk/tests/src/org/jboss/test/thirdparty/remoting/LazySubsystem.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/thirdparty/remoting/LazySubsystem.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -16,7 +16,7 @@
 import javax.management.MBeanServer;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/thirdparty/remoting/ManualConnectionValidatorTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/thirdparty/remoting/ManualConnectionValidatorTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/thirdparty/remoting/ManualConnectionValidatorTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -18,7 +18,7 @@
  * client ping for a long time. To be used with netstat to see if it creates new sockets for each
  * invocation.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/thirdparty/remoting/PureAsynchronousCallTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/thirdparty/remoting/PureAsynchronousCallTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/thirdparty/remoting/PureAsynchronousCallTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -29,7 +29,7 @@
 /**
  * A test case in which we play with "pure" remoting asynchronous calls.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  *
  * @version <tt>$Revision$</tt>
  *

Modified: trunk/tests/src/org/jboss/test/thirdparty/remoting/RemotingConnectionFailureTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/thirdparty/remoting/RemotingConnectionFailureTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/thirdparty/remoting/RemotingConnectionFailureTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -21,7 +21,7 @@
 import java.util.Map;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/thirdparty/remoting/RemotingTest.java
===================================================================
--- trunk/tests/src/org/jboss/test/thirdparty/remoting/RemotingTest.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/thirdparty/remoting/RemotingTest.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -51,7 +51,7 @@
 
 /**
  * @author <a href="tim.fox at jboss.com">Tim Fox</a>
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  *
  * @version <tt>$Revision: 1935 $</tt>
  *

Modified: trunk/tests/src/org/jboss/test/thirdparty/remoting/util/OnewayCallbackTrigger.java
===================================================================
--- trunk/tests/src/org/jboss/test/thirdparty/remoting/util/OnewayCallbackTrigger.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/thirdparty/remoting/util/OnewayCallbackTrigger.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -9,7 +9,7 @@
 import java.io.Serializable;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/thirdparty/remoting/util/RemotingTestSubsystem.java
===================================================================
--- trunk/tests/src/org/jboss/test/thirdparty/remoting/util/RemotingTestSubsystem.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/thirdparty/remoting/util/RemotingTestSubsystem.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -25,7 +25,7 @@
 import EDU.oswego.cs.dl.util.concurrent.Channel;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/thirdparty/remoting/util/RemotingTestSubsystemService.java
===================================================================
--- trunk/tests/src/org/jboss/test/thirdparty/remoting/util/RemotingTestSubsystemService.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/thirdparty/remoting/util/RemotingTestSubsystemService.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -19,7 +19,7 @@
 /**
  * A standard MBean service to be used when testing remoting.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/thirdparty/remoting/util/RemotingTestSubsystemServiceMBean.java
===================================================================
--- trunk/tests/src/org/jboss/test/thirdparty/remoting/util/RemotingTestSubsystemServiceMBean.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/thirdparty/remoting/util/RemotingTestSubsystemServiceMBean.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -9,7 +9,7 @@
 import org.jboss.remoting.InvocationRequest;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  * $Id$
  */

Modified: trunk/tests/src/org/jboss/test/thirdparty/remoting/util/SimpleConnectionListener.java
===================================================================
--- trunk/tests/src/org/jboss/test/thirdparty/remoting/util/SimpleConnectionListener.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/thirdparty/remoting/util/SimpleConnectionListener.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -17,7 +17,7 @@
 /**
  * It is Serializable so it can be used both on client and on server.
  *
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  *
  * $Id$

Modified: trunk/tests/src/org/jboss/test/thirdparty/remoting/util/TestableSubsystem.java
===================================================================
--- trunk/tests/src/org/jboss/test/thirdparty/remoting/util/TestableSubsystem.java	2007-07-10 18:57:16 UTC (rev 2867)
+++ trunk/tests/src/org/jboss/test/thirdparty/remoting/util/TestableSubsystem.java	2007-07-10 20:22:16 UTC (rev 2868)
@@ -9,7 +9,7 @@
 import org.jboss.remoting.InvocationRequest;
 
 /**
- * @author <a href="mailto:ovidiu at jboss.org">Ovidiu Feodorov</a>
+ * @author <a href="mailto:ovidiu at feodorov.com">Ovidiu Feodorov</a>
  * @version <tt>$Revision$</tt>
  * $Id$
  */




More information about the jboss-cvs-commits mailing list